Explorar o código

drm/i915: Fix oops on HWS unload

Freeing the Hardware Status Page was writing to the HWS register in
order to disable the GPU writing to the HWS page. Unfortunately, we were
writing to the mmio register after unmapping the register space, hence
the oops.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Daniel Vetter %!s(int64=15) %!d(string=hai) anos
pai
achega
701394cc53
Modificáronse 1 ficheiros con 3 adicións e 3 borrados
  1. 3 3
      drivers/gpu/drm/i915/i915_dma.c

+ 3 - 3
drivers/gpu/drm/i915/i915_dma.c

@@ -2133,9 +2133,6 @@ int i915_driver_unload(struct drm_device *dev)
 	if (dev->pdev->msi_enabled)
 	if (dev->pdev->msi_enabled)
 		pci_disable_msi(dev->pdev);
 		pci_disable_msi(dev->pdev);
 
 
-	if (dev_priv->regs != NULL)
-		iounmap(dev_priv->regs);
-
 	intel_opregion_fini(dev);
 	intel_opregion_fini(dev);
 
 
 	if (drm_core_check_feature(dev, DRIVER_MODESET)) {
 	if (drm_core_check_feature(dev, DRIVER_MODESET)) {
@@ -2157,6 +2154,9 @@ int i915_driver_unload(struct drm_device *dev)
 			i915_free_hws(dev);
 			i915_free_hws(dev);
 	}
 	}
 
 
+	if (dev_priv->regs != NULL)
+		iounmap(dev_priv->regs);
+
 	intel_teardown_gmbus(dev);
 	intel_teardown_gmbus(dev);
 	intel_teardown_mchbar(dev);
 	intel_teardown_mchbar(dev);