Commit 5b544337 authored by Chris Wilson's avatar Chris Wilson

drm/i915/selftests: Replace magic 1<<22 with MI_USE_GGTT/MI_MEM_VIRTUAL

Replace the magic bit with the proper symbolic name for instructing
MI_STORE_DWORD_IMM to use a virtual address (on gen3) or the global GTT
address (still virtual!) on gen4+.
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20180706142323.25699-1-chris@chris-wilson.co.ukReviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
parent 207b7000
...@@ -919,12 +919,12 @@ gpu_write_dw(struct i915_vma *vma, u64 offset, u32 val) ...@@ -919,12 +919,12 @@ gpu_write_dw(struct i915_vma *vma, u64 offset, u32 val)
*cmd++ = val; *cmd++ = val;
} else if (gen >= 4) { } else if (gen >= 4) {
*cmd++ = MI_STORE_DWORD_IMM_GEN4 | *cmd++ = MI_STORE_DWORD_IMM_GEN4 |
(gen < 6 ? 1 << 22 : 0); (gen < 6 ? MI_USE_GGTT : 0);
*cmd++ = 0; *cmd++ = 0;
*cmd++ = offset; *cmd++ = offset;
*cmd++ = val; *cmd++ = val;
} else { } else {
*cmd++ = MI_STORE_DWORD_IMM | 1 << 22; *cmd++ = MI_STORE_DWORD_IMM | MI_MEM_VIRTUAL;
*cmd++ = offset; *cmd++ = offset;
*cmd++ = val; *cmd++ = val;
} }
......
...@@ -210,12 +210,12 @@ static int gpu_set(struct drm_i915_gem_object *obj, ...@@ -210,12 +210,12 @@ static int gpu_set(struct drm_i915_gem_object *obj,
*cs++ = upper_32_bits(i915_ggtt_offset(vma) + offset); *cs++ = upper_32_bits(i915_ggtt_offset(vma) + offset);
*cs++ = v; *cs++ = v;
} else if (INTEL_GEN(i915) >= 4) { } else if (INTEL_GEN(i915) >= 4) {
*cs++ = MI_STORE_DWORD_IMM_GEN4 | 1 << 22; *cs++ = MI_STORE_DWORD_IMM_GEN4 | MI_USE_GGTT;
*cs++ = 0; *cs++ = 0;
*cs++ = i915_ggtt_offset(vma) + offset; *cs++ = i915_ggtt_offset(vma) + offset;
*cs++ = v; *cs++ = v;
} else { } else {
*cs++ = MI_STORE_DWORD_IMM | 1 << 22; *cs++ = MI_STORE_DWORD_IMM | MI_MEM_VIRTUAL;
*cs++ = i915_ggtt_offset(vma) + offset; *cs++ = i915_ggtt_offset(vma) + offset;
*cs++ = v; *cs++ = v;
*cs++ = MI_NOOP; *cs++ = MI_NOOP;
......
...@@ -63,12 +63,12 @@ gpu_fill_dw(struct i915_vma *vma, u64 offset, unsigned long count, u32 value) ...@@ -63,12 +63,12 @@ gpu_fill_dw(struct i915_vma *vma, u64 offset, unsigned long count, u32 value)
*cmd++ = value; *cmd++ = value;
} else if (gen >= 4) { } else if (gen >= 4) {
*cmd++ = MI_STORE_DWORD_IMM_GEN4 | *cmd++ = MI_STORE_DWORD_IMM_GEN4 |
(gen < 6 ? 1 << 22 : 0); (gen < 6 ? MI_USE_GGTT : 0);
*cmd++ = 0; *cmd++ = 0;
*cmd++ = offset; *cmd++ = offset;
*cmd++ = value; *cmd++ = value;
} else { } else {
*cmd++ = MI_STORE_DWORD_IMM | 1 << 22; *cmd++ = MI_STORE_DWORD_IMM | MI_MEM_VIRTUAL;
*cmd++ = offset; *cmd++ = offset;
*cmd++ = value; *cmd++ = value;
} }
......
...@@ -171,7 +171,7 @@ static int emit_recurse_batch(struct hang *h, ...@@ -171,7 +171,7 @@ static int emit_recurse_batch(struct hang *h,
*batch++ = MI_BATCH_BUFFER_START | 1 << 8; *batch++ = MI_BATCH_BUFFER_START | 1 << 8;
*batch++ = lower_32_bits(vma->node.start); *batch++ = lower_32_bits(vma->node.start);
} else if (INTEL_GEN(i915) >= 4) { } else if (INTEL_GEN(i915) >= 4) {
*batch++ = MI_STORE_DWORD_IMM_GEN4 | 1 << 22; *batch++ = MI_STORE_DWORD_IMM_GEN4 | MI_USE_GGTT;
*batch++ = 0; *batch++ = 0;
*batch++ = lower_32_bits(hws_address(hws, rq)); *batch++ = lower_32_bits(hws_address(hws, rq));
*batch++ = rq->fence.seqno; *batch++ = rq->fence.seqno;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment