|
@@ -604,7 +604,7 @@ mi_set_context(struct drm_i915_gem_request *req, u32 hw_flags)
|
|
i915.semaphores ?
|
|
i915.semaphores ?
|
|
INTEL_INFO(dev_priv)->num_rings - 1 :
|
|
INTEL_INFO(dev_priv)->num_rings - 1 :
|
|
0;
|
|
0;
|
|
- int len, ret;
|
|
|
|
|
|
+ int len;
|
|
|
|
|
|
/* w/a: If Flush TLB Invalidation Mode is enabled, driver must do a TLB
|
|
/* w/a: If Flush TLB Invalidation Mode is enabled, driver must do a TLB
|
|
* invalidation prior to MI_SET_CONTEXT. On GEN6 we don't set the value
|
|
* invalidation prior to MI_SET_CONTEXT. On GEN6 we don't set the value
|
|
@@ -612,7 +612,7 @@ mi_set_context(struct drm_i915_gem_request *req, u32 hw_flags)
|
|
* itlb_before_ctx_switch.
|
|
* itlb_before_ctx_switch.
|
|
*/
|
|
*/
|
|
if (IS_GEN6(dev_priv)) {
|
|
if (IS_GEN6(dev_priv)) {
|
|
- ret = engine->emit_flush(req, EMIT_INVALIDATE);
|
|
|
|
|
|
+ int ret = engine->emit_flush(req, EMIT_INVALIDATE);
|
|
if (ret)
|
|
if (ret)
|
|
return ret;
|
|
return ret;
|
|
}
|
|
}
|
|
@@ -687,7 +687,7 @@ mi_set_context(struct drm_i915_gem_request *req, u32 hw_flags)
|
|
|
|
|
|
intel_ring_advance(req, cs);
|
|
intel_ring_advance(req, cs);
|
|
|
|
|
|
- return ret;
|
|
|
|
|
|
+ return 0;
|
|
}
|
|
}
|
|
|
|
|
|
static int remap_l3(struct drm_i915_gem_request *req, int slice)
|
|
static int remap_l3(struct drm_i915_gem_request *req, int slice)
|