From 769a782ce16e832c0c1ea0304528e7b879923e7b Mon Sep 17 00:00:00 2001 From: Sandy Huang Date: Mon, 13 Jan 2020 15:51:14 +0800 Subject: [PATCH] drm/rockchip: vop: correct plane state Before this commit, cat /d/dri/0/summary maybe appear the following info, in fact the win1-0 state is DISABLED. VOP [ff370000.vop]: ACTIVE Connector: HDMI-A bus_format[2025]: YUV8_1X24 overlay_mode[1] output_mode[f] color_space[3] Display mode: 3840x2160p30 clk[297000] real_clk[297000] type[48] flag[5] H: 3840 4016 4104 4400 V: 2160 2168 2178 2250 win0-0: ACTIVE format: AB24 little-endian (0x34324241) SDR[0] color_space[0] csc: y2r[0] r2r[0] r2y[1] csc mode[1] zpos: 0 src: pos[0x0] rect[1280x720] dst: pos[0x0] rect[3840x2160] buf[0]: addr: 0x0000000002e6c000 pitch: 5120 offset: 0 win1-0: ACTIVE win2-0: DISABLED Change-Id: I5aaf7b0d1366253bdd56d7a40ecf157c3f95e4bc Signed-off-by: Sandy Huang --- drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c index 32101bdd54bd..f28edac9fe06 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c @@ -1554,8 +1554,10 @@ static int vop_plane_atomic_check(struct drm_plane *plane, void *kvaddr; crtc = crtc ? crtc : plane->state->crtc; - if (!crtc || !fb) + if (!crtc || !fb) { + plane->state->visible = false; return 0; + } crtc_state = drm_atomic_get_existing_crtc_state(state->state, crtc); if (WARN_ON(!crtc_state))