From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jesse Barnes <jbarnes@virtuousgeek.org>
Subject: Re: [PATCH 3/4] drm/i915: enable VT switchless resume v3
Date: Tue, 20 May 2014 14:10:16 -0700
Message-ID: <20140520141016.3dcd5658@jbarnes-desktop>
References: <1364315146-20542-1-git-send-email-jbarnes@virtuousgeek.org>
 <1364315146-20542-3-git-send-email-jbarnes@virtuousgeek.org>
 <5355494B.5040503@t-online.de>
 <20140516152047.4743f0f4@jbarnes-desktop>
 <20140516223807.GA11656@nuc-i3427.alporthouse.com>
 <20140516224223.GB11656@nuc-i3427.alporthouse.com>
 <20140520125329.23e9db9a@jbarnes-desktop>
 <20140520125803.5c86b414@jbarnes-desktop>
 <CAKMK7uHsTXSynyKDYyr=0RSjeeE=_bQrTf_FjXnRMRDqqUtvhA@mail.gmail.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <intel-gfx-bounces@lists.freedesktop.org>
Received: from gproxy4-pub.mail.unifiedlayer.com
 (gproxy4-pub.mail.unifiedlayer.com [69.89.23.142])
 by gabe.freedesktop.org (Postfix) with SMTP id 976C66E1EF
 for <intel-gfx@lists.freedesktop.org>; Tue, 20 May 2014 14:10:22 -0700 (PDT)
In-Reply-To: <CAKMK7uHsTXSynyKDYyr=0RSjeeE=_bQrTf_FjXnRMRDqqUtvhA@mail.gmail.com>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <http://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Errors-To: intel-gfx-bounces@lists.freedesktop.org
Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>
To: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: intel-gfx <intel-gfx@lists.freedesktop.org>
List-Id: intel-gfx@lists.freedesktop.org

On Tue, 20 May 2014 22:15:45 +0200
Daniel Vetter <daniel.vetter@ffwll.ch> wrote:

> On Tue, May 20, 2014 at 9:58 PM, Jesse Barnes <jbarnes@virtuousgeek.org> wrote:
> > Ah, poll_enable is false until after _thaw finishes, so
> > our hotplug_resume call of hpd_irq_event does nothing.  So aside from
> > the encoder hot_plug callbacks (which really just check dp link status,
> > which ought to be a no-op) our resume_hotplug function doesn't do
> > anything right now.  May as well kill it and just send an unconditional
> > uevent?
> 
> That's expensive since the reprobe will likely result in a few dropped
> frames (if the edid reading takes a long time). Better to do that in
> the kernel and avoid sending the uevent if nothing changed. Which iirc
> hpd_irq_event does for us.

Well delaying the resume by a long time isn't much better, but I guess
we need to fix this somehow.

Knut, does this patch also address your issue?  It should reset the
connector status fields correctly so the X driver doesn't have to work
around things...

diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index b948c71..e725235 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -623,8 +623,6 @@ static int __i915_drm_thaw(struct drm_device *dev, bool restore_gtt_mappings)
 		 * */
 		intel_hpd_init(dev);
 		dev_priv->enable_hotplug_processing = true;
-		/* Config may have changed between suspend and resume */
-		intel_resume_hotplug(dev);
 	}
 
 	intel_opregion_init(dev);
@@ -694,6 +692,11 @@ int i915_resume(struct drm_device *dev)
 		return ret;
 
 	drm_kms_helper_poll_enable(dev);
+	if (drm_core_check_feature(dev, DRIVER_MODESET)) {
+		/* Config may have changed between suspend and resume */
+		intel_resume_hotplug(dev);
+	}
+
 	return 0;
 }