On Wed, 5 Dec 2012 22:14:37 +0800, Dexuan Cui <dexuan.cui at intel.com> wrote: > Signed-off-by: Dexuan Cui <dexuan.cui at intel.com> > --- > 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
