Commit 6689cb2b authored by John Harrison's avatar John Harrison Committed by Daniel Vetter

drm/i915: Move common request allocation code into a common function

The request allocation code is largely duplicated between legacy mode and
execlist mode. The actual difference between the two versions of the code is
pretty minimal.

This patch moves the common code out into a separate function. This is then
called by the execution specific version prior to setting up the one different
value.

For: VIZ-5190
Signed-off-by: default avatarJohn Harrison <John.C.Harrison@Intel.com>
Reviewed-by: default avatarTomas Elf <tomas.elf@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent bc0dce3f
...@@ -2115,6 +2115,8 @@ struct drm_i915_gem_request { ...@@ -2115,6 +2115,8 @@ struct drm_i915_gem_request {
}; };
int i915_gem_request_alloc(struct intel_engine_cs *ring,
struct intel_context *ctx);
void i915_gem_request_free(struct kref *req_ref); void i915_gem_request_free(struct kref *req_ref);
static inline uint32_t static inline uint32_t
......
...@@ -2518,6 +2518,43 @@ void i915_gem_request_free(struct kref *req_ref) ...@@ -2518,6 +2518,43 @@ void i915_gem_request_free(struct kref *req_ref)
kfree(req); kfree(req);
} }
int i915_gem_request_alloc(struct intel_engine_cs *ring,
struct intel_context *ctx)
{
int ret;
struct drm_i915_gem_request *request;
struct drm_i915_private *dev_private = ring->dev->dev_private;
if (ring->outstanding_lazy_request)
return 0;
request = kzalloc(sizeof(*request), GFP_KERNEL);
if (request == NULL)
return -ENOMEM;
ret = i915_gem_get_seqno(ring->dev, &request->seqno);
if (ret) {
kfree(request);
return ret;
}
kref_init(&request->ref);
request->ring = ring;
request->uniq = dev_private->request_uniq++;
if (i915.enable_execlists)
ret = intel_logical_ring_alloc_request_extras(request, ctx);
else
ret = intel_ring_alloc_request_extras(request);
if (ret) {
kfree(request);
return ret;
}
ring->outstanding_lazy_request = request;
return 0;
}
struct drm_i915_gem_request * struct drm_i915_gem_request *
i915_gem_find_active_request(struct intel_engine_cs *ring) i915_gem_find_active_request(struct intel_engine_cs *ring)
{ {
......
...@@ -611,44 +611,21 @@ static int execlists_move_to_gpu(struct intel_ringbuffer *ringbuf, ...@@ -611,44 +611,21 @@ static int execlists_move_to_gpu(struct intel_ringbuffer *ringbuf,
return logical_ring_invalidate_all_caches(ringbuf, ctx); return logical_ring_invalidate_all_caches(ringbuf, ctx);
} }
static int logical_ring_alloc_request(struct intel_engine_cs *ring, int intel_logical_ring_alloc_request_extras(struct drm_i915_gem_request *request,
struct intel_context *ctx) struct intel_context *ctx)
{ {
struct drm_i915_gem_request *request;
struct drm_i915_private *dev_private = ring->dev->dev_private;
int ret; int ret;
if (ring->outstanding_lazy_request) if (ctx != request->ring->default_context) {
return 0; ret = intel_lr_context_pin(request->ring, ctx);
if (ret)
request = kzalloc(sizeof(*request), GFP_KERNEL);
if (request == NULL)
return -ENOMEM;
if (ctx != ring->default_context) {
ret = intel_lr_context_pin(ring, ctx);
if (ret) {
kfree(request);
return ret;
}
}
kref_init(&request->ref);
request->ring = ring;
request->uniq = dev_private->request_uniq++;
ret = i915_gem_get_seqno(ring->dev, &request->seqno);
if (ret) {
intel_lr_context_unpin(ring, ctx);
kfree(request);
return ret; return ret;
} }
request->ringbuf = ctx->engine[request->ring->id].ringbuf;
request->ctx = ctx; request->ctx = ctx;
i915_gem_context_reference(request->ctx); i915_gem_context_reference(request->ctx);
request->ringbuf = ctx->engine[ring->id].ringbuf;
ring->outstanding_lazy_request = request;
return 0; return 0;
} }
...@@ -840,7 +817,7 @@ static int intel_logical_ring_begin(struct intel_ringbuffer *ringbuf, ...@@ -840,7 +817,7 @@ static int intel_logical_ring_begin(struct intel_ringbuffer *ringbuf,
return ret; return ret;
/* Preallocate the olr before touching the ring */ /* Preallocate the olr before touching the ring */
ret = logical_ring_alloc_request(ring, ctx); ret = i915_gem_request_alloc(ring, ctx);
if (ret) if (ret)
return ret; return ret;
......
...@@ -36,6 +36,8 @@ ...@@ -36,6 +36,8 @@
#define RING_CONTEXT_STATUS_PTR(ring) ((ring)->mmio_base+0x3a0) #define RING_CONTEXT_STATUS_PTR(ring) ((ring)->mmio_base+0x3a0)
/* Logical Rings */ /* Logical Rings */
int intel_logical_ring_alloc_request_extras(struct drm_i915_gem_request *request,
struct intel_context *ctx);
void intel_logical_ring_stop(struct intel_engine_cs *ring); void intel_logical_ring_stop(struct intel_engine_cs *ring);
void intel_logical_ring_cleanup(struct intel_engine_cs *ring); void intel_logical_ring_cleanup(struct intel_engine_cs *ring);
int intel_logical_rings_init(struct drm_device *dev); int intel_logical_rings_init(struct drm_device *dev);
......
...@@ -2181,32 +2181,10 @@ int intel_ring_idle(struct intel_engine_cs *ring) ...@@ -2181,32 +2181,10 @@ int intel_ring_idle(struct intel_engine_cs *ring)
return i915_wait_request(req); return i915_wait_request(req);
} }
static int int intel_ring_alloc_request_extras(struct drm_i915_gem_request *request)
intel_ring_alloc_request(struct intel_engine_cs *ring)
{ {
int ret; request->ringbuf = request->ring->buffer;
struct drm_i915_gem_request *request;
struct drm_i915_private *dev_private = ring->dev->dev_private;
if (ring->outstanding_lazy_request)
return 0;
request = kzalloc(sizeof(*request), GFP_KERNEL);
if (request == NULL)
return -ENOMEM;
kref_init(&request->ref);
request->ring = ring;
request->ringbuf = ring->buffer;
request->uniq = dev_private->request_uniq++;
ret = i915_gem_get_seqno(ring->dev, &request->seqno);
if (ret) {
kfree(request);
return ret;
}
ring->outstanding_lazy_request = request;
return 0; return 0;
} }
...@@ -2247,7 +2225,7 @@ int intel_ring_begin(struct intel_engine_cs *ring, ...@@ -2247,7 +2225,7 @@ int intel_ring_begin(struct intel_engine_cs *ring,
return ret; return ret;
/* Preallocate the olr before touching the ring */ /* Preallocate the olr before touching the ring */
ret = intel_ring_alloc_request(ring); ret = i915_gem_request_alloc(ring, ring->default_context);
if (ret) if (ret)
return ret; return ret;
......
...@@ -390,6 +390,8 @@ int intel_alloc_ringbuffer_obj(struct drm_device *dev, ...@@ -390,6 +390,8 @@ int intel_alloc_ringbuffer_obj(struct drm_device *dev,
void intel_stop_ring_buffer(struct intel_engine_cs *ring); void intel_stop_ring_buffer(struct intel_engine_cs *ring);
void intel_cleanup_ring_buffer(struct intel_engine_cs *ring); void intel_cleanup_ring_buffer(struct intel_engine_cs *ring);
int intel_ring_alloc_request_extras(struct drm_i915_gem_request *request);
int __must_check intel_ring_begin(struct intel_engine_cs *ring, int n); int __must_check intel_ring_begin(struct intel_engine_cs *ring, int n);
int __must_check intel_ring_cacheline_align(struct intel_engine_cs *ring); int __must_check intel_ring_cacheline_align(struct intel_engine_cs *ring);
static inline void intel_ring_emit(struct intel_engine_cs *ring, static inline void intel_ring_emit(struct intel_engine_cs *ring,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment