Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 99cf8ea1 authored by Michel Thierry's avatar Michel Thierry Committed by Tvrtko Ursulin
Browse files

drm/i915/lrc: Only set RS ctx enable in ctx control reg if there is a RS 



The driver should only set the "RS context enable" bit in the context
image if we plan to use the resource streamer.

Reviewed-by: default avatarArun Siluvery <arun.siluvery@linux.intel.com>
Signed-off-by: default avatarMichel Thierry <michel.thierry@intel.com>
Signed-off-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1456393738-35608-1-git-send-email-michel.thierry@intel.com
parent 71562919

drivers/gpu/drm/i915/intel_lrc.c

+2 −1
Original line number Diff line number Diff line
@@ -2382,7 +2382,8 @@ populate_lr_context(struct intel_context *ctx, struct drm_i915_gem_object *ctx_o 
	ASSIGN_CTX_REG(reg_state, CTX_CONTEXT_CONTROL, RING_CONTEXT_CONTROL(ring),

		       _MASKED_BIT_ENABLE(CTX_CTRL_INHIBIT_SYN_CTX_SWITCH |

					  CTX_CTRL_ENGINE_CTX_RESTORE_INHIBIT |

					  CTX_CTRL_RS_CTX_ENABLE));

					  (HAS_RESOURCE_STREAMER(dev) ?

					    CTX_CTRL_RS_CTX_ENABLE : 0)));

	ASSIGN_CTX_REG(reg_state, CTX_RING_HEAD, RING_HEAD(ring->mmio_base), 0);

	ASSIGN_CTX_REG(reg_state, CTX_RING_TAIL, RING_TAIL(ring->mmio_base), 0);

	/* Ring buffer start address is not known until the buffer is pinned.