aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2015-07-16 10:47:50 -0400
committerDaniel Vetter <daniel.vetter@ffwll.ch>2015-07-22 08:52:26 -0400
commit5677d67ae3949f09f57357241b88222d49b8c782 (patch)
tree020f07098f48b52f9b8d26be5cf0686e13e7b05f
parent52721d9d3334c1cb1f76219a161084094ec634dc (diff)
drm: Stop resetting connector state to unknown
It's causing piles of issues since we've stopped forcing full detect cycles in the sysfs interfaces with commit c484f02d0f02fbbfc6decc945a69aae011041a27 Author: Chris Wilson <chris@chris-wilson.co.uk> Date: Fri Mar 6 12:36:42 2015 +0000 drm: Lighten sysfs connector 'status' The original justification for this was that the hpd handlers could use the unknown state as a hint to force a full detection. But current i915 code isn't doing that any more, and no one else really uses reset on resume. So instead just keep the old state around. References: http://article.gmane.org/gmane.comp.freedesktop.xorg.drivers.intel/62584 Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=100641 Cc: Rui Matos <tiagomatos@gmail.com> Cc: Julien Wajsberg <felash@gmail.com> Cc: kuddel.mail@gmx.de Cc: Lennart Poettering <mzxreary@0pointer.de> Cc: stable@vger.kernel.org Acked-by: Rob Clark <robdclark@gmail.com> Tested-by: Rui Tiago Cação Matos <tiagomatos@gmail.com> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
-rw-r--r--drivers/gpu/drm/drm_crtc.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
index 357bd04a173b..fed748311b92 100644
--- a/drivers/gpu/drm/drm_crtc.c
+++ b/drivers/gpu/drm/drm_crtc.c
@@ -5398,12 +5398,9 @@ void drm_mode_config_reset(struct drm_device *dev)
5398 if (encoder->funcs->reset) 5398 if (encoder->funcs->reset)
5399 encoder->funcs->reset(encoder); 5399 encoder->funcs->reset(encoder);
5400 5400
5401 list_for_each_entry(connector, &dev->mode_config.connector_list, head) { 5401 list_for_each_entry(connector, &dev->mode_config.connector_list, head)
5402 connector->status = connector_status_unknown;
5403
5404 if (connector->funcs->reset) 5402 if (connector->funcs->reset)
5405 connector->funcs->reset(connector); 5403 connector->funcs->reset(connector);
5406 }
5407} 5404}
5408EXPORT_SYMBOL(drm_mode_config_reset); 5405EXPORT_SYMBOL(drm_mode_config_reset);
5409 5406