Merge drm/drm-next into drm-intel-next

[linux-block.git] / drivers / gpu / drm / i915 / gt / intel_reset.c

diff --git a/drivers/gpu/drm/i915/gt/intel_reset.c b/drivers/gpu/drm/i915/gt/intel_reset.c
index 61410cd6292782f3e5ed48790e442a94f1527931..afe0342dcd478b31d122c47f5c679242414606b7 100644 (file)
--- a/drivers/gpu/drm/i915/gt/intel_reset.c
+++ b/drivers/gpu/drm/i915/gt/intel_reset.c
@@ -178,7 +178,7 @@ static int i915_do_reset(struct intel_gt *gt,
                         intel_engine_mask_t engine_mask,
                         unsigned int retry)
 {
-       struct pci_dev *pdev = gt->i915->drm.pdev;
+       struct pci_dev *pdev = to_pci_dev(gt->i915->drm.dev);
        int err;
 
        /* Assert reset for at least 20 usec, and wait for acknowledgement. */
@@ -207,7 +207,7 @@ static int g33_do_reset(struct intel_gt *gt,
                        intel_engine_mask_t engine_mask,
                        unsigned int retry)
 {
-       struct pci_dev *pdev = gt->i915->drm.pdev;
+       struct pci_dev *pdev = to_pci_dev(gt->i915->drm.dev);
 
        pci_write_config_byte(pdev, I915_GDRST, GRDOM_RESET_ENABLE);
        return wait_for_atomic(g4x_reset_complete(pdev), 50);
@@ -217,7 +217,7 @@ static int g4x_do_reset(struct intel_gt *gt,
                        intel_engine_mask_t engine_mask,
                        unsigned int retry)
 {
-       struct pci_dev *pdev = gt->i915->drm.pdev;
+       struct pci_dev *pdev = to_pci_dev(gt->i915->drm.dev);
        struct intel_uncore *uncore = gt->uncore;
        int ret;