drm/i915: Remove unused variable in i915_gem_request_add_to_client
Subsystems (2)
PATCH 1/4 drm/i915: Remove unused variable in i915_gem_request_add_to_client
From: Tvrtko Ursulin <[email protected]>
--- drivers/gpu/drm/i915/i915_gem.c | 2 -- 1 file changed, 2 deletions(-)
drivers/gpu/drm/i915/i915_gem.c +0 -2
@@ -1370,7 +1370,6 @@ out:int i915_gem_request_add_to_client (struct drm_i915_gem_request *req,struct drm_file *file) { -struct drm_i915_private *dev_private;struct drm_i915_file_private *file_priv;WARN_ON (!req || !file || req->file_priv);
@@ -1381,7 +1380,6 @@ int i915_gem_request_add_to_client(struct drm_i915_gem_request *req,if (req->file_priv)return -EINVAL ; - dev_private = req->engine->dev->dev_private; file_priv = file->driver_priv;spin_lock (&file_priv->mm.lock);
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/4 drm/i915: Use shorter route to dev_private where possible
From: Tvrtko Ursulin <[email protected]>
Where we have a request we can use req->i915 directly instead of going through the engine and device. Coccinelle script:
@@
function f;
identifier r;
@@f(..., struct drm_i915_gem_request *r, ...)
{
...
- engine->dev->dev_private
+ r->i915
...
}
@@
struct drm_i915_gem_request *req;
@@
(
req->
- engine->dev->dev_private
+ i915
)
--- drivers/gpu/drm/i915/i915_gem.c | 2 +- drivers/gpu/drm/i915/i915_gem_context.c | 4 ++-- drivers/gpu/drm/i915/i915_gem_gtt.c | 2 +- drivers/gpu/drm/i915/intel_lrc.c | 2 +- drivers/gpu/drm/i915/intel_ringbuffer.c | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-)
drivers/gpu/drm/i915/i915_gem.c +1 -1
@@ -2550,7 +2550,7 @@ void __i915_add_request(struct drm_i915_gem_request *request,return ; engine = request->engine; - dev_priv = engine->dev->dev_private; + dev_priv = request->i915; ringbuf = request->ringbuf;/*
drivers/gpu/drm/i915/i915_gem_context.c +2 -2
@@ -656,7 +656,7 @@ static int do_switch(struct drm_i915_gem_request *req) {struct intel_context *to = req->ctx;struct intel_engine_cs *engine = req->engine; -struct drm_i915_private *dev_priv = engine->dev->dev_private; +struct drm_i915_private *dev_priv = req->i915;struct intel_context *from = engine->last_context;u32 hw_flags =0 ;bool uninitialized = false;
@@ -829,7 +829,7 @@ unpin_out:int i915_switch_context (struct drm_i915_gem_request *req) {struct intel_engine_cs *engine = req->engine; -struct drm_i915_private *dev_priv = engine->dev->dev_private; +struct drm_i915_private *dev_priv = req->i915;WARN_ON (i915.enable_execlists);WARN_ON (!mutex_is_locked (&dev_priv->dev->struct_mutex));
drivers/gpu/drm/i915/i915_gem_gtt.c +1 -1
@@ -2192,7 +2192,7 @@ int i915_ppgtt_init_hw(struct drm_device *dev)int i915_ppgtt_init_ring (struct drm_i915_gem_request *req) { -struct drm_i915_private *dev_priv = req->engine->dev->dev_private; +struct drm_i915_private *dev_priv = req->i915;struct i915_hw_ppgtt *ppgtt = dev_priv->mm.aliasing_ppgtt;if (i915.enable_execlists)
drivers/gpu/drm/i915/intel_lrc.c +1 -1
@@ -897,7 +897,7 @@ int intel_logical_ring_begin(struct drm_i915_gem_request *req, int num_dwords)int ret;WARN_ON (req ==NULL ); - dev_priv = req->engine->dev->dev_private; + dev_priv = req->i915; ret =i915_gem_check_wedge (&dev_priv->gpu_error, dev_priv->mm.interruptible);
drivers/gpu/drm/i915/intel_ringbuffer.c +1 -1
@@ -2499,7 +2499,7 @@ int intel_ring_begin(struct drm_i915_gem_request *req,WARN_ON (req ==NULL ); engine = req->engine; - dev_priv = engine->dev->dev_private; + dev_priv = req->i915; ret =i915_gem_check_wedge (&dev_priv->gpu_error, dev_priv->mm.interruptible);
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 2/4] drm/i915: Use shorter route to dev_private where possible
Quoted 25 lines · Tvrtko Ursulin
From: Tvrtko Ursulin <[email protected]>
Where we have a request we can use
req->i915directly instead of going through the engine and device. Coccinelle script:@@
function f;
identifier r;
@@f(..., struct drm_i915_gem_request *r, ...)
{
...
-engine->dev->dev_private
+r->i915
...
}
@@
structdrm_i915_gem_request*req;
@@
(
req->
-engine->dev->dev_private
+ i915
)
Quoted 1 line
Signed-off-by Tvrtko Ursulin <[email protected]>
-Chris
Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 3/4 drm/i915: Rename local struct intel_ringbuffer variables
In reply to Tvrtko UrsulinFrom: Tvrtko Ursulin <[email protected]>
Majority of the code calls these ringbuf so fix up a few places which use something else to be consistent.
Coccinelle script of:
@@
expression E;
identifier r;
@@
- struct intel_ringbuffer *r = E;
+ struct intel_ringbuffer *ringbuf = E;
<+...
- r
+ ringbuf
...+>
@@
identifier r;
@@
- struct intel_ringbuffer *r;
+ struct intel_ringbuffer *ringbuf;
<+...
- r
+ ringbuf
...+>
--- drivers/gpu/drm/i915/i915_gem.c | 8 ++++---- drivers/gpu/drm/i915/intel_lrc.c | 3 ++- drivers/gpu/drm/i915/intel_mocs.c | 11 +++++++---- drivers/gpu/drm/i915/intel_ringbuffer.c | 28 ++++++++++++++-------------- 4 files changed, 27 insertions(+), 23 deletions(-)
drivers/gpu/drm/i915/i915_gem.c +4 -4
@@ -2821,7 +2821,7 @@ static void i915_gem_reset_engine_status(struct drm_i915_private *dev_priv,static void i915_gem_reset_engine_cleanup (struct drm_i915_private *dev_priv,struct intel_engine_cs *engine) { -struct intel_ringbuffer *buffer; +struct intel_ringbuffer *ringbuf;while (!list_empty (&engine->active_list)) {struct drm_i915_gem_object *obj;
@@ -2874,9 +2874,9 @@ static void i915_gem_reset_engine_cleanup(struct drm_i915_private *dev_priv,* upon reset is less than when we start. Do one more pass over * all the ringbuffers to reset last_retired_head. */ -list_for_each_entry (buffer, &engine->buffers, link) { - buffer->last_retired_head = buffer->tail; -intel_ring_update_space (buffer); +list_for_each_entry (ringbuf, &engine->buffers, link) { + ringbuf->last_retired_head = ringbuf->tail; +intel_ring_update_space (ringbuf); } }
drivers/gpu/drm/i915/intel_lrc.c +2 -1
@@ -1001,7 +1001,8 @@ int intel_execlists_submission(struct i915_execbuffer_params *params,intel_logical_ring_emit (ringbuf,MI_NOOP );intel_logical_ring_emit (ringbuf,MI_LOAD_REGISTER_IMM (1 ));intel_logical_ring_emit_reg (ringbuf,INSTPM ); -intel_logical_ring_emit (ringbuf, instp_mask <<16 | instp_mode); +intel_logical_ring_emit (ringbuf, + instp_mask <<16 | instp_mode);intel_logical_ring_advance (ringbuf); dev_priv->relative_constants_mode = instp_mode;
drivers/gpu/drm/i915/intel_mocs.c +7 -4
@@ -210,7 +210,8 @@ static int emit_mocs_control_table(struct drm_i915_gem_request *req, MI_LOAD_REGISTER_IMM(GEN9_NUM_MOCS_ENTRIES));for (index =0 ; index < table->size; index++) { -intel_logical_ring_emit_reg (ringbuf,mocs_register (ring, index)); +intel_logical_ring_emit_reg (ringbuf, +mocs_register (ring, index));intel_logical_ring_emit (ringbuf, table->table[index].control_value); }
@@ -224,8 +225,10 @@ static int emit_mocs_control_table(struct drm_i915_gem_request *req,* that value to all the used entries. */ for (; index <GEN9_NUM_MOCS_ENTRIES ; index++) { -intel_logical_ring_emit_reg (ringbuf,mocs_register (ring, index)); -intel_logical_ring_emit (ringbuf, table->table[0 ].control_value); +intel_logical_ring_emit_reg (ringbuf, +mocs_register (ring, index)); +intel_logical_ring_emit (ringbuf, + table->table[0 ].control_value); }intel_logical_ring_emit (ringbuf,MI_NOOP );
@@ -266,7 +269,7 @@ static int emit_mocs_l3cc_table(struct drm_i915_gem_request *req, }intel_logical_ring_emit (ringbuf, -MI_LOAD_REGISTER_IMM (GEN9_NUM_MOCS_ENTRIES /2 )); +MI_LOAD_REGISTER_IMM (GEN9_NUM_MOCS_ENTRIES /2 ));for (i =0 , count =0 ; i < table->size /2 ; i++, count +=2 ) { value = (table->table[count].l3cc_value & 0xffff) |
drivers/gpu/drm/i915/intel_ringbuffer.c +14 -14
@@ -2177,41 +2177,41 @@ static int intel_alloc_ringbuffer_obj(struct drm_device *dev,struct intel_ringbuffer *intel_engine_create_ringbuffer (struct intel_engine_cs *engine,int size) { -struct intel_ringbuffer *ring; +struct intel_ringbuffer *ringbuf;int ret; - ring =kzalloc (sizeof (*ring),GFP_KERNEL ); -if (ring ==NULL ) { + ringbuf =kzalloc (sizeof (*ringbuf),GFP_KERNEL ); +if (ringbuf ==NULL ) {DRM_DEBUG_DRIVER ("Failed to allocate ringbuffer %s\n" , engine->name);return ERR_PTR (-ENOMEM ); } - ring->engine = engine; -list_add (&ring->link, &engine->buffers); + ringbuf->engine = engine; +list_add (&ringbuf->link, &engine->buffers); - ring->size = size; + ringbuf->size = size;/* Workaround an erratum on the i830 which causes a hang if * the TAIL pointer points to within the last 2 cachelines * of the buffer. */ - ring->effective_size = size; + ringbuf->effective_size = size;if (IS_I830 (engine->dev) ||IS_845G (engine->dev)) - ring->effective_size -=2 *CACHELINE_BYTES ; + ringbuf->effective_size -=2 *CACHELINE_BYTES ; - ring->last_retired_head =-1 ; -intel_ring_update_space (ring); + ringbuf->last_retired_head =-1 ; +intel_ring_update_space (ringbuf); - ret =intel_alloc_ringbuffer_obj (engine->dev, ring); + ret =intel_alloc_ringbuffer_obj (engine->dev, ringbuf);if (ret) {DRM_DEBUG_DRIVER ("Failed to allocate ringbuffer %s: %d\n" , engine->name, ret); -list_del (&ring->link); -kfree (ring); +list_del (&ringbuf->link); +kfree (ringbuf);return ERR_PTR (ret); } -return ring; +return ringbuf; }void
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 3/4] drm/i915: Rename local struct intel_ringbuffer variables
Quoted 4 lines · Tvrtko Ursulin
From: Tvrtko Ursulin <[email protected]>
Majority of the code calls these ringbuf so fix up a few places which use something else to be consistent.
I absolutely detest ringbuf as a name. The point of calling the engine the engine was that we could call the ring state the ring. -Chris
Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 3/4] drm/i915: Rename local struct intel_ringbuffer variables
Quoted 8 lines · Chris Wilson
Quoted 4 lines · Tvrtko Ursulin
From: Tvrtko Ursulin <[email protected]>
Majority of the code calls these ringbuf so fix up a few places which use something else to be consistent.
I absolutely detest ringbuf as a name. The point of calling the engine the engine was that we could call the ring state the ring.
:) I knew it. It is easily doable but it would be a somewhat bigger and again disruptive patch. Maybe someone else should do it so I am not the only one causing rebasing pain:
@@
expression E;
identifier r;
@@
- struct intel_ringbuffer *r = E;
+ struct intel_ringbuffer *ring = E;
<+...
- r
+ ring
...+>
@@
identifier r;
@@
- struct intel_ringbuffer *r;
+ struct intel_ringbuffer *ring;
<+...
- r
+ ring
...+>
@@
identifier func;
identifier r;
@@
func(..., struct intel_ringbuffer *
- r
+ ring
, ...)
{
<...
- r
+ ring
...>
}
@@
identifier func, r;
type T;
@@
T func(..., struct intel_ringbuffer *
- r
+ ring
, ...);
# cd $drm-intel/drivers/gpu/drm/i915 # spatch -c --no-includes --include-headers --sp-file <above> -j <numcpus> --in-place .
Could maybe be all that is required.
Regards,
Tvrtko
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 3/4] drm/i915: Rename local struct intel_ringbuffer variables
Quoted 8 lines · Tvrtko Ursulin
Quoted 6 lines · Chris Wilson
Quoted 4 lines · Tvrtko Ursulin
From: Tvrtko Ursulin <[email protected]>
Majority of the code calls these ringbuf so fix up a few places which use something else to be consistent.
Quoted 6 lines
Quoted 2 lines
I absolutely detest ringbuf as a name. The point of calling the engine the engine was that we could call the ring state the ring.
:) I knew it. It is easily doable but it would be a somewhat bigger and again disruptive patch. Maybe someone else should do it so I am not the only one causing rebasing pain:
It's because it was the easier route that lead us into the current miasma.
It just takes a few more steps to get ringbufs to be rings. I don't have them as coccinelle patches, but in a few hours I'll see what they look like after rebasing.
-Chris
Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/1 drm/i915: Name all intel_ringbuffer instances ring
From: Tvrtko Ursulin <[email protected]>
A mix of Coccinelle, sed and manual editing.
--
Compile tested only!
--- drivers/gpu/drm/i915/i915_debugfs.c | 14 +- drivers/gpu/drm/i915/i915_drv.h | 4 +- drivers/gpu/drm/i915/i915_gem.c | 26 ++-- drivers/gpu/drm/i915/i915_gpu_error.c | 4 +- drivers/gpu/drm/i915/i915_guc_submission.c | 4 +- drivers/gpu/drm/i915/intel_lrc.c | 235 +++++++++++++++-------------- drivers/gpu/drm/i915/intel_lrc.h | 14 +- drivers/gpu/drm/i915/intel_mocs.c | 38 ++--- drivers/gpu/drm/i915/intel_ringbuffer.c | 179 +++++++++++----------- drivers/gpu/drm/i915/intel_ringbuffer.h | 31 ++-- 10 files changed, 278 insertions(+), 271 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +7 -7
@@ -1933,11 +1933,11 @@ static int i915_gem_framebuffer_info(struct seq_file *m, void *data) }static void describe_ctx_ringbuf (struct seq_file *m, -struct intel_ringbuffer *ringbuf) +struct intel_ringbuffer *ring) {seq_printf (m," (ringbuffer, space: %d, head: %u, tail: %u, last head: %d)" , - ringbuf->space, ringbuf->head, ringbuf->tail, - ringbuf->last_retired_head); + ring->space, ring->head, ring->tail, + ring->last_retired_head); }static int i915_context_status (struct seq_file *m,void *unused)
@@ -1968,14 +1968,14 @@ static int i915_context_status(struct seq_file *m, void *unused)for_each_engine (engine, dev_priv, i) {struct drm_i915_gem_object *ctx_obj = ctx->engine[i].state; -struct intel_ringbuffer *ringbuf = - ctx->engine[i].ringbuf; +struct intel_ringbuffer *ring = + ctx->engine[i].ring;seq_printf (m,"%s: " , engine->name);if (ctx_obj)describe_obj (m, ctx_obj); -if (ringbuf) -describe_ctx_ringbuf (m, ringbuf); +if (ring) +describe_ctx_ringbuf (m, ring);seq_putc (m,'\n' ); } }else {
drivers/gpu/drm/i915/i915_drv.h +2 -2
@@ -819,7 +819,7 @@ struct intel_context {/* Execlists */ struct {struct drm_i915_gem_object *state; -struct intel_ringbuffer *ringbuf; +struct intel_ringbuffer *ring;int pin_count;struct i915_vma *lrc_vma;u64 lrc_desc;
@@ -2222,7 +2222,7 @@ struct drm_i915_gem_request {* context. */ struct intel_context *ctx; -struct intel_ringbuffer *ringbuf; +struct intel_ringbuffer *ring;/** Batch buffer related to this request if any (used for error state dump only) */
drivers/gpu/drm/i915/i915_gem.c +13 -13
@@ -1421,7 +1421,7 @@ static void i915_gem_request_retire(struct drm_i915_gem_request *request)* Note this requires that we are always called in request * completion order. */ - request->ringbuf->last_retired_head = request->postfix; + request->ring->last_retired_head = request->postfix;list_del_init (&request->list);i915_gem_request_remove_from_client (request);
@@ -2542,7 +2542,7 @@ void __i915_add_request(struct drm_i915_gem_request *request, {struct intel_engine_cs *engine;struct drm_i915_private *dev_priv; -struct intel_ringbuffer *ringbuf; +struct intel_ringbuffer *ring;u32 request_start;int ret;
@@ -2551,16 +2551,16 @@ void __i915_add_request(struct drm_i915_gem_request *request, engine = request->engine; dev_priv = request->i915; - ringbuf = request->ringbuf; + ring = request->ring;/* * To ensure that this call will not fail, space for its emissions * should already have been reserved in the ring buffer. Let the ring * know that it is time to use that space up. */ -intel_ring_reserved_space_use (ringbuf); +intel_ring_reserved_space_use (ring); - request_start =intel_ring_get_tail (ringbuf); + request_start =intel_ring_get_tail (ring);/* * Emit any outstanding flushes - execbuf can fail to emit the flush * after having emitted the batchbuffer command. Hence we need to fix
@@ -2582,14 +2582,14 @@ void __i915_add_request(struct drm_i915_gem_request *request,* GPU processing the request, we never over-estimate the * position of the head. */ - request->postfix =intel_ring_get_tail (ringbuf); + request->postfix =intel_ring_get_tail (ring);if (i915.enable_execlists) ret = engine->emit_request (request);else { ret = engine->add_request (request); - request->tail =intel_ring_get_tail (ringbuf); + request->tail =intel_ring_get_tail (ring); }/* Not allowed to fail! */ WARN (ret,"emit|add_request failed: %d!\n" , ret);
@@ -2619,7 +2619,7 @@ void __i915_add_request(struct drm_i915_gem_request *request,intel_mark_busy (dev_priv->dev);/* Sanity check that the reserved size was large enough. */ -intel_ring_reserved_space_end (ringbuf); +intel_ring_reserved_space_end (ring); } static bool i915_context_is_banned(struct drm_i915_private *dev_priv,
@@ -2779,7 +2779,7 @@ i915_gem_request_alloc(struct intel_engine_cs *engine,void i915_gem_request_cancel (struct drm_i915_gem_request *req) { -intel_ring_reserved_space_cancel (req->ringbuf); +intel_ring_reserved_space_cancel (req->ring);i915_gem_request_unreference (req); }
@@ -2821,7 +2821,7 @@ static void i915_gem_reset_engine_status(struct drm_i915_private *dev_priv,static void i915_gem_reset_engine_cleanup (struct drm_i915_private *dev_priv,struct intel_engine_cs *engine) { -struct intel_ringbuffer *buffer; +struct intel_ringbuffer *ring;while (!list_empty (&engine->active_list)) {struct drm_i915_gem_object *obj;
@@ -2874,9 +2874,9 @@ static void i915_gem_reset_engine_cleanup(struct drm_i915_private *dev_priv,* upon reset is less than when we start. Do one more pass over * all the ringbuffers to reset last_retired_head. */ -list_for_each_entry (buffer, &engine->buffers, link) { - buffer->last_retired_head = buffer->tail; -intel_ring_update_space (buffer); +list_for_each_entry (ring, &engine->buffers, link) { + ring->last_retired_head = ring->tail; +intel_ring_update_space (ring); } }
drivers/gpu/drm/i915/i915_gpu_error.c +2 -2
@@ -1074,9 +1074,9 @@ static void i915_gem_record_rings(struct drm_device *dev,* executed). */ if (request) - rbuf = request->ctx->engine[engine->id].ringbuf; + rbuf = request->ctx->engine[engine->id].ring;else - rbuf = dev_priv->kernel_context->engine[engine->id].ringbuf; + rbuf = dev_priv->kernel_context->engine[engine->id].ring; }else rbuf = engine->buffer;
drivers/gpu/drm/i915/i915_guc_submission.c +2 -2
@@ -415,7 +415,7 @@ static void guc_init_ctx_desc(struct intel_guc *guc, lrc->context_id = (client->ctx_index <<GUC_ELC_CTXID_OFFSET ) | (engine->guc_id <<GUC_ELC_ENGINE_OFFSET ); - obj = ctx->engine[i].ringbuf->obj; + obj = ctx->engine[i].ring->obj; lrc->ring_begin =i915_gem_obj_ggtt_offset (obj); lrc->ring_end = lrc->ring_begin + obj->base.size -1 ;
@@ -550,7 +550,7 @@ static int guc_add_workqueue_item(struct i915_guc_client *gc, rq->engine);/* The GuC firmware wants the tail index in QWords, not bytes */ - tail = rq->ringbuf->tail >>3 ; + tail = rq->ring->tail >>3 ; wqi->ring_tail = tail <<WQ_RING_TAIL_SHIFT ; wqi->fence_id =0 ;/*XXX: what fence to be here */
drivers/gpu/drm/i915/intel_lrc.c +118 -117
547 lines not on this page · raw message
drivers/gpu/drm/i915/intel_lrc.h +7 -7
@@ -69,25 +69,25 @@ int logical_ring_flush_all_caches(struct drm_i915_gem_request *req);* * The tail is only updated in our logical ringbuffer struct. */ -static inline void intel_logical_ring_advance (struct intel_ringbuffer *ringbuf) +static inline void intel_logical_ring_advance (struct intel_ringbuffer *ring) { - ringbuf->tail &= ringbuf->size -1 ; + ring->tail &= ring->size -1 ; }/** * intel_logical_ring_emit() - write a DWORD to the ringbuffer. * @ringbuf: Ringbuffer to write to. * @data: DWORD to write. */ -static inline void intel_logical_ring_emit (struct intel_ringbuffer *ringbuf, +static inline void intel_logical_ring_emit (struct intel_ringbuffer *ring,u32 data) { -iowrite32 (data, ringbuf->virtual_start + ringbuf->tail); - ringbuf->tail +=4 ; +iowrite32 (data, ring->virtual_start + ring->tail); + ring->tail +=4 ; } -static inline void intel_logical_ring_emit_reg (struct intel_ringbuffer *ringbuf, +static inline void intel_logical_ring_emit_reg (struct intel_ringbuffer *ring,i915_reg_t reg) { -intel_logical_ring_emit (ringbuf,i915_mmio_reg_offset (reg)); +intel_logical_ring_emit (ring,i915_mmio_reg_offset (reg)); }/* Logical Ring Contexts */
drivers/gpu/drm/i915/intel_mocs.c +20 -18
@@ -191,9 +191,9 @@ static i915_reg_t mocs_register(enum intel_engine_id ring, int index)*/ static int emit_mocs_control_table (struct drm_i915_gem_request *req,const struct drm_i915_mocs_table *table, -enum intel_engine_id ring) +enum intel_engine_id engine_id) { -struct intel_ringbuffer *ringbuf = req->ringbuf; +struct intel_ringbuffer *ring = req->ring;unsigned int index;int ret;
@@ -206,12 +206,13 @@ static int emit_mocs_control_table(struct drm_i915_gem_request *req,return ret; } -intel_logical_ring_emit (ringbuf, +intel_logical_ring_emit (ring,MI_LOAD_REGISTER_IMM (GEN9_NUM_MOCS_ENTRIES ));for (index =0 ; index < table->size; index++) { -intel_logical_ring_emit_reg (ringbuf,mocs_register (ring, index)); -intel_logical_ring_emit (ringbuf, +intel_logical_ring_emit_reg (ring, +mocs_register (engine_id, index)); +intel_logical_ring_emit (ring, table->table[index].control_value); }
@@ -224,12 +225,13 @@ static int emit_mocs_control_table(struct drm_i915_gem_request *req,* that value to all the used entries. */ for (; index <GEN9_NUM_MOCS_ENTRIES ; index++) { -intel_logical_ring_emit_reg (ringbuf,mocs_register (ring, index)); -intel_logical_ring_emit (ringbuf, table->table[0 ].control_value); +intel_logical_ring_emit_reg (ring, +mocs_register (engine_id, index)); +intel_logical_ring_emit (ring, table->table[0 ].control_value); } -intel_logical_ring_emit (ringbuf,MI_NOOP ); -intel_logical_ring_advance (ringbuf); +intel_logical_ring_emit (ring,MI_NOOP ); +intel_logical_ring_advance (ring);return 0 ; }
@@ -248,7 +250,7 @@ static int emit_mocs_control_table(struct drm_i915_gem_request *req,static int emit_mocs_l3cc_table (struct drm_i915_gem_request *req,const struct drm_i915_mocs_table *table) { -struct intel_ringbuffer *ringbuf = req->ringbuf; +struct intel_ringbuffer *ring = req->ring;unsigned int count;unsigned int i;u32 value;
@@ -265,15 +267,15 @@ static int emit_mocs_l3cc_table(struct drm_i915_gem_request *req,return ret; } -intel_logical_ring_emit (ringbuf, -MI_LOAD_REGISTER_IMM (GEN9_NUM_MOCS_ENTRIES /2 )); +intel_logical_ring_emit (ring, +MI_LOAD_REGISTER_IMM (GEN9_NUM_MOCS_ENTRIES /2 ));for (i =0 , count =0 ; i < table->size /2 ; i++, count +=2 ) { value = (table->table[count].l3cc_value &0xffff ) | ((table->table[count +1 ].l3cc_value &0xffff ) <<16 ); -intel_logical_ring_emit_reg (ringbuf,GEN9_LNCFCMOCS (i)); -intel_logical_ring_emit (ringbuf, value); +intel_logical_ring_emit_reg (ring,GEN9_LNCFCMOCS (i)); +intel_logical_ring_emit (ring, value); }if (table->size &0x01 ) {
@@ -289,14 +291,14 @@ static int emit_mocs_l3cc_table(struct drm_i915_gem_request *req,* they are reserved by the hardware. */ for (; i <GEN9_NUM_MOCS_ENTRIES /2 ; i++) { -intel_logical_ring_emit_reg (ringbuf,GEN9_LNCFCMOCS (i)); -intel_logical_ring_emit (ringbuf, value); +intel_logical_ring_emit_reg (ring,GEN9_LNCFCMOCS (i)); +intel_logical_ring_emit (ring, value); value = filler; } -intel_logical_ring_emit (ringbuf,MI_NOOP ); -intel_logical_ring_advance (ringbuf); +intel_logical_ring_emit (ring,MI_NOOP ); +intel_logical_ring_advance (ring);return 0 ; }
drivers/gpu/drm/i915/intel_ringbuffer.c +91 -88
382 lines not on this page · raw message
drivers/gpu/drm/i915/intel_ringbuffer.h +16 -15
@@ -434,8 +434,8 @@ intel_write_status_page(struct intel_engine_cs *engine,struct intel_ringbuffer *intel_engine_create_ringbuffer (struct intel_engine_cs *engine,int size);int intel_pin_and_map_ringbuffer_obj (struct drm_device *dev, -struct intel_ringbuffer *ringbuf); -void intel_unpin_ringbuffer_obj (struct intel_ringbuffer *ringbuf); +struct intel_ringbuffer *ring); +void intel_unpin_ringbuffer_obj (struct intel_ringbuffer *ring);void intel_ringbuffer_free (struct intel_ringbuffer *ring);void intel_stop_engine (struct intel_engine_cs *engine);
@@ -448,9 +448,9 @@ int __must_check intel_ring_cacheline_align(struct drm_i915_gem_request *req);static inline void intel_ring_emit (struct intel_engine_cs *engine,u32 data) { -struct intel_ringbuffer *ringbuf = engine->buffer; -iowrite32 (data, ringbuf->virtual_start + ringbuf->tail); - ringbuf->tail +=4 ; +struct intel_ringbuffer *ring = engine->buffer; +iowrite32 (data, ring->virtual_start + ring->tail); + ring->tail +=4 ; }static inline void intel_ring_emit_reg (struct intel_engine_cs *engine,i915_reg_t reg)
@@ -459,12 +459,12 @@ static inline void intel_ring_emit_reg(struct intel_engine_cs *engine, }static inline void intel_ring_advance (struct intel_engine_cs *engine) { -struct intel_ringbuffer *ringbuf = engine->buffer; - ringbuf->tail &= ringbuf->size -1 ; +struct intel_ringbuffer *ring = engine->buffer; + ring->tail &= ring->size -1 ; }int __intel_ring_space (int head,int tail,int size); -void intel_ring_update_space (struct intel_ringbuffer *ringbuf); -int intel_ring_space (struct intel_ringbuffer *ringbuf); +void intel_ring_update_space (struct intel_ringbuffer *ring); +int intel_ring_space (struct intel_ringbuffer *ring);bool intel_engine_stopped (struct intel_engine_cs *engine);int __must_check intel_engine_idle (struct intel_engine_cs *engine);
@@ -485,9 +485,9 @@ u64 intel_ring_get_active_head(struct intel_engine_cs *engine);int init_workarounds_ring (struct intel_engine_cs *engine); -static inline u32 intel_ring_get_tail (struct intel_ringbuffer *ringbuf) +static inline u32 intel_ring_get_tail (struct intel_ringbuffer *ring) { -return ringbuf->tail; +return ring->tail; }/*
@@ -504,13 +504,14 @@ static inline u32 intel_ring_get_tail(struct intel_ringbuffer *ringbuf)* will always have sufficient room to do its stuff. The request creation * code calls this automatically. */ -void intel_ring_reserved_space_reserve (struct intel_ringbuffer *ringbuf,int size); +void intel_ring_reserved_space_reserve (struct intel_ringbuffer *ring, +int size);/* Cancel the reservation, e.g. because the request is being discarded. */ -void intel_ring_reserved_space_cancel (struct intel_ringbuffer *ringbuf); +void intel_ring_reserved_space_cancel (struct intel_ringbuffer *ring);/* Use the reserved space - for use by i915_add_request() only. */ -void intel_ring_reserved_space_use (struct intel_ringbuffer *ringbuf); +void intel_ring_reserved_space_use (struct intel_ringbuffer *ring);/* Finish with the reserved space - for use by i915_add_request() only. */ -void intel_ring_reserved_space_end (struct intel_ringbuffer *ringbuf); +void intel_ring_reserved_space_end (struct intel_ringbuffer *ring);/* Legacy ringbuffer specific portion of reservation code: */ int intel_ring_reserve_space (struct drm_i915_gem_request *request);
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 1/1 drm/i915: Name all intel_ringbuffer instances ring
From: Tvrtko Ursulin <[email protected]>
A mix of Coccinelle, sed and manual editing.
v2: Rename engine->buffer as well.
--
Compile tested only!
--- drivers/gpu/drm/i915/i915_debugfs.c | 14 +- drivers/gpu/drm/i915/i915_drv.h | 4 +- drivers/gpu/drm/i915/i915_gem.c | 26 ++-- drivers/gpu/drm/i915/i915_gpu_error.c | 6 +- drivers/gpu/drm/i915/i915_guc_submission.c | 4 +- drivers/gpu/drm/i915/i915_irq.c | 12 +- drivers/gpu/drm/i915/intel_lrc.c | 239 +++++++++++++++-------------- drivers/gpu/drm/i915/intel_lrc.h | 14 +- drivers/gpu/drm/i915/intel_mocs.c | 38 ++--- drivers/gpu/drm/i915/intel_ringbuffer.c | 193 +++++++++++------------ drivers/gpu/drm/i915/intel_ringbuffer.h | 33 ++-- 11 files changed, 295 insertions(+), 288 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +7 -7
@@ -1933,11 +1933,11 @@ static int i915_gem_framebuffer_info(struct seq_file *m, void *data) }static void describe_ctx_ringbuf (struct seq_file *m, -struct intel_ringbuffer *ringbuf) +struct intel_ringbuffer *ring) {seq_printf (m," (ringbuffer, space: %d, head: %u, tail: %u, last head: %d)" , - ringbuf->space, ringbuf->head, ringbuf->tail, - ringbuf->last_retired_head); + ring->space, ring->head, ring->tail, + ring->last_retired_head); }static int i915_context_status (struct seq_file *m,void *unused)
@@ -1968,14 +1968,14 @@ static int i915_context_status(struct seq_file *m, void *unused)for_each_engine (engine, dev_priv, i) {struct drm_i915_gem_object *ctx_obj = ctx->engine[i].state; -struct intel_ringbuffer *ringbuf = - ctx->engine[i].ringbuf; +struct intel_ringbuffer *ring = + ctx->engine[i].ring;seq_printf (m,"%s: " , engine->name);if (ctx_obj)describe_obj (m, ctx_obj); -if (ringbuf) -describe_ctx_ringbuf (m, ringbuf); +if (ring) +describe_ctx_ringbuf (m, ring);seq_putc (m,'\n' ); } }else {
drivers/gpu/drm/i915/i915_drv.h +2 -2
@@ -819,7 +819,7 @@ struct intel_context {/* Execlists */ struct {struct drm_i915_gem_object *state; -struct intel_ringbuffer *ringbuf; +struct intel_ringbuffer *ring;int pin_count;struct i915_vma *lrc_vma;u64 lrc_desc;
@@ -2222,7 +2222,7 @@ struct drm_i915_gem_request {* context. */ struct intel_context *ctx; -struct intel_ringbuffer *ringbuf; +struct intel_ringbuffer *ring;/** Batch buffer related to this request if any (used for error state dump only) */
drivers/gpu/drm/i915/i915_gem.c +13 -13
@@ -1421,7 +1421,7 @@ static void i915_gem_request_retire(struct drm_i915_gem_request *request)* Note this requires that we are always called in request * completion order. */ - request->ringbuf->last_retired_head = request->postfix; + request->ring->last_retired_head = request->postfix;list_del_init (&request->list);i915_gem_request_remove_from_client (request);
@@ -2542,7 +2542,7 @@ void __i915_add_request(struct drm_i915_gem_request *request, {struct intel_engine_cs *engine;struct drm_i915_private *dev_priv; -struct intel_ringbuffer *ringbuf; +struct intel_ringbuffer *ring;u32 request_start;int ret;
@@ -2551,16 +2551,16 @@ void __i915_add_request(struct drm_i915_gem_request *request, engine = request->engine; dev_priv = request->i915; - ringbuf = request->ringbuf; + ring = request->ring;/* * To ensure that this call will not fail, space for its emissions * should already have been reserved in the ring buffer. Let the ring * know that it is time to use that space up. */ -intel_ring_reserved_space_use (ringbuf); +intel_ring_reserved_space_use (ring); - request_start =intel_ring_get_tail (ringbuf); + request_start =intel_ring_get_tail (ring);/* * Emit any outstanding flushes - execbuf can fail to emit the flush * after having emitted the batchbuffer command. Hence we need to fix
@@ -2582,14 +2582,14 @@ void __i915_add_request(struct drm_i915_gem_request *request,* GPU processing the request, we never over-estimate the * position of the head. */ - request->postfix =intel_ring_get_tail (ringbuf); + request->postfix =intel_ring_get_tail (ring);if (i915.enable_execlists) ret = engine->emit_request (request);else { ret = engine->add_request (request); - request->tail =intel_ring_get_tail (ringbuf); + request->tail =intel_ring_get_tail (ring); }/* Not allowed to fail! */ WARN (ret,"emit|add_request failed: %d!\n" , ret);
@@ -2619,7 +2619,7 @@ void __i915_add_request(struct drm_i915_gem_request *request,intel_mark_busy (dev_priv->dev);/* Sanity check that the reserved size was large enough. */ -intel_ring_reserved_space_end (ringbuf); +intel_ring_reserved_space_end (ring); } static bool i915_context_is_banned(struct drm_i915_private *dev_priv,
@@ -2779,7 +2779,7 @@ i915_gem_request_alloc(struct intel_engine_cs *engine,void i915_gem_request_cancel (struct drm_i915_gem_request *req) { -intel_ring_reserved_space_cancel (req->ringbuf); +intel_ring_reserved_space_cancel (req->ring);i915_gem_request_unreference (req); }
@@ -2821,7 +2821,7 @@ static void i915_gem_reset_engine_status(struct drm_i915_private *dev_priv,static void i915_gem_reset_engine_cleanup (struct drm_i915_private *dev_priv,struct intel_engine_cs *engine) { -struct intel_ringbuffer *buffer; +struct intel_ringbuffer *ring;while (!list_empty (&engine->active_list)) {struct drm_i915_gem_object *obj;
@@ -2874,9 +2874,9 @@ static void i915_gem_reset_engine_cleanup(struct drm_i915_private *dev_priv,* upon reset is less than when we start. Do one more pass over * all the ringbuffers to reset last_retired_head. */ -list_for_each_entry (buffer, &engine->buffers, link) { - buffer->last_retired_head = buffer->tail; -intel_ring_update_space (buffer); +list_for_each_entry (ring, &engine->buffers, link) { + ring->last_retired_head = ring->tail; +intel_ring_update_space (ring); } }
drivers/gpu/drm/i915/i915_gpu_error.c +3 -3
@@ -1074,11 +1074,11 @@ static void i915_gem_record_rings(struct drm_device *dev,* executed). */ if (request) - rbuf = request->ctx->engine[engine->id].ringbuf; + rbuf = request->ctx->engine[engine->id].ring;else - rbuf = dev_priv->kernel_context->engine[engine->id].ringbuf; + rbuf = dev_priv->kernel_context->engine[engine->id].ring; }else - rbuf = engine->buffer; + rbuf = engine->ring; error->ring[i].cpu_ring_head = rbuf->head; error->ring[i].cpu_ring_tail = rbuf->tail;
drivers/gpu/drm/i915/i915_guc_submission.c +2 -2
@@ -415,7 +415,7 @@ static void guc_init_ctx_desc(struct intel_guc *guc, lrc->context_id = (client->ctx_index <<GUC_ELC_CTXID_OFFSET ) | (engine->guc_id <<GUC_ELC_ENGINE_OFFSET ); - obj = ctx->engine[i].ringbuf->obj; + obj = ctx->engine[i].ring->obj; lrc->ring_begin =i915_gem_obj_ggtt_offset (obj); lrc->ring_end = lrc->ring_begin + obj->base.size -1 ;
@@ -550,7 +550,7 @@ static int guc_add_workqueue_item(struct i915_guc_client *gc, rq->engine);/* The GuC firmware wants the tail index in QWords, not bytes */ - tail = rq->ringbuf->tail >>3 ; + tail = rq->ring->tail >>3 ; wqi->ring_tail = tail <<WQ_RING_TAIL_SHIFT ; wqi->fence_id =0 ;/*XXX: what fence to be here */
drivers/gpu/drm/i915/i915_irq.c +6 -6
@@ -2882,7 +2882,7 @@ semaphore_waits_for(struct intel_engine_cs *engine, u32 *seqno)* Therefore, this function does not support execlist mode in its * current form. Just return NULL and move on. */ -if (engine->buffer ==NULL ) +if (engine->ring ==NULL )return NULL ; ipehr =I915_READ (RING_IPEHR (engine->mmio_base));
@@ -2906,10 +2906,10 @@ semaphore_waits_for(struct intel_engine_cs *engine, u32 *seqno)* our ring is smaller than what the hardware (and hence * HEAD_ADDR) allows. Also handles wrap-around. */ - head &= engine->buffer->size -1 ; + head &= engine->ring->size -1 ;/* This here seems to blow up */ - cmd =ioread32 (engine->buffer->virtual_start + head); + cmd =ioread32 (engine->ring->virtual_start + head);if (cmd == ipehr)break ;
@@ -2919,11 +2919,11 @@ semaphore_waits_for(struct intel_engine_cs *engine, u32 *seqno)if (!i)return NULL ; - *seqno =ioread32 (engine->buffer->virtual_start + head +4 ) +1 ; + *seqno =ioread32 (engine->ring->virtual_start + head +4 ) +1 ;if (INTEL_INFO (engine->dev)->gen >=8 ) { - offset =ioread32 (engine->buffer->virtual_start + head +12 ); + offset =ioread32 (engine->ring->virtual_start + head +12 ); offset <<=32 ; - offset =ioread32 (engine->buffer->virtual_start + head +8 ); + offset =ioread32 (engine->ring->virtual_start + head +8 ); }return semaphore_wait_to_signaller_ring (engine, ipehr, offset); }
drivers/gpu/drm/i915/intel_lrc.c +120 -119
563 lines not on this page · raw message
drivers/gpu/drm/i915/intel_lrc.h +7 -7
@@ -69,25 +69,25 @@ int logical_ring_flush_all_caches(struct drm_i915_gem_request *req);* * The tail is only updated in our logical ringbuffer struct. */ -static inline void intel_logical_ring_advance (struct intel_ringbuffer *ringbuf) +static inline void intel_logical_ring_advance (struct intel_ringbuffer *ring) { - ringbuf->tail &= ringbuf->size -1 ; + ring->tail &= ring->size -1 ; }/** * intel_logical_ring_emit() - write a DWORD to the ringbuffer. * @ringbuf: Ringbuffer to write to. * @data: DWORD to write. */ -static inline void intel_logical_ring_emit (struct intel_ringbuffer *ringbuf, +static inline void intel_logical_ring_emit (struct intel_ringbuffer *ring,u32 data) { -iowrite32 (data, ringbuf->virtual_start + ringbuf->tail); - ringbuf->tail +=4 ; +iowrite32 (data, ring->virtual_start + ring->tail); + ring->tail +=4 ; } -static inline void intel_logical_ring_emit_reg (struct intel_ringbuffer *ringbuf, +static inline void intel_logical_ring_emit_reg (struct intel_ringbuffer *ring,i915_reg_t reg) { -intel_logical_ring_emit (ringbuf,i915_mmio_reg_offset (reg)); +intel_logical_ring_emit (ring,i915_mmio_reg_offset (reg)); }/* Logical Ring Contexts */
drivers/gpu/drm/i915/intel_mocs.c +20 -18
@@ -191,9 +191,9 @@ static i915_reg_t mocs_register(enum intel_engine_id ring, int index)*/ static int emit_mocs_control_table (struct drm_i915_gem_request *req,const struct drm_i915_mocs_table *table, -enum intel_engine_id ring) +enum intel_engine_id engine_id) { -struct intel_ringbuffer *ringbuf = req->ringbuf; +struct intel_ringbuffer *ring = req->ring;unsigned int index;int ret;
@@ -206,12 +206,13 @@ static int emit_mocs_control_table(struct drm_i915_gem_request *req,return ret; } -intel_logical_ring_emit (ringbuf, +intel_logical_ring_emit (ring,MI_LOAD_REGISTER_IMM (GEN9_NUM_MOCS_ENTRIES ));for (index =0 ; index < table->size; index++) { -intel_logical_ring_emit_reg (ringbuf,mocs_register (ring, index)); -intel_logical_ring_emit (ringbuf, +intel_logical_ring_emit_reg (ring, +mocs_register (engine_id, index)); +intel_logical_ring_emit (ring, table->table[index].control_value); }
@@ -224,12 +225,13 @@ static int emit_mocs_control_table(struct drm_i915_gem_request *req,* that value to all the used entries. */ for (; index <GEN9_NUM_MOCS_ENTRIES ; index++) { -intel_logical_ring_emit_reg (ringbuf,mocs_register (ring, index)); -intel_logical_ring_emit (ringbuf, table->table[0 ].control_value); +intel_logical_ring_emit_reg (ring, +mocs_register (engine_id, index)); +intel_logical_ring_emit (ring, table->table[0 ].control_value); } -intel_logical_ring_emit (ringbuf,MI_NOOP ); -intel_logical_ring_advance (ringbuf); +intel_logical_ring_emit (ring,MI_NOOP ); +intel_logical_ring_advance (ring);return 0 ; }
@@ -248,7 +250,7 @@ static int emit_mocs_control_table(struct drm_i915_gem_request *req,static int emit_mocs_l3cc_table (struct drm_i915_gem_request *req,const struct drm_i915_mocs_table *table) { -struct intel_ringbuffer *ringbuf = req->ringbuf; +struct intel_ringbuffer *ring = req->ring;unsigned int count;unsigned int i;u32 value;
@@ -265,15 +267,15 @@ static int emit_mocs_l3cc_table(struct drm_i915_gem_request *req,return ret; } -intel_logical_ring_emit (ringbuf, -MI_LOAD_REGISTER_IMM (GEN9_NUM_MOCS_ENTRIES /2 )); +intel_logical_ring_emit (ring, +MI_LOAD_REGISTER_IMM (GEN9_NUM_MOCS_ENTRIES /2 ));for (i =0 , count =0 ; i < table->size /2 ; i++, count +=2 ) { value = (table->table[count].l3cc_value &0xffff ) | ((table->table[count +1 ].l3cc_value &0xffff ) <<16 ); -intel_logical_ring_emit_reg (ringbuf,GEN9_LNCFCMOCS (i)); -intel_logical_ring_emit (ringbuf, value); +intel_logical_ring_emit_reg (ring,GEN9_LNCFCMOCS (i)); +intel_logical_ring_emit (ring, value); }if (table->size &0x01 ) {
@@ -289,14 +291,14 @@ static int emit_mocs_l3cc_table(struct drm_i915_gem_request *req,* they are reserved by the hardware. */ for (; i <GEN9_NUM_MOCS_ENTRIES /2 ; i++) { -intel_logical_ring_emit_reg (ringbuf,GEN9_LNCFCMOCS (i)); -intel_logical_ring_emit (ringbuf, value); +intel_logical_ring_emit_reg (ring,GEN9_LNCFCMOCS (i)); +intel_logical_ring_emit (ring, value); value = filler; } -intel_logical_ring_emit (ringbuf,MI_NOOP ); -intel_logical_ring_advance (ringbuf); +intel_logical_ring_emit (ring,MI_NOOP ); +intel_logical_ring_advance (ring);return 0 ; }
drivers/gpu/drm/i915/intel_ringbuffer.c +98 -95
419 lines not on this page · raw message
drivers/gpu/drm/i915/intel_ringbuffer.h +17 -16
@@ -159,7 +159,7 @@ struct intel_engine_cs {unsigned int guc_id;u32 mmio_base;struct drm_device *dev; -struct intel_ringbuffer *buffer; +struct intel_ringbuffer *ring;struct list_head buffers;/*
@@ -434,8 +434,8 @@ intel_write_status_page(struct intel_engine_cs *engine,struct intel_ringbuffer *intel_engine_create_ringbuffer (struct intel_engine_cs *engine,int size);int intel_pin_and_map_ringbuffer_obj (struct drm_device *dev, -struct intel_ringbuffer *ringbuf); -void intel_unpin_ringbuffer_obj (struct intel_ringbuffer *ringbuf); +struct intel_ringbuffer *ring); +void intel_unpin_ringbuffer_obj (struct intel_ringbuffer *ring);void intel_ringbuffer_free (struct intel_ringbuffer *ring);void intel_stop_engine (struct intel_engine_cs *engine);
@@ -448,9 +448,9 @@ int __must_check intel_ring_cacheline_align(struct drm_i915_gem_request *req);static inline void intel_ring_emit (struct intel_engine_cs *engine,u32 data) { -struct intel_ringbuffer *ringbuf = engine->buffer; -iowrite32 (data, ringbuf->virtual_start + ringbuf->tail); - ringbuf->tail +=4 ; +struct intel_ringbuffer *ring = engine->ring; +iowrite32 (data, ring->virtual_start + ring->tail); + ring->tail +=4 ; }static inline void intel_ring_emit_reg (struct intel_engine_cs *engine,i915_reg_t reg)
@@ -459,12 +459,12 @@ static inline void intel_ring_emit_reg(struct intel_engine_cs *engine, }static inline void intel_ring_advance (struct intel_engine_cs *engine) { -struct intel_ringbuffer *ringbuf = engine->buffer; - ringbuf->tail &= ringbuf->size -1 ; +struct intel_ringbuffer *ring = engine->ring; + ring->tail &= ring->size -1 ; }int __intel_ring_space (int head,int tail,int size); -void intel_ring_update_space (struct intel_ringbuffer *ringbuf); -int intel_ring_space (struct intel_ringbuffer *ringbuf); +void intel_ring_update_space (struct intel_ringbuffer *ring); +int intel_ring_space (struct intel_ringbuffer *ring);bool intel_engine_stopped (struct intel_engine_cs *engine);int __must_check intel_engine_idle (struct intel_engine_cs *engine);
@@ -485,9 +485,9 @@ u64 intel_ring_get_active_head(struct intel_engine_cs *engine);int init_workarounds_ring (struct intel_engine_cs *engine); -static inline u32 intel_ring_get_tail (struct intel_ringbuffer *ringbuf) +static inline u32 intel_ring_get_tail (struct intel_ringbuffer *ring) { -return ringbuf->tail; +return ring->tail; }/*
@@ -504,13 +504,14 @@ static inline u32 intel_ring_get_tail(struct intel_ringbuffer *ringbuf)* will always have sufficient room to do its stuff. The request creation * code calls this automatically. */ -void intel_ring_reserved_space_reserve (struct intel_ringbuffer *ringbuf,int size); +void intel_ring_reserved_space_reserve (struct intel_ringbuffer *ring, +int size);/* Cancel the reservation, e.g. because the request is being discarded. */ -void intel_ring_reserved_space_cancel (struct intel_ringbuffer *ringbuf); +void intel_ring_reserved_space_cancel (struct intel_ringbuffer *ring);/* Use the reserved space - for use by i915_add_request() only. */ -void intel_ring_reserved_space_use (struct intel_ringbuffer *ringbuf); +void intel_ring_reserved_space_use (struct intel_ringbuffer *ring);/* Finish with the reserved space - for use by i915_add_request() only. */ -void intel_ring_reserved_space_end (struct intel_ringbuffer *ringbuf); +void intel_ring_reserved_space_end (struct intel_ringbuffer *ring);/* Legacy ringbuffer specific portion of reservation code: */ int intel_ring_reserve_space (struct drm_i915_gem_request *request);
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 4/4 drm/i915: Rename struct intel_ringbuffer function parameters
In reply to Tvrtko UrsulinFrom: Tvrtko Ursulin <[email protected]>
From ring to ringbuf so it is always consistent.
Coccinelle script:
@@
identifier func;
identifier r;
@@
func(..., struct intel_ringbuffer *
- r
+ ringbuf
, ...)
{
<...
- r
+ ringbuf
...>
}
@@
identifier func, r;
type T;
@@
T func(..., struct intel_ringbuffer *
- r
+ ringbuf
, ...);
--- drivers/gpu/drm/i915/intel_ringbuffer.c | 17 ++++++++++------- drivers/gpu/drm/i915/intel_ringbuffer.h | 5 +++-- 2 files changed, 13 insertions(+), 9 deletions(-)
drivers/gpu/drm/i915/intel_ringbuffer.c +10 -7
@@ -2135,7 +2135,8 @@ int intel_pin_and_map_ringbuffer_obj(struct drm_device *dev,assert_rpm_wakelock_held (dev_priv); ringbuf->virtual_start =ioremap_wc (dev_priv->gtt.mappable_base + -i915_gem_obj_ggtt_offset (obj), ringbuf->size); +i915_gem_obj_ggtt_offset (obj), + ringbuf->size);if (ringbuf->virtual_start ==NULL ) {i915_gem_object_ggtt_unpin (obj);return -EINVAL ;
@@ -2215,11 +2216,11 @@ intel_engine_create_ringbuffer(struct intel_engine_cs *engine, int size) }void -intel_ringbuffer_free (struct intel_ringbuffer *ring) +intel_ringbuffer_free (struct intel_ringbuffer *ringbuf) { -intel_destroy_ringbuffer_obj (ring); -list_del (&ring->link); -kfree (ring); +intel_destroy_ringbuffer_obj (ringbuf); +list_del (&ringbuf->link); +kfree (ringbuf); } static int intel_init_ring_buffer(struct drm_device *dev,
@@ -2396,7 +2397,8 @@ int intel_ring_reserve_space(struct drm_i915_gem_request *request)return intel_ring_begin (request,0 ); } -void intel_ring_reserved_space_reserve (struct intel_ringbuffer *ringbuf,int size) +void intel_ring_reserved_space_reserve (struct intel_ringbuffer *ringbuf, +int size) {WARN_ON (ringbuf->reserved_size);WARN_ON (ringbuf->reserved_in_use);
@@ -2426,7 +2428,8 @@ void intel_ring_reserved_space_end(struct intel_ringbuffer *ringbuf)if (ringbuf->tail > ringbuf->reserved_tail) {WARN (ringbuf->tail > ringbuf->reserved_tail + ringbuf->reserved_size,"request reserved size too small: %d vs %d!\n" , - ringbuf->tail - ringbuf->reserved_tail, ringbuf->reserved_size); + ringbuf->tail - ringbuf->reserved_tail, + ringbuf->reserved_size); }else {/* * The ring was wrapped while the reserved space was in use.
drivers/gpu/drm/i915/intel_ringbuffer.h +3 -2
@@ -436,7 +436,7 @@ intel_engine_create_ringbuffer(struct intel_engine_cs *engine, int size);int intel_pin_and_map_ringbuffer_obj (struct drm_device *dev,struct intel_ringbuffer *ringbuf);void intel_unpin_ringbuffer_obj (struct intel_ringbuffer *ringbuf); -void intel_ringbuffer_free (struct intel_ringbuffer *ring); +void intel_ringbuffer_free (struct intel_ringbuffer *ringbuf);void intel_stop_engine (struct intel_engine_cs *engine);void intel_cleanup_engine (struct intel_engine_cs *engine);
@@ -504,7 +504,8 @@ static inline u32 intel_ring_get_tail(struct intel_ringbuffer *ringbuf)* will always have sufficient room to do its stuff. The request creation * code calls this automatically. */ -void intel_ring_reserved_space_reserve (struct intel_ringbuffer *ringbuf,int size); +void intel_ring_reserved_space_reserve (struct intel_ringbuffer *ringbuf, +int size);/* Cancel the reservation, e.g. because the request is being discarded. */ void intel_ring_reserved_space_cancel (struct intel_ringbuffer *ringbuf);/* Use the reserved space - for use by i915_add_request() only. */
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 3 lines · Tvrtko Ursulin
From: Tvrtko Ursulin <[email protected]>
Signed-off-by Tvrtko Ursulin <[email protected]>
This function is horrible, this is slightly better but not much.
-Chris
Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: failure for series starting with [1/4] drm/i915: Remove unused variable in i915_gem_request_add_to_client (rev3)
In reply to Tvrtko Ursulin== Series Details ==
== Series Details ==
Series: series starting with [1/4] drm/i915: Remove unused variable in i915_gem_request_add_to_client (rev3)
URL : https://patchwork.freedesktop.org/series/4526/
State : failure
== Summary ==
Series 4526v3 Series without cover letter
2016-03-16T17:03:45.630857 http://patchwork.freedesktop.org/api/1.0/series/4526/revisions/3/mbox/
Applying: drm/i915: Remove unused variable in i915_gem_request_add_to_client
Applying: drm/i915: Use shorter route to dev_private where possible
Applying: drm/i915: Name all intel_ringbuffer instances ring
Applying: drm/i915: Rename struct intel_ringbuffer function parameters Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0004 drm/i915: Rename struct intel_ringbuffer function parameters
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx