Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a9577f19 authored by Lowry Li (Arm Technology China)'s avatar Lowry Li (Arm Technology China) Committed by james qian wang (Arm Technology China)
Browse files

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.

Changes since v1:
1. Removed redundant warning check in komeda_get_afbc_format_bpp();
2. Removed a redundant empty line;
3. Rebased the branch.

Signed-off-by: default avatarLowry Li (Arm Technology China) <lowry.li@arm.com>
Reviewed-by: default avatarJames Qian Wang (Arm Technology China) <james.qian.wang@arm.com>
Signed-off-by: default avatarjames qian wang (Arm Technology China) <james.qian.wang@arm.com>
Link: https://patchwork.freedesktop.org/patch/msgid/1565073104-24047-1-git-send-email-lowry.li@arm.com
Link: https://patchwork.freedesktop.org/patch/msgid/1565073104-24047-1-git-send-email-lowry.li@arm.com
parent 1109635b

drivers/gpu/drm/arm/display/komeda/komeda_format_caps.c

+19 −0
Original line number Diff line number Diff line
@@ -35,6 +35,25 @@ komeda_get_format_caps(struct komeda_format_caps_table *table, 
	return NULL;

}



u32 komeda_get_afbc_format_bpp(const struct drm_format_info *info, u64 modifier)

{

	u32 bpp;



	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;

	}



	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
Original line number Diff line number Diff line
@@ -97,6 +97,9 @@ const struct komeda_format_caps * 
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

+3 −2
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ komeda_fb_afbc_size_check(struct komeda_fb *kfb, struct drm_file *file, 
	struct drm_framebuffer *fb = &kfb->base;

	const struct drm_format_info *info = fb->format;

	struct drm_gem_object *obj;

	u32 alignment_w = 0, alignment_h = 0, alignment_header, n_blocks;

	u32 alignment_w = 0, alignment_h = 0, alignment_header, n_blocks, bpp;

	u64 min_size;



	obj = drm_gem_object_lookup(file, mode_cmd->handles[0]);
@@ -88,8 +88,9 @@ komeda_fb_afbc_size_check(struct komeda_fb *kfb, struct drm_file *file, 
	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) {