diff options
| author | Dave Airlie <airlied@redhat.com> | 2016-11-24 11:17:44 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2016-11-24 11:17:44 +1000 |
| commit | 855f6529c7c974a566eb56d5e3351a628305e16e (patch) | |
| tree | 68923bc25db4238bb1b2451ed19beda1abee7f44 /drivers/gpu | |
| parent | 7ad54c99be62ff2f96deb002cff8221dd6f57087 (diff) | |
| parent | 7a79279e7186c4ac8b753cbd335ecc4ba81b5970 (diff) | |
Merge branch 'for-upstream/hdlcd' of git://linux-arm.org/linux-ld into drm-fixes
A late issue discovered by Russell King while testing his setup on Juno.
* 'for-upstream/hdlcd' of git://linux-arm.org/linux-ld:
drm/arm: hdlcd: fix plane base address update
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/arm/hdlcd_crtc.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/gpu/drm/arm/hdlcd_crtc.c b/drivers/gpu/drm/arm/hdlcd_crtc.c index 48019ae22ddb..28341b32067f 100644 --- a/drivers/gpu/drm/arm/hdlcd_crtc.c +++ b/drivers/gpu/drm/arm/hdlcd_crtc.c @@ -150,15 +150,14 @@ static void hdlcd_crtc_enable(struct drm_crtc *crtc) clk_prepare_enable(hdlcd->clk); hdlcd_crtc_mode_set_nofb(crtc); hdlcd_write(hdlcd, HDLCD_REG_COMMAND, 1); + drm_crtc_vblank_on(crtc); } static void hdlcd_crtc_disable(struct drm_crtc *crtc) { struct hdlcd_drm_private *hdlcd = crtc_to_hdlcd_priv(crtc); - if (!crtc->state->active) - return; - + drm_crtc_vblank_off(crtc); hdlcd_write(hdlcd, HDLCD_REG_COMMAND, 0); clk_disable_unprepare(hdlcd->clk); } |