diff options
author | Olof Johansson <olof@lixom.net> | 2012-05-09 02:31:01 -0700 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-05-09 02:31:01 -0700 |
commit | d5a2a1ba838f60d92bf67c5eef533e95453752cb (patch) | |
tree | f6436b5e2b430197f37e49ffff23e91ef694b303 /drivers/gpu/drm/i915/i915_reg.h | |
parent | Merge tag 'omap-cleanup-hwmod-for-v3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/cleanup (diff) | |
parent | Linux 3.4-rc6 (diff) | |
download | linux-dev-d5a2a1ba838f60d92bf67c5eef533e95453752cb.tar.xz linux-dev-d5a2a1ba838f60d92bf67c5eef533e95453752cb.zip |
Merge tag 'v3.4-rc6' into next/cleanup
Linux 3.4-rc6
Resolve conflict where an u5500 file had a bugfix go in, but was
deleted in the branch staged for next merge window.
Signed-off-by: Olof Johansson <olof@lixom.net>
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 b4bb1ef77ddc..9d24d65f0c3e 100644 --- a/drivers/gpu/drm/i915/i915_reg.h +++ b/drivers/gpu/drm/i915/i915_reg.h @@ -568,6 +568,7 @@ #define CM0_MASK_SHIFT 16 #define CM0_IZ_OPT_DISABLE (1<<6) #define CM0_ZR_OPT_DISABLE (1<<5) +#define CM0_STC_EVICT_DISABLE_LRA_SNB (1<<5) #define CM0_DEPTH_EVICT_DISABLE (1<<4) #define CM0_COLOR_EVICT_DISABLE (1<<3) #define CM0_DEPTH_WRITE_DISABLE (1<<1) |