From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Subject: Re: [PATCH 02/28] drm/i915: add sprite assertion function for VLV Date: Mon, 4 Mar 2013 20:29:49 +0200 Message-ID: <20130304182949.GN4469@intel.com> References: <1362172471-7643-1-git-send-email-jbarnes@virtuousgeek.org> <1362172471-7643-3-git-send-email-jbarnes@virtuousgeek.org> Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Return-path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id 11C42E5CC2 for ; Mon, 4 Mar 2013 10:29:53 -0800 (PST) Content-Disposition: inline In-Reply-To: <1362172471-7643-3-git-send-email-jbarnes@virtuousgeek.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-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: Jesse Barnes Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org On Fri, Mar 01, 2013 at 01:14:05PM -0800, Jesse Barnes wrote: > Need to make sure sprites are disabled before shutting off a pipe. But we don't actually turn them off anywhere, do we? > = > Signed-off-by: Jesse Barnes > --- > drivers/gpu/drm/i915/intel_display.c | 20 ++++++++++++++++++++ > 1 file changed, 20 insertions(+) > = > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/= intel_display.c > index 5baf850..794c23e5 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -1275,6 +1275,25 @@ static void assert_planes_disabled(struct drm_i915= _private *dev_priv, > } > } > = > +static void assert_sprites_disabled(struct drm_i915_private *dev_priv, > + enum pipe pipe) > +{ > + int reg, i; > + u32 val; > + > + if (!IS_VALLEYVIEW(dev_priv->dev)) > + return; > + > + /* Need to check both planes against the pipe */ > + for (i =3D 0; i < dev_priv->num_plane; i++) { > + reg =3D SPCNTR(pipe, i); > + val =3D I915_READ(reg); > + WARN((val & SP_ENABLE), > + "sprite %d assertion failure, should be off on pipe %c but is sti= ll active\n", > + pipe * 2 + i, pipe_name(pipe)); > + } > +} > + > static void assert_pch_refclk_enabled(struct drm_i915_private *dev_priv) > { > u32 val; > @@ -1859,6 +1878,7 @@ static void intel_disable_pipe(struct drm_i915_priv= ate *dev_priv, > * or we might hang the display. > */ > assert_planes_disabled(dev_priv, pipe); > + assert_sprites_disabled(dev_priv, pipe); > = > /* Don't disable pipe A or pipe A PLLs if needed */ > if (pipe =3D=3D PIPE_A && (dev_priv->quirks & QUIRK_PIPEA_FORCE)) > -- = > 1.7.9.5 > = > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- = Ville Syrj=E4l=E4 Intel OTC