summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/i915_dma.c
diff options
context:
space:
mode:
authorDaniel Vetter2014-09-30 10:56:44 +0200
committerDaniel Vetter2014-10-03 11:22:42 +0200
commitb963291cf9af882b2f30693fa8459afbdb0ed288 (patch)
tree9f2e4fa3711fefe8ef4930b74d09677c193fb9eb /drivers/gpu/drm/i915/i915_dma.c
parentdrm/i915: s/pm._irqs_disabled/pm.irqs_enabled/ (diff)
downloadkernel-qcow2-linux-b963291cf9af882b2f30693fa8459afbdb0ed288.tar.gz
kernel-qcow2-linux-b963291cf9af882b2f30693fa8459afbdb0ed288.tar.xz
kernel-qcow2-linux-b963291cf9af882b2f30693fa8459afbdb0ed288.zip
drm/i915: Use dev_priv instead of dev in irq setup functions
It's the new world order! Not going full monty on these here and rolling this out throughout the subsequent call chains since this is just for the kerneldoc. Later on we can go more crazy, especially once we've embedded drm_device correctly. v2: Also frob the runtime_pm functions ... Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.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.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
index 515fa6d3c993..85d14e169409 100644
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@ -1363,7 +1363,7 @@ static int i915_load_modeset_init(struct drm_device *dev)
goto cleanup_gem;
/* Only enable hotplug handling once the fbdev is fully set up. */
- intel_hpd_init(dev);
+ intel_hpd_init(dev_priv);
/*
* Some ports require correctly set-up hpd registers for detection to
@@ -1733,7 +1733,7 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
goto out_freewq;
}
- intel_irq_init(dev);
+ intel_irq_init(dev_priv);
intel_uncore_sanitize(dev);
/* Try to make sure MCHBAR is enabled before poking at it */