Message ID | 20171110162514.2114-2-stefan@agner.ch (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Den 10.11.2017 17.25, skrev Stefan Agner: > 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> > --- > drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c > index 24f234902646..aeeaf0bcf646 100644 > --- a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c > +++ b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c > @@ -225,9 +225,8 @@ static int fsl_dcu_drm_pm_resume(struct device *dev) > fsl_tcon_bypass_enable(fsl_dev->tcon); > fsl_dcu_drm_init_planes(fsl_dev->drm); > > - drm_mode_config_helper_resume(fsl_dev->drm); > - > enable_irq(fsl_dev->irq); > + drm_mode_config_helper_resume(fsl_dev->drm); > > return 0; > } Acked-by: Noralf Trønnes <noralf@tronnes.org>
diff --git a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c index 24f234902646..aeeaf0bcf646 100644 --- a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c +++ b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c @@ -225,9 +225,8 @@ static int fsl_dcu_drm_pm_resume(struct device *dev) fsl_tcon_bypass_enable(fsl_dev->tcon); fsl_dcu_drm_init_planes(fsl_dev->drm); - drm_mode_config_helper_resume(fsl_dev->drm); - enable_irq(fsl_dev->irq); + drm_mode_config_helper_resume(fsl_dev->drm); return 0; }
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> --- drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)