From: Daniel Vetter Subject: Re: [PATCH] drm/i915: Fix SPRITE0_FLIP_DONE_INT_EN_VLV and SPRITE0_FLIPDONE_INT_STATUS_VLV Date: Wed, 16 Jan 2013 20:45:02 +0100 Message-ID: <20130116194455.GO8347@phenom.ffwll.local> References: <1358359143-29482-1-git-send-email-ville.syrjala@linux.intel.com> <20130116101130.5ae3b387@jbarnes-desktop> Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Return-path: Received: from mail-wi0-f170.google.com (mail-wi0-f170.google.com [209.85.212.170]) by gabe.freedesktop.org (Postfix) with ESMTP id 87EFAE5C4E for ; Wed, 16 Jan 2013 11:43:01 -0800 (PST) Received: by mail-wi0-f170.google.com with SMTP id hq7so3901736wib.1 for ; Wed, 16 Jan 2013 11:43:00 -0800 (PST) Content-Disposition: inline In-Reply-To: <20130116101130.5ae3b387@jbarnes-desktop> 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 Wed, Jan 16, 2013 at 10:11:30AM -0800, Jesse Barnes wrote: > On Wed, 16 Jan 2013 19:59:03 +0200 > ville.syrjala@linux.intel.com wrote: > = > > From: Ville Syrj=E4l=E4 > > = > > Fix up some copypaste errors in the PIPESTAT register for VLV. > > = > > SPRITE0_FLIP_DONE_INT_EN_VLV is bit 22, not bit 26. > > = > > SPRITE0_FLIPDONE_INT_STATUS_VLV is bit 14, not bit 15. > > = > > Signed-off-by: Ville Syrj=E4l=E4 > > --- > > drivers/gpu/drm/i915/i915_reg.h | 4 ++-- > > 1 files changed, 2 insertions(+), 2 deletions(-) > > = > > diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i91= 5_reg.h > > index 36789bf..2745e7a 100644 > > --- a/drivers/gpu/drm/i915/i915_reg.h > > +++ b/drivers/gpu/drm/i915/i915_reg.h > > @@ -2674,7 +2674,7 @@ > > #define PIPE_VSYNC_INTERRUPT_ENABLE (1UL<<25) > > #define PIPE_DISPLAY_LINE_COMPARE_ENABLE (1UL<<24) > > #define PIPE_DPST_EVENT_ENABLE (1UL<<23) > > -#define SPRITE0_FLIP_DONE_INT_EN_VLV (1UL<<26) > > +#define SPRITE0_FLIP_DONE_INT_EN_VLV (1UL<<22) > > #define PIPE_LEGACY_BLC_EVENT_ENABLE (1UL<<22) > > #define PIPE_ODD_FIELD_INTERRUPT_ENABLE (1UL<<21) > > #define PIPE_EVEN_FIELD_INTERRUPT_ENABLE (1UL<<20) > > @@ -2684,7 +2684,7 @@ > > #define PIPEA_HBLANK_INT_EN_VLV (1UL<<16) > > #define PIPE_OVERLAY_UPDATED_ENABLE (1UL<<16) > > #define SPRITE1_FLIPDONE_INT_STATUS_VLV (1UL<<15) > > -#define SPRITE0_FLIPDONE_INT_STATUS_VLV (1UL<<15) > > +#define SPRITE0_FLIPDONE_INT_STATUS_VLV (1UL<<14) > > #define PIPE_CRC_ERROR_INTERRUPT_STATUS (1UL<<13) > > #define PIPE_CRC_DONE_INTERRUPT_STATUS (1UL<<12) > > #define PIPE_GMBUS_INTERRUPT_STATUS (1UL<<11) > = > Reviewed-by: Jesse Barnes Queued for -next, thanks for the patch. -Daniel -- = Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch