shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 03:15:31 +09:00
Code Issues Packages Projects Releases Wiki Activity

drm/rockchip: debugfs: optimize dump buffer file name and size

Browse Source 
1. for rfbc/afbc format we need to dump all buffer at fb even userspace
set src buffer offset;
2. optimize dump buffer name, so we can get buffer info correctly from
file name, the following is an example of a dump file:

old file name: video1920_1080_NV12.bin
new file name:
    Cluster0-win0_fb-1920x1088_stride-1920_offset-0x0_act-1920x1080_NV12_0.bin
    Cluster0-win0_fb-3840x2160_stride-5760_offset-0x0_act-3840x2160_YU08_AFBC_1.bin

Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: I96c3af65fdbe37629d408bb09a8ee9aed78a7f7f
This commit is contained in:
Sandy Huang
2024-07-02 15:01:13 +08:00
committed by Tao Huang
parent 8a5680ba81
commit c1c9524d3f
2 changed files with 18 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
drivers/gpu/drm/rockchip/rockchip_drm_debugfs.c
View File

@@ -35,18 +35,10 @@
struct vop_dump_info { struct vop_dump_info {
/* @win_name human readable vop win name */ /* @win_name human readable vop win name */
const char *win_name; const char *win_name;
/* @fbc_enable: indicate fbc is enabled */
bool fbc_enable;
/* @yuv_format: indicate yuv format or not */
bool yuv_format;
/* @pitches: the buffer pitch size */
u32 pitches;
/* @height: the buffer pitch height */
u32 height;
/* @info: DRM format info */
const struct drm_format_info *format;
/* @fb: DRM frame buffer */ /* @fb: DRM frame buffer */
struct drm_framebuffer *fb; struct drm_framebuffer *fb;
/* @src: source coordinates of the plane (in 16.16)*/
struct drm_rect *src;
}; };
static int temp_pow(int sum, int n) static int temp_pow(int sum, int n)
@@ -61,22 +53,6 @@ static int temp_pow(int sum, int n)
return sum; return sum;
} }
static int get_afbc_size(uint32_t width, uint32_t height, uint32_t bpp)
{
uint32_t h_alignment = 16;
uint32_t n_blocks;
uint32_t hdr_size;
uint32_t size;
height = ALIGN(height, h_alignment);
n_blocks = width * height / AFBC_SUPERBLK_PIXELS;
hdr_size = ALIGN(n_blocks * AFBC_HEADER_SIZE, AFBC_HDR_ALIGN);
size = hdr_size + n_blocks * ALIGN(bpp * AFBC_SUPERBLK_PIXELS / 8, AFBC_SUPERBLK_ALIGNMENT);
return size;
}
static int rockchip_drm_dump_plane_buffer(struct vop_dump_info *dump_info, int frame_count) static int rockchip_drm_dump_plane_buffer(struct vop_dump_info *dump_info, int frame_count)
{ {
struct iosys_map map[DRM_FORMAT_MAX_PLANES]; struct iosys_map map[DRM_FORMAT_MAX_PLANES];
@@ -84,43 +60,24 @@ static int rockchip_drm_dump_plane_buffer(struct vop_dump_info *dump_info, int f
struct drm_framebuffer *fb = dump_info->fb; struct drm_framebuffer *fb = dump_info->fb;
int ret; int ret;
int flags; int flags;
int bpp;
const char *ptr; const char *ptr;
char file_name[100]; char file_name[128];
char format_name[5]; char format_name[5];
int width;
size_t size, uv_size = 0;
void *kvaddr; void *kvaddr;
struct file *file; struct file *file;
loff_t pos = 0; loff_t pos = 0;
struct drm_gem_object *obj = dump_info->fb->obj[0];
struct rockchip_gem_object *rk_obj = to_rockchip_obj(obj);
snprintf(file_name, sizeof(file_name), "%p4cc", &dump_info->format->format); snprintf(file_name, sizeof(file_name), "%p4cc", &dump_info->fb->format->format);
strscpy(format_name, file_name, 5); strscpy(format_name, file_name, 5);
bpp = rockchip_drm_get_bpp(dump_info->format); flags = O_RDWR | O_CREAT;
if (!bpp) { snprintf(file_name, 100, "%s/%s_fb-%dx%d_stride-%d_offset-%dx%d_act-%dx%d_%s%s_%d.bin",
DRM_WARN("invalid bpp %d\n", bpp); DUMP_BUF_PATH, dump_info->win_name, dump_info->fb->width, dump_info->fb->height,
return 0; dump_info->fb->pitches[0], dump_info->src->x1 >> 16, dump_info->src->y1 >> 16,
} drm_rect_width(dump_info->src) >> 16, drm_rect_height(dump_info->src) >> 16,
format_name, rockchip_drm_modifier_to_string(dump_info->fb->modifier), frame_count);
if (dump_info->yuv_format) {
u8 hsub = dump_info->format->hsub;
u8 vsub = dump_info->format->vsub;
width = dump_info->pitches * 8 / bpp;
flags = O_RDWR | O_CREAT | O_APPEND;
uv_size = (width * dump_info->height * bpp >> 3) * 2 / hsub / vsub;
snprintf(file_name, 100, "%s/video%d_%d_%s.%s", DUMP_BUF_PATH,
width, dump_info->height, format_name,
"bin");
} else {
width = dump_info->pitches * 8 / bpp;
flags = O_RDWR | O_CREAT;
snprintf(file_name, 100, "%s/%s_%dx%d_%s%s%d.%s",
DUMP_BUF_PATH, dump_info->win_name, width, dump_info->height,
format_name, dump_info->fbc_enable ?
"_FBC_" : "_", frame_count, "bin");
}
ret = drm_gem_fb_begin_cpu_access(fb, DMA_FROM_DEVICE); ret = drm_gem_fb_begin_cpu_access(fb, DMA_FROM_DEVICE);
if (ret) if (ret)
@@ -133,16 +90,10 @@ static int rockchip_drm_dump_plane_buffer(struct vop_dump_info *dump_info, int f
} }
kvaddr = data[0].vaddr; kvaddr = data[0].vaddr;
if (dump_info->fbc_enable)
size = get_afbc_size(width, dump_info->height, bpp);
else
size = (width * dump_info->height * bpp >> 3) + uv_size;
ptr = file_name; ptr = file_name;
file = filp_open(ptr, flags, 0644); file = filp_open(ptr, flags, 0644);
if (!IS_ERR(file)) { if (!IS_ERR(file)) {
kernel_write(file, kvaddr, size, &pos); kernel_write(file, kvaddr, rk_obj->size, &pos);
DRM_INFO("dump file name is:%s\n", file_name); DRM_INFO("dump file name is:%s\n", file_name);
fput(file); fput(file);
} else { } else {
@@ -162,27 +113,21 @@ int rockchip_drm_crtc_dump_plane_buffer(struct drm_crtc *crtc)
struct drm_plane *plane; struct drm_plane *plane;
struct drm_plane_state *pstate; struct drm_plane_state *pstate;
struct drm_framebuffer *fb; struct drm_framebuffer *fb;
struct drm_rect *psrc;
struct vop_dump_info dump_info; struct vop_dump_info dump_info;
drm_atomic_crtc_for_each_plane(plane, crtc) { drm_atomic_crtc_for_each_plane(plane, crtc) {
pstate = plane->state; pstate = plane->state;
psrc = &pstate->src;
fb = pstate->fb; fb = pstate->fb;
if (!fb) if (!fb)
continue; continue;
dump_info.fbc_enable = rockchip_drm_is_afbc(plane, fb->modifier) ||
rockchip_drm_is_rfbc(plane, fb->modifier);
dump_info.win_name = plane->name; dump_info.win_name = plane->name;
dump_info.yuv_format = fb->format->is_yuv;
dump_info.fb = fb; dump_info.fb = fb;
dump_info.pitches = fb->pitches[0]; dump_info.src = &pstate->src;
dump_info.height = drm_rect_height(psrc) >> 16;
dump_info.format = fb->format;
rockchip_drm_dump_plane_buffer(&dump_info, rockchip_crtc->frame_count); rockchip_drm_dump_plane_buffer(&dump_info, rockchip_crtc->vop_dump_frame_count);
} }
rockchip_crtc->vop_dump_frame_count++;
return 0; return 0;
} }
@@ -239,7 +184,6 @@ rockchip_drm_dump_buffer_write(struct file *file, const char __user *ubuf,
} else { } else {
drm_modeset_lock_all(crtc->dev); drm_modeset_lock_all(crtc->dev);
rockchip_drm_crtc_dump_plane_buffer(crtc); rockchip_drm_crtc_dump_plane_buffer(crtc);
rockchip_crtc->frame_count++;
drm_modeset_unlock_all(crtc->dev); drm_modeset_unlock_all(crtc->dev);
} }
} else if (strncmp(buf, "enable", 6) == 0) { } else if (strncmp(buf, "enable", 6) == 0) {
@@ -269,7 +213,7 @@ int rockchip_drm_add_dump_buffer(struct drm_crtc *crtc, struct dentry *root)
vop_dump_root = debugfs_create_dir("vop_dump", root); vop_dump_root = debugfs_create_dir("vop_dump", root);
rockchip_crtc->vop_dump_status = DUMP_DISABLE; rockchip_crtc->vop_dump_status = DUMP_DISABLE;
rockchip_crtc->vop_dump_times = 0; rockchip_crtc->vop_dump_times = 0;
rockchip_crtc->frame_count = 0; rockchip_crtc->vop_dump_frame_count = 0;
ent = debugfs_create_file("dump", 0644, vop_dump_root, ent = debugfs_create_file("dump", 0644, vop_dump_root,
crtc, &rockchip_drm_dump_buffer_fops); crtc, &rockchip_drm_dump_buffer_fops);
if (!ent) { if (!ent) {

2
drivers/gpu/drm/rockchip/rockchip_drm_drv.h
View File

@@ -177,7 +177,7 @@ struct rockchip_crtc {
struct list_head vop_dump_list_head; struct list_head vop_dump_list_head;
bool vop_dump_list_init_flag; bool vop_dump_list_init_flag;
int vop_dump_times; int vop_dump_times;
int frame_count; int vop_dump_frame_count;
#endif #endif
}; };