diff options
| author | Steve French <sfrench@us.ibm.com> | 2011-06-25 23:22:28 +0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2011-06-25 23:22:28 +0400 |
| commit | daf6c4501e048eed56b256401d030d6b28e92ff1 (patch) | |
| tree | 7b1af88901b9c62cba26f9d5694a05bf2a1badac /drivers/gpu/drm/i915/i915_reg.h | |
| parent | 9b8e072a31180eb5cd6991d08524d9c4fa235ade (diff) | |
| parent | 8abf55883431a91d4877933240c8419b7fc17274 (diff) | |
| download | linux-daf6c4501e048eed56b256401d030d6b28e92ff1.tar.xz | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/gpu/drm/i915/i915_reg.h')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_reg.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h index 2f967af8e62e..5d5def756c9e 100644 --- a/drivers/gpu/drm/i915/i915_reg.h +++ b/drivers/gpu/drm/i915/i915_reg.h @@ -531,6 +531,7 @@ #define GEN6_BSD_SLEEP_PSMI_CONTROL_RC_ILDL_MESSAGE_ENABLE 0 #define GEN6_BSD_SLEEP_PSMI_CONTROL_IDLE_INDICATOR (1 << 3) +#define GEN6_BSD_HWSTAM 0x12098 #define GEN6_BSD_IMR 0x120a8 #define GEN6_BSD_USER_INTERRUPT (1 << 12) |