This commit is based on [email protected].
This bug is found when running IGT tests.
For CRTCs that doesn't support rotation should still return
DRM_MODE_ROTATE_0, otherwise the test will fail to restart.
Returns the hardware capabilities accordingly.
Changes in v3:
- Return 0 (not support) if rotation capabilities is not defined
in the driver data.
Changes in v2:
- Restore DRM_MODE_ROTATE_180 (reflect x + reflect y = rotate 180)
- Define supported rotations in the driver data
Hsiao Chien Sung (1):
drm/mediatek: Fix errors when reporting rotation capability
drivers/gpu/drm/mediatek/mtk_disp_drv.h | 1 +
drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 30 ++++++++++---------
.../gpu/drm/mediatek/mtk_disp_ovl_adaptor.c | 5 ++++
drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c | 1 +
drivers/gpu/drm/mediatek/mtk_drm_plane.c | 2 +-
5 files changed, 24 insertions(+), 15 deletions(-)
--
2.39.2
Create rotation property according to the hardware capability.
Fixes: 84d805753983 ("drm/mediatek: Support reflect-y plane rotation")
Reviewed-by: AngeloGioacchino Del Regno <[email protected]>
Signed-off-by: Hsiao Chien Sung <[email protected]>
---
drivers/gpu/drm/mediatek/mtk_disp_drv.h | 1 +
drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 30 ++++++++++---------
.../gpu/drm/mediatek/mtk_disp_ovl_adaptor.c | 5 ++++
drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c | 1 +
drivers/gpu/drm/mediatek/mtk_drm_plane.c | 2 +-
5 files changed, 24 insertions(+), 15 deletions(-)
diff --git a/drivers/gpu/drm/mediatek/mtk_disp_drv.h b/drivers/gpu/drm/mediatek/mtk_disp_drv.h
index 4d6e8b667bc3..c5afeb7c5527 100644
--- a/drivers/gpu/drm/mediatek/mtk_disp_drv.h
+++ b/drivers/gpu/drm/mediatek/mtk_disp_drv.h
@@ -127,6 +127,7 @@ void mtk_ovl_adaptor_register_vblank_cb(struct device *dev, void (*vblank_cb)(vo
void mtk_ovl_adaptor_unregister_vblank_cb(struct device *dev);
void mtk_ovl_adaptor_enable_vblank(struct device *dev);
void mtk_ovl_adaptor_disable_vblank(struct device *dev);
+unsigned int mtk_ovl_adaptor_supported_rotations(struct device *dev);
void mtk_ovl_adaptor_start(struct device *dev);
void mtk_ovl_adaptor_stop(struct device *dev);
unsigned int mtk_ovl_adaptor_layer_nr(struct device *dev);
diff --git a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
index ecc38932fd44..285987c1ccc7 100644
--- a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
+++ b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
@@ -177,6 +177,7 @@ static const u32 mt8195_ovl_crc_ofs[] = {
* @supports_clrfmt_ext: whether the ovl supports clear format (for alpha blend)
* @crc_ofs: crc offset table
* @crc_cnt: count of crc registers (could be more than one bank)
+ * @rotations: supported rotations
*/
struct mtk_disp_ovl_data {
unsigned int addr;
@@ -190,6 +191,7 @@ struct mtk_disp_ovl_data {
bool supports_clrfmt_ext;
const u32 *crc_ofs;
size_t crc_cnt;
+ unsigned int rotations;
};
/**
@@ -415,35 +417,26 @@ unsigned int mtk_ovl_layer_nr(struct device *dev)
unsigned int mtk_ovl_supported_rotations(struct device *dev)
{
- return DRM_MODE_ROTATE_0 | DRM_MODE_ROTATE_180 |
- DRM_MODE_REFLECT_X | DRM_MODE_REFLECT_Y;
+ struct mtk_disp_ovl *ovl = dev_get_drvdata(dev);
+
+ return ovl->data->rotations ?: 0;
}
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)
+ 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.
*/
- 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;
}
@@ -883,6 +876,15 @@ static const struct mtk_disp_ovl_data mt8195_ovl_driver_data = {
.supports_clrfmt_ext = true,
.crc_ofs = mt8195_ovl_crc_ofs,
.crc_cnt = ARRAY_SIZE(mt8195_ovl_crc_ofs),
+
+ /*
+ * although OVL only supports reflections on MT8195,
+ * reflect x + reflect y = rotate 180
+ */
+ .rotations = DRM_MODE_ROTATE_0 |
+ DRM_MODE_ROTATE_180 |
+ DRM_MODE_REFLECT_X |
+ DRM_MODE_REFLECT_Y,
};
static const struct of_device_id mtk_disp_ovl_driver_dt_match[] = {
diff --git a/drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c b/drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c
index 4398db9a6276..b0d3ebdba93a 100644
--- a/drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c
+++ b/drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c
@@ -383,6 +383,11 @@ void mtk_ovl_adaptor_register_vblank_cb(struct device *dev, void (*vblank_cb)(vo
vblank_cb, vblank_cb_data);
}
+unsigned int mtk_ovl_adaptor_supported_rotations(struct device *dev)
+{
+ return DRM_MODE_ROTATE_0;
+}
+
void mtk_ovl_adaptor_unregister_vblank_cb(struct device *dev)
{
struct mtk_disp_ovl_adaptor *ovl_adaptor = dev_get_drvdata(dev);
diff --git a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c
index ffa4868b1222..206dd6f6f99e 100644
--- a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c
+++ b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c
@@ -422,6 +422,7 @@ static const struct mtk_ddp_comp_funcs ddp_ovl_adaptor = {
.remove = mtk_ovl_adaptor_remove_comp,
.get_formats = mtk_ovl_adaptor_get_formats,
.get_num_formats = mtk_ovl_adaptor_get_num_formats,
+ .supported_rotations = mtk_ovl_adaptor_supported_rotations,
};
static const char * const mtk_ddp_comp_stem[MTK_DDP_COMP_TYPE_MAX] = {
diff --git a/drivers/gpu/drm/mediatek/mtk_drm_plane.c b/drivers/gpu/drm/mediatek/mtk_drm_plane.c
index e2ec61b69618..894c39a38a58 100644
--- a/drivers/gpu/drm/mediatek/mtk_drm_plane.c
+++ b/drivers/gpu/drm/mediatek/mtk_drm_plane.c
@@ -344,7 +344,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);
--
2.39.2
Hi, Hsiao-chien:
On Mon, 2023-11-20 at 15:12 +0800, Hsiao Chien Sung wrote:
> Create rotation property according to the hardware capability.
>
> Fixes: 84d805753983 ("drm/mediatek: Support reflect-y plane
> rotation")
In Sean Paul's patch (the patch you fix), ovl driver only support
mt8127 and mt8173, and I believe that Sean has tested on mt8173. In
this patch, only mt8195 ovl support rotation, why do you do this
modification? Please describe which SoC is wrong in commit message so I
could know how the code should be.
>
> Reviewed-by: AngeloGioacchino Del Regno <
> [email protected]>
> Signed-off-by: Hsiao Chien Sung <[email protected]>
> ---
> drivers/gpu/drm/mediatek/mtk_disp_drv.h | 1 +
> drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 30 ++++++++++-------
> --
> .../gpu/drm/mediatek/mtk_disp_ovl_adaptor.c | 5 ++++
> drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c | 1 +
> drivers/gpu/drm/mediatek/mtk_drm_plane.c | 2 +-
> 5 files changed, 24 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/gpu/drm/mediatek/mtk_disp_drv.h
> b/drivers/gpu/drm/mediatek/mtk_disp_drv.h
> index 4d6e8b667bc3..c5afeb7c5527 100644
> --- a/drivers/gpu/drm/mediatek/mtk_disp_drv.h
> +++ b/drivers/gpu/drm/mediatek/mtk_disp_drv.h
> @@ -127,6 +127,7 @@ void mtk_ovl_adaptor_register_vblank_cb(struct
> device *dev, void (*vblank_cb)(vo
> void mtk_ovl_adaptor_unregister_vblank_cb(struct device *dev);
> void mtk_ovl_adaptor_enable_vblank(struct device *dev);
> void mtk_ovl_adaptor_disable_vblank(struct device *dev);
> +unsigned int mtk_ovl_adaptor_supported_rotations(struct device
> *dev);
> void mtk_ovl_adaptor_start(struct device *dev);
> void mtk_ovl_adaptor_stop(struct device *dev);
> unsigned int mtk_ovl_adaptor_layer_nr(struct device *dev);
> diff --git a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
> b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
> index ecc38932fd44..285987c1ccc7 100644
> --- a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
> +++ b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
> @@ -177,6 +177,7 @@ static const u32 mt8195_ovl_crc_ofs[] = {
> * @supports_clrfmt_ext: whether the ovl supports clear format (for
> alpha blend)
> * @crc_ofs: crc offset table
> * @crc_cnt: count of crc registers (could be more than one bank)
> + * @rotations: supported rotations
> */
> struct mtk_disp_ovl_data {
> unsigned int addr;
> @@ -190,6 +191,7 @@ struct mtk_disp_ovl_data {
> bool supports_clrfmt_ext;
> const u32 *crc_ofs;
> size_t crc_cnt;
> + unsigned int rotations;
> };
>
> /**
> @@ -415,35 +417,26 @@ unsigned int mtk_ovl_layer_nr(struct device
> *dev)
>
> unsigned int mtk_ovl_supported_rotations(struct device *dev)
> {
> - return DRM_MODE_ROTATE_0 | DRM_MODE_ROTATE_180 |
> - DRM_MODE_REFLECT_X | DRM_MODE_REFLECT_Y;
> + struct mtk_disp_ovl *ovl = dev_get_drvdata(dev);
> +
> + return ovl->data->rotations ?: 0;
> }
>
> 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)
> + 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.
> */
> - 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;
> }
>
> @@ -883,6 +876,15 @@ static const struct mtk_disp_ovl_data
> mt8195_ovl_driver_data = {
> .supports_clrfmt_ext = true,
> .crc_ofs = mt8195_ovl_crc_ofs,
> .crc_cnt = ARRAY_SIZE(mt8195_ovl_crc_ofs),
> +
> + /*
> + * although OVL only supports reflections on MT8195,
> + * reflect x + reflect y = rotate 180
> + */
> + .rotations = DRM_MODE_ROTATE_0 |
> + DRM_MODE_ROTATE_180 |
> + DRM_MODE_REFLECT_X |
> + DRM_MODE_REFLECT_Y,
> };
>
> static const struct of_device_id mtk_disp_ovl_driver_dt_match[] = {
> diff --git a/drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c
> b/drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c
> index 4398db9a6276..b0d3ebdba93a 100644
> --- a/drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c
> +++ b/drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c
> @@ -383,6 +383,11 @@ void mtk_ovl_adaptor_register_vblank_cb(struct
> device *dev, void (*vblank_cb)(vo
> vblank_cb, vblank_cb_data);
> }
>
> +unsigned int mtk_ovl_adaptor_supported_rotations(struct device *dev)
> +{
> + return DRM_MODE_ROTATE_0;
> +}
> +
> void mtk_ovl_adaptor_unregister_vblank_cb(struct device *dev)
> {
> struct mtk_disp_ovl_adaptor *ovl_adaptor =
> dev_get_drvdata(dev);
> diff --git a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c
> b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c
> index ffa4868b1222..206dd6f6f99e 100644
> --- a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c
> +++ b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c
> @@ -422,6 +422,7 @@ static const struct mtk_ddp_comp_funcs
> ddp_ovl_adaptor = {
> .remove = mtk_ovl_adaptor_remove_comp,
> .get_formats = mtk_ovl_adaptor_get_formats,
> .get_num_formats = mtk_ovl_adaptor_get_num_formats,
> + .supported_rotations = mtk_ovl_adaptor_supported_rotations,
> };
>
> static const char * const mtk_ddp_comp_stem[MTK_DDP_COMP_TYPE_MAX] =
> {
> diff --git a/drivers/gpu/drm/mediatek/mtk_drm_plane.c
> b/drivers/gpu/drm/mediatek/mtk_drm_plane.c
> index e2ec61b69618..894c39a38a58 100644
> --- a/drivers/gpu/drm/mediatek/mtk_drm_plane.c
> +++ b/drivers/gpu/drm/mediatek/mtk_drm_plane.c
> @@ -344,7 +344,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) {
I think this modification is not necessary.
Regards,
CK
> err = drm_plane_create_rotation_property(plane,
> DRM_MODE_ROTAT
> E_0,
> supported_rota
> tions);
> --
> 2.39.2
>
Hi CK,
On Tue, 2023-11-21 at 02:57 +0000, CK Hu (胡俊光) wrote:
> Hi, Hsiao-chien:
>
> On Mon, 2023-11-20 at 15:12 +0800, Hsiao Chien Sung wrote:
> > Create rotation property according to the hardware capability.
> >
> > Fixes: 84d805753983 ("drm/mediatek: Support reflect-y plane
> > rotation")
>
> In Sean Paul's patch (the patch you fix), ovl driver only support
> mt8127 and mt8173, and I believe that Sean has tested on mt8173. In
> this patch, only mt8195 ovl support rotation, why do you do this
> modification? Please describe which SoC is wrong in commit message so
> I
> could know how the code should be.
Thanks for checking. According to the cover letter by Sean, his fix was
verified on mt8183, but it will be applied to all the chips. Since for
now OVL on all chips support same rotation, will remove it from the
driver data and return rotation property directly.
Regards,
Shawn