Merge tag 'drm-intel-next-2021-08-10-1' of git://anongit.freedesktop.org/drm/drm...

[sfrench/cifs-2.6.git] / drivers / gpu / drm / i915 / i915_drv.c

diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index c43b698bf0b976df99258f994eae2f5bb5708ca2..59fb4c710c8ca16c873ee5d4fb95de8a5701f37a 100644 (file)
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -620,7 +620,9 @@ static int i915_driver_hw_probe(struct drm_i915_private *dev_priv)
 
        intel_opregion_setup(dev_priv);
 
-       intel_pcode_init(dev_priv);
+       ret = intel_pcode_init(dev_priv);
+       if (ret)
+               goto err_msi;
 
        /*
         * Fill the dram structure to get the system dram info. This will be
@@ -1231,6 +1233,10 @@ static int i915_drm_resume(struct drm_device *dev)
 
        disable_rpm_wakeref_asserts(&dev_priv->runtime_pm);
 
+       ret = intel_pcode_init(dev_priv);
+       if (ret)
+               return ret;
+
        sanitize_gpu(dev_priv);
 
        ret = i915_ggtt_enable_hw(dev_priv);