shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 11:26:02 +09:00
Code Issues Packages Projects Releases Wiki Activity

drm/rockchip: vop2: fix splash screen when adjust gamma

Browse Source 
Fixes: 52c123bfd4 ("drm/rockchip: vop2: Move color cfg to atomic_flush")
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: Ida8d8ce7edd59015226fd7436c60610f510b5c05
This commit is contained in:
Sandy Huang
2023-01-11 15:48:58 +08:00
committed by Tao Huang
parent ce44d00809
commit 3f23ab2612
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
View File

@@ -997,6 +997,15 @@ static inline uint32_t vop2_read_grf_reg(struct regmap *regmap, const struct vop
return (vop2_grf_readl(regmap, reg) >> reg->shift) & reg->mask;
}
static inline void vop2_write_reg_uncached(struct vop2 *vop2, const struct vop_reg *reg, uint32_t v)
{
uint32_t offset = reg->offset;
uint32_t cached_val = vop2->regsbak[offset >> 2];
v = (cached_val & ~(reg->mask << reg->shift)) | ((v & reg->mask) << reg->shift);
writel(v, vop2->regs + offset);
}
static inline void vop2_mask_write(struct vop2 *vop2, uint32_t offset,
uint32_t mask, uint32_t shift, uint32_t v,
bool write_mask, bool relaxed)
@@ -3304,7 +3313,7 @@ static void rk3568_crtc_load_lut(struct drm_crtc *crtc)
spin_lock(&vop2->reg_lock);
VOP_MODULE_SET(vop2, vp, dsp_lut_en, 1);
VOP_MODULE_SET(vop2, vp, gamma_update_en, 1);
vop2_write_reg_uncached(vop2, &vp->regs->gamma_update_en, 1);
vop2_cfg_done(crtc);
vp->gamma_lut_active = true;
@@ -3325,7 +3334,7 @@ static void rk3588_crtc_load_lut(struct drm_crtc *crtc, u32 *lut)
vop2_write_lut(vop2, i << 2, lut[i]);
VOP_MODULE_SET(vop2, vp, dsp_lut_en, 1);
VOP_MODULE_SET(vop2, vp, gamma_update_en, 1);
vop2_write_reg_uncached(vop2, &vp->regs->gamma_update_en, 1);
vp->gamma_lut_active = true;
spin_unlock(&vop2->reg_lock);