diff options
| author | Stefan Agner | 2016-04-19 03:22:47 +0200 |
|---|---|---|
| committer | Stefan Agner | 2016-06-19 03:34:31 +0200 |
| commit | f5bce4309db6597003e683d28d12b1b4bc9408b0 (patch) | |
| tree | 60610155603a5d23c6dcc41a8b2aea1b62dac947 /drivers/gpu/drm/fsl-dcu | |
| parent | drm/fsl-dcu: implement suspend/resume using atomic helpers (diff) | |
| download | kernel-qcow2-linux-f5bce4309db6597003e683d28d12b1b4bc9408b0.tar.gz kernel-qcow2-linux-f5bce4309db6597003e683d28d12b1b4bc9408b0.tar.xz kernel-qcow2-linux-f5bce4309db6597003e683d28d12b1b4bc9408b0.zip | |
drm/fsl-dcu: disable vblank events on CRTC disable
Disable vblank events when CRTC gets disabled. This avoids an
external abort when entering suspend while disable_timer is still
active: On resume the timer might fire immediately and cause a
register access in fsl_dcu_drm_disable_vblank before clocks get
enabled by the resume function.
Signed-off-by: Stefan Agner <stefan@agner.ch>
Diffstat (limited to 'drivers/gpu/drm/fsl-dcu')
| -rw-r--r-- | drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_crtc.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_crtc.c b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_crtc.c index ca0f7d83a730..36df2eb8de1c 100644 --- a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_crtc.c +++ b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_crtc.c @@ -43,6 +43,8 @@ static void fsl_dcu_drm_disable_crtc(struct drm_crtc *crtc) struct drm_device *dev = crtc->dev; struct fsl_dcu_drm_device *fsl_dev = dev->dev_private; + drm_crtc_vblank_off(crtc); + regmap_update_bits(fsl_dev->regmap, DCU_DCU_MODE, DCU_MODE_DCU_MODE_MASK, DCU_MODE_DCU_MODE(DCU_MODE_OFF)); @@ -60,6 +62,8 @@ static void fsl_dcu_drm_crtc_enable(struct drm_crtc *crtc) DCU_MODE_DCU_MODE(DCU_MODE_NORMAL)); regmap_write(fsl_dev->regmap, DCU_UPDATE_MODE, DCU_UPDATE_MODE_READREG); + + drm_crtc_vblank_on(crtc); } static void fsl_dcu_drm_crtc_mode_set_nofb(struct drm_crtc *crtc) |