diff options
author | Jani Nikula <jani.nikula@intel.com> | 2021-02-02 14:39:24 +0200 |
---|---|---|
committer | Jani Nikula <jani.nikula@intel.com> | 2021-02-02 14:39:25 +0200 |
commit | eaf9a3465d9b1fd1dc5a9a151380d84ac3789964 (patch) | |
tree | c573ccc955c4f47ce4e2a090aa3641c3ff00acf8 /drivers/gpu/drm/i915/i915_irq.c | |
parent | Merge tag 'topic/adl-s-enabling-2021-02-01-1' of git://anongit.freedesktop.org/drm/drm-intel into drm-intel-next (diff) | |
parent | drm/i915/gvt: Remove references to struct drm_device.pdev (diff) | |
download | linux-dev-eaf9a3465d9b1fd1dc5a9a151380d84ac3789964.tar.xz linux-dev-eaf9a3465d9b1fd1dc5a9a151380d84ac3789964.zip |
Merge tag 'topic/drm-device-pdev-2021-02-02' of git://anongit.freedesktop.org/drm/drm-intel into drm-intel-next
Driver Changes:
- drm/i915: Remove references to struct drm_device.pdev
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
From: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/87y2g6fxxv.fsf@intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/i915_irq.c')
-rw-r--r-- | drivers/gpu/drm/i915/i915_irq.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index 352cd2260f55..9d47da8ec86d 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c @@ -4391,7 +4391,7 @@ static void intel_irq_postinstall(struct drm_i915_private *dev_priv) */ int intel_irq_install(struct drm_i915_private *dev_priv) { - int irq = dev_priv->drm.pdev->irq; + int irq = to_pci_dev(dev_priv->drm.dev)->irq; int ret; /* @@ -4426,7 +4426,7 @@ int intel_irq_install(struct drm_i915_private *dev_priv) */ void intel_irq_uninstall(struct drm_i915_private *dev_priv) { - int irq = dev_priv->drm.pdev->irq; + int irq = to_pci_dev(dev_priv->drm.dev)->irq; /* * FIXME we can get called twice during driver probe @@ -4486,5 +4486,5 @@ bool intel_irqs_enabled(struct drm_i915_private *dev_priv) void intel_synchronize_irq(struct drm_i915_private *i915) { - synchronize_irq(i915->drm.pdev->irq); + synchronize_irq(to_pci_dev(i915->drm.dev)->irq); } |