iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/fsl-dcu: enable IRQ before drm_atomic_helper_resume()

Browse Source 
commit 9fd99f4f3f upstream.

The resume helpers wait for a vblank to occurre hence IRQ need
to be enabled. This avoids a warning as follows during resume:
  WARNING: CPU: 0 PID: 314 at drivers/gpu/drm/drm_atomic_helper.c:1249 drm_atomic_helper_wait_for_vblanks.part.1+0x284/0x288
  [CRTC:28:crtc-0] vblank wait timed out

Signed-off-by: Stefan Agner <stefan@agner.ch>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Stefan Agner
2017-11-10 10:15:28 +01:00
committed by Greg Kroah-Hartman
parent c8111b1885
commit bacbe44889
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c
View File

@ -232,6 +232,7 @@ static int fsl_dcu_drm_pm_resume(struct device *dev)
if (fsl_dev->tcon) if (fsl_dev->tcon)
fsl_tcon_bypass_enable(fsl_dev->tcon); fsl_tcon_bypass_enable(fsl_dev->tcon);
fsl_dcu_drm_init_planes(fsl_dev->drm); fsl_dcu_drm_init_planes(fsl_dev->drm);
enable_irq(fsl_dev->irq);
drm_atomic_helper_resume(fsl_dev->drm, fsl_dev->state); drm_atomic_helper_resume(fsl_dev->drm, fsl_dev->state);
console_lock(); console_lock();
@ -239,7 +240,6 @@ static int fsl_dcu_drm_pm_resume(struct device *dev)
console_unlock(); console_unlock();
drm_kms_helper_poll_enable(fsl_dev->drm); drm_kms_helper_poll_enable(fsl_dev->drm);
enable_irq(fsl_dev->irq);
return 0; return 0;
} }