diff options
| author | Andy Hu <andy.hu@starfivetech.com> | 2024-05-13 13:21:24 +0300 |
|---|---|---|
| committer | Andy Hu <andy.hu@starfivetech.com> | 2024-05-13 13:21:24 +0300 |
| commit | 071075eeaa5d9fa49669cc0561c27f004a1d63b1 (patch) | |
| tree | b9b70396d28c970d1f073d171168f2b50ecb0164 | |
| parent | a61d1d826ca3060fd76ab31d37c691fc09b52fc0 (diff) | |
| parent | fdf62cd77426303f7ffd581db68620ddde79f0dd (diff) | |
| download | linux-071075eeaa5d9fa49669cc0561c27f004a1d63b1.tar.xz | |
Merge remote-tracking branch 'sdk/jh7110-5.15.y-devel' into vf2-515-devel
| -rwxr-xr-x | drivers/gpu/drm/verisilicon/vs_crtc.c | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/verisilicon/vs_dc_hw.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/verisilicon/vs_crtc.c b/drivers/gpu/drm/verisilicon/vs_crtc.c index ebf659decfde..3a6db008b69c 100755 --- a/drivers/gpu/drm/verisilicon/vs_crtc.c +++ b/drivers/gpu/drm/verisilicon/vs_crtc.c @@ -18,7 +18,7 @@ #include <drm/drm_vblank.h> #endif -#define CONFIG_ENABLE_GAMMA_LUT 0 +#define CONFIG_ENABLE_GAMMA_LUT 1 void vs_crtc_destroy(struct drm_crtc *crtc) { diff --git a/drivers/gpu/drm/verisilicon/vs_dc_hw.c b/drivers/gpu/drm/verisilicon/vs_dc_hw.c index e12b067a0311..4cbf0507cda0 100644 --- a/drivers/gpu/drm/verisilicon/vs_dc_hw.c +++ b/drivers/gpu/drm/verisilicon/vs_dc_hw.c @@ -1563,7 +1563,7 @@ static void gamma_ex_commit(struct dc_hw *hw) dc_write(hw, DC_DISPLAY_GAMMA_EX_INDEX + (j << 2), 0x00); for (i = 0; i < GAMMA_EX_SIZE; i++) { value = hw->gamma[j].gamma[i][2] | - (hw->gamma[j].gamma[i][1] << 12); + (hw->gamma[j].gamma[i][1] << 16); dc_write(hw, DC_DISPLAY_GAMMA_EX_DATA + (j << 2), value); dc_write(hw, DC_DISPLAY_GAMMA_EX_ONE_DATA + (j << 2), hw->gamma[j].gamma[i][0]); |