]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commit
drm/i915: Fix deadlock in i830_disable_pipe()
authorVille Syrjälä <ville.syrjala@linux.intel.com>
Wed, 29 Nov 2017 12:54:11 +0000 (14:54 +0200)
committerJani Nikula <jani.nikula@intel.com>
Mon, 15 Jan 2018 14:46:33 +0000 (16:46 +0200)
commit4488496d58200c7511842e049a4cc891d928da56
treea72ecfc8f837d65e65eab4d20e08b238fd8eaa7a
parent23ac12732825901b3fc6ac720958d8bff9a0d6ec
drm/i915: Fix deadlock in i830_disable_pipe()

i830_disable_pipe() gets called from the power well code, and thus
we're already holding the power domain mutex. That means we can't
call plane->get_hw_state() as it will also try to grab the
same mutex and will thus deadlock.

Replace the assert_plane() calls (which calls ->get_hw_state()) with
just raw register reads in i830_disable_pipe(). As a bonus we can
now get a warning if plane C is enabled even though we don't even
expose it as a drm plane.

v2: Do a separate WARN_ON() for each plane (Chris)

Cc: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Fixes: d87ce7640295 ("drm/i915: Add .get_hw_state() method for planes")
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20171129125411.29055-1-ville.syrjala@linux.intel.com
(cherry picked from commit 5816d9cbc0a0fbf232fe297cefcb85361a3cde90)
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
drivers/gpu/drm/i915/intel_display.c