From ce5a779a192d3c9022ec6df0c1b646d2cdd5bd5b Mon Sep 17 00:00:00 2001 From: Sandy Huang Date: Thu, 28 Jul 2022 09:16:50 +0800 Subject: [PATCH] drm/rockchip: vop2: gamma maybe enable at uboot gamma maybe enable at uboot, so we read dsp_lut state to adjust gamma state is more correct. Signed-off-by: Sandy Huang Change-Id: Ie8893e6136009874c140933b10a77d532e019aa1 --- drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c index 428b4da61cb7..ac855975ff39 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c @@ -2885,14 +2885,15 @@ static void rk3568_crtc_load_lut(struct drm_crtc *crtc) for (i = 0; i < vop2->data->nr_vps; i++) { struct vop2_video_port *_vp = &vop2->vps[i]; - if (_vp->gamma_lut_active) + if (VOP_MODULE_GET(vop2, _vp, dsp_lut_en)) vp_enable_gamma_nr++; } if (vop2->data->nr_gammas && vp_enable_gamma_nr >= vop2->data->nr_gammas && - vp->gamma_lut_active == false) { + VOP_MODULE_GET(vop2, vp, dsp_lut_en) == 0) { DRM_INFO("only support %d gamma\n", vop2->data->nr_gammas); + return; } @@ -2950,7 +2951,7 @@ static void vop2_crtc_load_lut(struct drm_crtc *crtc) return; if (vop2->version == VOP_VERSION_RK3568) { - return rk3568_crtc_load_lut(crtc); + rk3568_crtc_load_lut(crtc); } else if (vop2->version == VOP_VERSION_RK3588) { struct rockchip_crtc_state *vcstate = to_rockchip_crtc_state(crtc->state); const struct vop2_video_port_data *vp_data = &vop2->data->vp[vp->id];