]> git.itanic.dy.fi Git - linux-stable/commitdiff
drm/i915: Call i915_gem_suspend() only after display is turned off
authorJosé Roberto de Souza <jose.souza@intel.com>
Fri, 17 Jun 2022 19:06:29 +0000 (12:06 -0700)
committerJosé Roberto de Souza <jose.souza@intel.com>
Thu, 23 Jun 2022 20:20:41 +0000 (13:20 -0700)
When the last reference of a gem object is removed it is added to the
mm.free_list list and mm.free_work is queued to actually free the
object.

So gem objects that had their last reference removed by display during
drm_atomic_helper_shutdown() are added to mm.free_list what could
cause that mm.free_work is executed at the same time as
intel_runtime_pm_driver_release() causing raw-wakerefs warning.

So here only calling i915_gem_suspend() and by consequence
i915_gem_drain_freed_objects() only after display is down making
sure all display gem objecs are freed when
intel_runtime_pm_driver_release() is executed.

Signed-off-by: José Roberto de Souza <jose.souza@intel.com>
Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220617190629.355356-1-jose.souza@intel.com
drivers/gpu/drm/i915/i915_driver.c

index 419e237f9ea40de2b62a0ad5241eaad510ca30a7..be95f3d0c3d03b2ccc80ad99dc64f06bb81836cb 100644 (file)
@@ -1049,8 +1049,6 @@ void i915_driver_shutdown(struct drm_i915_private *i915)
        intel_runtime_pm_disable(&i915->runtime_pm);
        intel_power_domains_disable(i915);
 
-       i915_gem_suspend(i915);
-
        if (HAS_DISPLAY(i915)) {
                drm_kms_helper_poll_disable(&i915->drm);
 
@@ -1067,6 +1065,8 @@ void i915_driver_shutdown(struct drm_i915_private *i915)
 
        intel_dmc_ucode_suspend(i915);
 
+       i915_gem_suspend(i915);
+
        /*
         * The only requirement is to reboot with display DC states disabled,
         * for now leaving all display power wells in the INIT power domain