From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: Re: [PATCH 1/1] drm/i915: Remove 3 duplicate register #defines in i915_reg.h Date: Wed, 05 Dec 2012 14:17:44 +0000 Message-ID: <275ffc$7nbo12@fmsmga002.fm.intel.com> References: <1354716877-26712-1-git-send-email-dexuan.cui@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id 9C025E6540 for ; Wed, 5 Dec 2012 06:17:56 -0800 (PST) In-Reply-To: <1354716877-26712-1-git-send-email-dexuan.cui@intel.com> 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: Dexuan Cui , intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org On Wed, 5 Dec 2012 22:14:37 +0800, Dexuan Cui wrote: > Signed-off-by: Dexuan Cui > --- > drivers/gpu/drm/i915/i915_reg.h | 3 --- > 1 files changed, 0 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h > index 97fbd9d..b29970a 100644 > --- a/drivers/gpu/drm/i915/i915_reg.h > +++ b/drivers/gpu/drm/i915/i915_reg.h > @@ -1895,9 +1895,7 @@ > #define PFIT_HORIZ_SCALE_MASK 0x0000fff0 > /* Pre-965 */ > #define PFIT_VERT_SCALE_SHIFT 20 > -#define PFIT_VERT_SCALE_MASK 0xfff00000 > #define PFIT_HORIZ_SCALE_SHIFT 4 > -#define PFIT_HORIZ_SCALE_MASK 0x0000fff0 Deleted the wrong pair here. > /* 965+ */ > #define PFIT_VERT_SCALE_SHIFT_965 16 > #define PFIT_VERT_SCALE_MASK_965 0x1fff0000 > @@ -3815,7 +3813,6 @@ > #define TRANS_FSYNC_DELAY_HB2 (1<<27) > #define TRANS_FSYNC_DELAY_HB3 (2<<27) > #define TRANS_FSYNC_DELAY_HB4 (3<<27) > -#define TRANS_DP_AUDIO_ONLY (1<<26) > #define TRANS_DP_VIDEO_AUDIO (0<<26) And kill its inverse: TRANS_DP_VIDEO_AUDIO -Chris -- Chris Wilson, Intel Open Source Technology Centre