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

drm/rockchip: vop2: Remove unnecessary check

Browse Source 
Fix the following smatch warnings:

rockchip_drm_vop2.c:2892 rk3568_crtc_load_lut() warn: we tested 'vp->gamma_lut_active' before and it was 'true'
rockchip_drm_vop2.c:6995 vop2_setup_hdr10() warn: we tested 'vp->hdr_out' before and it was 'true'
rockchip_drm_vop2.c:7512 vop2_setup_dly_for_vp() warn: we tested 'vp->hdr_in' before and it was 'true'

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I239658d19924b12843efdee8edf89962df1dae0b
This commit is contained in:
Tao Huang
2022-07-27 10:10:31 +08:00
parent 867ebf0228
commit 1701545271
1 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2883,9 +2883,9 @@ static void rk3568_crtc_load_lut(struct drm_crtc *crtc)
u8 vp_enable_gamma_nr = 0;
for (i = 0; i < vop2->data->nr_vps; i++) {
struct vop2_video_port *vp = &vop2->vps[i];
struct vop2_video_port *_vp = &vop2->vps[i];
if (vp->gamma_lut_active)
if (_vp->gamma_lut_active)
vp_enable_gamma_nr++;
}
@@ -6988,17 +6988,12 @@ static void vop2_setup_hdr10(struct vop2_video_port *vp, uint8_t win_phys_id)
}
}
if (have_sdr_layer && vp->hdr_out)
if (have_sdr_layer && vp->hdr_out) {
sdr2hdr_en = 1;
vp->sdr2hdr_en = sdr2hdr_en;
if (sdr2hdr_en) {
sdr2hdr_r2r_mode = BT709_TO_BT2020;
if (vp->hdr_out)
sdr2hdr_tf = SDR2HDR_FOR_HDR;
else
sdr2hdr_tf = SDR2HDR_FOR_BT2020;
sdr2hdr_tf = SDR2HDR_FOR_HDR;
}
vp->sdr2hdr_en = sdr2hdr_en;
VOP_MODULE_SET(vop2, vp, hdr10_en, hdr_en);
@@ -7511,7 +7506,7 @@ static void vop2_setup_dly_for_vp(struct vop2_video_port *vp)
}
if (!vp->hdr_in ||
(vop2->version == VOP_VERSION_RK3588 && vp->hdr_in && vp->hdr_out))
(vop2->version == VOP_VERSION_RK3588 && vp->hdr_out))
bg_dly -= vp->bg_ovl_dly;
/*