summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_renderstate.h
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.h
parent6254b2042c794a8c2e14dc49b575a0708c823f88 (diff)
downloadlinux-stable-1ce826d436f33c8fc0cf8b51d213b496ea73e0a6.tar.gz
linux-stable-1ce826d436f33c8fc0cf8b51d213b496ea73e0a6.tar.bz2
linux-stable-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.h')
-rw-r--r--drivers/gpu/drm/i915/intel_renderstate.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_renderstate.h b/drivers/gpu/drm/i915/intel_renderstate.h
index a5e783a9928a..fd4f66231d30 100644
--- a/drivers/gpu/drm/i915/intel_renderstate.h
+++ b/drivers/gpu/drm/i915/intel_renderstate.h
@@ -28,7 +28,6 @@
struct intel_renderstate_rodata {
const u32 *reloc;
- const u32 reloc_items;
const u32 *batch;
const u32 batch_items;
};
@@ -40,7 +39,6 @@ extern const struct intel_renderstate_rodata gen8_null_state;
#define RO_RENDERSTATE(_g) \
const struct intel_renderstate_rodata gen ## _g ## _null_state = { \
.reloc = gen ## _g ## _null_state_relocs, \
- .reloc_items = sizeof(gen ## _g ## _null_state_relocs)/4, \
.batch = gen ## _g ## _null_state_batch, \
.batch_items = sizeof(gen ## _g ## _null_state_batch)/4, \
}