From: Zhihui Chen Date: Fri, 20 Dec 2019 02:30:04 +0000 (+0800) Subject: drm/hisilicon/hibmc: fix 'xset dpms force off' fail X-Git-Tag: libata-5.7-2020-04-09~30^2~20^2~62 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=f2f8653e0d7771c00a1b826cc53b6a48c5e33d18;p=linux-2.6-block.git drm/hisilicon/hibmc: fix 'xset dpms force off' fail both crtc_state->adjusted_mode.hdisplay and crtc_state->adjusted_mode.vdisplay are 0 when switch dpms off, return -EINVAL cause switch dpms off fail. Signed-off-by: Zhihui Chen Signed-off-by: Xinliang Liu Acked-by: Xinliang Liu Link: https://patchwork.freedesktop.org/patch/msgid/20191220023004.2658-1-chenzhihui4@huawei.com --- diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c index 7fa7d4933f60..9baeabd136d2 100644 --- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c +++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c @@ -80,6 +80,9 @@ static int hibmc_plane_atomic_check(struct drm_plane *plane, return -EINVAL; } + if (!crtc_state->enable) + return 0; + if (state->crtc_x + state->crtc_w > crtc_state->adjusted_mode.hdisplay || state->crtc_y + state->crtc_h >