diff options
| author | Daniel Vetter | 2013-11-03 21:09:27 +0100 |
|---|---|---|
| committer | Daniel Vetter | 2014-04-23 10:32:50 +0200 |
| commit | bb0f1b5c1695b4399cfd2359c114ae63edbb3ad8 (patch) | |
| tree | 2b5eb0a2b6e44168ab4af4f8393d5fcee8e2beee /drivers/gpu/drm/i915/i915_dma.c | |
| parent | drm/irq: Look up the pci irq directly in the drm_control ioctl (diff) | |
| download | kernel-qcow2-linux-bb0f1b5c1695b4399cfd2359c114ae63edbb3ad8.tar.gz kernel-qcow2-linux-bb0f1b5c1695b4399cfd2359c114ae63edbb3ad8.tar.xz kernel-qcow2-linux-bb0f1b5c1695b4399cfd2359c114ae63edbb3ad8.zip | |
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>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_dma.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_dma.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; |