| Message ID | 20191220023004.2658-1-chenzhihui4@huawei.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/hisilicon/hibmc: fix 'xset dpms force off' fail | expand |
On Fri, 20 Dec 2019 at 10:30, Zhihui Chen <chenzhihui4@huawei.com> wrote: > 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 <chenzhihui4@huawei.com> > Thanks for the patch. Acked-by: Xinliang Liu <xinliang.liu@linaro.org> Applied to drm-misc-next. > --- > drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c > b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c > index 6527a97f68a3..722e369f30d4 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 > > -- > 2.20.1 > > >
diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c index 6527a97f68a3..722e369f30d4 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 >
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 <chenzhihui4@huawei.com> --- drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c | 3 +++ 1 file changed, 3 insertions(+)