| Message ID | 1398199460-21508-1-git-send-email-daniel.vetter@ffwll.ch (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, Apr 22, 2014 at 10:44:20PM +0200, Daniel Vetter wrote: [...] > diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c > index 589e865832cd..7cf407bbfed5 100644 > --- a/drivers/gpu/drm/drm_irq.c > +++ b/drivers/gpu/drm/drm_irq.c > @@ -249,14 +249,16 @@ static inline int drm_dev_to_irq(struct drm_device *dev) > */ > int drm_irq_install(struct drm_device *dev) > { > - int ret; > + int ret, irq; > unsigned long sh_flags = 0; > char *irqname; > > + irq = drm_dev_to_irq(dev); I think the assignment could have happened either when the variable is declared, or... > + > if (!drm_core_check_feature(dev, DRIVER_HAVE_IRQ)) > return -EINVAL; > > - if (drm_dev_to_irq(dev) == 0) > + if (irq == 0) ... right above this, since it is where it is first used (it may not be necessary to query it before here at all if the driver doesn't set DRIVER_HAVE_IRQ). But I realize that that's pure bike-shedding, so either way: Reviewed-by: Thierry Reding <treding@nvidia.com>
On Wed, Apr 23, 2014 at 09:27:58AM +0200, Thierry Reding wrote: > On Tue, Apr 22, 2014 at 10:44:20PM +0200, Daniel Vetter wrote: > [...] > > diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c > > index 589e865832cd..7cf407bbfed5 100644 > > --- a/drivers/gpu/drm/drm_irq.c > > +++ b/drivers/gpu/drm/drm_irq.c > > @@ -249,14 +249,16 @@ static inline int drm_dev_to_irq(struct drm_device *dev) > > */ > > int drm_irq_install(struct drm_device *dev) > > { > > - int ret; > > + int ret, irq; > > unsigned long sh_flags = 0; > > char *irqname; > > > > + irq = drm_dev_to_irq(dev); > > I think the assignment could have happened either when the variable is > declared, or... > > > + > > if (!drm_core_check_feature(dev, DRIVER_HAVE_IRQ)) > > return -EINVAL; > > > > - if (drm_dev_to_irq(dev) == 0) > > + if (irq == 0) > > ... right above this, since it is where it is first used (it may not be > necessary to query it before here at all if the driver doesn't set > DRIVER_HAVE_IRQ). > > But I realize that that's pure bike-shedding, so either way: Follow-on patches will move this assignement into drivers and make int irq an function parameter, so I think I'll leave this ;-) > > Reviewed-by: Thierry Reding <treding@nvidia.com> Thanks for the review, I'll send the pull request to Dave now. -Daniel
diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c index 589e865832cd..7cf407bbfed5 100644 --- a/drivers/gpu/drm/drm_irq.c +++ b/drivers/gpu/drm/drm_irq.c @@ -249,14 +249,16 @@ static inline int drm_dev_to_irq(struct drm_device *dev) */ int drm_irq_install(struct drm_device *dev) { - int ret; + int ret, irq; unsigned long sh_flags = 0; char *irqname; + irq = drm_dev_to_irq(dev); + if (!drm_core_check_feature(dev, DRIVER_HAVE_IRQ)) return -EINVAL; - if (drm_dev_to_irq(dev) == 0) + if (irq == 0) return -EINVAL; /* Driver must have been initialized */ @@ -267,7 +269,7 @@ int drm_irq_install(struct drm_device *dev) return -EBUSY; dev->irq_enabled = true; - DRM_DEBUG("irq=%d\n", drm_dev_to_irq(dev)); + DRM_DEBUG("irq=%d\n", irq); /* Before installing handler */ if (dev->driver->irq_preinstall) @@ -282,7 +284,7 @@ int drm_irq_install(struct drm_device *dev) else irqname = dev->driver->name; - ret = request_irq(drm_dev_to_irq(dev), dev->driver->irq_handler, + ret = request_irq(irq, dev->driver->irq_handler, sh_flags, irqname, dev); if (ret < 0) { @@ -301,7 +303,9 @@ int drm_irq_install(struct drm_device *dev) dev->irq_enabled = false; if (!drm_core_check_feature(dev, DRIVER_MODESET)) vga_client_register(dev->pdev, NULL, NULL, NULL); - free_irq(drm_dev_to_irq(dev), dev); + free_irq(irq, dev); + } else { + dev->irq = irq; } return ret; @@ -344,7 +348,7 @@ int drm_irq_uninstall(struct drm_device *dev) if (!irq_enabled) return -EINVAL; - DRM_DEBUG("irq=%d\n", drm_dev_to_irq(dev)); + DRM_DEBUG("irq=%d\n", dev->irq); if (!drm_core_check_feature(dev, DRIVER_MODESET)) vga_client_register(dev->pdev, NULL, NULL, NULL); @@ -352,7 +356,7 @@ int drm_irq_uninstall(struct drm_device *dev) if (dev->driver->irq_uninstall) dev->driver->irq_uninstall(dev); - free_irq(drm_dev_to_irq(dev), dev); + free_irq(dev->irq, dev); return 0; } diff --git a/include/drm/drmP.h b/include/drm/drmP.h index 85682d959c7e..8e8c392d6fa8 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h @@ -1107,6 +1107,8 @@ struct drm_device { /** \name Context support */ /*@{ */ bool irq_enabled; /**< True if irq handler is enabled */ + int irq; + __volatile__ long context_flag; /**< Context swapping flag */ int last_context; /**< Last current context */ /*@} */
To get rid of the dev->bus->get_irq callback we need to pass in the desired irq explicitly into drm_irq_install. To avoid having to do the same for drm_irq_unistall just track it internally. That leaves drivers with less room to botch things up. v2: Add the hunk lost in an earlier patch to this one (Thierry). v3: Fix up the totally fumbled logic in drm_irq_install and use the local variable consistently. Spotted by both Thierry and Laurent. Shame on me for failing to properly test the rebase version of this patch ... Cc: Thierry Reding <thierry.reding@gmail.com> Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> --- drivers/gpu/drm/drm_irq.c | 18 +++++++++++------- include/drm/drmP.h | 2 ++ 2 files changed, 13 insertions(+), 7 deletions(-)