lkml.org 
[lkml]   [2020]   [Feb]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.5 311/542] drm/mediatek: Add gamma property according to hardware capability
    Date
    From: Yongqiang Niu <yongqiang.niu@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.niu@mediatek.com>
    Signed-off-by: Hsin-Yi Wang <hsinyi@chromium.org>
    Signed-off-by: CK Hu <ck.hu@mediatek.com>
    Signed-off-by: Sasha Levin <sashal@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 4132cd114a037..c3f5111fd563f 100644
    --- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
    +++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
    @@ -641,6 +641,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;
    @@ -691,6 +692,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;
    }

    for (i = 0; i < mtk_crtc->ddp_comp_nr; i++)
    @@ -711,8 +715,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
    \
     
     \ /
      Last update: 2020-02-14 19:11    [W:4.053 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site