Merge tag 'drm-intel-next-2023-03-23' of git://anongit.freedesktop.org/drm/drm-intel...

[thirdparty/linux.git] / drivers / gpu / drm / i915 / i915_driver.c

diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c
index a53fd339e2cc94ec65bce55422ae8b61ac71d0cc..da249337c23bdd5934bf9e97722df3b9e66bf9b0 100644 (file)
--- a/drivers/gpu/drm/i915/i915_driver.c
+++ b/drivers/gpu/drm/i915/i915_driver.c
@@ -535,7 +535,7 @@ static int i915_driver_hw_probe(struct drm_i915_private *dev_priv)
 
        ret = i915_pcode_init(dev_priv);
        if (ret)
-               goto err_msi;
+               goto err_opregion;
 
        /*
         * Fill the dram structure to get the system dram info. This will be
@@ -556,6 +556,8 @@ static int i915_driver_hw_probe(struct drm_i915_private *dev_priv)
 
        return 0;
 
+err_opregion:
+       intel_opregion_cleanup(dev_priv);
 err_msi:
        if (pdev->msi_enabled)
                pci_disable_msi(pdev);
@@ -581,6 +583,8 @@ static void i915_driver_hw_remove(struct drm_i915_private *dev_priv)
 
        i915_perf_fini(dev_priv);
 
+       intel_opregion_cleanup(dev_priv);
+
        if (pdev->msi_enabled)
                pci_disable_msi(pdev);