|
@@ -2065,8 +2065,7 @@ static int gen8_emit_bb_start(struct i915_request *rq,
|
|
|
|
|
|
/* FIXME(BDW): Address space and security selectors. */
|
|
|
*cs++ = MI_BATCH_BUFFER_START_GEN8 |
|
|
|
- (flags & I915_DISPATCH_SECURE ? 0 : BIT(8)) |
|
|
|
- (flags & I915_DISPATCH_RS ? MI_BATCH_RESOURCE_STREAMER : 0);
|
|
|
+ (flags & I915_DISPATCH_SECURE ? 0 : BIT(8));
|
|
|
*cs++ = lower_32_bits(offset);
|
|
|
*cs++ = upper_32_bits(offset);
|
|
|
|
|
@@ -2584,10 +2583,9 @@ static void execlists_init_reg_state(u32 *regs,
|
|
|
|
|
|
CTX_REG(regs, CTX_CONTEXT_CONTROL, RING_CONTEXT_CONTROL(engine),
|
|
|
_MASKED_BIT_DISABLE(CTX_CTRL_ENGINE_CTX_RESTORE_INHIBIT |
|
|
|
- CTX_CTRL_ENGINE_CTX_SAVE_INHIBIT) |
|
|
|
- _MASKED_BIT_ENABLE(CTX_CTRL_INHIBIT_SYN_CTX_SWITCH |
|
|
|
- (HAS_RESOURCE_STREAMER(dev_priv) ?
|
|
|
- CTX_CTRL_RS_CTX_ENABLE : 0)));
|
|
|
+ CTX_CTRL_ENGINE_CTX_SAVE_INHIBIT |
|
|
|
+ CTX_CTRL_RS_CTX_ENABLE) |
|
|
|
+ _MASKED_BIT_ENABLE(CTX_CTRL_INHIBIT_SYN_CTX_SWITCH));
|
|
|
CTX_REG(regs, CTX_RING_HEAD, RING_HEAD(base), 0);
|
|
|
CTX_REG(regs, CTX_RING_TAIL, RING_TAIL(base), 0);
|
|
|
CTX_REG(regs, CTX_RING_BUFFER_START, RING_START(base), 0);
|