[PATCH 3/4] drm/i915: Disable all crtcs during driver unload.

Maarten Lankhorst maarten.lankhorst at linux.intel.com
Tue Dec 13 14:58:56 UTC 2016


We may keep the crtc's enabled when userspace unsets all framebuffers but
keeps the crtc active. This exposes a WARN in fbc_global disable, and
a lot of bugs in our hardware readout code. Solve this by disabling
all crtc's for now.

Signed-off-by: Maarten Lankhorst <maarten.lankhorst at linux.intel.com>
---
 drivers/gpu/drm/i915/intel_display.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 0daa54633450..f8fa57dc231a 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -17355,6 +17355,10 @@ void intel_modeset_cleanup(struct drm_device *dev)
 
 	intel_unregister_dsm_handler();
 
+	drm_modeset_lock_all(dev);
+	drm_atomic_helper_disable_all(dev, dev->mode_config.acquire_ctx);
+	drm_modeset_unlock_all(dev);
+
 	intel_fbc_global_disable(dev_priv);
 
 	/* flush any delayed tasks or pending work */
-- 
2.7.4



More information about the Intel-gfx-trybot mailing list