Skip to content

Commit 6a8915d

Browse files
vsyrjalajlahtine-intel
authored andcommitted
drm/i915: Don't oops during modeset shutdown after lpe audio deinit
We deinit the lpe audio device before we call drm_atomic_helper_shutdown(), which means the platform device may already be gone when it comes time to shut down the crtc. As we don't know when the last reference to the platform device gets dropped by the audio driver we can't assume that the device and its data are still around when turning off the crtc. Mark the platform device as gone as soon as we do the audio deinit. Cc: stable@vger.kernel.org Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20181105194604.6994-1-ville.syrjala@linux.intel.com Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> (cherry picked from commit f45a797) Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
1 parent 0014868 commit 6a8915d

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

drivers/gpu/drm/i915/intel_lpe_audio.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -297,8 +297,10 @@ void intel_lpe_audio_teardown(struct drm_i915_private *dev_priv)
297297
lpe_audio_platdev_destroy(dev_priv);
298298

299299
irq_free_desc(dev_priv->lpe_audio.irq);
300-
}
301300

301+
dev_priv->lpe_audio.irq = -1;
302+
dev_priv->lpe_audio.platdev = NULL;
303+
}
302304

303305
/**
304306
* intel_lpe_audio_notify() - notify lpe audio event

0 commit comments

Comments
 (0)