From c7659101be62b75309b7ee05a4d4b7e63dbce784 Mon Sep 17 00:00:00 2001 From: Andy Yan Date: Thu, 10 Jun 2021 10:33:34 +0800 Subject: [PATCH] drm/rockchip: vop2: check plane state before check plane oetf We have some plane not registered to drm core(Such as cluster plane on some linux system), so they don't have pstate. And also we don't need to check plane state for oetf for a inactived plane(has no fb). Change-Id: I909b665397c3df530ff0f466e0d654dcbb3f1a40 Signed-off-by: Andy Yan --- drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c index e8d012631a9a..0dcd6bad19c4 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c @@ -4444,6 +4444,10 @@ static void vop2_setup_hdr10(struct vop2_video_port *vp, uint8_t win_phys_id) pstate = plane->state; vpstate = to_vop2_plane_state(pstate); + /* skip inactive plane */ + if (!pstate || !pstate->fb) + continue; + if (vpstate->eotf != SMPTE_ST2084) { have_sdr_layer = true; break;