Merge tag 'drm-intel-next-2022-06-22' of git://anongit.freedesktop.org/drm/drm-intel...

[linux-block.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 90b0ce5051aff6ff4544213ab68e59fc24c3da14..b47746152d97fc2cbec410beaebfe9e69fdf5dcf 100644 (file)
--- a/drivers/gpu/drm/i915/i915_driver.c
+++ b/drivers/gpu/drm/i915/i915_driver.c
@@ -629,7 +629,7 @@ static int i915_driver_hw_probe(struct drm_i915_private *dev_priv)
 
        intel_opregion_setup(dev_priv);
 
-       ret = intel_pcode_init(dev_priv);
+       ret = intel_pcode_init(&dev_priv->uncore);
        if (ret)
                goto err_msi;
 
@@ -1251,7 +1251,7 @@ static int i915_drm_resume(struct drm_device *dev)
 
        disable_rpm_wakeref_asserts(&dev_priv->runtime_pm);
 
-       ret = intel_pcode_init(dev_priv);
+       ret = intel_pcode_init(&dev_priv->uncore);
        if (ret)
                return ret;
 
@@ -1549,7 +1549,7 @@ static int intel_runtime_suspend(struct device *kdev)
        if (drm_WARN_ON_ONCE(&dev_priv->drm, !HAS_RUNTIME_PM(dev_priv)))
                return -ENODEV;
 
-       drm_dbg_kms(&dev_priv->drm, "Suspending device\n");
+       drm_dbg(&dev_priv->drm, "Suspending device\n");
 
        disable_rpm_wakeref_asserts(rpm);
 
@@ -1625,7 +1625,7 @@ static int intel_runtime_suspend(struct device *kdev)
        if (!IS_VALLEYVIEW(dev_priv) && !IS_CHERRYVIEW(dev_priv))
                intel_hpd_poll_enable(dev_priv);
 
-       drm_dbg_kms(&dev_priv->drm, "Device suspended\n");
+       drm_dbg(&dev_priv->drm, "Device suspended\n");
        return 0;
 }
 
@@ -1639,7 +1639,7 @@ static int intel_runtime_resume(struct device *kdev)
        if (drm_WARN_ON_ONCE(&dev_priv->drm, !HAS_RUNTIME_PM(dev_priv)))
                return -ENODEV;
 
-       drm_dbg_kms(&dev_priv->drm, "Resuming device\n");
+       drm_dbg(&dev_priv->drm, "Resuming device\n");
 
        drm_WARN_ON_ONCE(&dev_priv->drm, atomic_read(&rpm->wakeref_count));
        disable_rpm_wakeref_asserts(rpm);
@@ -1683,7 +1683,7 @@ static int intel_runtime_resume(struct device *kdev)
                drm_err(&dev_priv->drm,
                        "Runtime resume failed, disabling it (%d)\n", ret);
        else
-               drm_dbg_kms(&dev_priv->drm, "Device resumed\n");
+               drm_dbg(&dev_priv->drm, "Device resumed\n");
 
        return ret;
 }