drm: pass the irq explicitly to drm_irq_install

Unfortunately this requires a drm-wide change, and I didn't see a sane
way around that. Luckily it's fairly simple, we just need to inline
the respective get_irq implementation from either drm_pci.c or
drm_platform.c.

With that we can now also remove drm_dev_to_irq from drm_irq.c.

Reviewed-by: Thierry Reding <treding@nvidia.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

14 files changed, 17 insertions, 32 deletions

diff --git a/Documentation/DocBook/drm.tmpl b/Documentation/DocBook/drm.tmpl
index 677a02553ec0..83dd0b043c28 100644
--- a/Documentation/DocBook/drm.tmpl
+++ b/Documentation/DocBook/drm.tmpl
@@ -342,21 +342,13 @@ char *date;</synopsis>
         <sect4>
           <title>Managed IRQ Registration</title>
           <para>
-            Both the <function>drm_irq_install</function> and
-            <function>drm_irq_uninstall</function> functions get the device IRQ by
-            calling <function>drm_dev_to_irq</function>. This inline function will
-            call a bus-specific operation to retrieve the IRQ number. For platform
-            devices, <function>platform_get_irq</function>(..., 0) is used to
-            retrieve the IRQ number.
-          </para>
-          <para>
             <function>drm_irq_install</function> starts by calling the
             <methodname>irq_preinstall</methodname> driver operation. The operation
             is optional and must make sure that the interrupt will not get fired by
             clearing all pending interrupt flags or disabling the interrupt.
           </para>
           <para>
-            The IRQ will then be requested by a call to
+            The passed-in IRQ will then be requested by a call to
             <function>request_irq</function>. If the DRIVER_IRQ_SHARED driver
             feature flag is set, a shared (IRQF_SHARED) IRQ handler will be
             requested.
diff --git a/drivers/gpu/drm/armada/armada_drv.c b/drivers/gpu/drm/armada/armada_drv.c
index 32982da82694..567cfbde0883 100644
--- a/drivers/gpu/drm/armada/armada_drv.c
+++ b/drivers/gpu/drm/armada/armada_drv.c
@@ -173,7 +173,7 @@ static int armada_drm_load(struct drm_device *dev, unsigned long flags)
         if (ret)
                 goto err_kms;
 
-        ret = drm_irq_install(dev);
+        ret = drm_irq_install(dev, platform_get_irq(dev->platformdev, 0));
         if (ret)
                 goto err_kms;
 
diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c
index cbf6f259bfe4..de38bc9b6581 100644
--- a/drivers/gpu/drm/drm_irq.c
+++ b/drivers/gpu/drm/drm_irq.c
@@ -233,11 +233,6 @@ static void drm_irq_vgaarb_nokms(void *cookie, bool state)
         }
 }
 
-static inline int drm_dev_to_irq(struct drm_device *dev)
-{
-        return dev->driver->bus->get_irq(dev);
-}
-
 /**
  * Install IRQ handler.
  *
@@ -247,14 +242,12 @@ static inline int drm_dev_to_irq(struct drm_device *dev)
  * \c irq_preinstall() and \c irq_postinstall() functions
  * before and after the installation.
  */
-int drm_irq_install(struct drm_device *dev)
+int drm_irq_install(struct drm_device *dev, int irq)
 {
-        int ret, irq;
+        int ret;
         unsigned long sh_flags = 0;
         char *irqname;
 
-        irq = drm_dev_to_irq(dev);
-
         if (!drm_core_check_feature(dev, DRIVER_HAVE_IRQ))
                 return -EINVAL;
 
@@ -399,7 +392,7 @@ int drm_control(struct drm_device *dev, void *data,
                     ctl->irq != irq)
                         return -EINVAL;
                 mutex_lock(&dev->struct_mutex);
-                ret = drm_irq_install(dev);
+                ret = drm_irq_install(dev, irq);
                 mutex_unlock(&dev->struct_mutex);
 
                 return ret;
diff --git a/drivers/gpu/drm/gma500/psb_drv.c b/drivers/gpu/drm/gma500/psb_drv.c
index b686e56646eb..0a3101a3db19 100644
--- a/drivers/gpu/drm/gma500/psb_drv.c
+++ b/drivers/gpu/drm/gma500/psb_drv.c
@@ -354,7 +354,7 @@ static int psb_driver_load(struct drm_device *dev, unsigned long flags)
         PSB_WVDC32(0xFFFFFFFF, PSB_INT_MASK_R);
         spin_unlock_irqrestore(&dev_priv->irqmask_lock, irqflags);
 
-        drm_irq_install(dev);
+        drm_irq_install(dev, dev->pdev->irq);
 
         dev->vblank_disable_allowed = true;
         dev->max_vblank_count = 0xffffff; /* only 24 bits of frame count */
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
index 283ff06001bc..42de2808e53d 100644
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@ -1327,7 +1327,7 @@ static int i915_load_modeset_init(struct drm_device *dev)
 
         intel_power_domains_init_hw(dev_priv);
 
-        ret = drm_irq_install(dev);
+        ret = drm_irq_install(dev, dev->pdev->irq);
         if (ret)
                 goto cleanup_gem_stolen;
 
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 87ce105910f2..6124b491a19e 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -574,7 +574,7 @@ static int __i915_drm_thaw(struct drm_device *dev, bool restore_gtt_mappings)
                 mutex_unlock(&dev->struct_mutex);
 
                 /* We need working interrupts for modeset enabling ... */
-                drm_irq_install(dev);
+                drm_irq_install(dev, dev->pdev->irq);
 
                 intel_modeset_init_hw(dev);
 
@@ -752,7 +752,7 @@ int i915_reset(struct drm_device *dev)
                  * being false when they shouldn't be able to.
                  */
                 drm_irq_uninstall(dev);
-                drm_irq_install(dev);
+                drm_irq_install(dev, dev->pdev->irq);
 
                 /* rps/rc6 re-init is necessary to restore state lost after the
                  * reset and the re-install of drm irq. Skip for ironlake per
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index d2cc19a7023f..a94938f08698 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -4523,7 +4523,7 @@ i915_gem_entervt_ioctl(struct drm_device *dev, void *data,
 
         BUG_ON(!list_empty(&dev_priv->gtt.base.active_list));
 
-        ret = drm_irq_install(dev);
+        ret = drm_irq_install(dev, dev->pdev->irq);
         if (ret)
                 goto cleanup_ringbuffer;
         mutex_unlock(&dev->struct_mutex);
diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c
index f9de156b9e65..50ec1bed5820 100644
--- a/drivers/gpu/drm/msm/msm_drv.c
+++ b/drivers/gpu/drm/msm/msm_drv.c
@@ -288,7 +288,7 @@ static int msm_load(struct drm_device *dev, unsigned long flags)
         }
 
         pm_runtime_get_sync(dev->dev);
-        ret = drm_irq_install(dev);
+        ret = drm_irq_install(dev, platform_get_irq(dev->platformdev, 0));
         pm_runtime_put_sync(dev->dev);
         if (ret < 0) {
                 dev_err(dev->dev, "failed to install IRQ handler\n");
diff --git a/drivers/gpu/drm/qxl/qxl_irq.c b/drivers/gpu/drm/qxl/qxl_irq.c
index 28f84b4fce32..34d6a85e9023 100644
--- a/drivers/gpu/drm/qxl/qxl_irq.c
+++ b/drivers/gpu/drm/qxl/qxl_irq.c
@@ -87,7 +87,7 @@ int qxl_irq_init(struct qxl_device *qdev)
         atomic_set(&qdev->irq_received_cursor, 0);
         atomic_set(&qdev->irq_received_io_cmd, 0);
         qdev->irq_received_error = 0;
-        ret = drm_irq_install(qdev->ddev);
+        ret = drm_irq_install(qdev->ddev, qdev->ddev->pdev->irq);
         qdev->ram_header->int_mask = QXL_INTERRUPT_MASK;
         if (unlikely(ret != 0)) {
                 DRM_ERROR("Failed installing irq: %d\n", ret);
diff --git a/drivers/gpu/drm/radeon/radeon_irq_kms.c b/drivers/gpu/drm/radeon/radeon_irq_kms.c
index 089c9ffb0aa9..16807afab362 100644
--- a/drivers/gpu/drm/radeon/radeon_irq_kms.c
+++ b/drivers/gpu/drm/radeon/radeon_irq_kms.c
@@ -287,7 +287,7 @@ int radeon_irq_kms_init(struct radeon_device *rdev)
         INIT_WORK(&rdev->reset_work, radeon_irq_reset_work_func);
 
         rdev->irq.installed = true;
-        r = drm_irq_install(rdev->ddev);
+        r = drm_irq_install(rdev->ddev, rdev->ddev->pdev->irq);
         if (r) {
                 rdev->irq.installed = false;
                 flush_work(&rdev->hotplug_work);
diff --git a/drivers/gpu/drm/shmobile/shmob_drm_drv.c b/drivers/gpu/drm/shmobile/shmob_drm_drv.c
index c839c9c89efb..82c84c7fd4f6 100644
--- a/drivers/gpu/drm/shmobile/shmob_drm_drv.c
+++ b/drivers/gpu/drm/shmobile/shmob_drm_drv.c
@@ -185,7 +185,7 @@ static int shmob_drm_load(struct drm_device *dev, unsigned long flags)
                 goto done;
         }
 
-        ret = drm_irq_install(dev);
+        ret = drm_irq_install(dev, platform_get_irq(dev->platformdev, 0));
         if (ret < 0) {
                 dev_err(&pdev->dev, "failed to install IRQ handler\n");
                 goto done;
diff --git a/drivers/gpu/drm/tilcdc/tilcdc_drv.c b/drivers/gpu/drm/tilcdc/tilcdc_drv.c
index 171a8203892c..b20b69488dc9 100644
--- a/drivers/gpu/drm/tilcdc/tilcdc_drv.c
+++ b/drivers/gpu/drm/tilcdc/tilcdc_drv.c
@@ -268,7 +268,7 @@ static int tilcdc_load(struct drm_device *dev, unsigned long flags)
         }
 
         pm_runtime_get_sync(dev->dev);
-        ret = drm_irq_install(dev);
+        ret = drm_irq_install(dev, platform_get_irq(dev->platformdev, 0));
         pm_runtime_put_sync(dev->dev);
         if (ret < 0) {
                 dev_err(dev->dev, "failed to install IRQ handler\n");
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
index 4a223bbea3b3..6bdd15eea7e8 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
@@ -806,7 +806,7 @@ static int vmw_driver_load(struct drm_device *dev, unsigned long chipset)
         }
 
         if (dev_priv->capabilities & SVGA_CAP_IRQMASK) {
-                ret = drm_irq_install(dev);
+                ret = drm_irq_install(dev, dev->pdev->irq);
                 if (ret != 0) {
                         DRM_ERROR("Failed installing irq: %d\n", ret);
                         goto out_no_irq;
diff --git a/include/drm/drmP.h b/include/drm/drmP.h
index 8e8c392d6fa8..7a7cfe88b9bf 100644
--- a/include/drm/drmP.h
+++ b/include/drm/drmP.h
@@ -1353,7 +1353,7 @@ extern void drm_core_reclaim_buffers(struct drm_device *dev,
                                 /* IRQ support (drm_irq.h) */
 extern int drm_control(struct drm_device *dev, void *data,
                        struct drm_file *file_priv);
-extern int drm_irq_install(struct drm_device *dev);
+extern int drm_irq_install(struct drm_device *dev, int irq);
 extern int drm_irq_uninstall(struct drm_device *dev);
 
 extern int drm_vblank_init(struct drm_device *dev, int num_crtcs);