From: Yongqiang Niu <yongqiang....@mediatek.com>

[ Upstream commit 4cebc1de506fa753301266a5a23bb21bca52ad3a ]

If there is no gamma function in the crtc
display path, don't add gamma property
for crtc

Fixes: 2f3f4dda747c ("drm/mediatek: Add gamma correction.")
Signed-off-by: Yongqiang Niu <yongqiang....@mediatek.com>
Signed-off-by: Hsin-Yi Wang <hsi...@chromium.org>
Signed-off-by: CK Hu <ck...@mediatek.com>
Signed-off-by: Sasha Levin <sas...@kernel.org>
---
 drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c 
b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
index 0b3d284d19569..e6c049f4f08bb 100644
--- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
+++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
@@ -537,6 +537,7 @@ int mtk_drm_crtc_create(struct drm_device *drm_dev,
        int pipe = priv->num_pipes;
        int ret;
        int i;
+       uint gamma_lut_size = 0;
 
        if (!path)
                return 0;
@@ -587,6 +588,9 @@ int mtk_drm_crtc_create(struct drm_device *drm_dev,
                }
 
                mtk_crtc->ddp_comp[i] = comp;
+
+               if (comp->funcs && comp->funcs->gamma_set)
+                       gamma_lut_size = MTK_LUT_SIZE;
        }
 
        mtk_crtc->layer_nr = mtk_ddp_comp_layer_nr(mtk_crtc->ddp_comp[0]);
@@ -609,8 +613,10 @@ int mtk_drm_crtc_create(struct drm_device *drm_dev,
                                NULL, pipe);
        if (ret < 0)
                return ret;
-       drm_mode_crtc_set_gamma_size(&mtk_crtc->base, MTK_LUT_SIZE);
-       drm_crtc_enable_color_mgmt(&mtk_crtc->base, 0, false, MTK_LUT_SIZE);
+
+       if (gamma_lut_size)
+               drm_mode_crtc_set_gamma_size(&mtk_crtc->base, gamma_lut_size);
+       drm_crtc_enable_color_mgmt(&mtk_crtc->base, 0, false, gamma_lut_size);
        priv->num_pipes++;
 
        return 0;
-- 
2.20.1

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Reply via email to