From: Tomeu Vizoso Date: Fri, 18 Mar 2016 11:22:02 +0000 (+0100) Subject: FROMLIST: drm/rockchip: vop: Don't reject empty modesets X-Git-Tag: firefly_0821_release~2952 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=232f21b8370a5f59e54979b8631b4eb4a832400d;p=firefly-linux-kernel-4.4.55.git FROMLIST: drm/rockchip: vop: Don't reject empty modesets So that when DRM_IOCTL_MODE_SETCRTC is called without a FB nor mode, the CRTC gets disabled. Link: http://lkml.kernel.org/g/CAAObsKAv+05ih5U+=4kic_NsjGMhfxYheHR8xXXmacZs+p5SHw@mail.gmail.com (am from https://patchwork.kernel.org/patch/8618471/) Change-Id: I3a36e20f727f2087d718acec886766b743de2d9b Signed-off-by: Tomeu Vizoso Signed-off-by: Mark Yao --- diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c index 5ae7b2629d69..f36213c2e9a8 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c @@ -905,9 +905,6 @@ static bool vop_crtc_mode_fixup(struct drm_crtc *crtc, { struct vop *vop = to_vop(crtc); - if (adjusted_mode->htotal == 0 || adjusted_mode->vtotal == 0) - return false; - adjusted_mode->clock = clk_round_rate(vop->dclk, mode->clock * 1000) / 1000;