diff options
| author | Keith Packard <keithp@keithp.com> | 2011-07-28 16:30:41 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2011-07-28 16:30:41 -0700 |
| commit | 2c1756b12edc19fdd75c833699cb752e1bbb641e (patch) | |
| tree | 2893f6f8b59bfea0e295877643dc29849a7d1a67 /drivers/gpu/drm/i915/i915_reg.h | |
| parent | cf96e46fcd147856fd8151fab91c410f0ec16c47 (diff) | |
| parent | d74362c9e45689d8d7e3d4bcf6681c4358ef4f2e (diff) | |
| download | blackbird-op-linux-2c1756b12edc19fdd75c833699cb752e1bbb641e.tar.gz blackbird-op-linux-2c1756b12edc19fdd75c833699cb752e1bbb641e.zip | |
Merge branch 'drm-intel-fixes' into drm-intel-next
Diffstat (limited to 'drivers/gpu/drm/i915/i915_reg.h')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_reg.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h index 02db299f621a..a900809baf2a 100644 --- a/drivers/gpu/drm/i915/i915_reg.h +++ b/drivers/gpu/drm/i915/i915_reg.h @@ -2084,9 +2084,6 @@ #define DP_PIPEB_SELECT (1 << 30) #define DP_PIPE_MASK (1 << 30) -#define DP_PIPE_ENABLED(V, P) \ - (((V) & (DP_PIPE_MASK | DP_PORT_EN)) == ((P) << 30 | DP_PORT_EN)) - /* Link training mode - select a suitable mode for each stage */ #define DP_LINK_TRAIN_PAT_1 (0 << 28) #define DP_LINK_TRAIN_PAT_2 (1 << 28) @@ -3076,6 +3073,11 @@ #define TRANS_6BPC (2<<5) #define TRANS_12BPC (3<<5) +#define _TRANSA_CHICKEN2 0xf0064 +#define _TRANSB_CHICKEN2 0xf1064 +#define TRANS_CHICKEN2(pipe) _PIPE(pipe, _TRANSA_CHICKEN2, _TRANSB_CHICKEN2) +#define TRANS_AUTOTRAIN_GEN_STALL_DIS (1<<31) + #define SOUTH_CHICKEN2 0xc2004 #define DPLS_EDP_PPS_FIX_DIS (1<<0) |
