Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754142AbbLOSIa (ORCPT ); Tue, 15 Dec 2015 13:08:30 -0500 Received: from mx1.redhat.com ([209.132.183.28]:52736 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753528AbbLOSI2 (ORCPT ); Tue, 15 Dec 2015 13:08:28 -0500 From: Lyude To: David Airlie , dri-devel@lists.freedesktop.org (open list:DRM DRIVERS), linux-kernel@vger.kernel.org (open list), Daniel Vetter Cc: Rui Matos , Julien Wajsberg , kuddel.mail@gmx.de, Lennart Poettering , Rob Clark , Benjamin Tissoires , Lyude Subject: [PATCH] Revert "drm: Stop resetting connector state to unknown" Date: Tue, 15 Dec 2015 13:07:51 -0500 Message-Id: <1450202871-15062-1-git-send-email-cpaul@redhat.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2033 Lines: 53 This reverts commit 5677d67ae394 ("drm: Stop resetting connector state to unknown") Unfortunately, not resetting the connector status to unknown actually breaks reprobing on suspend/resume in i915, which is important to have working since it means a user docking their laptop in suspend won't have their monitors work after resume. This commit was originally pushed to fix a bug with systemd[1], however said bug has already been fixed in userspace. Since "unknown" is technically a valid option to return to userspace for a connector's status, I would think that this sort of behavior should probably be expected from userspace. Some good examples of this are the radeon driver reporting "unknown" for connectors that have done something wonky during a hotplug event (e.g. part of the initialization of the connector failed), and the omapdrm driver returns "unknown" for certain connector types by default. [1]: https://bugzilla.kernel.org/show_bug.cgi?id=100641 Signed-off-by: Lyude --- drivers/gpu/drm/drm_crtc.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c index 24c5434..474e636 100644 --- a/drivers/gpu/drm/drm_crtc.c +++ b/drivers/gpu/drm/drm_crtc.c @@ -5312,11 +5312,12 @@ void drm_mode_config_reset(struct drm_device *dev) if (encoder->funcs->reset) encoder->funcs->reset(encoder); - mutex_lock(&dev->mode_config.mutex); - drm_for_each_connector(connector, dev) + list_for_each_entry(connector, &dev->mode_config.connector_list, head) { + connector->status = connector_status_unknown; + if (connector->funcs->reset) connector->funcs->reset(connector); - mutex_unlock(&dev->mode_config.mutex); + } } EXPORT_SYMBOL(drm_mode_config_reset); -- 2.5.0 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/