drm/komeda: Adds internal bpp computing for arm afbc only format YU08 YU10
Subsystems (4)
PATCH 1/1 drm/komeda: Adds internal bpp computing for arm afbc only format YU08 YU10
The drm_format_info doesn't have any cpp or block_size (both are zero) information for arm only afbc format YU08/YU10. we need to compute it by ourselves.
--- .../drm/arm/display/komeda/komeda_format_caps.c | 23 ++++++++++++++++++++++ .../drm/arm/display/komeda/komeda_format_caps.h | 3 +++ .../drm/arm/display/komeda/komeda_framebuffer.c | 6 ++++-- 3 files changed, 30 insertions(+), 2 deletions(-)
drivers/gpu/drm/arm/display/komeda/komeda_format_caps.c +23 -0
@@ -35,6 +35,29 @@return NULL ; } +u32 komeda_get_afbc_format_bpp (const struct drm_format_info *info,u64 modifier) +{ +u32 bpp; + +WARN_ON (modifier ==DRM_FORMAT_MOD_LINEAR ); + +switch (info->format) { +case DRM_FORMAT_YUV420_8BIT : + bpp =12 ; +break ; +case DRM_FORMAT_YUV420_10BIT : + bpp =15 ; +break ; +default : + bpp = info->cpp[0 ] *8 ; +break ; + } + +WARN_ON (bpp ==0 ); + +return bpp; +} +/* Two assumptions * 1. RGB always has YTR * 2. Tiled RGB always has SC
drivers/gpu/drm/arm/display/komeda/komeda_format_caps.h +3 -0
@@ -97,6 +97,9 @@ static inline const char *komeda_get_format_name(u32 fourcc, u64 modifier) komeda_get_format_caps(struct komeda_format_caps_table *table, u32 fourcc, u64 modifier); +u32 komeda_get_afbc_format_bpp (const struct drm_format_info *info, +u64 modifier); +u32 *komeda_get_layer_fourcc_list (struct komeda_format_caps_table *table,u32 layer_type,u32 *n_fmts);
drivers/gpu/drm/arm/display/komeda/komeda_framebuffer.c +4 -2
@@ -44,7 +44,7 @@ static int komeda_fb_create_handle(struct drm_framebuffer *fb,const struct drm_format_info *info = fb->format;struct drm_gem_object *obj;u32 alignment_w =0 , alignment_h =0 , alignment_header; -u32 n_blocks =0 , min_size =0 ; +u32 n_blocks =0 , min_size =0 , bpp; obj =drm_gem_object_lookup (file, mode_cmd->handles[0 ]);if (!obj) {
@@ -86,10 +86,12 @@ static int komeda_fb_create_handle(struct drm_framebuffer *fb, kfb->offset_payload =ALIGN (n_blocks *AFBC_HEADER_SIZE , alignment_header); + bpp =komeda_get_afbc_format_bpp (info, fb->modifier); kfb->afbc_size = kfb->offset_payload + n_blocks * -ALIGN (info->cpp[0 ] *AFBC_SUPERBLK_PIXELS , +ALIGN (bpp *AFBC_SUPERBLK_PIXELS /8 ,AFBC_SUPERBLK_ALIGNMENT ); min_size = kfb->afbc_size + fb->offsets[0 ]; +if (min_size > obj->size) {DRM_DEBUG_KMS ("afbc size check failed, obj_size: 0x%lx. min_size 0x%x.\n" , obj->size, min_size);
Signature · 6 lines
1.9.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Liviu Dudau
maintainerHi Lowry,
Quoted 16 lines · Lowry Li (Arm Technology China)
The
drm_format_infodoesn't have any cpp orblock_size(both are zero) information for arm only afbc format YU08/YU10. we need to compute it by ourselves.Signed-off-by Lowry Li (Arm Technology China) <[email protected]>--- .../drm/arm/display/komeda/komeda_format_caps.c | 23 ++++++++++++++++++++++ .../drm/arm/display/komeda/komeda_format_caps.h | 3 +++ .../drm/arm/display/komeda/komeda_framebuffer.c | 6 ++++-- 3 files changed, 30 insertions(+), 2 deletions(-)drivers/gpu/drm/arm/display/komeda/komeda_format_caps.c +0
-0
drivers/gpu/drm/arm/display/komeda/komeda_format_caps.c line 42
Quoted 8 lines
drivers/gpu/drm/arm/display/komeda/komeda_format_caps.c +5
-0@@ -35,6 +35,29 @@return NULL ; } +u32 komeda_get_afbc_format_bpp (const struct drm_format_info *info,u64 modifier) +{ +u32 bpp; + +WARN_ON (modifier ==DRM_FORMAT_MOD_LINEAR );
Is it not better to return the value from info->char_per_block if modifier is DRM_FORMAT_MOD_LINEAR? Or return 0?
Quoted 52 lines
drivers/gpu/drm/arm/display/komeda/komeda_format_caps.c +18
-0+ +switch (info->format) { +case DRM_FORMAT_YUV420_8BIT : + bpp =12 ; +break ; +case DRM_FORMAT_YUV420_10BIT : + bpp =15 ; +break ; +default : + bpp = info->cpp[0 ] *8 ; +break ; + } + +WARN_ON (bpp ==0 ); + +return bpp; +} +/* Two assumptions * 1. RGB always has YTR * 2. Tiled RGB always has SC drivers/gpu/drm/arm/display/komeda/komeda_format_caps.h +3
-0@@ -97,6 +97,9 @@ static inline const char *komeda_get_format_name(u32 fourcc, u64 modifier) komeda_get_format_caps(struct komeda_format_caps_table *table, u32 fourcc, u64 modifier); +u32 komeda_get_afbc_format_bpp (const struct drm_format_info *info, +u64 modifier); +u32 *komeda_get_layer_fourcc_list (struct komeda_format_caps_table *table,u32 layer_type,u32 *n_fmts);drivers/gpu/drm/arm/display/komeda/komeda_framebuffer.c +1
-1@@ -44,7 +44,7 @@ static int komeda_fb_create_handle(struct drm_framebuffer *fb,const struct drm_format_info *info = fb->format;struct drm_gem_object *obj;u32 alignment_w =0 , alignment_h =0 , alignment_header; -u32 n_blocks =0 , min_size =0 ; +u32 n_blocks =0 , min_size =0 , bpp; obj =drm_gem_object_lookup (file, mode_cmd->handles[0 ]);if (!obj) {@@ -86,10 +86,12 @@ static int komeda_fb_create_handle(struct drm_framebuffer *fb, kfb->offset_payload =ALIGN (n_blocks *AFBC_HEADER_SIZE , alignment_header);
drivers/gpu/drm/arm/display/komeda/komeda_framebuffer.c static int komeda_fb_create_handle(struct drm_framebuffer *fb, · line 97
Quoted 10 lines
drivers/gpu/drm/arm/display/komeda/komeda_framebuffer.c +3
-1+ bpp =komeda_get_afbc_format_bpp (info, fb->modifier); kfb->afbc_size = kfb->offset_payload + n_blocks * -ALIGN (info->cpp[0 ] *AFBC_SUPERBLK_PIXELS , +ALIGN (bpp *AFBC_SUPERBLK_PIXELS /8 ,AFBC_SUPERBLK_ALIGNMENT ); min_size = kfb->afbc_size + fb->offsets[0 ]; +if (min_size > obj->size) {DRM_DEBUG_KMS ("afbc size check failed, obj_size: 0x%lx. min_size 0x%x.\n" , obj->size, min_size);
Patch doesn't apply to tip of drm-misc-next. What is this patch depending on?
Best regards,
Liviu
Quoted 3 lines
Signature · 1 line
1.9.1
Signature · 8 lines
====================
| I would like to |
| fix the world, |
| but they're not |
| giving me the |
\ source code! /
---------------
¯\_(ツ)_/¯Hi Liviu,
Quoted 22 lines · Liviu Dudau
Hi Lowry,
Quoted 19 lines · Lowry Li (Arm Technology China)
The
drm_format_infodoesn't have any cpp orblock_size(both are zero) information for arm only afbc format YU08/YU10. we need to compute it by ourselves.Signed-off-by Lowry Li (Arm Technology China) <[email protected]>--- .../drm/arm/display/komeda/komeda_format_caps.c | 23 ++++++++++++++++++++++ .../drm/arm/display/komeda/komeda_format_caps.h | 3 +++ .../drm/arm/display/komeda/komeda_framebuffer.c | 6 ++++-- 3 files changed, 30 insertions(+), 2 deletions(-)drivers/gpu/drm/arm/display/komeda/komeda_format_caps.c +0
-0@@ -35,6 +35,29 @@return NULL ; }
Quoted 8 lines
drivers/gpu/drm/arm/display/komeda/komeda_format_caps.c line 42
Quoted 5 lines
drivers/gpu/drm/arm/display/komeda/komeda_format_caps.c +5
-0+u32 komeda_get_afbc_format_bpp (const struct drm_format_info *info,u64 modifier) +{ +u32 bpp; + +WARN_ON (modifier ==DRM_FORMAT_MOD_LINEAR );Is it not better to return the value from
info->char_per_blockif modifier isDRM_FORMAT_MOD_LINEAR? Or return 0?
This function is only working for the afbc format and will remove this WARN_ON check.
Quoted 65 lines
Quoted 52 lines
drivers/gpu/drm/arm/display/komeda/komeda_format_caps.c +18
-0+ +switch (info->format) { +case DRM_FORMAT_YUV420_8BIT : + bpp =12 ; +break ; +case DRM_FORMAT_YUV420_10BIT : + bpp =15 ; +break ; +default : + bpp = info->cpp[0 ] *8 ; +break ; + } + +WARN_ON (bpp ==0 ); + +return bpp; +} +/* Two assumptions * 1. RGB always has YTR * 2. Tiled RGB always has SC drivers/gpu/drm/arm/display/komeda/komeda_format_caps.h +3
-0@@ -97,6 +97,9 @@ static inline const char *komeda_get_format_name(u32 fourcc, u64 modifier) komeda_get_format_caps(struct komeda_format_caps_table *table, u32 fourcc, u64 modifier); +u32 komeda_get_afbc_format_bpp (const struct drm_format_info *info, +u64 modifier); +u32 *komeda_get_layer_fourcc_list (struct komeda_format_caps_table *table,u32 layer_type,u32 *n_fmts);drivers/gpu/drm/arm/display/komeda/komeda_framebuffer.c +1
-1@@ -44,7 +44,7 @@ static int komeda_fb_create_handle(struct drm_framebuffer *fb,const struct drm_format_info *info = fb->format;struct drm_gem_object *obj;u32 alignment_w =0 , alignment_h =0 , alignment_header; -u32 n_blocks =0 , min_size =0 ; +u32 n_blocks =0 , min_size =0 , bpp; obj =drm_gem_object_lookup (file, mode_cmd->handles[0 ]);if (!obj) {@@ -86,10 +86,12 @@ static int komeda_fb_create_handle(struct drm_framebuffer *fb, kfb->offset_payload =ALIGN (n_blocks *AFBC_HEADER_SIZE , alignment_header);drivers/gpu/drm/arm/display/komeda/komeda_framebuffer.c static int komeda_fb_create_handle(struct drm_framebuffer *fb, · line 97
Quoted 10 lines
drivers/gpu/drm/arm/display/komeda/komeda_framebuffer.c +3
-1+ bpp =komeda_get_afbc_format_bpp (info, fb->modifier); kfb->afbc_size = kfb->offset_payload + n_blocks * -ALIGN (info->cpp[0 ] *AFBC_SUPERBLK_PIXELS , +ALIGN (bpp *AFBC_SUPERBLK_PIXELS /8 ,AFBC_SUPERBLK_ALIGNMENT ); min_size = kfb->afbc_size + fb->offsets[0 ]; +if (min_size > obj->size) {DRM_DEBUG_KMS ("afbc size check failed, obj_size: 0x%lx. min_size 0x%x.\n" , obj->size, min_size);Patch doesn't apply to tip of drm-misc-next. What is this patch depending on?
Quoted 2 lines
Best regards,
Liviu
Will rebase and send again. Thanks for the review.
Best regards,
Lowry
Quoted 13 lines
Quoted 3 lines
Signature · 1 line
1.9.1Signature · 8 lines
==================== | I would like to | | fix the world, | | but they're not | | giving me the | \ source code! / --------------- ¯\_(ツ)_/¯
Signature · 6 lines
Regards, Lowry _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel