drm/mediatek: Add support for 180-degree rotation in the display driver

[PATCH] drm/mediatek: Add support for 180-degree rotation in the display driver

Posted by Jason-JH.Lin 1 year, 2 months ago

mediatek-drm driver reported the capability of 180-degree rotation by
adding `DRM_MODE_ROTATE_180` to the plane property, as flip-x combined
with flip-y equals a 180-degree rotation. However, we did not handle
the rotation property in the driver and lead to rotation issues.

Fixes: 74608d8feefd ("drm/mediatek: Add DRM_MODE_ROTATE_0 to rotation property")
Signed-off-by: Jason-JH.Lin <jason-jh.lin@mediatek.com>
---
 drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
index e0c0bb01f65a..cc825c4f2e09 100644
--- a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
+++ b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
@@ -472,6 +472,7 @@ void mtk_ovl_layer_config(struct device *dev, unsigned int idx,
 	unsigned int hdr_pitch = pending->hdr_pitch;
 	unsigned int fmt = pending->format;
 	unsigned int offset = (pending->y << 16) | pending->x;
+	unsigned int rotation = pending->rotation;
 	unsigned int src_size = (pending->height << 16) | pending->width;
 	unsigned int blend_mode = state->base.pixel_blend_mode;
 	unsigned int ignore_pixel_alpha = 0;
@@ -513,12 +514,19 @@ void mtk_ovl_layer_config(struct device *dev, unsigned int idx,
 			ignore_pixel_alpha = OVL_CONST_BLEND;
 	}
 
-	if (pending->rotation & DRM_MODE_REFLECT_Y) {
+	/*
+	 * Treat rotate 180 as flip x + flip y, and XOR the original rotation value
+	 * to flip x + flip y to support both in the same time.
+	 */
+	if (rotation & DRM_MODE_ROTATE_180)
+		rotation ^= DRM_MODE_REFLECT_X | DRM_MODE_REFLECT_Y;
+
+	if (rotation & DRM_MODE_REFLECT_Y) {
 		con |= OVL_CON_VIRT_FLIP;
 		addr += (pending->height - 1) * pending->pitch;
 	}
 
-	if (pending->rotation & DRM_MODE_REFLECT_X) {
+	if (rotation & DRM_MODE_REFLECT_X) {
 		con |= OVL_CON_HORZ_FLIP;
 		addr += pending->pitch - 1;
 	}
-- 
2.43.0

Re: [PATCH] drm/mediatek: Add support for 180-degree rotation in the display driver

Posted by Chun-Kuang Hu 1 year, 1 month ago

Hi, Jason:

Jason-JH.Lin <jason-jh.lin@mediatek.com> 於 2024年11月18日 週一 上午10:51寫道：
>
> mediatek-drm driver reported the capability of 180-degree rotation by
> adding `DRM_MODE_ROTATE_180` to the plane property, as flip-x combined
> with flip-y equals a 180-degree rotation. However, we did not handle
> the rotation property in the driver and lead to rotation issues.

Applied to mediatek-drm-fixes [1], thanks.

[1] https://git.kernel.org/pub/scm/linux/kernel/git/chunkuang.hu/linux.git/log/?h=mediatek-drm-fixes

Regards,
Chun-Kuang.

>
> Fixes: 74608d8feefd ("drm/mediatek: Add DRM_MODE_ROTATE_0 to rotation property")
> Signed-off-by: Jason-JH.Lin <jason-jh.lin@mediatek.com>
> ---
>  drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 12 ++++++++++--
>  1 file changed, 10 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
> index e0c0bb01f65a..cc825c4f2e09 100644
> --- a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
> +++ b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
> @@ -472,6 +472,7 @@ void mtk_ovl_layer_config(struct device *dev, unsigned int idx,
>         unsigned int hdr_pitch = pending->hdr_pitch;
>         unsigned int fmt = pending->format;
>         unsigned int offset = (pending->y << 16) | pending->x;
> +       unsigned int rotation = pending->rotation;
>         unsigned int src_size = (pending->height << 16) | pending->width;
>         unsigned int blend_mode = state->base.pixel_blend_mode;
>         unsigned int ignore_pixel_alpha = 0;
> @@ -513,12 +514,19 @@ void mtk_ovl_layer_config(struct device *dev, unsigned int idx,
>                         ignore_pixel_alpha = OVL_CONST_BLEND;
>         }
>
> -       if (pending->rotation & DRM_MODE_REFLECT_Y) {
> +       /*
> +        * Treat rotate 180 as flip x + flip y, and XOR the original rotation value
> +        * to flip x + flip y to support both in the same time.
> +        */
> +       if (rotation & DRM_MODE_ROTATE_180)
> +               rotation ^= DRM_MODE_REFLECT_X | DRM_MODE_REFLECT_Y;
> +
> +       if (rotation & DRM_MODE_REFLECT_Y) {
>                 con |= OVL_CON_VIRT_FLIP;
>                 addr += (pending->height - 1) * pending->pitch;
>         }
>
> -       if (pending->rotation & DRM_MODE_REFLECT_X) {
> +       if (rotation & DRM_MODE_REFLECT_X) {
>                 con |= OVL_CON_HORZ_FLIP;
>                 addr += pending->pitch - 1;
>         }
> --
> 2.43.0
>

Re: [PATCH] drm/mediatek: Add support for 180-degree rotation in the display driver

Posted by CK Hu (胡俊光) 1 year, 2 months ago

Hi, Jason:

On Mon, 2024-11-18 at 10:51 +0800, Jason-JH.Lin wrote:
> mediatek-drm driver reported the capability of 180-degree rotation by
> adding `DRM_MODE_ROTATE_180` to the plane property, as flip-x combined
> with flip-y equals a 180-degree rotation. However, we did not handle
> the rotation property in the driver and lead to rotation issues.

Reviewed-by: CK Hu <ck.hu@mediatek.com>

> 
> Fixes: 74608d8feefd ("drm/mediatek: Add DRM_MODE_ROTATE_0 to rotation property")
> Signed-off-by: Jason-JH.Lin <jason-jh.lin@mediatek.com>
> ---
>  drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 12 ++++++++++--
>  1 file changed, 10 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
> index e0c0bb01f65a..cc825c4f2e09 100644
> --- a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
> +++ b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
> @@ -472,6 +472,7 @@ void mtk_ovl_layer_config(struct device *dev, unsigned int idx,
>  	unsigned int hdr_pitch = pending->hdr_pitch;
>  	unsigned int fmt = pending->format;
>  	unsigned int offset = (pending->y << 16) | pending->x;
> +	unsigned int rotation = pending->rotation;
>  	unsigned int src_size = (pending->height << 16) | pending->width;
>  	unsigned int blend_mode = state->base.pixel_blend_mode;
>  	unsigned int ignore_pixel_alpha = 0;
> @@ -513,12 +514,19 @@ void mtk_ovl_layer_config(struct device *dev, unsigned int idx,
>  			ignore_pixel_alpha = OVL_CONST_BLEND;
>  	}
>  
> -	if (pending->rotation & DRM_MODE_REFLECT_Y) {
> +	/*
> +	 * Treat rotate 180 as flip x + flip y, and XOR the original rotation value
> +	 * to flip x + flip y to support both in the same time.
> +	 */
> +	if (rotation & DRM_MODE_ROTATE_180)
> +		rotation ^= DRM_MODE_REFLECT_X | DRM_MODE_REFLECT_Y;
> +
> +	if (rotation & DRM_MODE_REFLECT_Y) {
>  		con |= OVL_CON_VIRT_FLIP;
>  		addr += (pending->height - 1) * pending->pitch;
>  	}
>  
> -	if (pending->rotation & DRM_MODE_REFLECT_X) {
> +	if (rotation & DRM_MODE_REFLECT_X) {
>  		con |= OVL_CON_HORZ_FLIP;
>  		addr += pending->pitch - 1;
>  	}

Re: [PATCH] drm/mediatek: Add support for 180-degree rotation in the display driver

Posted by AngeloGioacchino Del Regno 1 year, 2 months ago

Il 18/11/24 03:51, Jason-JH.Lin ha scritto:
> mediatek-drm driver reported the capability of 180-degree rotation by
> adding `DRM_MODE_ROTATE_180` to the plane property, as flip-x combined
> with flip-y equals a 180-degree rotation. However, we did not handle
> the rotation property in the driver and lead to rotation issues.
> 
> Fixes: 74608d8feefd ("drm/mediatek: Add DRM_MODE_ROTATE_0 to rotation property")
> Signed-off-by: Jason-JH.Lin <jason-jh.lin@mediatek.com>

Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>