diff options
author | Paulo Zanoni <paulo.r.zanoni@intel.com> | 2014-08-01 15:19:54 -0400 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-08-08 11:43:49 -0400 |
commit | 7fad3594bf2c66843c7d1e09005ff845a94524ab (patch) | |
tree | 25a4acdf7ee9a5716c03b0f73bea02e93a4ef6c1 | |
parent | ac921bdde92a354e8c59ea185dff26dc2611ee81 (diff) |
drm/i915: remove duplicate register defines
cat i915_reg.h | sort | uniq -d | grep define
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-rw-r--r-- | drivers/gpu/drm/i915/i915_reg.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h index ca37febbc2ae..7f9a81087ebc 100644 --- a/drivers/gpu/drm/i915/i915_reg.h +++ b/drivers/gpu/drm/i915/i915_reg.h | |||
@@ -3756,7 +3756,6 @@ enum punit_power_well { | |||
3756 | #define PIPE_VSYNC_INTERRUPT_STATUS (1UL<<9) | 3756 | #define PIPE_VSYNC_INTERRUPT_STATUS (1UL<<9) |
3757 | #define PIPE_DISPLAY_LINE_COMPARE_STATUS (1UL<<8) | 3757 | #define PIPE_DISPLAY_LINE_COMPARE_STATUS (1UL<<8) |
3758 | #define PIPE_DPST_EVENT_STATUS (1UL<<7) | 3758 | #define PIPE_DPST_EVENT_STATUS (1UL<<7) |
3759 | #define PIPE_LEGACY_BLC_EVENT_STATUS (1UL<<6) | ||
3760 | #define PIPE_A_PSR_STATUS_VLV (1UL<<6) | 3759 | #define PIPE_A_PSR_STATUS_VLV (1UL<<6) |
3761 | #define PIPE_LEGACY_BLC_EVENT_STATUS (1UL<<6) | 3760 | #define PIPE_LEGACY_BLC_EVENT_STATUS (1UL<<6) |
3762 | #define PIPE_ODD_FIELD_INTERRUPT_STATUS (1UL<<5) | 3761 | #define PIPE_ODD_FIELD_INTERRUPT_STATUS (1UL<<5) |
@@ -5431,7 +5430,6 @@ enum punit_power_well { | |||
5431 | #define VLV_GTLC_ALLOWWAKEERR (1 << 1) | 5430 | #define VLV_GTLC_ALLOWWAKEERR (1 << 1) |
5432 | #define VLV_GTLC_PW_MEDIA_STATUS_MASK (1 << 5) | 5431 | #define VLV_GTLC_PW_MEDIA_STATUS_MASK (1 << 5) |
5433 | #define VLV_GTLC_PW_RENDER_STATUS_MASK (1 << 7) | 5432 | #define VLV_GTLC_PW_RENDER_STATUS_MASK (1 << 7) |
5434 | #define VLV_GTLC_SURVIVABILITY_REG 0x130098 | ||
5435 | #define FORCEWAKE_MT 0xa188 /* multi-threaded */ | 5433 | #define FORCEWAKE_MT 0xa188 /* multi-threaded */ |
5436 | #define FORCEWAKE_KERNEL 0x1 | 5434 | #define FORCEWAKE_KERNEL 0x1 |
5437 | #define FORCEWAKE_USER 0x2 | 5435 | #define FORCEWAKE_USER 0x2 |