12 files changed, 103 insertions, 73 deletions

diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index 67af3277811a..c82afb113f0a 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -2739,6 +2739,7 @@ static int i915_runtime_pm_status(struct seq_file *m, void *unused)
         struct drm_info_node *node = m->private;
         struct drm_device *dev = node->minor->dev;
         struct drm_i915_private *dev_priv = to_i915(dev);
+        struct pci_dev *pdev = dev_priv->drm.pdev;
 
         if (!HAS_RUNTIME_PM(dev_priv))
                 seq_puts(m, "Runtime power management not supported\n");
@@ -2753,8 +2754,8 @@ static int i915_runtime_pm_status(struct seq_file *m, void *unused)
         seq_printf(m, "Device Power Management (CONFIG_PM) disabled\n");
 #endif
         seq_printf(m, "PCI device power state: %s [%d]\n",
-                   pci_power_name(dev_priv->drm.pdev->current_state),
-                   dev_priv->drm.pdev->current_state);
+                   pci_power_name(pdev->current_state),
+                   pdev->current_state);
 
         return 0;
 }
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index c316034aeda3..d22a1d8fe5b7 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -232,6 +232,7 @@ static int i915_getparam(struct drm_device *dev, void *data,
                          struct drm_file *file_priv)
 {
         struct drm_i915_private *dev_priv = to_i915(dev);
+        struct pci_dev *pdev = dev_priv->drm.pdev;
         drm_i915_getparam_t *param = data;
         int value;
 
@@ -242,10 +243,10 @@ static int i915_getparam(struct drm_device *dev, void *data,
                 /* Reject all old ums/dri params. */
                 return -ENODEV;
         case I915_PARAM_CHIPSET_ID:
-                value = dev->pdev->device;
+                value = pdev->device;
                 break;
         case I915_PARAM_REVISION:
-                value = dev->pdev->revision;
+                value = pdev->revision;
                 break;
         case I915_PARAM_HAS_GEM:
                 value = 1;
@@ -516,7 +517,7 @@ static void i915_switcheroo_set_state(struct pci_dev *pdev, enum vga_switcheroo_
                 pr_info("switched on\n");
                 dev->switch_power_state = DRM_SWITCH_POWER_CHANGING;
                 /* i915 resume handler doesn't set to D0 */
-                pci_set_power_state(dev->pdev, PCI_D0);
+                pci_set_power_state(pdev, PCI_D0);
                 i915_resume_switcheroo(dev);
                 dev->switch_power_state = DRM_SWITCH_POWER_ON;
         } else {
@@ -585,6 +586,7 @@ static void i915_gem_fini(struct drm_device *dev)
 static int i915_load_modeset_init(struct drm_device *dev)
 {
         struct drm_i915_private *dev_priv = to_i915(dev);
+        struct pci_dev *pdev = dev_priv->drm.pdev;
         int ret;
 
         if (i915_inject_load_failure())
@@ -601,13 +603,13 @@ static int i915_load_modeset_init(struct drm_device *dev)
          * then we do not take part in VGA arbitration and the
          * vga_client_register() fails with -ENODEV.
          */
-        ret = vga_client_register(dev->pdev, dev, NULL, i915_vga_set_decode);
+        ret = vga_client_register(pdev, dev, NULL, i915_vga_set_decode);
         if (ret && ret != -ENODEV)
                 goto out;
 
         intel_register_dsm_handler();
 
-        ret = vga_switcheroo_register_client(dev->pdev, &i915_switcheroo_ops, false);
+        ret = vga_switcheroo_register_client(pdev, &i915_switcheroo_ops, false);
         if (ret)
                 goto cleanup_vga_client;
 
@@ -659,9 +661,9 @@ cleanup_irq:
 cleanup_csr:
         intel_csr_ucode_fini(dev_priv);
         intel_power_domains_fini(dev_priv);
-        vga_switcheroo_unregister_client(dev->pdev);
+        vga_switcheroo_unregister_client(pdev);
 cleanup_vga_client:
-        vga_client_register(dev->pdev, NULL, NULL, NULL);
+        vga_client_register(pdev, NULL, NULL, NULL);
 out:
         return ret;
 }
@@ -881,6 +883,7 @@ static void i915_driver_cleanup_early(struct drm_i915_private *dev_priv)
 static int i915_mmio_setup(struct drm_device *dev)
 {
         struct drm_i915_private *dev_priv = to_i915(dev);
+        struct pci_dev *pdev = dev_priv->drm.pdev;
         int mmio_bar;
         int mmio_size;
 
@@ -897,7 +900,7 @@ static int i915_mmio_setup(struct drm_device *dev)
                 mmio_size = 512 * 1024;
         else
                 mmio_size = 2 * 1024 * 1024;
-        dev_priv->regs = pci_iomap(dev->pdev, mmio_bar, mmio_size);
+        dev_priv->regs = pci_iomap(pdev, mmio_bar, mmio_size);
         if (dev_priv->regs == NULL) {
                 DRM_ERROR("failed to map registers\n");
 
@@ -913,9 +916,10 @@ static int i915_mmio_setup(struct drm_device *dev)
 static void i915_mmio_cleanup(struct drm_device *dev)
 {
         struct drm_i915_private *dev_priv = to_i915(dev);
+        struct pci_dev *pdev = dev_priv->drm.pdev;
 
         intel_teardown_mchbar(dev);
-        pci_iounmap(dev->pdev, dev_priv->regs);
+        pci_iounmap(pdev, dev_priv->regs);
 }
 
 /**
@@ -994,6 +998,7 @@ static void intel_sanitize_options(struct drm_i915_private *dev_priv)
  */
 static int i915_driver_init_hw(struct drm_i915_private *dev_priv)
 {
+        struct pci_dev *pdev = dev_priv->drm.pdev;
         struct drm_device *dev = &dev_priv->drm;
         int ret;
 
@@ -1032,11 +1037,11 @@ static int i915_driver_init_hw(struct drm_i915_private *dev_priv)
                 goto out_ggtt;
         }
 
-        pci_set_master(dev->pdev);
+        pci_set_master(pdev);
 
         /* overlay on gen2 is broken and can't address above 1G */
         if (IS_GEN2(dev)) {
-                ret = dma_set_coherent_mask(&dev->pdev->dev, DMA_BIT_MASK(30));
+                ret = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(30));
                 if (ret) {
                         DRM_ERROR("failed to set DMA mask\n");
 
@@ -1053,7 +1058,7 @@ static int i915_driver_init_hw(struct drm_i915_private *dev_priv)
          * which also needs to be handled carefully.
          */
         if (IS_BROADWATER(dev) || IS_CRESTLINE(dev)) {
-                ret = dma_set_coherent_mask(&dev->pdev->dev, DMA_BIT_MASK(32));
+                ret = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32));
 
                 if (ret) {
                         DRM_ERROR("failed to set DMA mask\n");
@@ -1083,7 +1088,7 @@ static int i915_driver_init_hw(struct drm_i915_private *dev_priv)
          * stuck interrupts on some machines.
          */
         if (!IS_I945G(dev) && !IS_I945GM(dev)) {
-                if (pci_enable_msi(dev->pdev) < 0)
+                if (pci_enable_msi(pdev) < 0)
                         DRM_DEBUG_DRIVER("can't enable MSI");
         }
 
@@ -1101,10 +1106,10 @@ out_ggtt:
  */
 static void i915_driver_cleanup_hw(struct drm_i915_private *dev_priv)
 {
-        struct drm_device *dev = &dev_priv->drm;
+        struct pci_dev *pdev = dev_priv->drm.pdev;
 
-        if (dev->pdev->msi_enabled)
-                pci_disable_msi(dev->pdev);
+        if (pdev->msi_enabled)
+                pci_disable_msi(pdev);
 
         pm_qos_remove_request(&dev_priv->pm_qos);
         i915_ggtt_cleanup_hw(dev_priv);
@@ -1274,6 +1279,7 @@ out_free_priv:
 void i915_driver_unload(struct drm_device *dev)
 {
         struct drm_i915_private *dev_priv = to_i915(dev);
+        struct pci_dev *pdev = dev_priv->drm.pdev;
 
         intel_fbdev_fini(dev);
 
@@ -1302,8 +1308,8 @@ void i915_driver_unload(struct drm_device *dev)
         kfree(dev_priv->vbt.lfp_lvds_vbt_mode);
         dev_priv->vbt.lfp_lvds_vbt_mode = NULL;
 
-        vga_switcheroo_unregister_client(dev->pdev);
-        vga_client_register(dev->pdev, NULL, NULL, NULL);
+        vga_switcheroo_unregister_client(pdev);
+        vga_client_register(pdev, NULL, NULL, NULL);
 
         intel_csr_ucode_fini(dev_priv);
 
@@ -1400,6 +1406,7 @@ static bool suspend_to_idle(struct drm_i915_private *dev_priv)
 static int i915_drm_suspend(struct drm_device *dev)
 {
         struct drm_i915_private *dev_priv = to_i915(dev);
+        struct pci_dev *pdev = dev_priv->drm.pdev;
         pci_power_t opregion_target_state;
         int error;
 
@@ -1416,11 +1423,11 @@ static int i915_drm_suspend(struct drm_device *dev)
 
         drm_kms_helper_poll_disable(dev);
 
-        pci_save_state(dev->pdev);
+        pci_save_state(pdev);
 
         error = i915_gem_suspend(dev);
         if (error) {
-                dev_err(&dev->pdev->dev,
+                dev_err(&pdev->dev,
                         "GEM idle failed, resume might fail\n");
                 goto out;
         }
@@ -1465,6 +1472,7 @@ out:
 static int i915_drm_suspend_late(struct drm_device *dev, bool hibernation)
 {
         struct drm_i915_private *dev_priv = to_i915(dev);
+        struct pci_dev *pdev = dev_priv->drm.pdev;
         bool fw_csr;
         int ret;
 
@@ -1498,7 +1506,7 @@ static int i915_drm_suspend_late(struct drm_device *dev, bool hibernation)
                 goto out;
         }
 
-        pci_disable_device(dev->pdev);
+        pci_disable_device(pdev);
         /*
          * During hibernation on some platforms the BIOS may try to access
          * the device even though it's already in D3 and hang the machine. So
@@ -1512,7 +1520,7 @@ static int i915_drm_suspend_late(struct drm_device *dev, bool hibernation)
          * Acer Aspire 1830T
          */
         if (!(hibernation && INTEL_INFO(dev_priv)->gen < 6))
-                pci_set_power_state(dev->pdev, PCI_D3hot);
+                pci_set_power_state(pdev, PCI_D3hot);
 
         dev_priv->suspended_to_idle = suspend_to_idle(dev_priv);
 
@@ -1629,6 +1637,7 @@ static int i915_drm_resume(struct drm_device *dev)
 static int i915_drm_resume_early(struct drm_device *dev)
 {
         struct drm_i915_private *dev_priv = to_i915(dev);
+        struct pci_dev *pdev = dev_priv->drm.pdev;
         int ret;
 
         /*
@@ -1651,7 +1660,7 @@ static int i915_drm_resume_early(struct drm_device *dev)
          * the device powered we can also remove the following set power state
          * call.
          */
-        ret = pci_set_power_state(dev->pdev, PCI_D0);
+        ret = pci_set_power_state(pdev, PCI_D0);
         if (ret) {
                 DRM_ERROR("failed to set PCI D0 power state (%d)\n", ret);
                 goto out;
@@ -1670,12 +1679,12 @@ static int i915_drm_resume_early(struct drm_device *dev)
          * depend on the device enable refcount we can't anyway depend on them
          * disabling/enabling the device.
          */
-        if (pci_enable_device(dev->pdev)) {
+        if (pci_enable_device(pdev)) {
                 ret = -EIO;
                 goto out;
         }
 
-        pci_set_master(dev->pdev);
+        pci_set_master(pdev);
 
         disable_rpm_wakeref_asserts(dev_priv);
 
diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
index d31ae3d0f83f..eba0166c4df5 100644
--- a/drivers/gpu/drm/i915/i915_gem_gtt.c
+++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
@@ -350,10 +350,12 @@ static int setup_page_dma(struct drm_device *dev, struct i915_page_dma *p)
 
 static void cleanup_page_dma(struct drm_device *dev, struct i915_page_dma *p)
 {
+        struct pci_dev *pdev = dev->pdev;
+
         if (WARN_ON(!p->page))
                 return;
 
-        dma_unmap_page(&dev->pdev->dev, p->daddr, 4096, PCI_DMA_BIDIRECTIONAL);
+        dma_unmap_page(&pdev->dev, p->daddr, 4096, PCI_DMA_BIDIRECTIONAL);
         __free_page(p->page);
         memset(p, 0, sizeof(*p));
 }
@@ -2681,8 +2683,8 @@ static void ggtt_unbind_vma(struct i915_vma *vma)
 
 void i915_gem_gtt_finish_object(struct drm_i915_gem_object *obj)
 {
-        struct drm_device *dev = obj->base.dev;
-        struct drm_i915_private *dev_priv = to_i915(dev);
+        struct drm_i915_private *dev_priv = to_i915(obj->base.dev);
+        struct device *kdev = &dev_priv->drm.pdev->dev;
         struct i915_ggtt *ggtt = &dev_priv->ggtt;
 
         if (unlikely(ggtt->do_idle_maps)) {
@@ -2693,7 +2695,7 @@ void i915_gem_gtt_finish_object(struct drm_i915_gem_object *obj)
                 }
         }
 
-        dma_unmap_sg(&dev->pdev->dev, obj->pages->sgl, obj->pages->nents,
+        dma_unmap_sg(kdev, obj->pages->sgl, obj->pages->nents,
                      PCI_DMA_BIDIRECTIONAL);
 }
 
diff --git a/drivers/gpu/drm/i915/i915_gem_stolen.c b/drivers/gpu/drm/i915/i915_gem_stolen.c
index aa050fa1e558..59989e8ee5dc 100644
--- a/drivers/gpu/drm/i915/i915_gem_stolen.c
+++ b/drivers/gpu/drm/i915/i915_gem_stolen.c
@@ -92,6 +92,7 @@ void i915_gem_stolen_remove_node(struct drm_i915_private *dev_priv,
 static unsigned long i915_stolen_to_physical(struct drm_device *dev)
 {
         struct drm_i915_private *dev_priv = to_i915(dev);
+        struct pci_dev *pdev = dev_priv->drm.pdev;
         struct i915_ggtt *ggtt = &dev_priv->ggtt;
         struct resource *r;
         u32 base;
@@ -111,7 +112,7 @@ static unsigned long i915_stolen_to_physical(struct drm_device *dev)
         if (INTEL_INFO(dev)->gen >= 3) {
                 u32 bsm;
 
-                pci_read_config_dword(dev->pdev, INTEL_BSM, &bsm);
+                pci_read_config_dword(pdev, INTEL_BSM, &bsm);
 
                 base = bsm & INTEL_BSM_MASK;
         } else if (IS_I865G(dev)) {
@@ -119,7 +120,7 @@ static unsigned long i915_stolen_to_physical(struct drm_device *dev)
                 u16 toud = 0;
                 u8 tmp;
 
-                pci_bus_read_config_byte(dev->pdev->bus, PCI_DEVFN(0, 0),
+                pci_bus_read_config_byte(pdev->bus, PCI_DEVFN(0, 0),
                                          I845_ESMRAMC, &tmp);
 
                 if (tmp & TSEG_ENABLE) {
@@ -133,7 +134,7 @@ static unsigned long i915_stolen_to_physical(struct drm_device *dev)
                         }
                 }
 
-                pci_bus_read_config_word(dev->pdev->bus, PCI_DEVFN(0, 0),
+                pci_bus_read_config_word(pdev->bus, PCI_DEVFN(0, 0),
                                          I865_TOUD, &toud);
 
                 base = (toud << 16) + tseg_size;
@@ -142,13 +143,13 @@ static unsigned long i915_stolen_to_physical(struct drm_device *dev)
                 u32 tom;
                 u8 tmp;
 
-                pci_bus_read_config_byte(dev->pdev->bus, PCI_DEVFN(0, 0),
+                pci_bus_read_config_byte(pdev->bus, PCI_DEVFN(0, 0),
                                          I85X_ESMRAMC, &tmp);
 
                 if (tmp & TSEG_ENABLE)
                         tseg_size = MB(1);
 
-                pci_bus_read_config_byte(dev->pdev->bus, PCI_DEVFN(0, 1),
+                pci_bus_read_config_byte(pdev->bus, PCI_DEVFN(0, 1),
                                          I85X_DRB3, &tmp);
                 tom = tmp * MB(32);
 
@@ -158,7 +159,7 @@ static unsigned long i915_stolen_to_physical(struct drm_device *dev)
                 u32 tom;
                 u8 tmp;
 
-                pci_bus_read_config_byte(dev->pdev->bus, PCI_DEVFN(0, 0),
+                pci_bus_read_config_byte(pdev->bus, PCI_DEVFN(0, 0),
                                          I845_ESMRAMC, &tmp);
 
                 if (tmp & TSEG_ENABLE) {
@@ -172,7 +173,7 @@ static unsigned long i915_stolen_to_physical(struct drm_device *dev)
                         }
                 }
 
-                pci_bus_read_config_byte(dev->pdev->bus, PCI_DEVFN(0, 0),
+                pci_bus_read_config_byte(pdev->bus, PCI_DEVFN(0, 0),
                                          I830_DRB3, &tmp);
                 tom = tmp * MB(32);
 
@@ -182,7 +183,7 @@ static unsigned long i915_stolen_to_physical(struct drm_device *dev)
                 u32 tom;
                 u8 tmp;
 
-                pci_bus_read_config_byte(dev->pdev->bus, PCI_DEVFN(0, 0),
+                pci_bus_read_config_byte(pdev->bus, PCI_DEVFN(0, 0),
                                          I830_ESMRAMC, &tmp);
 
                 if (tmp & TSEG_ENABLE) {
@@ -192,7 +193,7 @@ static unsigned long i915_stolen_to_physical(struct drm_device *dev)
                                 tseg_size = KB(512);
                 }
 
-                pci_bus_read_config_byte(dev->pdev->bus, PCI_DEVFN(0, 0),
+                pci_bus_read_config_byte(pdev->bus, PCI_DEVFN(0, 0),
                                          I830_DRB3, &tmp);
                 tom = tmp * MB(32);
 
diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c
index 41ec7a183c73..aed55e4f100f 100644
--- a/drivers/gpu/drm/i915/i915_gpu_error.c
+++ b/drivers/gpu/drm/i915/i915_gpu_error.c
@@ -336,6 +336,7 @@ int i915_error_state_to_str(struct drm_i915_error_state_buf *m,
 {
         struct drm_device *dev = error_priv->dev;
         struct drm_i915_private *dev_priv = to_i915(dev);
+        struct pci_dev *pdev = dev_priv->drm.pdev;
         struct drm_i915_error_state *error = error_priv->error;
         struct drm_i915_error_object *obj;
         int i, j, offset, elt;
@@ -367,11 +368,11 @@ int i915_error_state_to_str(struct drm_i915_error_state_buf *m,
         }
         err_printf(m, "Reset count: %u\n", error->reset_count);
         err_printf(m, "Suspend count: %u\n", error->suspend_count);
-        err_printf(m, "PCI ID: 0x%04x\n", dev->pdev->device);
-        err_printf(m, "PCI Revision: 0x%02x\n", dev->pdev->revision);
+        err_printf(m, "PCI ID: 0x%04x\n", pdev->device);
+        err_printf(m, "PCI Revision: 0x%02x\n", pdev->revision);
         err_printf(m, "PCI Subsystem: %04x:%04x\n",
-                   dev->pdev->subsystem_vendor,
-                   dev->pdev->subsystem_device);
+                   pdev->subsystem_vendor,
+                   pdev->subsystem_device);
         err_printf(m, "IOMMU enabled?: %d\n", error->iommu);
 
         if (HAS_CSR(dev)) {
diff --git a/drivers/gpu/drm/i915/i915_suspend.c b/drivers/gpu/drm/i915/i915_suspend.c
index 4f272777b4f4..a0af170062b1 100644
--- a/drivers/gpu/drm/i915/i915_suspend.c
+++ b/drivers/gpu/drm/i915/i915_suspend.c
@@ -63,6 +63,7 @@ static void i915_restore_display(struct drm_device *dev)
 int i915_save_state(struct drm_device *dev)
 {
         struct drm_i915_private *dev_priv = to_i915(dev);
+        struct pci_dev *pdev = dev_priv->drm.pdev;
         int i;
 
         mutex_lock(&dev->struct_mutex);
@@ -70,7 +71,7 @@ int i915_save_state(struct drm_device *dev)
         i915_save_display(dev);
 
         if (IS_GEN4(dev))
-                pci_read_config_word(dev->pdev, GCDGMBUS,
+                pci_read_config_word(pdev, GCDGMBUS,
                                      &dev_priv->regfile.saveGCDGMBUS);
 
         /* Cache mode state */
@@ -108,6 +109,7 @@ int i915_save_state(struct drm_device *dev)
 int i915_restore_state(struct drm_device *dev)
 {
         struct drm_i915_private *dev_priv = to_i915(dev);
+        struct pci_dev *pdev = dev_priv->drm.pdev;
         int i;
 
         mutex_lock(&dev->struct_mutex);
@@ -115,7 +117,7 @@ int i915_restore_state(struct drm_device *dev)
         i915_gem_restore_fences(dev);
 
         if (IS_GEN4(dev))
-                pci_write_config_word(dev->pdev, GCDGMBUS,
+                pci_write_config_word(pdev, GCDGMBUS,
                                       dev_priv->regfile.saveGCDGMBUS);
         i915_restore_display(dev);
 
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index e8fee41c9b81..d5d8fea8305b 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -7273,9 +7273,10 @@ static int i9xx_misc_get_display_clock_speed(struct drm_device *dev)
 
 static int pnv_get_display_clock_speed(struct drm_device *dev)
 {
+        struct pci_dev *pdev = dev->pdev;
         u16 gcfgc = 0;
 
-        pci_read_config_word(dev->pdev, GCFGC, &gcfgc);
+        pci_read_config_word(pdev, GCFGC, &gcfgc);
 
         switch (gcfgc & GC_DISPLAY_CLOCK_MASK) {
         case GC_DISPLAY_CLOCK_267_MHZ_PNV:
@@ -7297,9 +7298,10 @@ static int pnv_get_display_clock_speed(struct drm_device *dev)
 
 static int i915gm_get_display_clock_speed(struct drm_device *dev)
 {
+        struct pci_dev *pdev = dev->pdev;
         u16 gcfgc = 0;
 
-        pci_read_config_word(dev->pdev, GCFGC, &gcfgc);
+        pci_read_config_word(pdev, GCFGC, &gcfgc);
 
         if (gcfgc & GC_LOW_FREQUENCY_ENABLE)
                 return 133333;
@@ -7321,6 +7323,7 @@ static int i865_get_display_clock_speed(struct drm_device *dev)
 
 static int i85x_get_display_clock_speed(struct drm_device *dev)
 {
+        struct pci_dev *pdev = dev->pdev;
         u16 hpllcc = 0;
 
         /*
@@ -7328,10 +7331,10 @@ static int i85x_get_display_clock_speed(struct drm_device *dev)
          * encoding is different :(
          * FIXME is this the right way to detect 852GM/852GMV?
          */
-        if (dev->pdev->revision == 0x1)
+        if (pdev->revision == 0x1)
                 return 133333;
 
-        pci_bus_read_config_word(dev->pdev->bus,
+        pci_bus_read_config_word(pdev->bus,
                                  PCI_DEVFN(0, 3), HPLLCC, &hpllcc);
 
         /* Assume that the hardware is in the high speed state.  This
@@ -7432,10 +7435,11 @@ static unsigned int intel_hpll_vco(struct drm_device *dev)
 
 static int gm45_get_display_clock_speed(struct drm_device *dev)
 {
+        struct pci_dev *pdev = dev->pdev;
         unsigned int cdclk_sel, vco = intel_hpll_vco(dev);
         uint16_t tmp = 0;
 
-        pci_read_config_word(dev->pdev, GCFGC, &tmp);
+        pci_read_config_word(pdev, GCFGC, &tmp);
 
         cdclk_sel = (tmp >> 12) & 0x1;
 
@@ -7454,6 +7458,7 @@ static int gm45_get_display_clock_speed(struct drm_device *dev)
 
 static int i965gm_get_display_clock_speed(struct drm_device *dev)
 {
+        struct pci_dev *pdev = dev->pdev;
         static const uint8_t div_3200[] = { 16, 10,  8 };
         static const uint8_t div_4000[] = { 20, 12, 10 };
         static const uint8_t div_5333[] = { 24, 16, 14 };
@@ -7461,7 +7466,7 @@ static int i965gm_get_display_clock_speed(struct drm_device *dev)
         unsigned int cdclk_sel, vco = intel_hpll_vco(dev);
         uint16_t tmp = 0;
 
-        pci_read_config_word(dev->pdev, GCFGC, &tmp);
+        pci_read_config_word(pdev, GCFGC, &tmp);
 
         cdclk_sel = ((tmp >> 8) & 0x1f) - 1;
 
@@ -7491,6 +7496,7 @@ fail:
 
 static int g33_get_display_clock_speed(struct drm_device *dev)
 {
+        struct pci_dev *pdev = dev->pdev;
         static const uint8_t div_3200[] = { 12, 10,  8,  7, 5, 16 };
         static const uint8_t div_4000[] = { 14, 12, 10,  8, 6, 20 };
         static const uint8_t div_4800[] = { 20, 14, 12, 10, 8, 24 };
@@ -7499,7 +7505,7 @@ static int g33_get_display_clock_speed(struct drm_device *dev)
         unsigned int cdclk_sel, vco = intel_hpll_vco(dev);
         uint16_t tmp = 0;
 
-        pci_read_config_word(dev->pdev, GCFGC, &tmp);
+        pci_read_config_word(pdev, GCFGC, &tmp);
 
         cdclk_sel = (tmp >> 4) & 0x7;
 
@@ -15991,15 +15997,16 @@ static void intel_init_quirks(struct drm_device *dev)
 static void i915_disable_vga(struct drm_device *dev)
 {
         struct drm_i915_private *dev_priv = to_i915(dev);
+        struct pci_dev *pdev = dev_priv->drm.pdev;
         u8 sr1;
         i915_reg_t vga_reg = i915_vgacntrl_reg(dev);
 
         /* WaEnableVGAAccessThroughIOPort:ctg,elk,ilk,snb,ivb,vlv,hsw */
-        vga_get_uninterruptible(dev->pdev, VGA_RSRC_LEGACY_IO);
+        vga_get_uninterruptible(pdev, VGA_RSRC_LEGACY_IO);
         outb(SR01, VGA_SR_INDEX);
         sr1 = inb(VGA_SR_DATA);
         outb(sr1 | 1<<5, VGA_SR_DATA);
-        vga_put(dev->pdev, VGA_RSRC_LEGACY_IO);
+        vga_put(pdev, VGA_RSRC_LEGACY_IO);
         udelay(300);
 
         I915_WRITE(vga_reg, VGA_DISP_DISABLE);
diff --git a/drivers/gpu/drm/i915/intel_fbdev.c b/drivers/gpu/drm/i915/intel_fbdev.c
index 4003e4908c09..b7098f98bb67 100644
--- a/drivers/gpu/drm/i915/intel_fbdev.c
+++ b/drivers/gpu/drm/i915/intel_fbdev.c
@@ -183,6 +183,7 @@ static int intelfb_create(struct drm_fb_helper *helper,
         struct intel_framebuffer *intel_fb = ifbdev->fb;
         struct drm_device *dev = helper->dev;
         struct drm_i915_private *dev_priv = to_i915(dev);
+        struct pci_dev *pdev = dev_priv->drm.pdev;
         struct i915_ggtt *ggtt = &dev_priv->ggtt;
         struct fb_info *info;
         struct drm_framebuffer *fb;
@@ -280,7 +281,7 @@ static int intelfb_create(struct drm_fb_helper *helper,
         ifbdev->vma = vma;
 
         mutex_unlock(&dev->struct_mutex);
-        vga_switcheroo_client_fb_set(dev->pdev, info);
+        vga_switcheroo_client_fb_set(pdev, info);
         return 0;
 
 out_destroy_fbi:
diff --git a/drivers/gpu/drm/i915/intel_guc_loader.c b/drivers/gpu/drm/i915/intel_guc_loader.c
index 324812d69b70..e67d8de427d0 100644
--- a/drivers/gpu/drm/i915/intel_guc_loader.c
+++ b/drivers/gpu/drm/i915/intel_guc_loader.c
@@ -565,6 +565,7 @@ fail:
 
 static void guc_fw_fetch(struct drm_device *dev, struct intel_guc_fw *guc_fw)
 {
+        struct pci_dev *pdev = dev->pdev;
         struct drm_i915_gem_object *obj;
         const struct firmware *fw;
         struct guc_css_header *css;
@@ -574,7 +575,7 @@ static void guc_fw_fetch(struct drm_device *dev, struct intel_guc_fw *guc_fw)
         DRM_DEBUG_DRIVER("before requesting firmware: GuC fw fetch status %s\n",
                 intel_guc_fw_status_repr(guc_fw->guc_fw_fetch_status));
 
-        err = request_firmware(&fw, guc_fw->guc_fw_path, &dev->pdev->dev);
+        err = request_firmware(&fw, guc_fw->guc_fw_path, &pdev->dev);
         if (err)
                 goto fail;
         if (!fw)
diff --git a/drivers/gpu/drm/i915/intel_i2c.c b/drivers/gpu/drm/i915/intel_i2c.c
index 1f266d7df2ec..a4ca2052315e 100644
--- a/drivers/gpu/drm/i915/intel_i2c.c
+++ b/drivers/gpu/drm/i915/intel_i2c.c
@@ -633,6 +633,7 @@ static const struct i2c_algorithm gmbus_algorithm = {
 int intel_setup_gmbus(struct drm_device *dev)
 {
         struct drm_i915_private *dev_priv = to_i915(dev);
+        struct pci_dev *pdev = dev_priv->drm.pdev;
         struct intel_gmbus *bus;
         unsigned int pin;
         int ret;
@@ -663,7 +664,7 @@ int intel_setup_gmbus(struct drm_device *dev)
                          "i915 gmbus %s",
                          get_gmbus_pin(dev_priv, pin)->name);
 
-                bus->adapter.dev.parent = &dev->pdev->dev;
+                bus->adapter.dev.parent = &pdev->dev;
                 bus->dev_priv = dev_priv;
 
                 bus->adapter.algo = &gmbus_algorithm;
diff --git a/drivers/gpu/drm/i915/intel_runtime_pm.c b/drivers/gpu/drm/i915/intel_runtime_pm.c
index 7686b7f1d599..6c11168facd6 100644
--- a/drivers/gpu/drm/i915/intel_runtime_pm.c
+++ b/drivers/gpu/drm/i915/intel_runtime_pm.c
@@ -287,6 +287,7 @@ void intel_display_set_init_power(struct drm_i915_private *dev_priv,
  */
 static void hsw_power_well_post_enable(struct drm_i915_private *dev_priv)
 {
+        struct pci_dev *pdev = dev_priv->drm.pdev;
         struct drm_device *dev = &dev_priv->drm;
 
         /*
@@ -299,9 +300,9 @@ static void hsw_power_well_post_enable(struct drm_i915_private *dev_priv)
          * sure vgacon can keep working normally without triggering interrupts
          * and error messages.
          */
-        vga_get_uninterruptible(dev->pdev, VGA_RSRC_LEGACY_IO);
+        vga_get_uninterruptible(pdev, VGA_RSRC_LEGACY_IO);
         outb(inb(VGA_MSR_READ), VGA_MSR_WRITE);
-        vga_put(dev->pdev, VGA_RSRC_LEGACY_IO);
+        vga_put(pdev, VGA_RSRC_LEGACY_IO);
 
         if (IS_BROADWELL(dev))
                 gen8_irq_power_well_post_enable(dev_priv,
@@ -318,7 +319,7 @@ static void hsw_power_well_pre_disable(struct drm_i915_private *dev_priv)
 static void skl_power_well_post_enable(struct drm_i915_private *dev_priv,
                                        struct i915_power_well *power_well)
 {
-        struct drm_device *dev = &dev_priv->drm;
+        struct pci_dev *pdev = dev_priv->drm.pdev;
 
         /*
          * After we re-enable the power well, if we touch VGA register 0x3d5
@@ -331,9 +332,9 @@ static void skl_power_well_post_enable(struct drm_i915_private *dev_priv,
          * and error messages.
          */
         if (power_well->data == SKL_DISP_PW_2) {
-                vga_get_uninterruptible(dev->pdev, VGA_RSRC_LEGACY_IO);
+                vga_get_uninterruptible(pdev, VGA_RSRC_LEGACY_IO);
                 outb(inb(VGA_MSR_READ), VGA_MSR_WRITE);
-                vga_put(dev->pdev, VGA_RSRC_LEGACY_IO);
+                vga_put(pdev, VGA_RSRC_LEGACY_IO);
 
                 gen8_irq_power_well_post_enable(dev_priv,
                                                 1 << PIPE_C | 1 << PIPE_B);
@@ -2651,8 +2652,8 @@ void intel_power_domains_suspend(struct drm_i915_private *dev_priv)
  */
 void intel_runtime_pm_get(struct drm_i915_private *dev_priv)
 {
-        struct drm_device *dev = &dev_priv->drm;
-        struct device *kdev = &dev->pdev->dev;
+        struct pci_dev *pdev = dev_priv->drm.pdev;
+        struct device *kdev = &pdev->dev;
 
         pm_runtime_get_sync(kdev);
 
@@ -2672,8 +2673,8 @@ void intel_runtime_pm_get(struct drm_i915_private *dev_priv)
  */
 bool intel_runtime_pm_get_if_in_use(struct drm_i915_private *dev_priv)
 {
-        struct drm_device *dev = &dev_priv->drm;
-        struct device *kdev = &dev->pdev->dev;
+        struct pci_dev *pdev = dev_priv->drm.pdev;
+        struct device *kdev = &pdev->dev;
 
         if (IS_ENABLED(CONFIG_PM)) {
                 int ret = pm_runtime_get_if_in_use(kdev);
@@ -2714,8 +2715,8 @@ bool intel_runtime_pm_get_if_in_use(struct drm_i915_private *dev_priv)
  */
 void intel_runtime_pm_get_noresume(struct drm_i915_private *dev_priv)
 {
-        struct drm_device *dev = &dev_priv->drm;
-        struct device *kdev = &dev->pdev->dev;
+        struct pci_dev *pdev = dev_priv->drm.pdev;
+        struct device *kdev = &pdev->dev;
 
         assert_rpm_wakelock_held(dev_priv);
         pm_runtime_get_noresume(kdev);
@@ -2733,8 +2734,8 @@ void intel_runtime_pm_get_noresume(struct drm_i915_private *dev_priv)
  */
 void intel_runtime_pm_put(struct drm_i915_private *dev_priv)
 {
-        struct drm_device *dev = &dev_priv->drm;
-        struct device *kdev = &dev->pdev->dev;
+        struct pci_dev *pdev = dev_priv->drm.pdev;
+        struct device *kdev = &pdev->dev;
 
         assert_rpm_wakelock_held(dev_priv);
         if (atomic_dec_and_test(&dev_priv->pm.wakeref_count))
@@ -2756,8 +2757,9 @@ void intel_runtime_pm_put(struct drm_i915_private *dev_priv)
  */
 void intel_runtime_pm_enable(struct drm_i915_private *dev_priv)
 {
+        struct pci_dev *pdev = dev_priv->drm.pdev;
         struct drm_device *dev = &dev_priv->drm;
-        struct device *kdev = &dev->pdev->dev;
+        struct device *kdev = &pdev->dev;
 
         pm_runtime_set_autosuspend_delay(kdev, 10000); /* 10s */
         pm_runtime_mark_last_busy(kdev);
diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c
index e378f35365a2..dd75510eba67 100644
--- a/drivers/gpu/drm/i915/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/intel_sdvo.c
@@ -2930,10 +2930,12 @@ static bool
 intel_sdvo_init_ddc_proxy(struct intel_sdvo *sdvo,
                           struct drm_device *dev)
 {
+        struct pci_dev *pdev = dev->pdev;
+
         sdvo->ddc.owner = THIS_MODULE;
         sdvo->ddc.class = I2C_CLASS_DDC;
         snprintf(sdvo->ddc.name, I2C_NAME_SIZE, "SDVO DDC proxy");
-        sdvo->ddc.dev.parent = &dev->pdev->dev;
+        sdvo->ddc.dev.parent = &pdev->dev;
         sdvo->ddc.algo_data = sdvo;
         sdvo->ddc.algo = &intel_sdvo_ddc_proxy;