Commit 74608d8f authored by Hsiao Chien Sung's avatar Hsiao Chien Sung Committed by Chun-Kuang Hu
Browse files

drm/mediatek: Add DRM_MODE_ROTATE_0 to rotation property 



Always add DRM_MODE_ROTATE_0 to rotation property to meet
IGT's (Intel GPU Tools) requirement.

Reviewed-by: default avatarCK Hu <ck.hu@mediatek.com>
Reviewed-by: default avatarAngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Fixes: 119f5173 ("drm/mediatek: Add DRM Driver for Mediatek SoC MT8173.")
Signed-off-by: default avatarHsiao Chien Sung <shawn.sung@mediatek.com>
Link: https://patchwork.kernel.org/project/dri-devel/patch/20240620-igt-v3-8-a9d62d2e2c7e@mediatek.com/


Signed-off-by: default avatarChun-Kuang Hu <chunkuang.hu@kernel.org>
parent 6fb7a098

drivers/gpu/drm/mediatek/mtk_ddp_comp.h

+5 −1
Original line number Diff line number Diff line
@@ -192,7 +192,11 @@ unsigned int mtk_ddp_comp_supported_rotations(struct mtk_ddp_comp *comp) 
	if (comp->funcs && comp->funcs->supported_rotations)

		return comp->funcs->supported_rotations(comp->dev);



	return 0;

	/*

	 * In order to pass IGT tests, DRM_MODE_ROTATE_0 is required when

	 * rotation is not supported.

	 */

	return DRM_MODE_ROTATE_0;

}



static inline unsigned int mtk_ddp_comp_layer_nr(struct mtk_ddp_comp *comp)

drivers/gpu/drm/mediatek/mtk_disp_ovl.c

+5 −12
Original line number Diff line number Diff line
@@ -305,27 +305,20 @@ int mtk_ovl_layer_check(struct device *dev, unsigned int idx, 
			struct mtk_plane_state *mtk_state)

{

	struct drm_plane_state *state = &mtk_state->base;

	unsigned int rotation = 0;



	rotation = drm_rotation_simplify(state->rotation,

					 DRM_MODE_ROTATE_0 |

					 DRM_MODE_REFLECT_X |

					 DRM_MODE_REFLECT_Y);

	rotation &= ~DRM_MODE_ROTATE_0;



	/* We can only do reflection, not rotation */

	if ((rotation & DRM_MODE_ROTATE_MASK) != 0)

	/* check if any unsupported rotation is set */

	if (state->rotation & ~mtk_ovl_supported_rotations(dev))

		return -EINVAL;



	/*

	 * TODO: Rotating/reflecting YUV buffers is not supported at this time.

	 *	 Only RGB[AX] variants are supported.

	 *	 Since DRM_MODE_ROTATE_0 means "no rotation", we should not

	 *	 reject layers with this property.

	 */

	if (state->fb->format->is_yuv && rotation != 0)

	if (state->fb->format->is_yuv && (state->rotation & ~DRM_MODE_ROTATE_0))

		return -EINVAL;



	state->rotation = rotation;



	return 0;

}

drivers/gpu/drm/mediatek/mtk_plane.c

+1 −1
Original line number Diff line number Diff line
@@ -338,7 +338,7 @@ int mtk_plane_init(struct drm_device *dev, struct drm_plane *plane, 
		return err;

	}



	if (supported_rotations & ~DRM_MODE_ROTATE_0) {

	if (supported_rotations) {

		err = drm_plane_create_rotation_property(plane,

							 DRM_MODE_ROTATE_0,

							 supported_rotations);