aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm
diff options
context:
space:
mode:
authorBen Widawsky <ben@bwidawsk.net>2012-07-18 13:10:10 -0400
committerDaniel Vetter <daniel.vetter@ffwll.ch>2012-07-20 06:21:35 -0400
commit6a4ea1248cc10354f36b7917eb412d01e979d5ad (patch)
treed1568df8e1bc1be50c414e6bd5cacbd875a00f06 /drivers/gpu/drm
parent4f91dd6f27f015f09828e42123bdabce0c8441e6 (diff)
drm/i915/context: Add missing IVB context sizes
There were some fields missed. Daniel pointed this out in review, and I know I fixed it, but something happened somehow and some time. Signed-off-by: Ben Widawsky <ben@bwidawsk.net> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm')
-rw-r--r--drivers/gpu/drm/i915/i915_reg.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index 9019194068e8..ac5688e8b01d 100644
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -1483,11 +1483,15 @@
1483 GEN6_CXT_EXTENDED_SIZE(cxt_reg) + \ 1483 GEN6_CXT_EXTENDED_SIZE(cxt_reg) + \
1484 GEN6_CXT_PIPELINE_SIZE(cxt_reg)) 1484 GEN6_CXT_PIPELINE_SIZE(cxt_reg))
1485#define GEN7_CXT_SIZE 0x21a8 1485#define GEN7_CXT_SIZE 0x21a8
1486#define GEN7_CXT_POWER_SIZE(ctx_reg) ((ctx_reg >> 25) & 0x7f)
1487#define GEN7_CXT_RING_SIZE(ctx_reg) ((ctx_reg >> 22) & 0x7)
1486#define GEN7_CXT_RENDER_SIZE(ctx_reg) ((ctx_reg >> 16) & 0x3f) 1488#define GEN7_CXT_RENDER_SIZE(ctx_reg) ((ctx_reg >> 16) & 0x3f)
1487#define GEN7_CXT_EXTENDED_SIZE(ctx_reg) ((ctx_reg >> 9) & 0x7f) 1489#define GEN7_CXT_EXTENDED_SIZE(ctx_reg) ((ctx_reg >> 9) & 0x7f)
1488#define GEN7_CXT_GT1_SIZE(ctx_reg) ((ctx_reg >> 6) & 0x7) 1490#define GEN7_CXT_GT1_SIZE(ctx_reg) ((ctx_reg >> 6) & 0x7)
1489#define GEN7_CXT_VFSTATE_SIZE(ctx_reg) ((ctx_reg >> 0) & 0x3f) 1491#define GEN7_CXT_VFSTATE_SIZE(ctx_reg) ((ctx_reg >> 0) & 0x3f)
1490#define GEN7_CXT_TOTAL_SIZE(ctx_reg) (GEN7_CXT_RENDER_SIZE(ctx_reg) + \ 1492#define GEN7_CXT_TOTAL_SIZE(ctx_reg) (GEN7_CXT_POWER_SIZE(ctx_reg) + \
1493 GEN7_CXT_RING_SIZE(ctx_reg) + \
1494 GEN7_CXT_RENDER_SIZE(ctx_reg) + \
1491 GEN7_CXT_EXTENDED_SIZE(ctx_reg) + \ 1495 GEN7_CXT_EXTENDED_SIZE(ctx_reg) + \
1492 GEN7_CXT_GT1_SIZE(ctx_reg) + \ 1496 GEN7_CXT_GT1_SIZE(ctx_reg) + \
1493 GEN7_CXT_VFSTATE_SIZE(ctx_reg)) 1497 GEN7_CXT_VFSTATE_SIZE(ctx_reg))