summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_renderstate_gen6.c
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2014-06-10 11:23:33 +0100
committerDaniel Vetter <daniel.vetter@ffwll.ch>2014-06-16 19:53:09 +0200
commit1ce826d436f33c8fc0cf8b51d213b496ea73e0a6 (patch)
tree9abd31ba2f1739f60e40ddbca8a0850195b75591 /drivers/gpu/drm/i915/intel_renderstate_gen6.c
parent6254b2042c794a8c2e14dc49b575a0708c823f88 (diff)
downloadtalos-op-linux-1ce826d436f33c8fc0cf8b51d213b496ea73e0a6.tar.gz
talos-op-linux-1ce826d436f33c8fc0cf8b51d213b496ea73e0a6.zip
drm/i915: Simplify processing of the golden render context state
Rewrite i915_gem_render_state.c for the purposes of clarity and compactness, in the process we can eliminate some dodgy math that did not handle 64bit addresses correctly. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> Cc: Damien Lespiau <damien.lespiau@intel.com> Cc: Mika Kuoppala <mika.kuoppala@intel.com> Reviewed-by: Mika Kuoppala <mika.kuoppala@intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_renderstate_gen6.c')
-rw-r--r--drivers/gpu/drm/i915/intel_renderstate_gen6.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_renderstate_gen6.c b/drivers/gpu/drm/i915/intel_renderstate_gen6.c
index 740538ad0977..56c1429d8a60 100644
--- a/drivers/gpu/drm/i915/intel_renderstate_gen6.c
+++ b/drivers/gpu/drm/i915/intel_renderstate_gen6.c
@@ -6,6 +6,7 @@ static const u32 gen6_null_state_relocs[] = {
0x0000002c,
0x000001e0,
0x000001e4,
+ -1,
};
static const u32 gen6_null_state_batch[] = {
OpenPOWER on IntegriCloud