From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jesse Barnes <jbarnes@virtuousgeek.org>
Subject: Re: [PATCH 06/13] drm/i915: Retrieve the current mode
 upon KMS takeover
Date: Tue, 26 Mar 2013 16:24:48 -0700
Message-ID: <20130326162448.0b345bc5@jbarnes-desktop>
References: <1361309508-4901-1-git-send-email-jbarnes@virtuousgeek.org>
	<1361309508-4901-7-git-send-email-jbarnes@virtuousgeek.org>
	<1363782985.13528.25.camel@intelbox>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org>
Received: from oproxy9.bluehost.com (oproxy9.bluehost.com [69.89.24.6])
	by gabe.freedesktop.org (Postfix) with SMTP id 39F80E6025
	for <intel-gfx@lists.freedesktop.org>;
	Tue, 26 Mar 2013 16:24:33 -0700 (PDT)
In-Reply-To: <1363782985.13528.25.camel@intelbox>
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>
Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org
Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org
To: imre.deak@intel.com
Cc: intel-gfx@lists.freedesktop.org
List-Id: intel-gfx@lists.freedesktop.org

On Wed, 20 Mar 2013 14:36:25 +0200
Imre Deak <imre.deak@intel.com> wrote:

> > +		pipe = -1;
> >  
> >  		if (encoder->get_hw_state(encoder, &pipe)) {
> > -			encoder->base.crtc =
> > -				dev_priv->pipe_to_crtc_mapping[pipe];
> > -		} else {
> > +			crtc = to_intel_crtc(dev_priv->pipe_to_crtc_mapping[pipe]);  
> 
> get_hw_state() can return true and still leave pipe at -1, causing an
> invalid access here.

Fixed, thanks.

-- 
Jesse Barnes, Intel Open Source Technology Center