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

drm/rockchip: vop2: Enable sd2hdr when we have a sdr plane but hdr output

Browse Source 
We thought when userspace switch hdmi to hdr mode, it must
give vop a hdr plane, but We meet a case: composer give
vop only one sdr plane, but switch hdmi to hdr mode.

so we don't check the plane number for sdr2hdr_en;

Change-Id: I4804a88321af84328735d6499ac9df610bf2cb85
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
This commit is contained in:
Andy Yan
2021-05-14 11:33:07 +08:00
committed by Tao Huang
parent dd815d2e64
commit d9aca94d74
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4351,7 +4351,7 @@ static void vop2_setup_hdr10(struct vop2_video_port *vp, uint8_t win_phys_id)
bool sdr2hdr_en = 0;
bool sdr2hdr_tf = 0;
bool hdr2sdr_tf_update = 1;
bool sdr2hdr_tf_update = 0;
bool sdr2hdr_tf_update = 1;
/*
* Check whether this video port support hdr or not
@@ -4378,7 +4378,7 @@ static void vop2_setup_hdr10(struct vop2_video_port *vp, uint8_t win_phys_id)
if (vp->hdr_in && !vp->hdr_out)
hdr2sdr_en = 1;
if (vp->hdr_out && (vp->nr_layers > 1))
if (!vp->hdr_in && vp->hdr_out)
sdr2hdr_en = 1;
vp->sdr2hdr_en = sdr2hdr_en;
@@ -4387,7 +4387,7 @@ static void vop2_setup_hdr10(struct vop2_video_port *vp, uint8_t win_phys_id)
if (sdr2hdr_en) {
sdr2hdr_r2r_mode = BT709_TO_BT2020;
if (vp->hdr_in)
if (vp->hdr_out)
sdr2hdr_tf = SDR2HDR_FOR_HDR;
else
sdr2hdr_tf = SDR2HDR_FOR_BT2020;