Commit 582d67f0 authored Jul 24, 2014 by Oscar Mateo Committed by Daniel Vetter Aug 14, 2014

drm/i915: Add temporary ring->ctx backpointer



The execlist patches have a bit a convoluted and long history and due
to that have the actual submission still misplaced deeply burried in
the low-level ringbuffer handling code. This design goes back to the
legacy ringbuffer code with its tricky lazy request and simple work
submissiion using ring tail writes. For that reason they need a
ring->ctx backpointer.

The goal is to unburry that code and move it up into a level where the
full execlist context is available so that we can ditch this
backpointer. Until that's done make it really obvious that there's
work still to be done.

Cc: Oscar Mateo <oscar.mateo@intel.com>
Cc: Thomas Daniel <thomas.daniel@intel.com>
Acked-by: Thomas Daniel <thomas.daniel@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

parent 3a448734

drivers/gpu/drm/i915/intel_lrc.c

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1086,6 +1086,8 @@ int intel_lr_context_deferred_create(struct intel_context *ctx,
	}		}

	ringbuf->ring = ring;		ringbuf->ring = ring;
			ringbuf->FIXME_lrc_ctx = ctx;

	ringbuf->size = 32 * PAGE_SIZE;		ringbuf->size = 32 * PAGE_SIZE;
	ringbuf->effective_size = ringbuf->size;		ringbuf->effective_size = ringbuf->size;
	ringbuf->head = 0;		ringbuf->head = 0;

drivers/gpu/drm/i915/intel_ringbuffer.h

+7 −0

Original line number	Original line	Diff line number	Diff line
	@@ -99,6 +99,13 @@ struct intel_ringbuffer {

	struct intel_engine_cs *ring;		struct intel_engine_cs *ring;

			/*
			* FIXME: This backpointer is an artifact of the history of how the
			* execlist patches came into being. It will get removed once the basic
			* code has landed.
			*/
			struct intel_context *FIXME_lrc_ctx;

	u32 head;		u32 head;
	u32 tail;		u32 tail;
	int space;		int space;