Subject: [PATCH] drm: mediatek: mtk_disp_gamma: Fix breakage due to merge issue

While the commit that was sent to the mailing lists was fine, something
happened during merge and the mtk_gamma_set() function got broken as
a writel() was turned into a readl().

Fix that by changing that back to the expected writel().

Fixes: a6b39cd248f3 ("drm/mediatek: De-commonize disp_aal/disp_gamma gamma_set functions")
Signed-off-by: AngeloGioacchino Del Regno <[email protected]>
---
drivers/gpu/drm/mediatek/mtk_disp_gamma.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/mediatek/mtk_disp_gamma.c b/drivers/gpu/drm/mediatek/mtk_disp_gamma.c
index 2fada9d6c95f..52c752bc5f41 100644
--- a/drivers/gpu/drm/mediatek/mtk_disp_gamma.c
+++ b/drivers/gpu/drm/mediatek/mtk_disp_gamma.c
@@ -203,7 +203,7 @@ void mtk_gamma_set(struct device *dev, struct drm_crtc_state *state)
/* Disable RELAY mode to pass the processed image */
cfg_val &= ~GAMMA_RELAY_MODE;

- cfg_val = readl(gamma->regs + DISP_GAMMA_CFG);
+ writel(cfg_val, gamma->regs + DISP_GAMMA_CFG);
}

void mtk_gamma_config(struct device *dev, unsigned int w,
--
2.42.0


Subject: Re: [PATCH] drm: mediatek: mtk_disp_gamma: Fix breakage due to merge issue

Il 25/10/23 12:49, AngeloGioacchino Del Regno ha scritto:
> While the commit that was sent to the mailing lists was fine, something
> happened during merge and the mtk_gamma_set() function got broken as
> a writel() was turned into a readl().
>
> Fix that by changing that back to the expected writel().
>
> Fixes: a6b39cd248f3 ("drm/mediatek: De-commonize disp_aal/disp_gamma gamma_set functions")
> Signed-off-by: AngeloGioacchino Del Regno <[email protected]>

This was a urgent patch one month ago, and it got ignored.

Friendly ping.

Regards,
Angelo

> ---
> drivers/gpu/drm/mediatek/mtk_disp_gamma.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/mediatek/mtk_disp_gamma.c b/drivers/gpu/drm/mediatek/mtk_disp_gamma.c
> index 2fada9d6c95f..52c752bc5f41 100644
> --- a/drivers/gpu/drm/mediatek/mtk_disp_gamma.c
> +++ b/drivers/gpu/drm/mediatek/mtk_disp_gamma.c
> @@ -203,7 +203,7 @@ void mtk_gamma_set(struct device *dev, struct drm_crtc_state *state)
> /* Disable RELAY mode to pass the processed image */
> cfg_val &= ~GAMMA_RELAY_MODE;
>
> - cfg_val = readl(gamma->regs + DISP_GAMMA_CFG);
> + writel(cfg_val, gamma->regs + DISP_GAMMA_CFG);
> }
>
> void mtk_gamma_config(struct device *dev, unsigned int w,