Skip to contentSkip to conversation

drm/i915: Remove 3 duplicate register #defines in i915_reg.h

PATCH Superseded Dexuan Cui 2 participants 3 messages Dec 5, 2012

Subsystems (2)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Dexuan Cui

author
#0 lore raw

PATCH 1/1 drm/i915: Remove 3 duplicate register #defines in i915_reg.h

---
 drivers/gpu/drm/i915/i915_reg.h |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/i915_reg.h +0 -3
index 97fbd9d..b29970a 100644
@@ -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
 /* 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)
 #define  TRANS_INTERLACE_MASK   (7<<21)
 #define  TRANS_PROGRESSIVE      (0<<21)
Signature · 1 line
1.7.6
#1 lore raw
Quoted 10 lines · Dexuan Cui
---
 drivers/gpu/drm/i915/i915_reg.h |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/i915_reg.h +0 -0
index 97fbd9d..b29970a 100644

drivers/gpu/drm/i915/i915_reg.h line 1900

Quoted 6 lines
drivers/gpu/drm/i915/i915_reg.h +0 -2
@@ -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.

drivers/gpu/drm/i915/i915_reg.h line 3816

Quoted 9 lines
drivers/gpu/drm/i915/i915_reg.h +0 -1
 /* 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

Signature · 1 line
Chris Wilson, Intel Open Source Technology Centre
#2 lore raw

Chris Wilson wrote on 2012-12-05:

Quoted 18 lines

drivers/gpu/drm/i915/i915_reg.h line 1899

Quoted 13 lines · Dexuan Cui
---
 drivers/gpu/drm/i915/i915_reg.h |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)
(quoted diff) +0 -0

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

drivers/gpu/drm/i915/i915_reg.h +0 -1
@@ -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.

Quoted 7 lines

Review

Quoted 5 lines
(quoted diff) +0 -0
 /* 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

Hi Chris,
Thanks for the suggestions! I'll send out the v2.

Thanks,
-- Dexuan