Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965507AbbLOW0J (ORCPT ); Tue, 15 Dec 2015 17:26:09 -0500 Received: from mx1.redhat.com ([209.132.183.28]:57603 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932800AbbLOW0H (ORCPT ); Tue, 15 Dec 2015 17:26:07 -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 v2] drm/i915: Send a hotplug event on resume instead of an IRQ event Date: Tue, 15 Dec 2015 17:25:56 -0500 Message-Id: <1450218356-24028-1-git-send-email-cpaul@redhat.com> In-Reply-To: <1450211658.8084.11.camel@redhat.com> References: <1450211658.8084.11.camel@redhat.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1965 Lines: 46 We currently call drm_helper_hpd_irq_event() to handle reprobing displays on resume, however drm_helper_hpd_irq_event() only checks the status of hpd. HPD doesn't update if the displays connected changed before resuming the system, and as such causes us not to detect any connection changes after resume. This originally wasn't the case since drm would reset all of the connectors to unknown during resume and cause a reprobe (since the connector statuses would change), however this behavior changed in 5677d67ae394 ('drm: Stop resetting connector state to unknown'). Signed-off-by: Lyude --- I did some research into why setting the connector state to unknown was causing a reprobe and discovered that the fact that this reprobing ever worked at all was just a coincidence (i915's IRQ handler gets called by the irq event, notices the state of all the connectors changed since they were set to unknown, causes a reprobe). This seems to fix everything (including monitor detection in normal VTs), and I can't figure out any real use now for us to set everything to unknown so I'm going to go the route of just sending the hotplug event instead. drivers/gpu/drm/i915/i915_drv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index 760e0ce..27a6c1b 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -792,7 +792,7 @@ static int i915_drm_resume(struct drm_device *dev) * */ intel_hpd_init(dev_priv); /* Config may have changed between suspend and resume */ - drm_helper_hpd_irq_event(dev); + drm_kms_helper_hotplug_event(dev); intel_opregion_init(dev); -- 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/