From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH] drm/i915: Do not clobber config status after a forced restore of hw state Date: Tue, 3 Dec 2013 17:43:14 +0100 Message-ID: <20131203164314.GG27344@phenom.ffwll.local> References: <1386005949-19198-1-git-send-email-chris@chris-wilson.co.uk> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-ea0-f179.google.com (mail-ea0-f179.google.com [209.85.215.179]) by gabe.freedesktop.org (Postfix) with ESMTP id 58A50FB497 for ; Tue, 3 Dec 2013 08:42:32 -0800 (PST) Received: by mail-ea0-f179.google.com with SMTP id r15so10210718ead.10 for ; Tue, 03 Dec 2013 08:42:31 -0800 (PST) Content-Disposition: inline In-Reply-To: <1386005949-19198-1-git-send-email-chris@chris-wilson.co.uk> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org To: Chris Wilson Cc: intel-gfx@lists.freedesktop.org, "v3.8 and later" , Paulo Zanoni List-Id: intel-gfx@lists.freedesktop.org On Mon, Dec 02, 2013 at 05:39:09PM +0000, Chris Wilson wrote: > We call intel_modeset_setup_hw_state() along two paths, driver > load/resume and after a lid event notification. During initialisation of > the driver, it is imperative that we reset the config state. This > correctly sets up the initial connector statuses and prepares the > hardware for a thorough probing. However, during a lid event, we only > want to undo the damage caused by the bios by resetting our last known > mode. In this cirumstance, we do not want to clobber our desired state. > > In order to try and keep sanity between the config state and our own > tracking, do the drm_mode_config_reset() first along the load/resume > paths before reading out the hw state and apply any definite known > corrections. > > v2: "As discussed on irc I don't think we should force the connector > state to anything here: Imo connector->status should reflect what we > believe to be the true output connection state, whereas connector->encoder > reflects whether this connector is wired up to a pipe. And since we no > longer reject modeset on disconnected connectors and never nuked the pipe > if the connector gets disconnected there's no reason for that - such policy > is userspace's job. > > This regression has been introduced in > > commit 2e9388923e83bc4e2726f170a984621f1d582e77 > Author: Daniel Vetter > Date: Thu Oct 11 20:08:24 2012 +0200 > > drm/i915/crt: explicitly set up HOTPLUG_BITS on resume" > so sayeth Daniel. > > Signed-off-by: Chris Wilson > Cc: Daniel Vetter > Cc: stable@vger.kernel.org (v3.8 and later) > Cc: Paulo Zanoni Picked up for -fixes, thanks for the patch. -Daniel -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch