Commit 753b1ad4 authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Daniel Vetter
Browse files

drm/i915: Add intel_ring_cachline_align() 



intel_ring_cachline_align() emits MI_NOOPs until the ring tail is
aligned to a cacheline boundary.

Cc: Bjoern C <lkml@call-home.ch>
Cc: Alexandru DAMIAN <alexandru.damian@intel.com>
Cc: Enrico Tagliavini <enrico.tagliavini@gmail.com>
Suggested-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: stable@vger.kernel.org (prereq for the next patch)
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 1d2cb9a5

drivers/gpu/drm/i915/intel_ringbuffer.c

+21 −0
Original line number Original line Diff line number Diff line
@@ -1653,6 +1653,27 @@ int intel_ring_begin(struct intel_ring_buffer *ring, 
	return 0;

	return 0;

}

}





/* Align the ring tail to a cacheline boundary */

int intel_ring_cacheline_align(struct intel_ring_buffer *ring)

{

	int num_dwords = (64 - (ring->tail & 63)) / sizeof(uint32_t);

	int ret;



	if (num_dwords == 0)

		return 0;



	ret = intel_ring_begin(ring, num_dwords);

	if (ret)

		return ret;



	while (num_dwords--)

		intel_ring_emit(ring, MI_NOOP);



	intel_ring_advance(ring);



	return 0;

}



void intel_ring_init_seqno(struct intel_ring_buffer *ring, u32 seqno)

void intel_ring_init_seqno(struct intel_ring_buffer *ring, u32 seqno)

{

{

	struct drm_i915_private *dev_priv = ring->dev->dev_private;

	struct drm_i915_private *dev_priv = ring->dev->dev_private;

drivers/gpu/drm/i915/intel_ringbuffer.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -233,6 +233,7 @@ intel_write_status_page(struct intel_ring_buffer *ring, 
void intel_cleanup_ring_buffer(struct intel_ring_buffer *ring);

void intel_cleanup_ring_buffer(struct intel_ring_buffer *ring);





int __must_check intel_ring_begin(struct intel_ring_buffer *ring, int n);

int __must_check intel_ring_begin(struct intel_ring_buffer *ring, int n);

int __must_check intel_ring_cacheline_align(struct intel_ring_buffer *ring);

static inline void intel_ring_emit(struct intel_ring_buffer *ring,

static inline void intel_ring_emit(struct intel_ring_buffer *ring,

				   u32 data)

				   u32 data)

{

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE