On Fri, Apr 11, 2014 at 11:36:07PM +0200, Daniel Vetter wrote:
> 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).
>
> Cc: Thierry Reding <thierry.reding@xxxxxxxxx>
> Signed-off-by: Daniel Vetter <daniel.vetter@xxxxxxxx>
> ---
> drivers/gpu/drm/drm_irq.c | 18 +++++++++++-------
> include/drm/drmP.h | 2 ++
> 2 files changed, 13 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c
> index 330e85b19115..1c3b6229363d 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);
> +
This looks odd...
> if (!drm_core_check_feature(dev, DRIVER_HAVE_IRQ))
> return -EINVAL;
>
> - if (drm_dev_to_irq(dev) == 0)
> + if (irq == 0)
> return -EINVAL;
Wouldn't it make more sense to assign irq only here? And while at it,
perhaps you meant to store irq directly within dev->irq, rather than in
a local variable? That would address Laurent's comment as well.
>
> /* 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", dev->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(dev->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(dev->irq, dev);
> + } else {
> + dev->irq = irq;
> }
But perhaps you really only want to assign it after it's been properly
initialized, so I guess the local variable is fine. But in that case you
probably need to make sure to not use dev->irq until after this
assignment.
Thierry
Attachment:
pgppKNtUeCXm1.pgp
Description: PGP signature
_______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/dri-devel
