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

Commit 19358630 authored by Lowry Li (Arm Technology China)'s avatar Lowry Li (Arm Technology China) Committed by Liviu Dudau
Browse files

drm/komeda: Adds limitation check for AFBC wide block not support Rot90 



Komeda series hardware doesn't support Rot90 for AFBC wide block. So
add limitation check to reject it if such configuration has been posted.

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 avatarLiviu Dudau <liviu.dudau@arm.com>
parent 429bfabe

drivers/gpu/drm/arm/display/komeda/d71/d71_dev.c

+15 −0
Original line number Diff line number Diff line
@@ -494,11 +494,26 @@ static struct komeda_format_caps d71_format_caps_table[] = { 
	{__HW_ID(6, 7),	0/*DRM_FORMAT_YUV420_10BIT*/, 1,	RICH,	Rot_ALL_H_V,	LYT_NM, AFB_TH},

};



static bool d71_format_mod_supported(const struct komeda_format_caps *caps,

				     u32 layer_type, u64 modifier, u32 rot)

{

	uint64_t layout = modifier & AFBC_FORMAT_MOD_BLOCK_SIZE_MASK;



	if ((layout == AFBC_FORMAT_MOD_BLOCK_SIZE_32x8) &&

	    drm_rotation_90_or_270(rot)) {

		DRM_DEBUG_ATOMIC("D71 doesn't support ROT90 for WB-AFBC.\n");

		return false;

	}



	return true;

}



static void d71_init_fmt_tbl(struct komeda_dev *mdev)

{

	struct komeda_format_caps_table *table = &mdev->fmt_tbl;



	table->format_caps = d71_format_caps_table;

	table->format_mod_supported = d71_format_mod_supported;

	table->n_formats = ARRAY_SIZE(d71_format_caps_table);

}

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

+6 −1
Original line number Diff line number Diff line
@@ -74,7 +74,8 @@ u64 komeda_supported_modifiers[] = { 
};



bool komeda_format_mod_supported(struct komeda_format_caps_table *table,

				 u32 layer_type, u32 fourcc, u64 modifier)

				 u32 layer_type, u32 fourcc, u64 modifier,

				 u32 rot)

{

	const struct komeda_format_caps *caps;
@@ -85,6 +86,10 @@ bool komeda_format_mod_supported(struct komeda_format_caps_table *table, 
	if (!(caps->supported_layer_types & layer_type))

		return false;



	if (table->format_mod_supported)

		return table->format_mod_supported(caps, layer_type, modifier,

						   rot);



	return true;

}

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

+7 −1
Original line number Diff line number Diff line
@@ -71,10 +71,15 @@ struct komeda_format_caps { 
 *

 * @n_formats: the size of format_caps list.

 * @format_caps: format_caps list.

 * @format_mod_supported: Optional. Some HW may have special requirements or

 * limitations which can not be described by format_caps, this func supply HW

 * the ability to do the further HW specific check.

 */

struct komeda_format_caps_table {

	u32 n_formats;

	const struct komeda_format_caps *format_caps;

	bool (*format_mod_supported)(const struct komeda_format_caps *caps,

				     u32 layer_type, u64 modifier, u32 rot);

};



extern u64 komeda_supported_modifiers[];
@@ -100,6 +105,7 @@ u32 *komeda_get_layer_fourcc_list(struct komeda_format_caps_table *table, 
void komeda_put_fourcc_list(u32 *fourcc_list);



bool komeda_format_mod_supported(struct komeda_format_caps_table *table,

				 u32 layer_type, u32 fourcc, u64 modifier);

				 u32 layer_type, u32 fourcc, u64 modifier,

				 u32 rot);



#endif

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

+9 −9
Original line number Diff line number Diff line
@@ -240,20 +240,20 @@ komeda_fb_get_pixel_addr(struct komeda_fb *kfb, int x, int y, int plane) 
}



/* if the fb can be supported by a specific layer */

bool komeda_fb_is_layer_supported(struct komeda_fb *kfb, u32 layer_type)

bool komeda_fb_is_layer_supported(struct komeda_fb *kfb, u32 layer_type,

				  u32 rot)

{

	struct drm_framebuffer *fb = &kfb->base;

	struct komeda_dev *mdev = fb->dev->dev_private;

	const struct komeda_format_caps *caps;

	u32 fourcc = fb->format->format;

	u64 modifier = fb->modifier;

	bool supported;



	caps = komeda_get_format_caps(&mdev->fmt_tbl, fourcc, modifier);

	if (!caps)

		return false;

	supported = komeda_format_mod_supported(&mdev->fmt_tbl, layer_type,

						fourcc, modifier, rot);

	if (!supported)

		DRM_DEBUG_ATOMIC("Layer TYPE: %d doesn't support fb FMT: %s.\n",

			layer_type, komeda_get_format_name(fourcc, modifier));



	if (!(caps->supported_layer_types & layer_type))

		return false;



	return true;

	return supported;

}

drivers/gpu/drm/arm/display/komeda/komeda_framebuffer.h

+3 −2
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ komeda_fb_create(struct drm_device *dev, struct drm_file *file, 
		const struct drm_mode_fb_cmd2 *mode_cmd);

dma_addr_t

komeda_fb_get_pixel_addr(struct komeda_fb *kfb, int x, int y, int plane);

bool komeda_fb_is_layer_supported(struct komeda_fb *kfb, u32 layer_type);

bool komeda_fb_is_layer_supported(struct komeda_fb *kfb, u32 layer_type,

		u32 rot);



#endif