summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/i915_reg.h
diff options
context:
space:
mode:
authorChris Wilson2010-09-11 11:46:47 +0200
committerChris Wilson2010-09-11 11:59:57 +0200
commit4ed765f966c8279acc6f6bc1a5dcb0424d074b40 (patch)
tree6955e28290f74b665ea93e0a7fc7532aa6bc40cc /drivers/gpu/drm/i915/i915_reg.h
parentdrm/i915: Fix updating FBC (diff)
downloadkernel-qcow2-linux-4ed765f966c8279acc6f6bc1a5dcb0424d074b40.tar.gz
kernel-qcow2-linux-4ed765f966c8279acc6f6bc1a5dcb0424d074b40.tar.xz
kernel-qcow2-linux-4ed765f966c8279acc6f6bc1a5dcb0424d074b40.zip
drm/i915: Tidy Ironlake watermark computation
Refactor the common code into seperate functions and use the MIN(large, small) buffer calculation for self-refresh watermarks. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_reg.h')
-rw-r--r--drivers/gpu/drm/i915/i915_reg.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index 27d20177708f..eb8cb9440449 100644
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -2219,8 +2219,8 @@
#define WM1_LP_SR_EN (1<<31)
#define WM1_LP_LATENCY_SHIFT 24
#define WM1_LP_LATENCY_MASK (0x7f<<24)
-#define WM1_LP_FBC_LP1_MASK (0xf<<20)
-#define WM1_LP_FBC_LP1_SHIFT 20
+#define WM1_LP_FBC_MASK (0xf<<20)
+#define WM1_LP_FBC_SHIFT 20
#define WM1_LP_SR_MASK (0x1ff<<8)
#define WM1_LP_SR_SHIFT 8
#define WM1_LP_CURSOR_MASK (0x3f)