* [PATCH 1/1] drm/i915: Remove 3 duplicate register #defines in i915_reg.h
@ 2012-12-05 14:14 Dexuan Cui
2012-12-05 14:17 ` Chris Wilson
0 siblings, 1 reply; 3+ messages in thread
From: Dexuan Cui @ 2012-12-05 14:14 UTC (permalink / raw)
To: intel-gfx
Signed-off-by: Dexuan Cui <dexuan.cui@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
/* 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)
--
1.7.6
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 1/1] drm/i915: Remove 3 duplicate register #defines in i915_reg.h
2012-12-05 14:14 [PATCH 1/1] drm/i915: Remove 3 duplicate register #defines in i915_reg.h Dexuan Cui
@ 2012-12-05 14:17 ` Chris Wilson
2012-12-05 14:34 ` Cui, Dexuan
0 siblings, 1 reply; 3+ messages in thread
From: Chris Wilson @ 2012-12-05 14:17 UTC (permalink / raw)
To: Dexuan Cui, intel-gfx
On Wed, 5 Dec 2012 22:14:37 +0800, Dexuan Cui <dexuan.cui@intel.com> wrote:
> Signed-off-by: Dexuan Cui <dexuan.cui@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
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH 1/1] drm/i915: Remove 3 duplicate register #defines in i915_reg.h
2012-12-05 14:17 ` Chris Wilson
@ 2012-12-05 14:34 ` Cui, Dexuan
0 siblings, 0 replies; 3+ messages in thread
From: Cui, Dexuan @ 2012-12-05 14:34 UTC (permalink / raw)
To: Chris Wilson, intel-gfx@lists.freedesktop.org
Chris Wilson wrote on 2012-12-05:
> On Wed, 5 Dec 2012 22:14:37 +0800, Dexuan Cui <dexuan.cui@intel.com>
> wrote:
>> Signed-off-by: Dexuan Cui <dexuan.cui@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
Hi Chris,
Thanks for the suggestions! I'll send out the v2.
Thanks,
-- Dexuan
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-12-05 14:34 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-12-05 14:14 [PATCH 1/1] drm/i915: Remove 3 duplicate register #defines in i915_reg.h Dexuan Cui
2012-12-05 14:17 ` Chris Wilson
2012-12-05 14:34 ` Cui, Dexuan
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.