From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Subject: Re: [PATCH 7/7] drm/i915: add i9xx pfit pipe asserts Date: Thu, 11 Apr 2013 19:37:53 +0300 Message-ID: <20130411163753.GA4469@intel.com> References: <1365690550-5716-1-git-send-email-daniel.vetter@ffwll.ch> <1365690550-5716-7-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: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id 5B6E5E6664 for ; Thu, 11 Apr 2013 09:37:57 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1365690550-5716-7-git-send-email-daniel.vetter@ffwll.ch> 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: Daniel Vetter Cc: Intel Graphics Development List-Id: intel-gfx@lists.freedesktop.org On Thu, Apr 11, 2013 at 04:29:10PM +0200, Daniel Vetter wrote: > We can only enable the pfit if the pipe. Ensure that this is obied ^ "is disabled" or something? > with a neat assert. > = > Also check whether the pfit is off before enabling it - if not we've > lost track of things somewhere since the pfit is only ever used by the > lvds output. > = > Signed-off-by: Daniel Vetter > --- > drivers/gpu/drm/i915/intel_lvds.c | 3 +++ > 1 file changed, 3 insertions(+) > = > diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/int= el_lvds.c > index ca2d903..1ff981f 100644 > --- a/drivers/gpu/drm/i915/intel_lvds.c > +++ b/drivers/gpu/drm/i915/intel_lvds.c > @@ -159,6 +159,9 @@ static void intel_pre_enable_lvds(struct intel_encode= r *encoder) > if (HAS_PCH_SPLIT(dev) || !enc->pfit_control) > return; > = > + WARN_ON(I915_READ(PFIT_CONTROL) & PFIT_ENABLE); > + assert_pipe_disabled(dev_priv, to_intel_crtc(encoder->base.crtc)->pipe); > + > /* > * Enable automatic panel scaling so that non-native modes > * fill the screen. The panel fitter should only be > -- = > 1.7.10.4 > = > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- = Ville Syrj=E4l=E4 Intel OTC