From mboxrd@z Thu Jan  1 00:00:00 1970
From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= <ville.syrjala@linux.intel.com>
Subject: Re: [PATCH] drm/i915: preserve pipe A quirk in
 i9xx_set_pipeconf
Date: Mon, 23 Sep 2013 11:17:33 +0300
Message-ID: <20130923081733.GS4531@intel.com>
References: <1379875872-16674-1-git-send-email-daniel.vetter@ffwll.ch>
Mime-Version: 1.0
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
Return-path: <intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org>
Received: from mga02.intel.com (mga02.intel.com [134.134.136.20])
	by gabe.freedesktop.org (Postfix) with ESMTP id E28A0E64C2
	for <intel-gfx@lists.freedesktop.org>;
	Mon, 23 Sep 2013 01:17:36 -0700 (PDT)
Content-Disposition: inline
In-Reply-To: <1379875872-16674-1-git-send-email-daniel.vetter@ffwll.ch>
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: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Intel Graphics Development <intel-gfx@lists.freedesktop.org>, Meelis Roos <mroos@ut.ee>
List-Id: intel-gfx@lists.freedesktop.org

On Sun, Sep 22, 2013 at 08:51:12PM +0200, Daniel Vetter wrote:
> This regression has been introduced in
> =

> commit 9f11a9e4e50006b615ba94722dfc33ced89664cf
> Author: Daniel Vetter <daniel.vetter@ffwll.ch>
> Date:   Thu Jun 13 00:54:58 2013 +0200
> =

>     drm/i915: set up PIPECONF explicitly for i9xx/vlv platforms
> =

> Ville brough up the idea that this is just the pipe A quirk gone
> wrong.
> =

> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=3D66462
> References: https://lkml.org/lkml/2013/8/26/238
> Cc: Meelis Roos <mroos@ut.ee>
> Cc: Chris Wilson <chris@chris-wilson.co.uk>
> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
> ---
>  drivers/gpu/drm/i915/intel_display.c | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
> =

> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/=
intel_display.c
> index f7d868e..be97b42 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -4833,7 +4833,11 @@ static void i9xx_set_pipeconf(struct intel_crtc *i=
ntel_crtc)
>  	struct drm_i915_private *dev_priv =3D dev->dev_private;
>  	uint32_t pipeconf;
>  =

> -	pipeconf =3D 0;
> +	if (dev_priv->quirks & QUIRK_PIPEA_FORCE) {
> +		pipeconf =3D
> +			I915_READ(PIPECONF(intel_crtc->pipe)) & PIPECONF_ENABLE;
> +	} else
> +		pipeconf =3D 0;

Hmm. Why not just this?

pipeconf =3D 0;
if (pipe =3D=3D PIPE_A && QUIRK)
 pipeconf |=3D PIPECONF_ENABLE;

>  =

>  	if (intel_crtc->config.double_wide)
>  		pipeconf |=3D PIPECONF_DOUBLE_WIDE;
> -- =

> 1.8.4.rc3
> =

> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- =

Ville Syrj=E4l=E4
Intel OTC