| Message ID | 1476195969-23655-1-git-send-email-brian.starkey@arm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, Oct 11, 2016 at 03:26:02PM +0100, Brian Starkey wrote: > From: Liviu Dudau <Liviu.Dudau@arm.com> > > Mali DP driver does not use drm_irq_{un,}install() function so the > drm->irq_enabled flag does not get set automatically. > drm_wait_vblank() checks the value of the flag among other functions. > > Signed-off-by: Liviu Dudau <Liviu.Dudau@arm.com> > --- > > Hi, > > This series is a bunch of small driver-internal fixes and cleanup for > Mali-DP. For the whole series, on the patches not already Signed-off-by me or acked: Acked-by: Liviu Dudau <Liviu.Dudau@arm.com> Many thanks, Liviu > > -Brian > > drivers/gpu/drm/arm/malidp_drv.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/drivers/gpu/drm/arm/malidp_drv.c b/drivers/gpu/drm/arm/malidp_drv.c > index 9280358..7987ebd 100644 > --- a/drivers/gpu/drm/arm/malidp_drv.c > +++ b/drivers/gpu/drm/arm/malidp_drv.c > @@ -377,6 +377,8 @@ static int malidp_bind(struct device *dev) > if (ret < 0) > goto irq_init_fail; > > + drm->irq_enabled = true; > + > ret = drm_vblank_init(drm, drm->mode_config.num_crtc); > if (ret < 0) { > DRM_ERROR("failed to initialise vblank\n"); > @@ -402,6 +404,7 @@ fbdev_fail: > vblank_fail: > malidp_se_irq_fini(drm); > malidp_de_irq_fini(drm); > + drm->irq_enabled = false; > irq_init_fail: > component_unbind_all(dev, drm); > bind_fail: > -- > 1.7.9.5 >
diff --git a/drivers/gpu/drm/arm/malidp_drv.c b/drivers/gpu/drm/arm/malidp_drv.c index 9280358..7987ebd 100644 --- a/drivers/gpu/drm/arm/malidp_drv.c +++ b/drivers/gpu/drm/arm/malidp_drv.c @@ -377,6 +377,8 @@ static int malidp_bind(struct device *dev) if (ret < 0) goto irq_init_fail; + drm->irq_enabled = true; + ret = drm_vblank_init(drm, drm->mode_config.num_crtc); if (ret < 0) { DRM_ERROR("failed to initialise vblank\n"); @@ -402,6 +404,7 @@ fbdev_fail: vblank_fail: malidp_se_irq_fini(drm); malidp_de_irq_fini(drm); + drm->irq_enabled = false; irq_init_fail: component_unbind_all(dev, drm); bind_fail: