diff options
author | Oscar Mateo <oscar.mateo@intel.com> | 2014-08-21 06:40:54 -0400 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-09-03 05:04:52 -0400 |
commit | 564ddb2fae4da01406a24e5a763e601dc21c23d7 (patch) | |
tree | 48b36deb20a0ac13323ca2d6c99235bddac0b0a2 /drivers/gpu/drm/i915/intel_lrc.h | |
parent | c76bb61a71083b2d90504cc6d0dda2047c5d63ca (diff) |
drm/i915/bdw: Render state init for Execlists
The batchbuffer that sets the render context state is submitted
in a different way, and from different places.
We needed to make both the render state preparation and free functions
outside accesible, and namespace accordingly. This mess is so that all
LR, LRC and Execlists functionality can go together in intel_lrc.c: we
can fix all of this later on, once the interfaces are clear.
v2: Create a separate ctx->rcs_initialized for the Execlists case, as
suggested by Chris Wilson.
Signed-off-by: Oscar Mateo <oscar.mateo@intel.com>
v3: Setup ring status page in lr_context_deferred_create when the
default context is being created. This means that the render state
init for the default context is no longer a special case. Execute
deferred creation of the default context at the end of
logical_ring_init to allow the render state commands to be submitted.
Fix style errors reported by checkpatch. Rebased.
Signed-off-by: Thomas Daniel <thomas.daniel@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_lrc.h')
-rw-r--r-- | drivers/gpu/drm/i915/intel_lrc.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_lrc.h b/drivers/gpu/drm/i915/intel_lrc.h index 991d4499fb03..33c3b4bf28c5 100644 --- a/drivers/gpu/drm/i915/intel_lrc.h +++ b/drivers/gpu/drm/i915/intel_lrc.h | |||
@@ -62,6 +62,8 @@ static inline void intel_logical_ring_emit(struct intel_ringbuffer *ringbuf, | |||
62 | int intel_logical_ring_begin(struct intel_ringbuffer *ringbuf, int num_dwords); | 62 | int intel_logical_ring_begin(struct intel_ringbuffer *ringbuf, int num_dwords); |
63 | 63 | ||
64 | /* Logical Ring Contexts */ | 64 | /* Logical Ring Contexts */ |
65 | int intel_lr_context_render_state_init(struct intel_engine_cs *ring, | ||
66 | struct intel_context *ctx); | ||
65 | void intel_lr_context_free(struct intel_context *ctx); | 67 | void intel_lr_context_free(struct intel_context *ctx); |
66 | int intel_lr_context_deferred_create(struct intel_context *ctx, | 68 | int intel_lr_context_deferred_create(struct intel_context *ctx, |
67 | struct intel_engine_cs *ring); | 69 | struct intel_engine_cs *ring); |