From mboxrd@z Thu Jan  1 00:00:00 1970
From: Daniel Vetter <daniel@ffwll.ch>
Subject: Re: [PATCH] drm/i915: Fix sprite_scaling_enabled for
 multiple sprites
Date: Sat, 9 Feb 2013 15:47:55 +0100
Message-ID: <20130209144754.GS5813@phenom.ffwll.local>
References: <1360358015-26643-1-git-send-email-ville.syrjala@linux.intel.com>
	<20130208212630.GA519@cantiga.alporthouse.com>
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 mail-ea0-f178.google.com (mail-ea0-f178.google.com
	[209.85.215.178])
	by gabe.freedesktop.org (Postfix) with ESMTP id A4510E5D23
	for <intel-gfx@lists.freedesktop.org>;
	Sat,  9 Feb 2013 06:45:40 -0800 (PST)
Received: by mail-ea0-f178.google.com with SMTP id a14so2101960eaa.37
	for <intel-gfx@lists.freedesktop.org>;
	Sat, 09 Feb 2013 06:45:39 -0800 (PST)
Content-Disposition: inline
In-Reply-To: <20130208212630.GA519@cantiga.alporthouse.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>
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: Chris Wilson <chris@chris-wilson.co.uk>, ville.syrjala@linux.intel.com, intel-gfx@lists.freedesktop.org
List-Id: intel-gfx@lists.freedesktop.org

On Fri, Feb 08, 2013 at 09:26:30PM +0000, Chris Wilson wrote:
> On Fri, Feb 08, 2013 at 11:13:35PM +0200, ville.syrjala@linux.intel.com w=
rote:
> > From: Ville Syrj=E4l=E4 <ville.syrjala@linux.intel.com>
> > =

> > We have more than one sprite, so a boolean simply won't cut it.
> > Turn sprite_scaling_enabled into a bitmask and track the state
> > of sprite scaler for each sprite independently.

I'm not sure whether keeping that in dev_priv is right, probably should
move into a crtc flag. Otoh we have a few funny issues around watermark
changes anyway already, so better fix those all up before creating havoc
...

> > Also don't re-enable LP watermarks until the sprite registers
> > have actually been written, and thus sprite scaling has really
> > been disabled.
> =

> I would emphasize this, since this fix is worthy of Cc: stable@
>  =

> > Signed-off-by: Ville Syrj=E4l=E4 <ville.syrjala@linux.intel.com>
> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>

Queued for -next, thanks for the patch.
-Daniel
-- =

Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch