intel_engine_cs renaming bomb
Subsystems (2)
cover intel_engine_cs renaming bomb
From: Tvrtko Ursulin <[email protected]>
I think there is consesus to do this, but the question is whether now is the time to do it?
If desired, needs to go in quickly before it goes stale.
But if not, it was an interesting exercise of learning Coccinelle nevertheless.
Tvrtko Ursulin (5):
drm/i915: Rename local struct intel_engine_cs variables drm/i915: Rename intel_engine_cs function parameters drm/i915: Rename intel_engine_cs struct members drm/i915: More intel_engine_cs renaming drm/i915: More renaming of rings to engines
drivers/gpu/drm/i915/i915_cmd_parser.c | 122 +-- drivers/gpu/drm/i915/i915_debugfs.c | 229 +++-- drivers/gpu/drm/i915/i915_dma.c | 12 +- drivers/gpu/drm/i915/i915_drv.h | 70 +- drivers/gpu/drm/i915/i915_gem.c | 316 +++--- drivers/gpu/drm/i915/i915_gem_context.c | 168 +-- drivers/gpu/drm/i915/i915_gem_debug.c | 15 +- drivers/gpu/drm/i915/i915_gem_execbuffer.c | 120 +-- drivers/gpu/drm/i915/i915_gem_gtt.c | 94 +- drivers/gpu/drm/i915/i915_gem_render_state.c | 12 +- drivers/gpu/drm/i915/i915_gem_render_state.h | 2 +- drivers/gpu/drm/i915/i915_gpu_error.c | 158 +-- drivers/gpu/drm/i915/i915_guc_submission.c | 37 +- drivers/gpu/drm/i915/i915_irq.c | 243 ++--- drivers/gpu/drm/i915/i915_trace.h | 6 +- drivers/gpu/drm/i915/intel_display.c | 114 +-- drivers/gpu/drm/i915/intel_guc_loader.c | 12 +- drivers/gpu/drm/i915/intel_lrc.c | 826 ++++++++------- drivers/gpu/drm/i915/intel_lrc.h | 16 +- drivers/gpu/drm/i915/intel_mocs.c | 6 +- drivers/gpu/drm/i915/intel_overlay.c | 60 +- drivers/gpu/drm/i915/intel_pm.c | 38 +- drivers/gpu/drm/i915/intel_ringbuffer.c | 1425 +++++++++++++------------- drivers/gpu/drm/i915/intel_ringbuffer.h | 86 +- drivers/gpu/drm/i915/intel_uncore.c | 4 +- 25 files changed, 2132 insertions(+), 2059 deletions(-)
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/5 drm/i915: Rename local struct intel_engine_cs variables
From: Tvrtko Ursulin <[email protected]>
Done by the Coccinelle script below plus a manual
intervention to GEN8_RING_SEMAPHORE_INIT.
@@
expression E;
@@
- struct intel_engine_cs *ring = E;
+ struct intel_engine_cs *engine = E;
<+...
- ring
+ engine
...+>
@@
@@
- struct intel_engine_cs *ring;
+ struct intel_engine_cs *engine;
<+...
- ring
+ engine
...+>
--- drivers/gpu/drm/i915/i915_debugfs.c | 203 ++++---- drivers/gpu/drm/i915/i915_gem.c | 136 ++--- drivers/gpu/drm/i915/i915_gem_context.c | 140 ++--- drivers/gpu/drm/i915/i915_gem_debug.c | 15 +- drivers/gpu/drm/i915/i915_gem_execbuffer.c | 74 +-- drivers/gpu/drm/i915/i915_gem_gtt.c | 90 ++-- drivers/gpu/drm/i915/i915_gpu_error.c | 35 +- drivers/gpu/drm/i915/i915_guc_submission.c | 30 +- drivers/gpu/drm/i915/i915_irq.c | 84 +-- drivers/gpu/drm/i915/intel_display.c | 106 ++-- drivers/gpu/drm/i915/intel_guc_loader.c | 12 +- drivers/gpu/drm/i915/intel_lrc.c | 216 ++++---- drivers/gpu/drm/i915/intel_mocs.c | 4 +- drivers/gpu/drm/i915/intel_overlay.c | 60 +-- drivers/gpu/drm/i915/intel_pm.c | 36 +- drivers/gpu/drm/i915/intel_ringbuffer.c | 785 +++++++++++++++-------------- drivers/gpu/drm/i915/intel_ringbuffer.h | 14 +- 17 files changed, 1035 insertions(+), 1005 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +104 -99
@@ -129,7 +129,7 @@ static void describe_obj(struct seq_file *m, struct drm_i915_gem_object *obj) { struct drm_i915_private *dev_priv = to_i915(obj->base.dev); -struct intel_engine_cs *ring; +struct intel_engine_cs *engine;struct i915_vma *vma;int pin_count =0 ;int i;
@@ -143,7 +143,7 @@ describe_obj(struct seq_file *m, struct drm_i915_gem_object *obj) obj->base.size /1024 , obj->base.read_domains, obj->base.write_domain); -for_each_ring (ring, dev_priv, i) +for_each_ring (engine, dev_priv, i)seq_printf (m,"%x " ,i915_gem_request_get_seqno (obj->last_read_req[i])); seq_printf(m, "] %x %x%s%s%s",
@@ -397,15 +397,15 @@ static void print_batch_pool_stats(struct seq_file *m, {struct drm_i915_gem_object *obj;struct file_stats stats; -struct intel_engine_cs *ring; +struct intel_engine_cs *engine;int i, j;memset (&stats,0 ,sizeof (stats)); -for_each_ring (ring, dev_priv, i) { -for (j =0 ; j <ARRAY_SIZE (ring->batch_pool.cache_list); j++) { +for_each_ring (engine, dev_priv, i) { +for (j =0 ; j <ARRAY_SIZE (engine->batch_pool.cache_list); j++) {list_for_each_entry (obj, - &ring->batch_pool.cache_list[j], + &engine->batch_pool.cache_list[j], batch_pool_link)per_file_stats (0 , obj, &stats); }
@@ -591,14 +591,13 @@ static int i915_gem_pageflip_info(struct seq_file *m, void *data) pipe, plane); }if (work->flip_queued_req) { -struct intel_engine_cs *ring = -i915_gem_request_get_ring (work->flip_queued_req); +struct intel_engine_cs *engine =i915_gem_request_get_ring (work->flip_queued_req);seq_printf (m,"Flip queued on %s at seqno %x, next seqno %x [current breadcrumb %x], completed? %d\n" , - ring->name, + engine->name,i915_gem_request_get_seqno (work->flip_queued_req), dev_priv->next_seqno, - ring->get_seqno (ring, true), + engine->get_seqno (engine, true),i915_gem_request_completed (work->flip_queued_req, true)); }else seq_printf (m,"Flip not associated with any ring\n" );
@@ -637,7 +636,7 @@ static int i915_gem_batch_pool_info(struct seq_file *m, void *data)struct drm_device *dev = node->minor->dev;struct drm_i915_private *dev_priv = dev->dev_private;struct drm_i915_gem_object *obj; -struct intel_engine_cs *ring; +struct intel_engine_cs *engine;int total =0 ;int ret, i, j;
@@ -645,20 +644,20 @@ static int i915_gem_batch_pool_info(struct seq_file *m, void *data)if (ret)return ret; -for_each_ring (ring, dev_priv, i) { -for (j =0 ; j <ARRAY_SIZE (ring->batch_pool.cache_list); j++) { +for_each_ring (engine, dev_priv, i) { +for (j =0 ; j <ARRAY_SIZE (engine->batch_pool.cache_list); j++) {int count; count =0 ;list_for_each_entry (obj, - &ring->batch_pool.cache_list[j], + &engine->batch_pool.cache_list[j], batch_pool_link) count++;seq_printf (m,"%s cache[%d]: %d objects\n" , - ring->name, j, count); + engine->name, j, count);list_for_each_entry (obj, - &ring->batch_pool.cache_list[j], + &engine->batch_pool.cache_list[j], batch_pool_link) {seq_puts (m," " );describe_obj (m, obj);
@@ -681,7 +680,7 @@ static int i915_gem_request_info(struct seq_file *m, void *data)struct drm_info_node *node = m->private;struct drm_device *dev = node->minor->dev;struct drm_i915_private *dev_priv = dev->dev_private; -struct intel_engine_cs *ring; +struct intel_engine_cs *engine;struct drm_i915_gem_request *req;int ret, any, i;
@@ -690,17 +689,17 @@ static int i915_gem_request_info(struct seq_file *m, void *data)return ret; any =0 ; -for_each_ring (ring, dev_priv, i) { +for_each_ring (engine, dev_priv, i) {int count; count =0 ; -list_for_each_entry (req, &ring->request_list, list) +list_for_each_entry (req, &engine->request_list, list) count++;if (count ==0 )continue ; -seq_printf (m,"%s requests: %d\n" , ring->name, count); -list_for_each_entry (req, &ring->request_list, list) { +seq_printf (m,"%s requests: %d\n" , engine->name, count); +list_for_each_entry (req, &engine->request_list, list) {struct task_struct *task;rcu_read_lock ();
@@ -739,7 +738,7 @@ static int i915_gem_seqno_info(struct seq_file *m, void *data)struct drm_info_node *node = m->private;struct drm_device *dev = node->minor->dev;struct drm_i915_private *dev_priv = dev->dev_private; -struct intel_engine_cs *ring; +struct intel_engine_cs *engine;int ret, i; ret =mutex_lock_interruptible (&dev->struct_mutex);
@@ -747,8 +746,8 @@ static int i915_gem_seqno_info(struct seq_file *m, void *data)return ret;intel_runtime_pm_get (dev_priv); -for_each_ring (ring, dev_priv, i) -i915_ring_seqno_info (m, ring); +for_each_ring (engine, dev_priv, i) +i915_ring_seqno_info (m, engine);intel_runtime_pm_put (dev_priv);mutex_unlock (&dev->struct_mutex);
@@ -762,7 +761,7 @@ static int i915_interrupt_info(struct seq_file *m, void *data)struct drm_info_node *node = m->private;struct drm_device *dev = node->minor->dev;struct drm_i915_private *dev_priv = dev->dev_private; -struct intel_engine_cs *ring; +struct intel_engine_cs *engine;int ret, i, pipe; ret =mutex_lock_interruptible (&dev->struct_mutex);
@@ -934,13 +933,13 @@ static int i915_interrupt_info(struct seq_file *m, void *data)seq_printf (m,"Graphics Interrupt mask: %08x\n" ,I915_READ (GTIMR )); } -for_each_ring (ring, dev_priv, i) { +for_each_ring (engine, dev_priv, i) {if (INTEL_INFO (dev)->gen >=6 ) {seq_printf (m,"Graphics Interrupt mask (%s): %08x\n" , - ring->name,I915_READ_IMR (ring)); + engine->name,I915_READ_IMR (engine)); } -i915_ring_seqno_info (m, ring); +i915_ring_seqno_info (m, engine); }intel_runtime_pm_put (dev_priv);mutex_unlock (&dev->struct_mutex);
@@ -981,12 +980,12 @@ static int i915_hws_info(struct seq_file *m, void *data)struct drm_info_node *node = m->private;struct drm_device *dev = node->minor->dev;struct drm_i915_private *dev_priv = dev->dev_private; -struct intel_engine_cs *ring; +struct intel_engine_cs *engine;const u32 *hws;int i; - ring = &dev_priv->ring[(uintptr_t )node->info_ent->data]; - hws = ring->status_page.page_addr; + engine = &dev_priv->ring[(uintptr_t )node->info_ent->data]; + hws = engine->status_page.page_addr;if (hws ==NULL )return 0 ;
@@ -1331,7 +1330,7 @@ static int i915_hangcheck_info(struct seq_file *m, void *unused)struct drm_info_node *node = m->private;struct drm_device *dev = node->minor->dev;struct drm_i915_private *dev_priv = dev->dev_private; -struct intel_engine_cs *ring; +struct intel_engine_cs *engine;u64 acthd[I915_NUM_RINGS ];u32 seqno[I915_NUM_RINGS ];u32 instdone[I915_NUM_INSTDONE_REG ];
@@ -1344,9 +1343,9 @@ static int i915_hangcheck_info(struct seq_file *m, void *unused)intel_runtime_pm_get (dev_priv); -for_each_ring (ring, dev_priv, i) { - seqno[i] = ring->get_seqno (ring, false); - acthd[i] =intel_ring_get_active_head (ring); +for_each_ring (engine, dev_priv, i) { + seqno[i] = engine->get_seqno (engine, false); + acthd[i] =intel_ring_get_active_head (engine); }i915_get_extra_instdone (dev, instdone);
@@ -1360,17 +1359,17 @@ static int i915_hangcheck_info(struct seq_file *m, void *unused) }else seq_printf (m,"Hangcheck inactive\n" ); -for_each_ring (ring, dev_priv, i) { -seq_printf (m,"%s:\n" , ring->name); +for_each_ring (engine, dev_priv, i) { +seq_printf (m,"%s:\n" , engine->name);seq_printf (m,"\tseqno = %x [current %x]\n" , - ring->hangcheck.seqno, seqno[i]); + engine->hangcheck.seqno, seqno[i]);seq_printf (m,"\tACTHD = 0x%08llx [current 0x%08llx]\n" , - (long long )ring->hangcheck.acthd, + (long long )engine->hangcheck.acthd, (long long )acthd[i]); -seq_printf (m,"\tscore = %d\n" , ring->hangcheck.score); -seq_printf (m,"\taction = %d\n" , ring->hangcheck.action); +seq_printf (m,"\tscore = %d\n" , engine->hangcheck.score); +seq_printf (m,"\taction = %d\n" , engine->hangcheck.action); -if (ring->id ==RCS ) { +if (engine->id ==RCS ) {seq_puts (m,"\tinstdone read =" );for (j =0 ; j <I915_NUM_INSTDONE_REG ; j++)
@@ -1380,7 +1379,7 @@ static int i915_hangcheck_info(struct seq_file *m, void *unused)for (j =0 ; j <I915_NUM_INSTDONE_REG ; j++)seq_printf (m," 0x%08x" , - ring->hangcheck.instdone[j]); + engine->hangcheck.instdone[j]);seq_puts (m,"\n" ); }
@@ -1946,7 +1945,7 @@ static int i915_context_status(struct seq_file *m, void *unused)struct drm_info_node *node = m->private;struct drm_device *dev = node->minor->dev;struct drm_i915_private *dev_priv = dev->dev_private; -struct intel_engine_cs *ring; +struct intel_engine_cs *engine;struct intel_context *ctx;int ret, i;
@@ -1966,13 +1965,13 @@ static int i915_context_status(struct seq_file *m, void *unused)if (i915.enable_execlists) {seq_putc (m,'\n' ); -for_each_ring (ring, dev_priv, i) { +for_each_ring (engine, dev_priv, i) {struct drm_i915_gem_object *ctx_obj = ctx->engine[i].state;struct intel_ringbuffer *ringbuf = ctx->engine[i].ringbuf; -seq_printf (m,"%s: " , ring->name); +seq_printf (m,"%s: " , engine->name);if (ctx_obj)describe_obj (m, ctx_obj);if (ringbuf)
@@ -2041,7 +2040,7 @@ static int i915_dump_lrc(struct seq_file *m, void *unused)struct drm_info_node *node = (struct drm_info_node *) m->private;struct drm_device *dev = node->minor->dev;struct drm_i915_private *dev_priv = dev->dev_private; -struct intel_engine_cs *ring; +struct intel_engine_cs *engine;struct intel_context *ctx;int ret, i;
@@ -2056,8 +2055,8 @@ static int i915_dump_lrc(struct seq_file *m, void *unused)list_for_each_entry (ctx, &dev_priv->context_list, link)if (ctx != dev_priv->kernel_context) -for_each_ring (ring, dev_priv, i) -i915_dump_lrc_obj (m, ctx, ring); +for_each_ring (engine, dev_priv, i) +i915_dump_lrc_obj (m, ctx, engine);mutex_unlock (&dev->struct_mutex);
@@ -2069,7 +2068,7 @@ static int i915_execlists(struct seq_file *m, void *data)struct drm_info_node *node = (struct drm_info_node *)m->private;struct drm_device *dev = node->minor->dev;struct drm_i915_private *dev_priv = dev->dev_private; -struct intel_engine_cs *ring; +struct intel_engine_cs *engine;u32 status_pointer;u8 read_pointer;u8 write_pointer;
@@ -2090,22 +2089,22 @@ static int i915_execlists(struct seq_file *m, void *data)intel_runtime_pm_get (dev_priv); -for_each_ring (ring, dev_priv, ring_id) { +for_each_ring (engine, dev_priv, ring_id) {struct drm_i915_gem_request *head_req =NULL ;int count =0 ;unsigned long flags; -seq_printf (m,"%s\n" , ring->name); +seq_printf (m,"%s\n" , engine->name); - status =I915_READ (RING_EXECLIST_STATUS_LO (ring)); - ctx_id =I915_READ (RING_EXECLIST_STATUS_HI (ring)); + status =I915_READ (RING_EXECLIST_STATUS_LO (engine)); + ctx_id =I915_READ (RING_EXECLIST_STATUS_HI (engine));seq_printf (m,"\tExeclist status: 0x%08X, context: %u\n" , status, ctx_id); - status_pointer =I915_READ (RING_CONTEXT_STATUS_PTR (ring)); + status_pointer =I915_READ (RING_CONTEXT_STATUS_PTR (engine));seq_printf (m,"\tStatus pointer: 0x%08X\n" , status_pointer); - read_pointer = ring->next_context_status_buffer; + read_pointer = engine->next_context_status_buffer; write_pointer =GEN8_CSB_WRITE_PTR (status_pointer);if (read_pointer > write_pointer) write_pointer +=GEN8_CSB_ENTRIES ;
@@ -2113,24 +2112,25 @@ static int i915_execlists(struct seq_file *m, void *data) read_pointer, write_pointer);for (i =0 ; i <GEN8_CSB_ENTRIES ; i++) { - status =I915_READ (RING_CONTEXT_STATUS_BUF_LO (ring, i)); - ctx_id =I915_READ (RING_CONTEXT_STATUS_BUF_HI (ring, i)); + status =I915_READ (RING_CONTEXT_STATUS_BUF_LO (engine, i)); + ctx_id =I915_READ (RING_CONTEXT_STATUS_BUF_HI (engine, i));seq_printf (m,"\tStatus buffer %d: 0x%08X, context: %u\n" , i, status, ctx_id); } -spin_lock_irqsave (&ring->execlist_lock, flags); -list_for_each (cursor, &ring->execlist_queue) +spin_lock_irqsave (&engine->execlist_lock, flags); +list_for_each (cursor, &engine->execlist_queue) count++; - head_req =list_first_entry_or_null (&ring->execlist_queue, - struct drm_i915_gem_request, execlist_link); -spin_unlock_irqrestore (&ring->execlist_lock, flags); + head_req =list_first_entry_or_null (&engine->execlist_queue, + struct drm_i915_gem_request, + execlist_link); +spin_unlock_irqrestore (&engine->execlist_lock, flags);seq_printf (m,"\t%d requests in queue\n" , count);if (head_req) {seq_printf (m,"\tHead request id: %u\n" , -intel_execlists_ctx_id (head_req->ctx, ring)); +intel_execlists_ctx_id (head_req->ctx, engine));seq_printf (m,"\tHead request tail: %u\n" , head_req->tail); }
@@ -2246,19 +2246,19 @@ static int per_file_ctx(int id, void *ptr, void *data)static void gen8_ppgtt_info (struct seq_file *m,struct drm_device *dev) {struct drm_i915_private *dev_priv = dev->dev_private; -struct intel_engine_cs *ring; +struct intel_engine_cs *engine;struct i915_hw_ppgtt *ppgtt = dev_priv->mm.aliasing_ppgtt;int unused, i;if (!ppgtt)return ; -for_each_ring (ring, dev_priv, unused) { -seq_printf (m,"%s\n" , ring->name); +for_each_ring (engine, dev_priv, unused) { +seq_printf (m,"%s\n" , engine->name);for (i =0 ; i <4 ; i++) { -u64 pdp =I915_READ (GEN8_RING_PDP_UDW (ring, i)); +u64 pdp =I915_READ (GEN8_RING_PDP_UDW (engine, i)); pdp <<=32 ; - pdp |=I915_READ (GEN8_RING_PDP_LDW (ring, i)); + pdp |=I915_READ (GEN8_RING_PDP_LDW (engine, i));seq_printf (m,"\tPDP%d 0x%016llx\n" , i, pdp); } }
@@ -2267,19 +2267,23 @@ static void gen8_ppgtt_info(struct seq_file *m, struct drm_device *dev)static void gen6_ppgtt_info (struct seq_file *m,struct drm_device *dev) {struct drm_i915_private *dev_priv = dev->dev_private; -struct intel_engine_cs *ring; +struct intel_engine_cs *engine;int i;if (INTEL_INFO (dev)->gen ==6 )seq_printf (m,"GFX_MODE: 0x%08x\n" ,I915_READ (GFX_MODE )); -for_each_ring (ring, dev_priv, i) { -seq_printf (m,"%s\n" , ring->name); +for_each_ring (engine, dev_priv, i) { +seq_printf (m,"%s\n" , engine->name);if (INTEL_INFO (dev)->gen ==7 ) -seq_printf (m,"GFX_MODE: 0x%08x\n" ,I915_READ (RING_MODE_GEN7 (ring))); -seq_printf (m,"PP_DIR_BASE: 0x%08x\n" ,I915_READ (RING_PP_DIR_BASE (ring))); -seq_printf (m,"PP_DIR_BASE_READ: 0x%08x\n" ,I915_READ (RING_PP_DIR_BASE_READ (ring))); -seq_printf (m,"PP_DIR_DCLV: 0x%08x\n" ,I915_READ (RING_PP_DIR_DCLV (ring))); +seq_printf (m,"GFX_MODE: 0x%08x\n" , +I915_READ (RING_MODE_GEN7 (engine))); +seq_printf (m,"PP_DIR_BASE: 0x%08x\n" , +I915_READ (RING_PP_DIR_BASE (engine))); +seq_printf (m,"PP_DIR_BASE_READ: 0x%08x\n" , +I915_READ (RING_PP_DIR_BASE_READ (engine))); +seq_printf (m,"PP_DIR_DCLV: 0x%08x\n" , +I915_READ (RING_PP_DIR_DCLV (engine))); }if (dev_priv->mm.aliasing_ppgtt) {struct i915_hw_ppgtt *ppgtt = dev_priv->mm.aliasing_ppgtt;
@@ -2334,12 +2338,12 @@ out_put:static int count_irq_waiters (struct drm_i915_private *i915) { -struct intel_engine_cs *ring; +struct intel_engine_cs *engine;int count =0 ;int i; -for_each_ring (ring, i915, i) - count += ring->irq_refcount; +for_each_ring (engine, i915, i) + count += engine->irq_refcount;return count; }
@@ -2447,7 +2451,7 @@ static void i915_guc_client_info(struct seq_file *m,struct drm_i915_private *dev_priv, struct i915_guc_client *client) { - struct intel_engine_cs *ring; + struct intel_engine_cs *engine;uint64_t tot =0 ;uint32_t i;
@@ -2462,11 +2466,11 @@ static void i915_guc_client_info(struct seq_file *m,seq_printf (m,"\tFailed doorbell: %u\n" , client->b_fail);seq_printf (m,"\tLast submission result: %d\n" , client->retcode); -for_each_ring (ring, dev_priv, i) { +for_each_ring (engine, dev_priv, i) {seq_printf (m,"\tSubmissions: %llu %s\n" , - client->submissions[ring->guc_id], - ring->name); - tot += client->submissions[ring->guc_id]; + client->submissions[engine->guc_id], + engine->name); + tot += client->submissions[engine->guc_id]; }seq_printf (m,"\tTotal: %llu\n" , tot); }
@@ -2478,7 +2482,7 @@ static int i915_guc_info(struct seq_file *m, void *data)struct drm_i915_private *dev_priv = dev->dev_private;struct intel_guc guc;struct i915_guc_client client = {}; -struct intel_engine_cs *ring; +struct intel_engine_cs *engine;enum intel_ring_id i;u64 total =0 ;
@@ -2502,11 +2506,11 @@ static int i915_guc_info(struct seq_file *m, void *data)seq_printf (m,"GuC last action error code: %d\n" , guc.action_err);seq_printf (m,"\nGuC submissions:\n" ); -for_each_ring (ring, dev_priv, i) { +for_each_ring (engine, dev_priv, i) {seq_printf (m,"\t%-24s: %10llu, last seqno 0x%08x\n" , - ring->name, guc.submissions[ring->guc_id], - guc.last_seqno[ring->guc_id]); - total += guc.submissions[ring->guc_id]; + engine->name, guc.submissions[engine->guc_id], + guc.last_seqno[engine->guc_id]); + total += guc.submissions[engine->guc_id]; }seq_printf (m,"\t%s: %llu\n" ,"Total" , total);
@@ -3128,7 +3132,7 @@ static int i915_semaphore_status(struct seq_file *m, void *unused)struct drm_info_node *node = (struct drm_info_node *) m->private;struct drm_device *dev = node->minor->dev;struct drm_i915_private *dev_priv = dev->dev_private; -struct intel_engine_cs *ring; +struct intel_engine_cs *engine;int num_rings =hweight32 (INTEL_INFO (dev)->ring_mask);int i, j, ret;
@@ -3149,10 +3153,10 @@ static int i915_semaphore_status(struct seq_file *m, void *unused) page =i915_gem_object_get_page (dev_priv->semaphore_obj,0 ); seqno = (uint64_t *)kmap_atomic (page); -for_each_ring (ring, dev_priv, i) { +for_each_ring (engine, dev_priv, i) {uint64_t offset; -seq_printf (m,"%s\n" , ring->name); +seq_printf (m,"%s\n" , engine->name);seq_puts (m," Last signal:" );for (j =0 ; j < num_rings; j++) {
@@ -3174,17 +3178,18 @@ static int i915_semaphore_status(struct seq_file *m, void *unused)kunmap_atomic (seqno); }else {seq_puts (m," Last signal:" ); -for_each_ring (ring, dev_priv, i) +for_each_ring (engine, dev_priv, i)for (j =0 ; j < num_rings; j++)seq_printf (m,"0x%08x\n" , -I915_READ (ring->semaphore.mbox.signal[j])); +I915_READ (engine->semaphore.mbox.signal[j]));seq_putc (m,'\n' ); }seq_puts (m,"\nSync seqno:\n" ); -for_each_ring (ring, dev_priv, i) { +for_each_ring (engine, dev_priv, i) {for (j =0 ; j < num_rings; j++) { -seq_printf (m," 0x%08x " , ring->semaphore.sync_seqno[j]); +seq_printf (m," 0x%08x " , + engine->semaphore.sync_seqno[j]); }seq_putc (m,'\n' ); }
@@ -3226,7 +3231,7 @@ static int i915_wa_registers(struct seq_file *m, void *unused) {int i;int ret; -struct intel_engine_cs *ring; +struct intel_engine_cs *engine;struct drm_info_node *node = (struct drm_info_node *) m->private;struct drm_device *dev = node->minor->dev;struct drm_i915_private *dev_priv = dev->dev_private;
@@ -3239,9 +3244,9 @@ static int i915_wa_registers(struct seq_file *m, void *unused)intel_runtime_pm_get (dev_priv);seq_printf (m,"Workarounds applied: %d\n" , workarounds->count); -for_each_ring (ring, dev_priv, i) +for_each_ring (engine, dev_priv, i)seq_printf (m,"HW whitelist count for %s: %d\n" , - ring->name, workarounds->hw_whitelist_count[i]); + engine->name, workarounds->hw_whitelist_count[i]);for (i =0 ; i < workarounds->count; ++i) {i915_reg_t addr;u32 mask, value, read;
drivers/gpu/drm/i915/i915_gem.c +68 -68
334 lines not on this page · raw message
drivers/gpu/drm/i915/i915_gem_context.c +74 -66
298 lines not on this page · raw message
drivers/gpu/drm/i915/i915_gem_debug.c +8 -7
@@ -36,29 +36,30 @@ i915_verify_lists(struct drm_device *dev)static int warned;struct drm_i915_private *dev_priv =to_i915 (dev);struct drm_i915_gem_object *obj; -struct intel_engine_cs *ring; +struct intel_engine_cs *engine;int err =0 ;int i;if (warned)return 0 ; -for_each_ring (ring, dev_priv, i) { -list_for_each_entry (obj, &ring->active_list, ring_list[ring->id]) { +for_each_ring (engine, dev_priv, i) { +list_for_each_entry (obj, &engine->active_list, + ring_list[engine->id]) {if (obj->base.dev != dev || !atomic_read (&obj->base.refcount.refcount)) {DRM_ERROR ("%s: freed active obj %p\n" , - ring->name, obj); + engine->name, obj); err++;break ; }else if (!obj->active || - obj->last_read_req[ring->id] ==NULL ) { + obj->last_read_req[engine->id] ==NULL ) {DRM_ERROR ("%s: invalid active obj %p\n" , - ring->name, obj); + engine->name, obj); err++; }else if (obj->base.write_domain) {DRM_ERROR ("%s: invalid write obj %p (w %x)\n" , - ring->name, + engine->name, obj, obj->base.write_domain); err++; }
drivers/gpu/drm/i915/i915_gem_execbuffer.c +38 -36
195 lines not on this page · raw message
drivers/gpu/drm/i915/i915_gem_gtt.c +45 -45
193 lines not on this page · raw message
drivers/gpu/drm/i915/i915_gpu_error.c +18 -17
@@ -495,9 +495,9 @@ int i915_error_state_to_str(struct drm_i915_error_state_buf *m,if (obj) {u64 wa_ctx_offset = obj->gtt_offset;u32 *wa_ctx_page = &obj->pages[0 ][0 ]; -struct intel_engine_cs *ring = &dev_priv->ring[RCS ]; -u32 wa_ctx_size = (ring->wa_ctx.indirect_ctx.size + - ring->wa_ctx.per_ctx.size); +struct intel_engine_cs *engine = &dev_priv->ring[RCS ]; +u32 wa_ctx_size = (engine->wa_ctx.indirect_ctx.size + + engine->wa_ctx.per_ctx.size);err_printf (m,"%s --- WA ctx batch buffer = 0x%08llx\n" , dev_priv->ring[i].name, wa_ctx_offset);
@@ -1019,19 +1019,19 @@ static void i915_gem_record_rings(struct drm_device *dev,int i, count;for (i =0 ; i <I915_NUM_RINGS ; i++) { -struct intel_engine_cs *ring = &dev_priv->ring[i]; +struct intel_engine_cs *engine = &dev_priv->ring[i];struct intel_ringbuffer *rbuf; error->ring[i].pid =-1 ; -if (ring->dev ==NULL ) +if (engine->dev ==NULL )continue ; error->ring[i].valid = true; -i915_record_ring_state (dev, error, ring, &error->ring[i]); +i915_record_ring_state (dev, error, engine, &error->ring[i]); - request =i915_gem_find_active_request (ring); + request =i915_gem_find_active_request (engine);if (request) {struct i915_address_space *vm;
@@ -1051,7 +1051,7 @@ static void i915_gem_record_rings(struct drm_device *dev,if (HAS_BROKEN_CS_TLB (dev_priv->dev)) error->ring[i].wa_batchbuffer =i915_error_ggtt_object_create (dev_priv, - ring->scratch.obj); + engine->scratch.obj);if (request->pid) {struct task_struct *task;
@@ -1073,11 +1073,11 @@ static void i915_gem_record_rings(struct drm_device *dev,* executed). */ if (request) - rbuf = request->ctx->engine[ring->id].ringbuf; + rbuf = request->ctx->engine[engine->id].ringbuf;else - rbuf = dev_priv->kernel_context->engine[ring->id].ringbuf; + rbuf = dev_priv->kernel_context->engine[engine->id].ringbuf; }else - rbuf = ring->buffer; + rbuf = engine->buffer; error->ring[i].cpu_ring_head = rbuf->head; error->ring[i].cpu_ring_tail = rbuf->tail;
@@ -1086,18 +1086,19 @@ static void i915_gem_record_rings(struct drm_device *dev,i915_error_ggtt_object_create (dev_priv, rbuf->obj); error->ring[i].hws_page = -i915_error_ggtt_object_create (dev_priv, ring->status_page.obj); +i915_error_ggtt_object_create (dev_priv, + engine->status_page.obj); -if (ring->wa_ctx.obj) { +if (engine->wa_ctx.obj) { error->ring[i].wa_ctx =i915_error_ggtt_object_create (dev_priv, - ring->wa_ctx.obj); + engine->wa_ctx.obj); } -i915_gem_record_active_context (ring, error, &error->ring[i]); +i915_gem_record_active_context (engine, error, &error->ring[i]); count =0 ; -list_for_each_entry (request, &ring->request_list, list) +list_for_each_entry (request, &engine->request_list, list) count++; error->ring[i].num_requests = count;
@@ -1110,7 +1111,7 @@ static void i915_gem_record_rings(struct drm_device *dev, } count =0 ; -list_for_each_entry (request, &ring->request_list, list) { +list_for_each_entry (request, &engine->request_list, list) {struct drm_i915_error_request *erq;if (count >= error->ring[i].num_requests) {
drivers/gpu/drm/i915/i915_guc_submission.c +15 -15
@@ -377,7 +377,7 @@ static void guc_init_ctx_desc(struct intel_guc *guc, struct i915_guc_client *client) {struct drm_i915_private *dev_priv =guc_to_i915 (guc); -struct intel_engine_cs *ring; +struct intel_engine_cs *engine;struct intel_context *ctx = client->owner;struct guc_context_desc desc;struct sg_table *sg;
@@ -390,8 +390,8 @@ static void guc_init_ctx_desc(struct intel_guc *guc, desc.priority = client->priority; desc.db_id = client->doorbell_id; -for_each_ring (ring, dev_priv, i) { -struct guc_execlist_context *lrc = &desc.lrc[ring->guc_id]; +for_each_ring (engine, dev_priv, i) { +struct guc_execlist_context *lrc = &desc.lrc[engine->guc_id];struct drm_i915_gem_object *obj;uint64_t ctx_desc;
@@ -406,14 +406,14 @@ static void guc_init_ctx_desc(struct intel_guc *guc,if (!obj)break ;/* XXX: continue? */ - ctx_desc =intel_lr_context_descriptor (ctx, ring); + ctx_desc =intel_lr_context_descriptor (ctx, engine); lrc->context_desc = (u32 )ctx_desc;/* The state page is after PPHWSP */ lrc->ring_lcra =i915_gem_obj_ggtt_offset (obj) +LRC_STATE_PN *PAGE_SIZE ; lrc->context_id = (client->ctx_index <<GUC_ELC_CTXID_OFFSET ) | - (ring->guc_id <<GUC_ELC_ENGINE_OFFSET ); + (engine->guc_id <<GUC_ELC_ENGINE_OFFSET ); obj = ctx->engine[i].ringbuf->obj;
@@ -422,7 +422,7 @@ static void guc_init_ctx_desc(struct intel_guc *guc, lrc->ring_next_free_location = lrc->ring_begin; lrc->ring_current_tail_pointer_value =0 ; - desc.engines_used |= (1 << ring->guc_id); + desc.engines_used |= (1 << engine->guc_id); }WARN_ON (desc.engines_used ==0 );
@@ -839,7 +839,7 @@ static void guc_create_ads(struct intel_guc *guc)struct guc_ads *ads;struct guc_policies *policies;struct guc_mmio_reg_state *reg_state; -struct intel_engine_cs *ring; +struct intel_engine_cs *engine;struct page *page;u32 size, i;
@@ -867,11 +867,11 @@ static void guc_create_ads(struct intel_guc *guc)* so its address won't change after we've told the GuC where * to find it. */ - ring = &dev_priv->ring[RCS ]; - ads->golden_context_lrca = ring->status_page.gfx_addr; + engine = &dev_priv->ring[RCS ]; + ads->golden_context_lrca = engine->status_page.gfx_addr; -for_each_ring (ring, dev_priv, i) - ads->eng_state_size[ring->guc_id] =intel_lr_context_size (ring); +for_each_ring (engine, dev_priv, i) + ads->eng_state_size[engine->guc_id] =intel_lr_context_size (engine);/* GuC scheduling policies */ policies = (void *)ads +sizeof (struct guc_ads );
@@ -883,12 +883,12 @@ static void guc_create_ads(struct intel_guc *guc)/* MMIO reg state */ reg_state = (void *)policies +sizeof (struct guc_policies ); -for_each_ring (ring, dev_priv, i) { - reg_state->mmio_white_list[ring->guc_id].mmio_start = - ring->mmio_base +GUC_MMIO_WHITE_LIST_START ; +for_each_ring (engine, dev_priv, i) { + reg_state->mmio_white_list[engine->guc_id].mmio_start = + engine->mmio_base +GUC_MMIO_WHITE_LIST_START ;/* Nothing to be saved or restored for now. */ - reg_state->mmio_white_list[ring->guc_id].count =0 ; + reg_state->mmio_white_list[engine->guc_id].count =0 ; } ads->reg_state_addr = ads->scheduler_policies +
drivers/gpu/drm/i915/i915_irq.c +42 -42
172 lines not on this page · raw message
drivers/gpu/drm/i915/intel_display.c +53 -53
227 lines not on this page · raw message
drivers/gpu/drm/i915/intel_guc_loader.c +6 -6
@@ -81,14 +81,14 @@ const char *intel_guc_fw_status_repr(enum intel_guc_fw_status status)static void direct_interrupts_to_host (struct drm_i915_private *dev_priv) { -struct intel_engine_cs *ring; +struct intel_engine_cs *engine;int i, irqs;/* tell all command streamers NOT to forward interrupts and vblank to GuC */ irqs =_MASKED_FIELD (GFX_FORWARD_VBLANK_MASK ,GFX_FORWARD_VBLANK_NEVER ); irqs |=_MASKED_BIT_DISABLE (GFX_INTERRUPT_STEERING ); -for_each_ring (ring, dev_priv, i) -I915_WRITE (RING_MODE_GEN7 (ring), irqs); +for_each_ring (engine, dev_priv, i) +I915_WRITE (RING_MODE_GEN7 (engine), irqs);/* route all GT interrupts to the host */ I915_WRITE (GUC_BCS_RCS_IER ,0 );
@@ -98,14 +98,14 @@ static void direct_interrupts_to_host(struct drm_i915_private *dev_priv)static void direct_interrupts_to_guc (struct drm_i915_private *dev_priv) { -struct intel_engine_cs *ring; +struct intel_engine_cs *engine;int i, irqs;/* tell all command streamers to forward interrupts and vblank to GuC */ irqs =_MASKED_FIELD (GFX_FORWARD_VBLANK_MASK ,GFX_FORWARD_VBLANK_ALWAYS ); irqs |=_MASKED_BIT_ENABLE (GFX_INTERRUPT_STEERING ); -for_each_ring (ring, dev_priv, i) -I915_WRITE (RING_MODE_GEN7 (ring), irqs); +for_each_ring (engine, dev_priv, i) +I915_WRITE (RING_MODE_GEN7 (engine), irqs);/* route USER_INTERRUPT to Host, all others are sent to GuC. */ irqs = GT_RENDER_USER_INTERRUPT << GEN8_RCS_IRQ_SHIFT |
drivers/gpu/drm/i915/intel_lrc.c +109 -107
465 lines not on this page · raw message
drivers/gpu/drm/i915/intel_mocs.c +2 -2
@@ -324,11 +324,11 @@ int intel_rcs_context_init_mocs(struct drm_i915_gem_request *req)if (get_mocs_settings (req->ring->dev, &t)) {struct drm_i915_private *dev_priv = req->i915; -struct intel_engine_cs *ring; +struct intel_engine_cs *engine;enum intel_ring_id ring_id;/* Program the control registers */ -for_each_ring (ring, dev_priv, ring_id) { +for_each_ring (engine, dev_priv, ring_id) { ret =emit_mocs_control_table (req, &t, ring_id);if (ret)return ret;
drivers/gpu/drm/i915/intel_overlay.c +31 -29
138 lines not on this page · raw message
drivers/gpu/drm/i915/intel_pm.c +18 -18
@@ -4815,7 +4815,7 @@ static void gen9_enable_rps(struct drm_device *dev)static void gen9_enable_rc6 (struct drm_device *dev) {struct drm_i915_private *dev_priv = dev->dev_private; -struct intel_engine_cs *ring; +struct intel_engine_cs *engine;uint32_t rc6_mask =0 ;int unused;
@@ -4838,8 +4838,8 @@ static void gen9_enable_rc6(struct drm_device *dev)I915_WRITE (GEN6_RC6_WAKE_RATE_LIMIT ,54 <<16 );I915_WRITE (GEN6_RC_EVALUATION_INTERVAL ,125000 );/* 12500 * 1280ns */ I915_WRITE (GEN6_RC_IDLE_HYSTERSIS ,25 );/* 25 * 1280ns */ -for_each_ring (ring, dev_priv, unused) -I915_WRITE (RING_MAX_IDLE (ring->mmio_base),10 ); +for_each_ring (engine, dev_priv, unused) +I915_WRITE (RING_MAX_IDLE (engine->mmio_base),10 );if (HAS_GUC_UCODE (dev))I915_WRITE (GUC_MAX_IDLE_COUNT ,0xA );
@@ -4885,7 +4885,7 @@ static void gen9_enable_rc6(struct drm_device *dev)static void gen8_enable_rps (struct drm_device *dev) {struct drm_i915_private *dev_priv = dev->dev_private; -struct intel_engine_cs *ring; +struct intel_engine_cs *engine;uint32_t rc6_mask =0 ;int unused;
@@ -4906,8 +4906,8 @@ static void gen8_enable_rps(struct drm_device *dev)I915_WRITE (GEN6_RC6_WAKE_RATE_LIMIT ,40 <<16 );I915_WRITE (GEN6_RC_EVALUATION_INTERVAL ,125000 );/* 12500 * 1280ns */ I915_WRITE (GEN6_RC_IDLE_HYSTERSIS ,25 );/* 25 * 1280ns */ -for_each_ring (ring, dev_priv, unused) -I915_WRITE (RING_MAX_IDLE (ring->mmio_base),10 ); +for_each_ring (engine, dev_priv, unused) +I915_WRITE (RING_MAX_IDLE (engine->mmio_base),10 );I915_WRITE (GEN6_RC_SLEEP ,0 );if (IS_BROADWELL (dev))I915_WRITE (GEN6_RC6_THRESHOLD ,625 );/* 800us/1.28 for TO */
@@ -4967,7 +4967,7 @@ static void gen8_enable_rps(struct drm_device *dev)static void gen6_enable_rps (struct drm_device *dev) {struct drm_i915_private *dev_priv = dev->dev_private; -struct intel_engine_cs *ring; +struct intel_engine_cs *engine;u32 rc6vids, pcu_mbox =0 , rc6_mask =0 ;u32 gtfifodbg;int rc6_mode;
@@ -5003,8 +5003,8 @@ static void gen6_enable_rps(struct drm_device *dev)I915_WRITE (GEN6_RC_EVALUATION_INTERVAL ,125000 );I915_WRITE (GEN6_RC_IDLE_HYSTERSIS ,25 ); -for_each_ring (ring, dev_priv, i) -I915_WRITE (RING_MAX_IDLE (ring->mmio_base),10 ); +for_each_ring (engine, dev_priv, i) +I915_WRITE (RING_MAX_IDLE (engine->mmio_base),10 );I915_WRITE (GEN6_RC_SLEEP ,0 );I915_WRITE (GEN6_RC1e_THRESHOLD,1000 );
@@ -5495,7 +5495,7 @@ static void valleyview_cleanup_gt_powersave(struct drm_device *dev)static void cherryview_enable_rps (struct drm_device *dev) {struct drm_i915_private *dev_priv = dev->dev_private; -struct intel_engine_cs *ring; +struct intel_engine_cs *engine;u32 gtfifodbg, val, rc6_mode =0 , pcbr;int i;
@@ -5522,8 +5522,8 @@ static void cherryview_enable_rps(struct drm_device *dev)I915_WRITE (GEN6_RC_EVALUATION_INTERVAL ,125000 );/* 12500 * 1280ns */ I915_WRITE (GEN6_RC_IDLE_HYSTERSIS ,25 );/* 25 * 1280ns */ -for_each_ring (ring, dev_priv, i) -I915_WRITE (RING_MAX_IDLE (ring->mmio_base),10 ); +for_each_ring (engine, dev_priv, i) +I915_WRITE (RING_MAX_IDLE (engine->mmio_base),10 );I915_WRITE (GEN6_RC_SLEEP ,0 );/* TO threshold set to 500 us ( 0x186 * 1.28 us) */
@@ -5593,7 +5593,7 @@ static void cherryview_enable_rps(struct drm_device *dev)static void valleyview_enable_rps (struct drm_device *dev) {struct drm_i915_private *dev_priv = dev->dev_private; -struct intel_engine_cs *ring; +struct intel_engine_cs *engine;u32 gtfifodbg, val, rc6_mode =0 ;int i;
@@ -5633,8 +5633,8 @@ static void valleyview_enable_rps(struct drm_device *dev)I915_WRITE (GEN6_RC_EVALUATION_INTERVAL ,125000 );I915_WRITE (GEN6_RC_IDLE_HYSTERSIS ,25 ); -for_each_ring (ring, dev_priv, i) -I915_WRITE (RING_MAX_IDLE (ring->mmio_base),10 ); +for_each_ring (engine, dev_priv, i) +I915_WRITE (RING_MAX_IDLE (engine->mmio_base),10 );I915_WRITE (GEN6_RC6_THRESHOLD ,0x557 );
@@ -6010,7 +6010,7 @@ EXPORT_SYMBOL_GPL(i915_gpu_lower);bool i915_gpu_busy (void ) {struct drm_i915_private *dev_priv; -struct intel_engine_cs *ring; +struct intel_engine_cs *engine;bool ret = false;int i;
@@ -6019,8 +6019,8 @@ bool i915_gpu_busy(void) goto out_unlock; dev_priv = i915_mch_dev; -for_each_ring (ring, dev_priv, i) - ret |= !list_empty (&ring->request_list); +for_each_ring (engine, dev_priv, i) + ret |= !list_empty (&engine->request_list); out_unlock:spin_unlock_irq (&mchdev_lock);
drivers/gpu/drm/i915/intel_ringbuffer.c +397 -388
107 lines not on this page · raw message
drivers/gpu/drm/i915/intel_ringbuffer.h +7 -7
Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Part of the diff is not shown here. View the raw message.
PATCH 2/5 drm/i915: Rename intel_engine_cs function parameters
In reply to Tvrtko UrsulinFrom: Tvrtko Ursulin <[email protected]>
From ring to engine. Done via Coccinelle scripts:
@@
identifier func;
@@
func(..., struct intel_engine_cs *
- ring
+ engine
, ...)
{
<...
- ring
+ engine
...>
}
@@
identifier func;
type T;
@@
T func(..., struct intel_engine_cs *
- ring
+ engine
, ...);
--- drivers/gpu/drm/i915/i915_cmd_parser.c | 122 +++--- drivers/gpu/drm/i915/i915_debugfs.c | 16 +- drivers/gpu/drm/i915/i915_drv.h | 18 +- drivers/gpu/drm/i915/i915_gem.c | 86 ++-- drivers/gpu/drm/i915/i915_gem_context.c | 22 +- drivers/gpu/drm/i915/i915_gem_execbuffer.c | 34 +- drivers/gpu/drm/i915/i915_gem_render_state.c | 6 +- drivers/gpu/drm/i915/i915_gem_render_state.h | 2 +- drivers/gpu/drm/i915/i915_gpu_error.c | 97 ++--- drivers/gpu/drm/i915/i915_irq.c | 111 ++--- drivers/gpu/drm/i915/intel_display.c | 8 +- drivers/gpu/drm/i915/intel_lrc.c | 566 ++++++++++++------------ drivers/gpu/drm/i915/intel_lrc.h | 16 +- drivers/gpu/drm/i915/intel_ringbuffer.c | 618 ++++++++++++++------------- drivers/gpu/drm/i915/intel_ringbuffer.h | 54 +-- 15 files changed, 909 insertions(+), 867 deletions(-)
drivers/gpu/drm/i915/i915_cmd_parser.c +61 -61
@@ -555,7 +555,7 @@ static u32 gen7_blt_get_cmd_length_mask(u32 cmd_header)return 0 ; } -static bool validate_cmds_sorted (struct intel_engine_cs *ring, +static bool validate_cmds_sorted (struct intel_engine_cs *engine,const struct drm_i915_cmd_table *cmd_tables,int cmd_table_count) {
@@ -577,7 +577,7 @@ static bool validate_cmds_sorted(struct intel_engine_cs *ring,if (curr < previous) {DRM_ERROR ("CMD: table not sorted ring=%d table=%d entry=%d cmd=0x%08X prev=0x%08X\n" , - ring->id, i, j, curr, previous); + engine->id, i, j, curr, previous); ret = false; }
@@ -611,11 +611,11 @@ static bool check_sorted(int ring_id,return ret; } -static bool validate_regs_sorted (struct intel_engine_cs *ring) +static bool validate_regs_sorted (struct intel_engine_cs *engine) { -return check_sorted (ring->id, ring->reg_table, ring->reg_count) && -check_sorted (ring->id, ring->master_reg_table, - ring->master_reg_count); +return check_sorted (engine->id, engine->reg_table, engine->reg_count) && +check_sorted (engine->id, engine->master_reg_table, + engine->master_reg_count); }struct cmd_node {
@@ -639,13 +639,13 @@ struct cmd_node {*/ #define CMD_HASH_MASK STD_MI_OPCODE_MASK -static int init_hash_table (struct intel_engine_cs *ring, +static int init_hash_table (struct intel_engine_cs *engine,const struct drm_i915_cmd_table *cmd_tables,int cmd_table_count) {int i, j; -hash_init (ring->cmd_hash); +hash_init (engine->cmd_hash);for (i =0 ; i < cmd_table_count; i++) {const struct drm_i915_cmd_table *table = &cmd_tables[i];
@@ -660,7 +660,7 @@ static int init_hash_table(struct intel_engine_cs *ring,return -ENOMEM ; desc_node->desc = desc; -hash_add (ring->cmd_hash, &desc_node->node, +hash_add (engine->cmd_hash, &desc_node->node, desc->cmd.value &CMD_HASH_MASK ); } }
@@ -668,13 +668,13 @@ static int init_hash_table(struct intel_engine_cs *ring,return 0 ; } -static void fini_hash_table (struct intel_engine_cs *ring) +static void fini_hash_table (struct intel_engine_cs *engine) {struct hlist_node *tmp;struct cmd_node *desc_node;int i; -hash_for_each_safe (ring->cmd_hash, i, tmp, desc_node, node) { +hash_for_each_safe (engine->cmd_hash, i, tmp, desc_node, node) {hash_del (&desc_node->node);kfree (desc_node); }
@@ -690,18 +690,18 @@ static void fini_hash_table(struct intel_engine_cs *ring)* * Return: non-zero if initialization fails */ -int i915_cmd_parser_init_ring (struct intel_engine_cs *ring) +int i915_cmd_parser_init_ring (struct intel_engine_cs *engine) {const struct drm_i915_cmd_table *cmd_tables;int cmd_table_count;int ret; -if (!IS_GEN7 (ring->dev)) +if (!IS_GEN7 (engine->dev))return 0 ; -switch (ring->id) { +switch (engine->id) {case RCS : -if (IS_HASWELL (ring->dev)) { +if (IS_HASWELL (engine->dev)) { cmd_tables = hsw_render_ring_cmds; cmd_table_count =ARRAY_SIZE (hsw_render_ring_cmds);
@@ -710,26 +710,26 @@ int i915_cmd_parser_init_ring(struct intel_engine_cs *ring) cmd_table_count =ARRAY_SIZE (gen7_render_cmds); } - ring->reg_table = gen7_render_regs; - ring->reg_count =ARRAY_SIZE (gen7_render_regs); + engine->reg_table = gen7_render_regs; + engine->reg_count =ARRAY_SIZE (gen7_render_regs); -if (IS_HASWELL (ring->dev)) { - ring->master_reg_table = hsw_master_regs; - ring->master_reg_count =ARRAY_SIZE (hsw_master_regs); +if (IS_HASWELL (engine->dev)) { + engine->master_reg_table = hsw_master_regs; + engine->master_reg_count =ARRAY_SIZE (hsw_master_regs); }else { - ring->master_reg_table = ivb_master_regs; - ring->master_reg_count =ARRAY_SIZE (ivb_master_regs); + engine->master_reg_table = ivb_master_regs; + engine->master_reg_count =ARRAY_SIZE (ivb_master_regs); } - ring->get_cmd_length_mask = gen7_render_get_cmd_length_mask; + engine->get_cmd_length_mask = gen7_render_get_cmd_length_mask;break ;case VCS : cmd_tables = gen7_video_cmds; cmd_table_count =ARRAY_SIZE (gen7_video_cmds); - ring->get_cmd_length_mask = gen7_bsd_get_cmd_length_mask; + engine->get_cmd_length_mask = gen7_bsd_get_cmd_length_mask;break ;case BCS : -if (IS_HASWELL (ring->dev)) { +if (IS_HASWELL (engine->dev)) { cmd_tables = hsw_blt_ring_cmds; cmd_table_count =ARRAY_SIZE (hsw_blt_ring_cmds); }else {
@@ -737,44 +737,44 @@ int i915_cmd_parser_init_ring(struct intel_engine_cs *ring) cmd_table_count =ARRAY_SIZE (gen7_blt_cmds); } - ring->reg_table = gen7_blt_regs; - ring->reg_count =ARRAY_SIZE (gen7_blt_regs); + engine->reg_table = gen7_blt_regs; + engine->reg_count =ARRAY_SIZE (gen7_blt_regs); -if (IS_HASWELL (ring->dev)) { - ring->master_reg_table = hsw_master_regs; - ring->master_reg_count =ARRAY_SIZE (hsw_master_regs); +if (IS_HASWELL (engine->dev)) { + engine->master_reg_table = hsw_master_regs; + engine->master_reg_count =ARRAY_SIZE (hsw_master_regs); }else { - ring->master_reg_table = ivb_master_regs; - ring->master_reg_count =ARRAY_SIZE (ivb_master_regs); + engine->master_reg_table = ivb_master_regs; + engine->master_reg_count =ARRAY_SIZE (ivb_master_regs); } - ring->get_cmd_length_mask = gen7_blt_get_cmd_length_mask; + engine->get_cmd_length_mask = gen7_blt_get_cmd_length_mask;break ;case VECS : cmd_tables = hsw_vebox_cmds; cmd_table_count =ARRAY_SIZE (hsw_vebox_cmds);/* VECS can use the same length_mask function as VCS */ - ring->get_cmd_length_mask = gen7_bsd_get_cmd_length_mask; + engine->get_cmd_length_mask = gen7_bsd_get_cmd_length_mask;break ;default :DRM_ERROR ("CMD: cmd_parser_init with unknown ring: %d\n" , - ring->id); + engine->id);BUG (); } -BUG_ON (!validate_cmds_sorted (ring, cmd_tables, cmd_table_count)); -BUG_ON (!validate_regs_sorted (ring)); +BUG_ON (!validate_cmds_sorted (engine, cmd_tables, cmd_table_count)); +BUG_ON (!validate_regs_sorted (engine)); -WARN_ON (!hash_empty (ring->cmd_hash)); +WARN_ON (!hash_empty (engine->cmd_hash)); - ret =init_hash_table (ring, cmd_tables, cmd_table_count); + ret =init_hash_table (engine, cmd_tables, cmd_table_count);if (ret) {DRM_ERROR ("CMD: cmd_parser_init failed!\n" ); -fini_hash_table (ring); +fini_hash_table (engine);return ret; } - ring->needs_cmd_parser = true; + engine->needs_cmd_parser = true;return 0 ; }
@@ -786,21 +786,21 @@ int i915_cmd_parser_init_ring(struct intel_engine_cs *ring)* Releases any resources related to command parsing that may have been * initialized for the specified ring. */ -void i915_cmd_parser_fini_ring (struct intel_engine_cs *ring) +void i915_cmd_parser_fini_ring (struct intel_engine_cs *engine) { -if (!ring->needs_cmd_parser) +if (!engine->needs_cmd_parser)return ; -fini_hash_table (ring); +fini_hash_table (engine); }static const struct drm_i915_cmd_descriptor * -find_cmd_in_table (struct intel_engine_cs *ring, +find_cmd_in_table (struct intel_engine_cs *engine,u32 cmd_header) {struct cmd_node *desc_node; -hash_for_each_possible (ring->cmd_hash, desc_node, node, +hash_for_each_possible (engine->cmd_hash, desc_node, node, cmd_header &CMD_HASH_MASK ) {const struct drm_i915_cmd_descriptor *desc = desc_node->desc;u32 masked_cmd = desc->cmd.mask & cmd_header;
@@ -822,18 +822,18 @@ find_cmd_in_table(struct intel_engine_cs *ring,* ring's default length encoding and returns default_desc. */ static const struct drm_i915_cmd_descriptor * -find_cmd (struct intel_engine_cs *ring, +find_cmd (struct intel_engine_cs *engine,u32 cmd_header,struct drm_i915_cmd_descriptor *default_desc) {const struct drm_i915_cmd_descriptor *desc;u32 mask; - desc =find_cmd_in_table (ring, cmd_header); + desc =find_cmd_in_table (engine, cmd_header);if (desc)return desc; - mask = ring->get_cmd_length_mask (cmd_header); + mask = engine->get_cmd_length_mask (cmd_header);if (!mask)return NULL ;
@@ -963,18 +963,18 @@ unpin_src:* * Return: true if the ring requires software command parsing */ -bool i915_needs_cmd_parser (struct intel_engine_cs *ring) +bool i915_needs_cmd_parser (struct intel_engine_cs *engine) { -if (!ring->needs_cmd_parser) +if (!engine->needs_cmd_parser)return false; -if (!USES_PPGTT (ring->dev)) +if (!USES_PPGTT (engine->dev))return false;return (i915.enable_cmd_parser ==1 ); } -static bool check_cmd(const struct intel_engine_cs *ring, +static bool check_cmd(const struct intel_engine_cs *engine, const struct drm_i915_cmd_descriptor *desc, const u32 *cmd, u32 length, const bool is_master,
@@ -1004,17 +1004,17 @@ static bool check_cmd(const struct intel_engine_cs *ring, offset += step) {const u32 reg_addr = cmd[offset] & desc->reg.mask;const struct drm_i915_reg_descriptor *reg = -find_reg (ring->reg_table, ring->reg_count, +find_reg (engine->reg_table, engine->reg_count, reg_addr);if (!reg && is_master) - reg =find_reg (ring->master_reg_table, - ring->master_reg_count, + reg =find_reg (engine->master_reg_table, + engine->master_reg_count, reg_addr);if (!reg) {DRM_DEBUG_DRIVER ("CMD: Rejected register 0x%08X in command: 0x%08X (ring=%d)\n" , - reg_addr, *cmd, ring->id); + reg_addr, *cmd, engine->id);return false; }
@@ -1087,7 +1087,7 @@ static bool check_cmd(const struct intel_engine_cs *ring, *cmd, desc->bits[i].mask, desc->bits[i].expected, - dword, ring->id); + dword, engine->id);return false; } }
@@ -1113,7 +1113,7 @@ static bool check_cmd(const struct intel_engine_cs *ring,* Return: non-zero if the parser finds violations or otherwise fails; -EACCES * if the batch appears legal but should use hardware parsing */ -int i915_parse_cmds(struct intel_engine_cs *ring, +int i915_parse_cmds(struct intel_engine_cs *engine, struct drm_i915_gem_object *batch_obj, struct drm_i915_gem_object *shadow_batch_obj, u32 batch_start_offset,
@@ -1147,7 +1147,7 @@ int i915_parse_cmds(struct intel_engine_cs *ring,if (*cmd ==MI_BATCH_BUFFER_END )break ; - desc =find_cmd (ring, *cmd, &default_desc); + desc =find_cmd (engine, *cmd, &default_desc);if (!desc) {DRM_DEBUG_DRIVER ("CMD: Unrecognized command: 0x%08X\n" , *cmd);
@@ -1179,7 +1179,7 @@ int i915_parse_cmds(struct intel_engine_cs *ring,break ; } -if (!check_cmd (ring, desc, cmd, length, is_master, +if (!check_cmd (engine, desc, cmd, length, is_master, &oacontrol_set)) { ret = -EINVAL ;break ;
drivers/gpu/drm/i915/i915_debugfs.c +8 -8
@@ -725,11 +725,11 @@ static int i915_gem_request_info(struct seq_file *m, void *data) }static void i915_ring_seqno_info (struct seq_file *m, -struct intel_engine_cs *ring) +struct intel_engine_cs *engine) { -if (ring->get_seqno) { +if (engine->get_seqno) {seq_printf (m,"Current sequence (%s): %x\n" , - ring->name, ring->get_seqno (ring, false)); + engine->name, engine->get_seqno (engine, false)); } }
@@ -1992,22 +1992,22 @@ static int i915_context_status(struct seq_file *m, void *unused)static void i915_dump_lrc_obj (struct seq_file *m,struct intel_context *ctx, -struct intel_engine_cs *ring) +struct intel_engine_cs *engine) {struct page *page;uint32_t *reg_state;int j; -struct drm_i915_gem_object *ctx_obj = ctx->engine[ring->id].state; +struct drm_i915_gem_object *ctx_obj = ctx->engine[engine->id].state;unsigned long ggtt_offset =0 ;if (ctx_obj ==NULL ) {seq_printf (m,"Context on %s with no gem object\n" , - ring->name); + engine->name);return ; } -seq_printf (m,"CONTEXT: %s %u\n" , ring->name, -intel_execlists_ctx_id (ctx, ring)); +seq_printf (m,"CONTEXT: %s %u\n" , engine->name, +intel_execlists_ctx_id (ctx, engine));if (!i915_gem_obj_ggtt_bound (ctx_obj))seq_puts (m,"\tNot bound in GGTT\n" );
drivers/gpu/drm/i915/i915_drv.h +9 -9
@@ -3037,10 +3037,10 @@ int __must_check i915_gem_get_seqno(struct drm_device *dev, u32 *seqno);int __must_check i915_gem_set_seqno (struct drm_device *dev,u32 seqno);struct drm_i915_gem_request * -i915_gem_find_active_request (struct intel_engine_cs *ring); +i915_gem_find_active_request (struct intel_engine_cs *engine);bool i915_gem_retire_requests (struct drm_device *dev); -void i915_gem_retire_requests_ring (struct intel_engine_cs *ring); +void i915_gem_retire_requests_ring (struct intel_engine_cs *engine);int __must_check i915_gem_check_wedge (struct i915_gpu_error *error,bool interruptible);
@@ -3370,10 +3370,10 @@ const char *i915_cache_level_str(struct drm_i915_private *i915, int type);/* i915_cmd_parser.c */ int i915_cmd_parser_get_version (void ); -int i915_cmd_parser_init_ring (struct intel_engine_cs *ring); -void i915_cmd_parser_fini_ring (struct intel_engine_cs *ring); -bool i915_needs_cmd_parser (struct intel_engine_cs *ring); -int i915_parse_cmds(struct intel_engine_cs *ring, +int i915_cmd_parser_init_ring (struct intel_engine_cs *engine); +void i915_cmd_parser_fini_ring (struct intel_engine_cs *engine); +bool i915_needs_cmd_parser (struct intel_engine_cs *engine); +int i915_parse_cmds(struct intel_engine_cs *engine, struct drm_i915_gem_object *batch_obj, struct drm_i915_gem_object *shadow_batch_obj, u32 batch_start_offset,
@@ -3644,11 +3644,11 @@ wait_remaining_ms_from_jiffies(unsigned long timestamp_jiffies, int to_wait_ms) } } -static inline void i915_trace_irq_get (struct intel_engine_cs *ring, +static inline void i915_trace_irq_get (struct intel_engine_cs *engine,struct drm_i915_gem_request *req) { -if (ring->trace_irq_req ==NULL && ring->irq_get (ring)) -i915_gem_request_assign (&ring->trace_irq_req, req); +if (engine->trace_irq_req ==NULL && engine->irq_get (engine)) +i915_gem_request_assign (&engine->trace_irq_req, req); }#endif
drivers/gpu/drm/i915/i915_gem.c +43 -43
210 lines not on this page · raw message
drivers/gpu/drm/i915/i915_gem_context.c +11 -11
@@ -600,7 +600,7 @@ mi_set_context(struct drm_i915_gem_request *req, u32 hw_flags)return ret; } -static inline bool should_skip_switch (struct intel_engine_cs *ring, +static inline bool should_skip_switch (struct intel_engine_cs *engine,struct intel_context *from,struct intel_context *to) {
@@ -608,42 +608,42 @@ static inline bool should_skip_switch(struct intel_engine_cs *ring,return false;if (to->ppgtt && from == to && - !(intel_ring_flag (ring) & to->ppgtt->pd_dirty_rings)) + !(intel_ring_flag (engine) & to->ppgtt->pd_dirty_rings))return true;return false; }static bool -needs_pd_load_pre (struct intel_engine_cs *ring,struct intel_context *to) +needs_pd_load_pre (struct intel_engine_cs *engine,struct intel_context *to) { -struct drm_i915_private *dev_priv = ring->dev->dev_private; +struct drm_i915_private *dev_priv = engine->dev->dev_private;if (!to->ppgtt)return false; -if (INTEL_INFO (ring->dev)->gen <8 ) +if (INTEL_INFO (engine->dev)->gen <8 )return true; -if (ring != &dev_priv->ring[RCS ]) +if (engine != &dev_priv->ring[RCS ])return true;return false; }static bool -needs_pd_load_post (struct intel_engine_cs *ring,struct intel_context *to, -u32 hw_flags) +needs_pd_load_post (struct intel_engine_cs *engine,struct intel_context *to, +u32 hw_flags) { -struct drm_i915_private *dev_priv = ring->dev->dev_private; +struct drm_i915_private *dev_priv = engine->dev->dev_private;if (!to->ppgtt)return false; -if (!IS_GEN8 (ring->dev)) +if (!IS_GEN8 (engine->dev))return false; -if (ring != &dev_priv->ring[RCS ]) +if (engine != &dev_priv->ring[RCS ])return false;if (hw_flags &MI_RESTORE_INHIBIT )
drivers/gpu/drm/i915/i915_gem_execbuffer.c +19 -15
@@ -599,7 +599,7 @@ static bool only_mappable_for_reloc(unsigned int flags)static int i915_gem_execbuffer_reserve_vma (struct i915_vma *vma, -struct intel_engine_cs *ring, +struct intel_engine_cs *engine,bool *need_reloc) {struct drm_i915_gem_object *obj = vma->obj;
@@ -713,7 +713,7 @@ eb_vma_misplaced(struct i915_vma *vma) }static int -i915_gem_execbuffer_reserve (struct intel_engine_cs *ring, +i915_gem_execbuffer_reserve (struct intel_engine_cs *engine,struct list_head *vmas,struct intel_context *ctx,bool *need_relocs)
@@ -723,10 +723,10 @@ i915_gem_execbuffer_reserve(struct intel_engine_cs *ring,struct i915_address_space *vm;struct list_head ordered_vmas;struct list_head pinned_vmas; -bool has_fenced_gpu_access =INTEL_INFO (ring->dev)->gen <4 ; +bool has_fenced_gpu_access =INTEL_INFO (engine->dev)->gen <4 ;int retry; -i915_gem_retire_requests_ring (ring); +i915_gem_retire_requests_ring (engine); vm = list_first_entry(vmas, struct i915_vma, exec_list)->vm;
@@ -788,7 +788,9 @@ i915_gem_execbuffer_reserve(struct intel_engine_cs *ring,if (eb_vma_misplaced (vma)) ret =i915_vma_unbind (vma);else - ret =i915_gem_execbuffer_reserve_vma (vma, ring, need_relocs); + ret =i915_gem_execbuffer_reserve_vma (vma, + engine, + need_relocs);if (ret) goto err; }
@@ -798,7 +800,8 @@ i915_gem_execbuffer_reserve(struct intel_engine_cs *ring,if (drm_mm_node_allocated (&vma->node))continue ; - ret =i915_gem_execbuffer_reserve_vma (vma, ring, need_relocs); + ret =i915_gem_execbuffer_reserve_vma (vma, engine, + need_relocs);if (ret) goto err; }
@@ -821,7 +824,7 @@ static int i915_gem_execbuffer_relocate_slow(struct drm_device *dev, struct drm_i915_gem_execbuffer2 *args, struct drm_file *file, - struct intel_engine_cs *ring, + struct intel_engine_cs *engine, struct eb_vmas *eb, struct drm_i915_gem_exec_object2 *exec, struct intel_context *ctx)
@@ -910,7 +913,8 @@ i915_gem_execbuffer_relocate_slow(struct drm_device *dev, goto err; need_relocs = (args->flags &I915_EXEC_NO_RELOC ) ==0 ; - ret =i915_gem_execbuffer_reserve (ring, &eb->vmas, ctx, &need_relocs); + ret =i915_gem_execbuffer_reserve (engine, &eb->vmas, ctx, + &need_relocs);if (ret) goto err;
@@ -1062,12 +1066,12 @@ validate_exec_list(struct drm_device *dev,static struct intel_context *i915_gem_validate_context (struct drm_device *dev,struct drm_file *file, -struct intel_engine_cs *ring,const u32 ctx_id) +struct intel_engine_cs *engine,const u32 ctx_id) {struct intel_context *ctx =NULL ;struct i915_ctx_hang_stats *hs; -if (ring->id !=RCS && ctx_id !=DEFAULT_CONTEXT_HANDLE ) +if (engine->id !=RCS && ctx_id !=DEFAULT_CONTEXT_HANDLE )return ERR_PTR (-EINVAL ); ctx =i915_gem_context_get (file->driver_priv, ctx_id);
@@ -1080,8 +1084,8 @@ i915_gem_validate_context(struct drm_device *dev, struct drm_file *file,return ERR_PTR (-EIO ); } -if (i915.enable_execlists && !ctx->engine[ring->id].state) { -int ret =intel_lr_context_deferred_alloc (ctx, ring); +if (i915.enable_execlists && !ctx->engine[engine->id].state) { +int ret =intel_lr_context_deferred_alloc (ctx, engine);if (ret) {DRM_DEBUG ("Could not create LRC %u: %d\n" , ctx_id, ret);return ERR_PTR (ret);
@@ -1171,7 +1175,7 @@ i915_reset_gen7_sol_offsets(struct drm_device *dev, }static struct drm_i915_gem_object * -i915_gem_execbuffer_parse(struct intel_engine_cs *ring, +i915_gem_execbuffer_parse(struct intel_engine_cs *engine, struct drm_i915_gem_exec_object2 *shadow_exec_entry, struct eb_vmas *eb, struct drm_i915_gem_object *batch_obj,
@@ -1183,12 +1187,12 @@ i915_gem_execbuffer_parse(struct intel_engine_cs *ring,struct i915_vma *vma;int ret; - shadow_batch_obj =i915_gem_batch_pool_get (&ring->batch_pool, + shadow_batch_obj =i915_gem_batch_pool_get (&engine->batch_pool,PAGE_ALIGN (batch_len));if (IS_ERR (shadow_batch_obj))return shadow_batch_obj; - ret = i915_parse_cmds(ring, + ret = i915_parse_cmds(engine, batch_obj, shadow_batch_obj, batch_start_offset,
drivers/gpu/drm/i915/i915_gem_render_state.c +3 -3
@@ -169,15 +169,15 @@ void i915_gem_render_state_fini(struct render_state *so)drm_gem_object_unreference (&so->obj->base); } -int i915_gem_render_state_prepare (struct intel_engine_cs *ring, +int i915_gem_render_state_prepare (struct intel_engine_cs *engine,struct render_state *so) {int ret; -if (WARN_ON (ring->id !=RCS )) +if (WARN_ON (engine->id !=RCS ))return -ENOENT ; - ret =render_state_init (so, ring->dev); + ret =render_state_init (so, engine->dev);if (ret)return ret;
drivers/gpu/drm/i915/i915_gem_render_state.h +1 -1
@@ -43,7 +43,7 @@ struct render_state {int i915_gem_render_state_init (struct drm_i915_gem_request *req);void i915_gem_render_state_fini (struct render_state *so); -int i915_gem_render_state_prepare (struct intel_engine_cs *ring, +int i915_gem_render_state_prepare (struct intel_engine_cs *engine,struct render_state *so);#endif /* _I915_GEM_RENDER_STATE_H_ */
drivers/gpu/drm/i915/i915_gpu_error.c +49 -48
190 lines not on this page · raw message
drivers/gpu/drm/i915/i915_irq.c +56 -55
271 lines not on this page · raw message
drivers/gpu/drm/i915/intel_display.c +4 -4
@@ -11394,7 +11394,7 @@ static int intel_gen7_queue_flip(struct drm_device *dev,return 0 ; } -static bool use_mmio_flip (struct intel_engine_cs *ring, +static bool use_mmio_flip (struct intel_engine_cs *engine,struct drm_i915_gem_object *obj) {/*
@@ -11405,10 +11405,10 @@ static bool use_mmio_flip(struct intel_engine_cs *ring,* So using MMIO flips there would disrupt this mechanism. */ -if (ring ==NULL ) +if (engine ==NULL )return true; -if (INTEL_INFO (ring->dev)->gen <5 ) +if (INTEL_INFO (engine->dev)->gen <5 )return false;if (i915.use_mmio_flip <0 )
@@ -11422,7 +11422,7 @@ static bool use_mmio_flip(struct intel_engine_cs *ring, false))return true; else - return ring != i915_gem_request_get_ring(obj->last_write_req); + return engine != i915_gem_request_get_ring(obj->last_write_req); } static void skl_do_mmio_flip(struct intel_crtc *intel_crtc,
drivers/gpu/drm/i915/intel_lrc.c +298 -268
1,224 lines not on this page · raw message
drivers/gpu/drm/i915/intel_lrc.h +8 -8
@@ -57,8 +57,8 @@/* Logical Rings */ int intel_logical_ring_alloc_request_extras (struct drm_i915_gem_request *request);int intel_logical_ring_reserve_space (struct drm_i915_gem_request *request); -void intel_logical_ring_stop (struct intel_engine_cs *ring); -void intel_logical_ring_cleanup (struct intel_engine_cs *ring); +void intel_logical_ring_stop (struct intel_engine_cs *engine); +void intel_logical_ring_cleanup (struct intel_engine_cs *engine);int intel_logical_rings_init (struct drm_device *dev);int intel_logical_ring_begin (struct drm_i915_gem_request *req,int num_dwords);
@@ -98,18 +98,18 @@ static inline void intel_logical_ring_emit_reg(struct intel_ringbuffer *ringbuf,#define LRC_STATE_PN (LRC_PPHWSP_PN + 1)void intel_lr_context_free (struct intel_context *ctx); -uint32_t intel_lr_context_size (struct intel_engine_cs *ring); +uint32_t intel_lr_context_size (struct intel_engine_cs *engine);int intel_lr_context_deferred_alloc (struct intel_context *ctx, -struct intel_engine_cs *ring); +struct intel_engine_cs *engine);void intel_lr_context_unpin (struct intel_context *ctx,struct intel_engine_cs *engine);void intel_lr_context_reset (struct drm_device *dev,struct intel_context *ctx);uint64_t intel_lr_context_descriptor (struct intel_context *ctx, -struct intel_engine_cs *ring); +struct intel_engine_cs *engine);u32 intel_execlists_ctx_id (struct intel_context *ctx, -struct intel_engine_cs *ring); +struct intel_engine_cs *engine);/* Execlists */ int intel_sanitize_enable_execlists (struct drm_device *dev,int enable_execlists);
@@ -118,7 +118,7 @@ int intel_execlists_submission(struct i915_execbuffer_params *params,struct drm_i915_gem_execbuffer2 *args, struct list_head *vmas); -void intel_lrc_irq_handler (struct intel_engine_cs *ring); -void intel_execlists_retire_requests (struct intel_engine_cs *ring); +void intel_lrc_irq_handler (struct intel_engine_cs *engine); +void intel_execlists_retire_requests (struct intel_engine_cs *engine);#endif /* _INTEL_LRC_H_ */
drivers/gpu/drm/i915/intel_ringbuffer.c +312 -306
450 lines not on this page · raw message
drivers/gpu/drm/i915/intel_ringbuffer.h +27 -27
54 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Part of the diff is not shown here. View the raw message.
kbuild test robot
build botRe: [PATCH 2/5] drm/i915: Rename intel_engine_cs function parameters
All warnings (new ones prefixed by >>):
Hi Tvrtko,
[auto build test WARNING on drm-intel/for-linux-next]
[also build test WARNING on next-20160310]
[cannot apply to v4.5-rc7]
[if your patch is applied to the wrong git tree, please drop us a note to help improving the system]
url: https://github.com/0day-ci/linux/commits/Tvrtko-Ursulin/drm-i915-Rename-local-struct-intel_engine_cs-variables/20160310-222447 base: git://anongit.freedesktop.org/drm-intel for-linux-next reproduce: make htmldocs
All warnings (new ones prefixed by >>):
include/drm/drm_crtc.h:2144: warning: No description found for parameter 'tv_select_subconnector_property' include/drm/drm_crtc.h:2144: warning: No description found for parameter 'tv_mode_property' include/drm/drm_crtc.h:2144: warning: No description found for parameter 'tv_left_margin_property' include/drm/drm_crtc.h:2144: warning: No description found for parameter 'tv_right_margin_property' include/drm/drm_crtc.h:2144: warning: No description found for parameter 'tv_top_margin_property' include/drm/drm_crtc.h:2144: warning: No description found for parameter 'tv_bottom_margin_property' include/drm/drm_crtc.h:2144: warning: No description found for parameter 'tv_brightness_property' include/drm/drm_crtc.h:2144: warning: No description found for parameter 'tv_contrast_property' include/drm/drm_crtc.h:2144: warning: No description found for parameter 'tv_flicker_reduction_property' include/drm/drm_crtc.h:2144: warning: No description found for parameter 'tv_overscan_property' include/drm/drm_crtc.h:2144: warning: No description found for parameter 'tv_saturation_property' include/drm/drm_crtc.h:2144: warning: No description found for parameter 'tv_hue_property' include/drm/drm_crtc.h:2144: warning: No description found for parameter 'scaling_mode_property' include/drm/drm_crtc.h:2144: warning: No description found for parameter 'aspect_ratio_property' include/drm/drm_crtc.h:2144: warning: No description found for parameter 'dirty_info_property' include/drm/drm_crtc.h:2144: warning: No description found for parameter 'suggested_x_property' include/drm/drm_crtc.h:2144: warning: No description found for parameter 'suggested_y_property' include/drm/drm_crtc.h:2144: warning: No description found for parameter 'allow_fb_modifiers' include/drm/drm_dp_helper.h:749: warning: No description found for parameter 'i2c_nack_count' include/drm/drm_dp_helper.h:749: warning: No description found for parameter 'i2c_defer_count' drivers/gpu/drm/drm_dp_mst_topology.c:2364: warning: No description found for parameter 'connector' include/drm/drm_dp_mst_helper.h:92: warning: No description found for parameter 'cached_edid' include/drm/drm_dp_mst_helper.h:92: warning: No description found for parameter 'has_audio' include/drm/drm_dp_mst_helper.h:466: warning: No description found for parameter 'max_dpcd_transaction_bytes' include/drm/drm_dp_mst_helper.h:466: warning: No description found for parameter 'sink_count' include/drm/drm_dp_mst_helper.h:466: warning: No description found for parameter 'total_slots' include/drm/drm_dp_mst_helper.h:466: warning: No description found for parameter 'avail_slots' include/drm/drm_dp_mst_helper.h:466: warning: No description found for parameter 'total_pbn' include/drm/drm_dp_mst_helper.h:466: warning: No description found for parameter 'qlock' include/drm/drm_dp_mst_helper.h:466: warning: No description found for parameter 'tx_msg_downq' include/drm/drm_dp_mst_helper.h:466: warning: No description found for parameter 'tx_down_in_progress' include/drm/drm_dp_mst_helper.h:466: warning: No description found for parameter 'payload_lock' include/drm/drm_dp_mst_helper.h:466: warning: No description found for parameter 'proposed_vcpis' include/drm/drm_dp_mst_helper.h:466: warning: No description found for parameter 'payloads' include/drm/drm_dp_mst_helper.h:466: warning: No description found for parameter 'payload_mask' include/drm/drm_dp_mst_helper.h:466: warning: No description found for parameter 'vcpi_mask' include/drm/drm_dp_mst_helper.h:466: warning: No description found for parameter 'tx_waitq' include/drm/drm_dp_mst_helper.h:466: warning: No description found for parameter 'work' include/drm/drm_dp_mst_helper.h:466: warning: No description found for parameter 'tx_work' include/drm/drm_dp_mst_helper.h:466: warning: No description found for parameter 'destroy_connector_list' include/drm/drm_dp_mst_helper.h:466: warning: No description found for parameter 'destroy_connector_lock' include/drm/drm_dp_mst_helper.h:466: warning: No description found for parameter 'destroy_connector_work' drivers/gpu/drm/drm_dp_mst_topology.c:2364: warning: No description found for parameter 'connector' drivers/gpu/drm/drm_irq.c:176: warning: No description found for parameter 'flags' include/drm/drmP.h:168: warning: No description found for parameter 'fmt'
include/drm/drmP.h:184: warning: No description found for parameter 'fmt'
include/drm/drmP.h:202: warning: No description found for parameter 'fmt'
include/drm/drmP.h:247: warning: No description found for parameter 'dev'
include/drm/drmP.h:247: warning: No description found for parameter 'data'
include/drm/drmP.h:247: warning: No description found for parameter 'file_priv' include/drm/drmP.h:280: warning: No description found for parameter 'ioctl'
include/drm/drmP.h:280: warning: No description found for parameter '_func'
include/drm/drmP.h:280: warning: No description found for parameter '_flags'
include/drm/drmP.h:362: warning: cannot understand function prototype: 'struct drm_lock_data ' include/drm/drmP.h:415: warning: cannot understand function prototype: 'struct drm_driver ' include/drm/drmP.h:672: warning: cannot understand function prototype: 'struct drm_info_list ' include/drm/drmP.h:682: warning: cannot understand function prototype: 'struct drm_info_node ' include/drm/drmP.h:692: warning: cannot understand function prototype: 'struct drm_minor ' include/drm/drmP.h:740: warning: cannot understand function prototype: 'struct drm_device ' drivers/gpu/drm/i915/intel_runtime_pm.c:2269: warning: No description found for parameter 'resume' drivers/gpu/drm/i915/intel_runtime_pm.c:2269: warning: No description found for parameter 'resume' drivers/gpu/drm/i915/i915_irq.c:2665: warning: No description found for parameter 'wedged' drivers/gpu/drm/i915/i915_irq.c:2665: warning: No description found for parameter 'fmt' drivers/gpu/drm/i915/i915_irq.c:2665: warning: No description found for parameter 'wedged' drivers/gpu/drm/i915/i915_irq.c:2665: warning: No description found for parameter 'fmt' drivers/gpu/drm/i915/i915_irq.c:2665: warning: No description found for parameter 'wedged' drivers/gpu/drm/i915/i915_irq.c:2665: warning: No description found for parameter 'fmt' drivers/gpu/drm/i915/i915_irq.c:2665: warning: No description found for parameter 'wedged' drivers/gpu/drm/i915/i915_irq.c:2665: warning: No description found for parameter 'fmt' drivers/gpu/drm/i915/i915_gem.c:421: warning: No description found for parameter 'dev' drivers/gpu/drm/i915/i915_gem.c:421: warning: No description found for parameter 'data' drivers/gpu/drm/i915/i915_gem.c:421: warning: No description found for parameter 'file' drivers/gpu/drm/i915/i915_gem.c:686: warning: No description found for parameter 'dev' drivers/gpu/drm/i915/i915_gem.c:686: warning: No description found for parameter 'data' drivers/gpu/drm/i915/i915_gem.c:686: warning: No description found for parameter 'file' drivers/gpu/drm/i915/i915_gem.c:767: warning: No description found for parameter 'dev' drivers/gpu/drm/i915/i915_gem.c:767: warning: No description found for parameter 'obj' drivers/gpu/drm/i915/i915_gem.c:767: warning: No description found for parameter 'args' drivers/gpu/drm/i915/i915_gem.c:767: warning: No description found for parameter 'file' drivers/gpu/drm/i915/i915_gem.c:1029: warning: No description found for parameter 'dev' drivers/gpu/drm/i915/i915_gem.c:1029: warning: No description found for parameter 'data' drivers/gpu/drm/i915/i915_gem.c:1029: warning: No description found for parameter 'file' drivers/gpu/drm/i915/i915_gem.c:1245: warning: No description found for parameter 'rps' drivers/gpu/drm/i915/i915_gem.c:1461: warning: No description found for parameter 'req' drivers/gpu/drm/i915/i915_gem.c:1496: warning: No description found for parameter 'obj' drivers/gpu/drm/i915/i915_gem.c:1496: warning: No description found for parameter 'readonly' drivers/gpu/drm/i915/i915_gem.c:1619: warning: No description found for parameter 'dev' drivers/gpu/drm/i915/i915_gem.c:1619: warning: No description found for parameter 'data' drivers/gpu/drm/i915/i915_gem.c:1619: warning: No description found for parameter 'file' drivers/gpu/drm/i915/i915_gem.c:1682: warning: No description found for parameter 'dev' drivers/gpu/drm/i915/i915_gem.c:1682: warning: No description found for parameter 'data' drivers/gpu/drm/i915/i915_gem.c:1682: warning: No description found for parameter 'file' drivers/gpu/drm/i915/i915_gem.c:1727: warning: No description found for parameter 'dev' drivers/gpu/drm/i915/i915_gem.c:1727: warning: No description found for parameter 'data' drivers/gpu/drm/i915/i915_gem.c:1727: warning: No description found for parameter 'file' drivers/gpu/drm/i915/i915_gem.c:2015: warning: No description found for parameter 'dev' drivers/gpu/drm/i915/i915_gem.c:2015: warning: No description found for parameter 'size' drivers/gpu/drm/i915/i915_gem.c:2015: warning: No description found for parameter 'tiling_mode' drivers/gpu/drm/i915/i915_gem.c:2015: warning: No description found for parameter 'fenced' drivers/gpu/drm/i915/i915_gem.c:2015: warning: Excess function parameter 'obj' description in 'i915_gem_get_gtt_alignment'
>> drivers/gpu/drm/i915/i915_gem.c:2914: warning: No description found for parameter 'engine' drivers/gpu/drm/i915/i915_gem.c:3045: warning: No description found for parameter 'obj' drivers/gpu/drm/i915/i915_gem.c:3095: warning: No description found for parameter 'dev' drivers/gpu/drm/i915/i915_gem.c:3095: warning: No description found for parameter 'data' drivers/gpu/drm/i915/i915_gem.c:3095: warning: No description found for parameter 'file' drivers/gpu/drm/i915/i915_gem.c:3095: warning: Excess function parameter 'DRM_IOCTL_ARGS' description in 'i915_gem_wait_ioctl' drivers/gpu/drm/i915/i915_gem.c:3467: warning: No description found for parameter 'obj' drivers/gpu/drm/i915/i915_gem.c:3467: warning: No description found for parameter 'vm' drivers/gpu/drm/i915/i915_gem.c:3467: warning: No description found for parameter 'ggtt_view' drivers/gpu/drm/i915/i915_gem.c:3467: warning: No description found for parameter 'alignment' drivers/gpu/drm/i915/i915_gem.c:3467: warning: No description found for parameter 'flags' drivers/gpu/drm/i915/i915_gem.c:3722: warning: No description found for parameter 'obj' drivers/gpu/drm/i915/i915_gem.c:3722: warning: No description found for parameter 'write' drivers/gpu/drm/i915/i915_gem.c:3797: warning: No description found for parameter 'obj' drivers/gpu/drm/i915/i915_gem.c:3797: warning: No description found for parameter 'cache_level' drivers/gpu/drm/i915/i915_gem.c:4071: warning: No description found for parameter 'obj' drivers/gpu/drm/i915/i915_gem.c:4071: warning: No description found for parameter 'write' >> drivers/gpu/drm/i915/i915_cmd_parser.c:694: warning: No description found for parameter 'engine' >> drivers/gpu/drm/i915/i915_cmd_parser.c:694: warning: Excess function parameter 'ring' description in 'i915_cmd_parser_init_ring' drivers/gpu/drm/i915/i915_cmd_parser.c:790: warning: No description found for parameter 'engine' >> drivers/gpu/drm/i915/i915_cmd_parser.c:790: warning: Excess function parameter 'ring' description in 'i915_cmd_parser_fini_ring' drivers/gpu/drm/i915/i915_cmd_parser.c:967: warning: No description found for parameter 'engine' >> drivers/gpu/drm/i915/i915_cmd_parser.c:967: warning: Excess function parameter 'ring' description in 'i915_needs_cmd_parser' drivers/gpu/drm/i915/i915_cmd_parser.c:1122: warning: No description found for parameter 'engine' >> drivers/gpu/drm/i915/i915_cmd_parser.c:1122: warning: Excess function parameter 'ring' description in 'i915_parse_cmds' >> drivers/gpu/drm/i915/i915_cmd_parser.c:694: warning: No description found for parameter 'engine' >> drivers/gpu/drm/i915/i915_cmd_parser.c:694: warning: Excess function parameter 'ring' description in 'i915_cmd_parser_init_ring' drivers/gpu/drm/i915/i915_cmd_parser.c:790: warning: No description found for parameter 'engine' >> drivers/gpu/drm/i915/i915_cmd_parser.c:790: warning: Excess function parameter 'ring' description in 'i915_cmd_parser_fini_ring' drivers/gpu/drm/i915/i915_cmd_parser.c:967: warning: No description found for parameter 'engine' >> drivers/gpu/drm/i915/i915_cmd_parser.c:967: warning: Excess function parameter 'ring' description in 'i915_needs_cmd_parser' drivers/gpu/drm/i915/i915_cmd_parser.c:1122: warning: No description found for parameter 'engine' >> drivers/gpu/drm/i915/i915_cmd_parser.c:1122: warning: Excess function parameter 'ring' description in 'i915_parse_cmds' >> drivers/gpu/drm/i915/intel_lrc.c:318: warning: No description found for parameter 'engine' >> drivers/gpu/drm/i915/intel_lrc.c:318: warning: Excess function parameter 'ring' description in 'intel_lr_context_descriptor_update' drivers/gpu/drm/i915/intel_lrc.c:355: warning: No description found for parameter 'engine' >> drivers/gpu/drm/i915/intel_lrc.c:355: warning: Excess function parameter 'ring' description in 'intel_execlists_ctx_id' drivers/gpu/drm/i915/intel_lrc.c:550: warning: No description found for parameter 'engine' >> drivers/gpu/drm/i915/intel_lrc.c:550: warning: Excess function parameter 'ring' description in 'intel_lrc_irq_handler' drivers/gpu/drm/i915/intel_lrc.c:950: warning: No description found for parameter 'params' drivers/gpu/drm/i915/intel_lrc.c:950: warning: Excess function parameter 'dev' description in 'intel_execlists_submission' drivers/gpu/drm/i915/intel_lrc.c:950: warning: Excess function parameter 'file' description in 'intel_execlists_submission' drivers/gpu/drm/i915/intel_lrc.c:950: warning: Excess function parameter 'ring' description in 'intel_execlists_submission' drivers/gpu/drm/i915/intel_lrc.c:950: warning: Excess function parameter 'ctx' description in 'intel_execlists_submission' drivers/gpu/drm/i915/intel_lrc.c:950: warning: Excess function parameter 'batch_obj' description in 'intel_execlists_submission' drivers/gpu/drm/i915/intel_lrc.c:950: warning: Excess function parameter 'exec_start' description in 'intel_execlists_submission' drivers/gpu/drm/i915/intel_lrc.c:950: warning: Excess function parameter 'dispatch_flags' description in 'intel_execlists_submission' drivers/gpu/drm/i915/intel_lrc.c:1333: warning: No description found for parameter 'engine' >> drivers/gpu/drm/i915/intel_lrc.c:1333: warning: Excess function parameter 'ring' description in 'gen8_init_indirectctx_bb' drivers/gpu/drm/i915/intel_lrc.c:1396: warning: No description found for parameter 'engine' >> drivers/gpu/drm/i915/intel_lrc.c:1396: warning: Excess function parameter 'ring' description in 'gen8_init_perctx_bb' drivers/gpu/drm/i915/intel_lrc.c:2012: warning: No description found for parameter 'engine' >> drivers/gpu/drm/i915/intel_lrc.c:2012: warning: Excess function parameter 'ring' description in 'intel_logical_ring_cleanup' drivers/gpu/drm/i915/intel_lrc.c:2547: warning: No description found for parameter 'engine' >> drivers/gpu/drm/i915/intel_lrc.c:2547: warning: Excess function parameter 'ring' description in 'intel_lr_context_size' drivers/gpu/drm/i915/intel_lrc.c:2604: warning: No description found for parameter 'engine' >> drivers/gpu/drm/i915/intel_lrc.c:2604: warning: Excess function parameter 'ring' description in 'intel_lr_context_deferred_alloc'
vim +/engine +2914 drivers/gpu/drm/i915/i915_gem.c
4db080f9 Chris Wilson 2013-12-04 2898
9b995c0b Tvrtko Ursulin 2016-03-10 2899 for_each_ring(engine, dev_priv, i)
9b995c0b Tvrtko Ursulin 2016-03-10 2900 i915_gem_reset_ring_cleanup(dev_priv, engine);
dfaae392 Chris Wilson 2010-09-22 2901
acce9ffa Ben Widawsky 2013-12-06 2902 i915_gem_context_reset(dev);
acce9ffa Ben Widawsky 2013-12-06 2903
19b2dbde Chris Wilson 2013-06-12 2904 i915_gem_restore_fences(dev);
b4716185 Chris Wilson 2015-04-27 2905
b4716185 Chris Wilson 2015-04-27 2906 WARN_ON(i915_verify_lists(dev));
673a394b Eric Anholt 2008-07-30 2907 }
673a394b Eric Anholt 2008-07-30 2908
673a394b Eric Anholt 2008-07-30 2909 /**
673a394b Eric Anholt 2008-07-30 2910 * This function clears the request list as sequence numbers are passed.
673a394b Eric Anholt 2008-07-30 2911 */
1cf0ba14 Chris Wilson 2014-05-05 2912 void
732ac404 Tvrtko Ursulin 2016-03-10 2913 i915_gem_retire_requests_ring(struct intel_engine_cs *engine)
673a394b Eric Anholt 2008-07-30 @2914 {
732ac404 Tvrtko Ursulin 2016-03-10 2915 WARN_ON(i915_verify_lists(engine->dev));
673a394b Eric Anholt 2008-07-30 2916
832a3aad Chris Wilson 2015-03-18 2917 /* Retire requests first as we use it above for the early return.
832a3aad Chris Wilson 2015-03-18 2918 * If we retire requests last, we may use a later seqno and so clear
832a3aad Chris Wilson 2015-03-18 2919 * the requests lists without clearing the active list, leading to
832a3aad Chris Wilson 2015-03-18 2920 * confusion.
e9103038 Chris Wilson 2014-01-07 2921 */
732ac404 Tvrtko Ursulin 2016-03-10 2922 while (!list_empty(&engine->request_list)) {:::::: The code at line 2914 was first introduced by commit
:::::: 673a394b1e3b69be886ff24abfd6df97c52e8d08 drm: Add GEM ("graphics execution manager") to i915 driver.
:::::: TO: Eric Anholt <[email protected]> :::::: CC: Dave Airlie <[email protected]>
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 3/5 drm/i915: Rename intel_engine_cs struct members
In reply to Tvrtko UrsulinFrom: Tvrtko Ursulin <[email protected]>
From ring to engine, by the virtue of Coccinelle patch below and a couple manual fixups.
@@
identifier I, J;
@@
struct I {
...
- struct intel_engine_cs *J;
+ struct intel_engine_cs *engine;
...
}
@@
identifier I, J;
@@
struct I {
...
- struct intel_engine_cs J;
+ struct intel_engine_cs engine;
...
}
@@
struct drm_i915_private *d;
@@
(
- d->ring
+ d->engine
)
@@
struct i915_execbuffer_params *p;
@@
(
- p->ring
+ p->engine
)
@@
struct intel_ringbuffer *r;
@@
(
- r->ring
+ r->engine
)
@@
struct drm_i915_gem_request *req;
@@
(
- req->ring
+ req->engine
)
--- drivers/gpu/drm/i915/i915_debugfs.c | 2 +- drivers/gpu/drm/i915/i915_dma.c | 8 +-- drivers/gpu/drm/i915/i915_drv.h | 18 +++---- drivers/gpu/drm/i915/i915_gem.c | 38 +++++++------- drivers/gpu/drm/i915/i915_gem_context.c | 24 ++++----- drivers/gpu/drm/i915/i915_gem_execbuffer.c | 24 ++++----- drivers/gpu/drm/i915/i915_gem_gtt.c | 14 ++--- drivers/gpu/drm/i915/i915_gem_render_state.c | 6 +-- drivers/gpu/drm/i915/i915_gpu_error.c | 18 +++---- drivers/gpu/drm/i915/i915_guc_submission.c | 9 ++-- drivers/gpu/drm/i915/i915_irq.c | 40 +++++++-------- drivers/gpu/drm/i915/intel_display.c | 18 +++---- drivers/gpu/drm/i915/intel_lrc.c | 76 ++++++++++++++-------------- drivers/gpu/drm/i915/intel_mocs.c | 2 +- drivers/gpu/drm/i915/intel_overlay.c | 8 +-- drivers/gpu/drm/i915/intel_pm.c | 2 +- drivers/gpu/drm/i915/intel_ringbuffer.c | 74 +++++++++++++-------------- drivers/gpu/drm/i915/intel_ringbuffer.h | 2 +- 18 files changed, 192 insertions(+), 191 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +1 -1
@@ -984,7 +984,7 @@ static int i915_hws_info(struct seq_file *m, void *data)const u32 *hws;int i; - engine = &dev_priv->ring[(uintptr_t )node->info_ent->data]; + engine = &dev_priv->engine[(uintptr_t )node->info_ent->data]; hws = engine->status_page.page_addr;if (hws ==NULL )return 0 ;
drivers/gpu/drm/i915/i915_dma.c +4 -4
@@ -87,16 +87,16 @@ static int i915_getparam(struct drm_device *dev, void *data, value =1 ;break ;case I915_PARAM_HAS_BSD : - value =intel_ring_initialized (&dev_priv->ring[VCS ]); + value =intel_ring_initialized (&dev_priv->engine[VCS ]);break ;case I915_PARAM_HAS_BLT : - value =intel_ring_initialized (&dev_priv->ring[BCS ]); + value =intel_ring_initialized (&dev_priv->engine[BCS ]);break ;case I915_PARAM_HAS_VEBOX : - value =intel_ring_initialized (&dev_priv->ring[VECS ]); + value =intel_ring_initialized (&dev_priv->engine[VECS ]);break ;case I915_PARAM_HAS_BSD2 : - value =intel_ring_initialized (&dev_priv->ring[VCS2 ]); + value =intel_ring_initialized (&dev_priv->engine[VCS2 ]);break ;case I915_PARAM_HAS_RELAXED_FENCING : value =1 ;
drivers/gpu/drm/i915/i915_drv.h +9 -9
@@ -1726,7 +1726,7 @@ struct i915_execbuffer_params {uint32_t dispatch_flags;uint32_t args_batch_start_offset;uint64_t batch_obj_vm_offset; -struct intel_engine_cs *ring; +struct intel_engine_cs *engine;struct drm_i915_gem_object *batch_obj;struct intel_context *ctx;struct drm_i915_gem_request *request;
@@ -1778,7 +1778,7 @@ struct drm_i915_private {wait_queue_head_t gmbus_wait_queue;struct pci_dev *bridge_dev; -struct intel_engine_cs ring[I915_NUM_RINGS ]; +struct intel_engine_cs engine[I915_NUM_RINGS ];struct drm_i915_gem_object *semaphore_obj;uint32_t last_seqno, next_seqno;
@@ -2042,7 +2042,7 @@ static inline struct drm_i915_private *guc_to_i915(struct intel_guc *guc)/* Iterate over initialised rings */ #define for_each_ring (ring__, dev_priv__, i__) \ for ((i__) = 0; (i__) < I915_NUM_RINGS; (i__)++) \ - for_each_if ((((ring__) = &(dev_priv__)->ring[(i__)]), intel_ring_initialized((ring__)))) + for_each_if ((((ring__) = &(dev_priv__)->engine[(i__)]), intel_ring_initialized((ring__))))enum hdmi_force_audio {HDMI_AUDIO_OFF_DVI =-2 ,/* no aux data for HDMI-DVI converter */
@@ -2257,7 +2257,7 @@ struct drm_i915_gem_request {/** On Which ring this request was generated */ struct drm_i915_private *i915; -struct intel_engine_cs *ring; +struct intel_engine_cs *engine;/** GEM sequence number associated with the previous request, * when the HWS breadcrumb is equal to this the GPU is processing
@@ -2352,7 +2352,7 @@ i915_gem_request_get_seqno(struct drm_i915_gem_request *req)static inline struct intel_engine_cs *i915_gem_request_get_ring (struct drm_i915_gem_request *req) { -return req ? req->ring :NULL ; +return req ? req->engine :NULL ; } static inline struct drm_i915_gem_request *
@@ -2366,7 +2366,7 @@ i915_gem_request_reference(struct drm_i915_gem_request *req)static inline void i915_gem_request_unreference (struct drm_i915_gem_request *req) { -WARN_ON (!mutex_is_locked (&req->ring->dev->struct_mutex)); +WARN_ON (!mutex_is_locked (&req->engine->dev->struct_mutex));kref_put (&req->ref, i915_gem_request_free); }
@@ -2378,7 +2378,7 @@ i915_gem_request_unreference__unlocked(struct drm_i915_gem_request *req)if (!req)return ; - dev = req->ring->dev; + dev = req->engine->dev;if (kref_put_mutex (&req->ref, i915_gem_request_free, &dev->struct_mutex))mutex_unlock (&dev->struct_mutex); }
@@ -3022,14 +3022,14 @@ i915_seqno_passed(uint32_t seq1, uint32_t seq2)static inline bool i915_gem_request_started (struct drm_i915_gem_request *req,bool lazy_coherency) { -u32 seqno = req->ring->get_seqno (req->ring, lazy_coherency); +u32 seqno = req->engine->get_seqno (req->engine, lazy_coherency);return i915_seqno_passed (seqno, req->previous_seqno); }static inline bool i915_gem_request_completed (struct drm_i915_gem_request *req,bool lazy_coherency) { -u32 seqno = req->ring->get_seqno (req->ring, lazy_coherency); +u32 seqno = req->engine->get_seqno (req->engine, lazy_coherency);return i915_seqno_passed (seqno, req->seqno); }
drivers/gpu/drm/i915/i915_gem.c +19 -19
@@ -1193,7 +1193,7 @@ static int __i915_spin_request(struct drm_i915_gem_request *req, int state)* takes to sleep on a request, on the order of a microsecond. */ -if (req->ring->irq_refcount) +if (req->engine->irq_refcount)return -EBUSY ;/* Only spin if we know the GPU is processing this request */
@@ -1381,7 +1381,7 @@ int i915_gem_request_add_to_client(struct drm_i915_gem_request *req,if (req->file_priv)return -EINVAL ; - dev_private = req->ring->dev->dev_private; + dev_private = req->engine->dev->dev_private; file_priv = file->driver_priv;spin_lock (&file_priv->mm.lock);
@@ -1434,7 +1434,7 @@ static void i915_gem_request_retire(struct drm_i915_gem_request *request)static void __i915_gem_request_retire__upto (struct drm_i915_gem_request *req) { -struct intel_engine_cs *engine = req->ring; +struct intel_engine_cs *engine = req->engine;struct drm_i915_gem_request *tmp;lockdep_assert_held (&engine->dev->struct_mutex);
@@ -1466,7 +1466,7 @@ i915_wait_request(struct drm_i915_gem_request *req)BUG_ON (req ==NULL ); - dev = req->ring->dev; + dev = req->engine->dev; dev_priv = dev->dev_private; interruptible = dev_priv->mm.interruptible;
@@ -1505,7 +1505,7 @@ i915_gem_object_wait_rendering(struct drm_i915_gem_object *obj,if (ret)return ret; - i = obj->last_write_req->ring->id; + i = obj->last_write_req->engine->id;if (obj->last_read_req[i] == obj->last_write_req)i915_gem_object_retire__read (obj, i);else
@@ -1532,7 +1532,7 @@ static void i915_gem_object_retire_request(struct drm_i915_gem_object *obj, struct drm_i915_gem_request *req) { - int ring = req->ring->id; + int ring = req->engine->id;if (obj->last_read_req[ring] == req)i915_gem_object_retire__read (obj, ring);
@@ -2423,7 +2423,7 @@ static void i915_gem_object_retire__write(struct drm_i915_gem_object *obj) {RQ_BUG_ON (obj->last_write_req ==NULL ); -RQ_BUG_ON (!(obj->active &intel_ring_flag (obj->last_write_req->ring))); +RQ_BUG_ON (!(obj->active &intel_ring_flag (obj->last_write_req->engine)));i915_gem_request_assign (&obj->last_write_req,NULL );intel_fb_obj_flush (obj, true,ORIGIN_CS );
@@ -2440,7 +2440,7 @@ i915_gem_object_retire__read(struct drm_i915_gem_object *obj, int ring)list_del_init (&obj->ring_list[ring]);i915_gem_request_assign (&obj->last_read_req[ring],NULL ); -if (obj->last_write_req && obj->last_write_req->ring->id == ring) +if (obj->last_write_req && obj->last_write_req->engine->id == ring)i915_gem_object_retire__write (obj); obj->active &= ~(1 << ring);
@@ -2551,7 +2551,7 @@ void __i915_add_request(struct drm_i915_gem_request *request,if (WARN_ON (request ==NULL ))return ; - engine = request->ring; + engine = request->engine; dev_priv = engine->dev->dev_private; ringbuf = request->ringbuf;
@@ -2680,7 +2680,7 @@ void i915_gem_request_free(struct kref *req_ref)if (ctx) {if (i915.enable_execlists && ctx != req->i915->kernel_context) -intel_lr_context_unpin (ctx, req->ring); +intel_lr_context_unpin (ctx, req->engine);i915_gem_context_unreference (ctx); }
@@ -2712,7 +2712,7 @@ __i915_gem_request_alloc(struct intel_engine_cs *engine,kref_init (&req->ref); req->i915 = dev_priv; - req->ring = engine; + req->engine = engine; req->ctx = ctx;i915_gem_context_reference (req->ctx);
@@ -4364,10 +4364,10 @@ i915_gem_busy_ioctl(struct drm_device *dev, void *data, req = obj->last_read_req[i];if (req) - args->busy |=1 << (16 + req->ring->exec_id); + args->busy |=1 << (16 + req->engine->exec_id); }if (obj->last_write_req) - args->busy |= obj->last_write_req->ring->exec_id; + args->busy |= obj->last_write_req->engine->exec_id; } unref:
@@ -4697,7 +4697,7 @@ err:int i915_gem_l3_remap (struct drm_i915_gem_request *req,int slice) { -struct intel_engine_cs *engine = req->ring; +struct intel_engine_cs *engine = req->engine;struct drm_device *dev = engine->dev;struct drm_i915_private *dev_priv = dev->dev_private;u32 *remap_info = dev_priv->l3_parity.remap_info[slice];
@@ -4814,13 +4814,13 @@ int i915_gem_init_rings(struct drm_device *dev)return 0 ; cleanup_vebox_ring: -intel_cleanup_ring_buffer (&dev_priv->ring[VECS ]); +intel_cleanup_ring_buffer (&dev_priv->engine[VECS ]); cleanup_blt_ring: -intel_cleanup_ring_buffer (&dev_priv->ring[BCS ]); +intel_cleanup_ring_buffer (&dev_priv->engine[BCS ]); cleanup_bsd_ring: -intel_cleanup_ring_buffer (&dev_priv->ring[VCS ]); +intel_cleanup_ring_buffer (&dev_priv->engine[VCS ]); cleanup_render_ring: -intel_cleanup_ring_buffer (&dev_priv->ring[RCS ]); +intel_cleanup_ring_buffer (&dev_priv->engine[RCS ]);return ret; }
@@ -5056,7 +5056,7 @@ i915_gem_load_init(struct drm_device *dev)INIT_LIST_HEAD (&dev_priv->mm.bound_list);INIT_LIST_HEAD (&dev_priv->mm.fence_list);for (i =0 ; i <I915_NUM_RINGS ; i++) -init_ring_lists (&dev_priv->ring[i]); +init_ring_lists (&dev_priv->engine[i]);for (i =0 ; i <I915_MAX_NUM_FENCES ; i++)INIT_LIST_HEAD (&dev_priv->fence_regs[i].lru_list); INIT_DELAYED_WORK(&dev_priv->mm.retire_work,
drivers/gpu/drm/i915/i915_gem_context.c +12 -12
@@ -346,7 +346,7 @@ void i915_gem_context_reset(struct drm_device *dev) }for (i =0 ; i <I915_NUM_RINGS ; i++) { -struct intel_engine_cs *engine = &dev_priv->ring[i]; +struct intel_engine_cs *engine = &dev_priv->engine[i];if (engine->last_context) {i915_gem_context_unpin (engine->last_context, engine);
@@ -421,13 +421,13 @@ void i915_gem_context_fini(struct drm_device *dev)* to default context. So we need to unreference the base object once * to offset the do_switch part, so that i915_gem_context_unreference() * can then free the base object correctly. */ -WARN_ON (!dev_priv->ring[RCS ].last_context); +WARN_ON (!dev_priv->engine[RCS ].last_context);i915_gem_object_ggtt_unpin (dctx->legacy_hw_ctx.rcs_state); }for (i =I915_NUM_RINGS ; --i >=0 ;) { -struct intel_engine_cs *engine = &dev_priv->ring[i]; +struct intel_engine_cs *engine = &dev_priv->engine[i];if (engine->last_context) {i915_gem_context_unpin (engine->last_context, engine);
@@ -441,7 +441,7 @@ void i915_gem_context_fini(struct drm_device *dev)int i915_gem_context_enable (struct drm_i915_gem_request *req) { -struct intel_engine_cs *engine = req->ring; +struct intel_engine_cs *engine = req->engine;int ret;if (i915.enable_execlists) {
@@ -510,7 +510,7 @@ i915_gem_context_get(struct drm_i915_file_private *file_priv, u32 id)static inline int mi_set_context (struct drm_i915_gem_request *req,u32 hw_flags) { -struct intel_engine_cs *engine = req->ring; +struct intel_engine_cs *engine = req->engine;u32 flags = hw_flags |MI_MM_SPACE_GTT ;const int num_rings = /* Use an extended w/a on ivb+ if signalling from other rings */
@@ -625,7 +625,7 @@ needs_pd_load_pre(struct intel_engine_cs *engine, struct intel_context *to)if (INTEL_INFO (engine->dev)->gen <8 )return true; -if (engine != &dev_priv->ring[RCS ]) +if (engine != &dev_priv->engine[RCS ])return true;return false;
@@ -643,7 +643,7 @@ needs_pd_load_post(struct intel_engine_cs *engine, struct intel_context *to,if (!IS_GEN8 (engine->dev))return false; -if (engine != &dev_priv->ring[RCS ]) +if (engine != &dev_priv->engine[RCS ])return false;if (hw_flags &MI_RESTORE_INHIBIT )
@@ -655,14 +655,14 @@ needs_pd_load_post(struct intel_engine_cs *engine, struct intel_context *to,static int do_switch (struct drm_i915_gem_request *req) {struct intel_context *to = req->ctx; -struct intel_engine_cs *engine = req->ring; +struct intel_engine_cs *engine = req->engine;struct drm_i915_private *dev_priv = engine->dev->dev_private;struct intel_context *from = engine->last_context;u32 hw_flags =0 ;bool uninitialized = false;int ret, i; -if (from !=NULL && engine == &dev_priv->ring[RCS ]) { +if (from !=NULL && engine == &dev_priv->engine[RCS ]) {BUG_ON (from->legacy_hw_ctx.rcs_state ==NULL );BUG_ON (!i915_gem_obj_is_pinned (from->legacy_hw_ctx.rcs_state)); }
@@ -671,7 +671,7 @@ static int do_switch(struct drm_i915_gem_request *req)return 0 ;/* Trying to pin first makes error handling easier. */ -if (engine == &dev_priv->ring[RCS ]) { +if (engine == &dev_priv->engine[RCS ]) { ret =i915_gem_obj_ggtt_pin (to->legacy_hw_ctx.rcs_state,get_context_alignment (engine->dev),0 );
@@ -700,7 +700,7 @@ static int do_switch(struct drm_i915_gem_request *req) to->ppgtt->pd_dirty_rings &= ~intel_ring_flag (engine); } -if (engine != &dev_priv->ring[RCS ]) { +if (engine != &dev_priv->engine[RCS ]) {if (from)i915_gem_context_unreference (from); goto done;
@@ -828,7 +828,7 @@ unpin_out:*/ int i915_switch_context (struct drm_i915_gem_request *req) { -struct intel_engine_cs *engine = req->ring; +struct intel_engine_cs *engine = req->engine;struct drm_i915_private *dev_priv = engine->dev->dev_private;WARN_ON (i915.enable_execlists);
drivers/gpu/drm/i915/i915_gem_execbuffer.c +12 -12
@@ -942,7 +942,7 @@ static int i915_gem_execbuffer_move_to_gpu(struct drm_i915_gem_request *req, struct list_head *vmas) { - const unsigned other_rings = ~intel_ring_flag(req->ring); + const unsigned other_rings = ~intel_ring_flag(req->engine);struct i915_vma *vma;uint32_t flush_domains =0 ;bool flush_chipset = false;
@@ -952,7 +952,7 @@ i915_gem_execbuffer_move_to_gpu(struct drm_i915_gem_request *req,struct drm_i915_gem_object *obj = vma->obj;if (obj->active & other_rings) { - ret =i915_gem_object_sync (obj, req->ring, &req); + ret =i915_gem_object_sync (obj, req->engine, &req);if (ret)return ret; }
@@ -964,7 +964,7 @@ i915_gem_execbuffer_move_to_gpu(struct drm_i915_gem_request *req, }if (flush_chipset) -i915_gem_chipset_flush (req->ring->dev); +i915_gem_chipset_flush (req->engine->dev);if (flush_domains &I915_GEM_DOMAIN_GTT )wmb ();
@@ -1140,7 +1140,7 @@ void i915_gem_execbuffer_retire_commands(struct i915_execbuffer_params *params) {/* Unconditionally force add_request to emit a full flush. */ - params->ring->gpu_caches_dirty = true; + params->engine->gpu_caches_dirty = true;/* Add a breadcrumb for the completion of the batch buffer */ __i915_add_request (params->request, params->batch_obj, true);
@@ -1150,11 +1150,11 @@ static int i915_reset_gen7_sol_offsets(struct drm_device *dev, struct drm_i915_gem_request *req) { - struct intel_engine_cs *engine = req->ring; + struct intel_engine_cs *engine = req->engine;struct drm_i915_private *dev_priv = dev->dev_private;int ret, i; -if (!IS_GEN7 (dev) || engine != &dev_priv->ring[RCS ]) { +if (!IS_GEN7 (dev) || engine != &dev_priv->engine[RCS ]) {DRM_DEBUG ("sol reset is gen7/rcs only\n" );return -EINVAL ; }
@@ -1233,7 +1233,7 @@ i915_gem_ringbuffer_submission(struct i915_execbuffer_params *params, struct list_head *vmas) {struct drm_device *dev = params->dev; -struct intel_engine_cs *engine = params->ring; +struct intel_engine_cs *engine = params->engine;struct drm_i915_private *dev_priv = dev->dev_private;u64 exec_start, exec_len;int instp_mode;
@@ -1257,7 +1257,7 @@ i915_gem_ringbuffer_submission(struct i915_execbuffer_params *params,case I915_EXEC_CONSTANTS_REL_GENERAL :case I915_EXEC_CONSTANTS_ABSOLUTE :case I915_EXEC_CONSTANTS_REL_SURFACE : -if (instp_mode !=0 && engine != &dev_priv->ring[RCS ]) { +if (instp_mode !=0 && engine != &dev_priv->engine[RCS ]) {DRM_DEBUG ("non-0 rel constants mode on non-RCS\n" );return -EINVAL ; }
@@ -1284,7 +1284,7 @@ i915_gem_ringbuffer_submission(struct i915_execbuffer_params *params,return -EINVAL ; } -if (engine == &dev_priv->ring[RCS ] && +if (engine == &dev_priv->engine[RCS ] && instp_mode != dev_priv->relative_constants_mode) { ret =intel_ring_begin (params->request,4 );if (ret)
@@ -1412,9 +1412,9 @@ eb_select_ring(struct drm_i915_private *dev_priv,return -EINVAL ; } - *ring = &dev_priv->ring[_VCS (bsd_idx)]; + *ring = &dev_priv->engine[_VCS (bsd_idx)]; }else { - *ring = &dev_priv->ring[user_ring_map[user_ring_id]]; + *ring = &dev_priv->engine[user_ring_map[user_ring_id]]; }if (!intel_ring_initialized (*ring)) {
@@ -1632,7 +1632,7 @@ i915_gem_do_execbuffer(struct drm_device *dev, void *data,*/ params->dev = dev; params->file = file; - params->ring = engine; + params->engine = engine; params->dispatch_flags = dispatch_flags; params->batch_obj = batch_obj; params->ctx = ctx;
drivers/gpu/drm/i915/i915_gem_gtt.c +7 -7
@@ -658,7 +658,7 @@ static int gen8_write_pdp(struct drm_i915_gem_request *req, unsigned entry, dma_addr_t addr) { -struct intel_engine_cs *engine = req->ring; +struct intel_engine_cs *engine = req->engine;int ret;BUG_ON (entry >=4 );
@@ -1650,7 +1650,7 @@ static uint32_t get_pd_offset(struct i915_hw_ppgtt *ppgtt)static int hsw_mm_switch (struct i915_hw_ppgtt *ppgtt,struct drm_i915_gem_request *req) { -struct intel_engine_cs *engine = req->ring; +struct intel_engine_cs *engine = req->engine;int ret;/* NB: TLBs must be flushed and invalidated before a switch */
@@ -1676,7 +1676,7 @@ static int hsw_mm_switch(struct i915_hw_ppgtt *ppgtt,static int vgpu_mm_switch (struct i915_hw_ppgtt *ppgtt,struct drm_i915_gem_request *req) { -struct intel_engine_cs *engine = req->ring; +struct intel_engine_cs *engine = req->engine;struct drm_i915_private *dev_priv =to_i915 (ppgtt->base.dev);I915_WRITE (RING_PP_DIR_DCLV (engine),PP_DIR_DCLV_2G );
@@ -1687,7 +1687,7 @@ static int vgpu_mm_switch(struct i915_hw_ppgtt *ppgtt,static int gen7_mm_switch (struct i915_hw_ppgtt *ppgtt,struct drm_i915_gem_request *req) { -struct intel_engine_cs *engine = req->ring; +struct intel_engine_cs *engine = req->engine;int ret;/* NB: TLBs must be flushed and invalidated before a switch */
@@ -1720,7 +1720,7 @@ static int gen7_mm_switch(struct i915_hw_ppgtt *ppgtt,static int gen6_mm_switch (struct i915_hw_ppgtt *ppgtt,struct drm_i915_gem_request *req) { -struct intel_engine_cs *engine = req->ring; +struct intel_engine_cs *engine = req->engine;struct drm_device *dev = ppgtt->base.dev;struct drm_i915_private *dev_priv = dev->dev_private;
@@ -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->ring->dev->dev_private; +struct drm_i915_private *dev_priv = req->engine->dev->dev_private;struct i915_hw_ppgtt *ppgtt = dev_priv->mm.aliasing_ppgtt;if (i915.enable_execlists)
@@ -2309,7 +2309,7 @@ void i915_check_and_clear_faults(struct drm_device *dev) fault_reg & ~RING_FAULT_VALID); } } -POSTING_READ (RING_FAULT_REG (&dev_priv->ring[RCS ])); +POSTING_READ (RING_FAULT_REG (&dev_priv->engine[RCS ])); }static void i915_ggtt_flush (struct drm_i915_private *dev_priv)
drivers/gpu/drm/i915/i915_gem_render_state.c +3 -3
@@ -198,21 +198,21 @@ int i915_gem_render_state_init(struct drm_i915_gem_request *req)struct render_state so;int ret; - ret =i915_gem_render_state_prepare (req->ring, &so); + ret =i915_gem_render_state_prepare (req->engine, &so);if (ret)return ret;if (so.rodata ==NULL )return 0 ; - ret = req->ring->dispatch_execbuffer (req, so.ggtt_offset, + ret = req->engine->dispatch_execbuffer (req, so.ggtt_offset, so.rodata->batch_items *4 ,I915_DISPATCH_SECURE );if (ret) goto out;if (so.aux_batch_size >8 ) { - ret = req->ring->dispatch_execbuffer(req, + ret = req->engine->dispatch_execbuffer(req, (so.ggtt_offset + so.aux_batch_offset), so.aux_batch_size,
drivers/gpu/drm/i915/i915_gpu_error.c +9 -9
@@ -431,7 +431,7 @@ int i915_error_state_to_str(struct drm_i915_error_state_buf *m,for (i =0 ; i <ARRAY_SIZE (error->ring); i++) { obj = error->ring[i].batchbuffer;if (obj) { -err_puts (m, dev_priv->ring[i].name); +err_puts (m, dev_priv->engine[i].name);if (error->ring[i].pid !=-1 ) err_printf(m, " (submitted by %s [%d])", error->ring[i].comm,
@@ -445,14 +445,14 @@ int i915_error_state_to_str(struct drm_i915_error_state_buf *m, obj = error->ring[i].wa_batchbuffer;if (obj) {err_printf (m,"%s (w/a) --- gtt_offset = 0x%08x\n" , - dev_priv->ring[i].name, + dev_priv->engine[i].name,lower_32_bits (obj->gtt_offset));print_error_obj (m, obj); }if (error->ring[i].num_requests) {err_printf (m,"%s --- %d requests\n" , - dev_priv->ring[i].name, + dev_priv->engine[i].name, error->ring[i].num_requests);for (j =0 ; j < error->ring[i].num_requests; j++) { err_printf(m, " seqno 0x%08x, emitted %ld, tail 0x%08x\n",
@@ -464,7 +464,7 @@ int i915_error_state_to_str(struct drm_i915_error_state_buf *m,if ((obj = error->ring[i].ringbuffer)) {err_printf (m,"%s --- ringbuffer = 0x%08x\n" , - dev_priv->ring[i].name, + dev_priv->engine[i].name,lower_32_bits (obj->gtt_offset));print_error_obj (m, obj); }
@@ -478,7 +478,7 @@ int i915_error_state_to_str(struct drm_i915_error_state_buf *m, hws_page = &obj->pages[LRC_PPHWSP_PN ][0 ]; }err_printf (m,"%s --- HW Status = 0x%08llx\n" , - dev_priv->ring[i].name, hws_offset); + dev_priv->engine[i].name, hws_offset); offset =0 ;for (elt =0 ; elt <PAGE_SIZE /16 ; elt +=4 ) { err_printf(m, "[%04x] %08x %08x %08x %08x\n",
@@ -495,12 +495,12 @@ int i915_error_state_to_str(struct drm_i915_error_state_buf *m,if (obj) {u64 wa_ctx_offset = obj->gtt_offset;u32 *wa_ctx_page = &obj->pages[0 ][0 ]; -struct intel_engine_cs *engine = &dev_priv->ring[RCS ]; +struct intel_engine_cs *engine = &dev_priv->engine[RCS ];u32 wa_ctx_size = (engine->wa_ctx.indirect_ctx.size + engine->wa_ctx.per_ctx.size);err_printf (m,"%s --- WA ctx batch buffer = 0x%08llx\n" , - dev_priv->ring[i].name, wa_ctx_offset); + dev_priv->engine[i].name, wa_ctx_offset); offset =0 ;for (elt =0 ; elt < wa_ctx_size; elt +=4 ) { err_printf(m, "[%04x] %08x %08x %08x %08x\n",
@@ -515,7 +515,7 @@ int i915_error_state_to_str(struct drm_i915_error_state_buf *m,if ((obj = error->ring[i].ctx)) {err_printf (m,"%s --- HW Context = 0x%08x\n" , - dev_priv->ring[i].name, + dev_priv->engine[i].name,lower_32_bits (obj->gtt_offset));print_error_obj (m, obj); }
@@ -1020,7 +1020,7 @@ static void i915_gem_record_rings(struct drm_device *dev,int i, count;for (i =0 ; i <I915_NUM_RINGS ; i++) { -struct intel_engine_cs *engine = &dev_priv->ring[i]; +struct intel_engine_cs *engine = &dev_priv->engine[i];struct intel_ringbuffer *rbuf; error->ring[i].pid =-1 ;
drivers/gpu/drm/i915/i915_guc_submission.c +5 -4
@@ -542,11 +542,12 @@ static int guc_add_workqueue_item(struct i915_guc_client *gc, wq_len =sizeof (struct guc_wq_item ) /sizeof (u32) -1 ; wqi->header =WQ_TYPE_INORDER | (wq_len <<WQ_LEN_SHIFT ) | - (rq->ring->guc_id <<WQ_TARGET_SHIFT ) | + (rq->engine->guc_id <<WQ_TARGET_SHIFT ) |WQ_NO_WCFLUSH_WAIT ;/* The GuC wants only the low-order word of the context descriptor */ - wqi->context_desc = (u32 )intel_lr_context_descriptor (rq->ctx, rq->ring); + wqi->context_desc = (u32 )intel_lr_context_descriptor (rq->ctx, + rq->engine);/* The GuC firmware wants the tail index in QWords, not bytes */ tail = rq->ringbuf->tail >>3 ;
@@ -569,7 +570,7 @@ int i915_guc_submit(struct i915_guc_client *client, struct drm_i915_gem_request *rq) {struct intel_guc *guc = client->guc; -unsigned int engine_id = rq->ring->guc_id; +unsigned int engine_id = rq->engine->guc_id;int q_ret, b_ret; q_ret =guc_add_workqueue_item (client, rq);
@@ -867,7 +868,7 @@ static void guc_create_ads(struct intel_guc *guc)* so its address won't change after we've told the GuC where * to find it. */ - engine = &dev_priv->ring[RCS ]; + engine = &dev_priv->engine[RCS ]; ads->golden_context_lrca = engine->status_page.gfx_addr;for_each_ring (engine, dev_priv, i)
drivers/gpu/drm/i915/i915_irq.c +20 -20
@@ -1291,9 +1291,9 @@ static void ilk_gt_irq_handler(struct drm_device *dev, {if (gt_iir & (GT_RENDER_USER_INTERRUPT |GT_RENDER_PIPECTL_NOTIFY_INTERRUPT )) -notify_ring (&dev_priv->ring[RCS ]); +notify_ring (&dev_priv->engine[RCS ]);if (gt_iir &ILK_BSD_USER_INTERRUPT ) -notify_ring (&dev_priv->ring[VCS ]); +notify_ring (&dev_priv->engine[VCS ]); } static void snb_gt_irq_handler(struct drm_device *dev,
@@ -1303,11 +1303,11 @@ static void snb_gt_irq_handler(struct drm_device *dev,if (gt_iir & (GT_RENDER_USER_INTERRUPT |GT_RENDER_PIPECTL_NOTIFY_INTERRUPT )) -notify_ring (&dev_priv->ring[RCS ]); +notify_ring (&dev_priv->engine[RCS ]);if (gt_iir >_BSD_USER_INTERRUPT ) -notify_ring (&dev_priv->ring[VCS ]); +notify_ring (&dev_priv->engine[VCS ]);if (gt_iir >_BLT_USER_INTERRUPT ) -notify_ring (&dev_priv->ring[BCS ]); +notify_ring (&dev_priv->engine[BCS ]); if (gt_iir & (GT_BLT_CS_ERROR_INTERRUPT | GT_BSD_CS_ERROR_INTERRUPT |
@@ -1338,11 +1338,11 @@ static irqreturn_t gen8_gt_irq_handler(struct drm_i915_private *dev_priv,I915_WRITE_FW (GEN8_GT_IIR (0 ), iir); ret =IRQ_HANDLED ; -gen8_cs_irq_handler (&dev_priv->ring[RCS ], - iir,GEN8_RCS_IRQ_SHIFT ); +gen8_cs_irq_handler (&dev_priv->engine[RCS ], + iir,GEN8_RCS_IRQ_SHIFT ); -gen8_cs_irq_handler (&dev_priv->ring[BCS ], - iir,GEN8_BCS_IRQ_SHIFT ); +gen8_cs_irq_handler (&dev_priv->engine[BCS ], + iir,GEN8_BCS_IRQ_SHIFT ); }else DRM_ERROR ("The master control interrupt lied (GT0)!\n" ); }
@@ -1353,11 +1353,11 @@ static irqreturn_t gen8_gt_irq_handler(struct drm_i915_private *dev_priv,I915_WRITE_FW (GEN8_GT_IIR (1 ), iir); ret =IRQ_HANDLED ; -gen8_cs_irq_handler (&dev_priv->ring[VCS ], - iir,GEN8_VCS1_IRQ_SHIFT ); +gen8_cs_irq_handler (&dev_priv->engine[VCS ], + iir,GEN8_VCS1_IRQ_SHIFT ); -gen8_cs_irq_handler (&dev_priv->ring[VCS2 ], - iir,GEN8_VCS2_IRQ_SHIFT ); +gen8_cs_irq_handler (&dev_priv->engine[VCS2 ], + iir,GEN8_VCS2_IRQ_SHIFT ); }else DRM_ERROR ("The master control interrupt lied (GT1)!\n" ); }
@@ -1368,8 +1368,8 @@ static irqreturn_t gen8_gt_irq_handler(struct drm_i915_private *dev_priv,I915_WRITE_FW (GEN8_GT_IIR (3 ), iir); ret =IRQ_HANDLED ; -gen8_cs_irq_handler (&dev_priv->ring[VECS ], - iir,GEN8_VECS_IRQ_SHIFT ); +gen8_cs_irq_handler (&dev_priv->engine[VECS ], + iir,GEN8_VECS_IRQ_SHIFT ); }else DRM_ERROR ("The master control interrupt lied (GT3)!\n" ); }
@@ -1629,7 +1629,7 @@ static void gen6_rps_irq_handler(struct drm_i915_private *dev_priv, u32 pm_iir)if (HAS_VEBOX (dev_priv->dev)) {if (pm_iir &PM_VEBOX_USER_INTERRUPT ) -notify_ring (&dev_priv->ring[VECS ]); +notify_ring (&dev_priv->engine[VECS ]);if (pm_iir &PM_VEBOX_CS_ERROR_INTERRUPT )DRM_DEBUG ("Command parser error, pm_iir 0x%08x\n" , pm_iir);
@@ -4042,7 +4042,7 @@ static irqreturn_t i8xx_irq_handler(int irq, void *arg) new_iir =I915_READ16 (IIR );/* Flush posted writes */ if (iir &I915_USER_INTERRUPT ) -notify_ring (&dev_priv->ring[RCS ]); +notify_ring (&dev_priv->engine[RCS ]);for_each_pipe (dev_priv, pipe) {int plane = pipe;
@@ -4238,7 +4238,7 @@ static irqreturn_t i915_irq_handler(int irq, void *arg) new_iir =I915_READ (IIR );/* Flush posted writes */ if (iir &I915_USER_INTERRUPT ) -notify_ring (&dev_priv->ring[RCS ]); +notify_ring (&dev_priv->engine[RCS ]);for_each_pipe (dev_priv, pipe) {int plane = pipe;
@@ -4468,9 +4468,9 @@ static irqreturn_t i965_irq_handler(int irq, void *arg) new_iir =I915_READ (IIR );/* Flush posted writes */ if (iir &I915_USER_INTERRUPT ) -notify_ring (&dev_priv->ring[RCS ]); +notify_ring (&dev_priv->engine[RCS ]);if (iir &I915_BSD_USER_INTERRUPT ) -notify_ring (&dev_priv->ring[VCS ]); +notify_ring (&dev_priv->engine[VCS ]);for_each_pipe (dev_priv, pipe) { if (pipe_stats[pipe] & PIPE_START_VBLANK_INTERRUPT_STATUS &&
drivers/gpu/drm/i915/intel_display.c +9 -9
@@ -11164,7 +11164,7 @@ static int intel_gen2_queue_flip(struct drm_device *dev, struct drm_i915_gem_request *req, uint32_t flags) { -struct intel_engine_cs *engine = req->ring; +struct intel_engine_cs *engine = req->engine;struct intel_crtc *intel_crtc =to_intel_crtc (crtc);u32 flip_mask;int ret;
@@ -11199,7 +11199,7 @@ static int intel_gen3_queue_flip(struct drm_device *dev, struct drm_i915_gem_request *req, uint32_t flags) { -struct intel_engine_cs *engine = req->ring; +struct intel_engine_cs *engine = req->engine;struct intel_crtc *intel_crtc =to_intel_crtc (crtc);u32 flip_mask;int ret;
@@ -11231,7 +11231,7 @@ static int intel_gen4_queue_flip(struct drm_device *dev, struct drm_i915_gem_request *req, uint32_t flags) { -struct intel_engine_cs *engine = req->ring; +struct intel_engine_cs *engine = req->engine;struct drm_i915_private *dev_priv = dev->dev_private;struct intel_crtc *intel_crtc =to_intel_crtc (crtc);uint32_t pf, pipesrc;
@@ -11270,7 +11270,7 @@ static int intel_gen6_queue_flip(struct drm_device *dev, struct drm_i915_gem_request *req, uint32_t flags) { -struct intel_engine_cs *engine = req->ring; +struct intel_engine_cs *engine = req->engine;struct drm_i915_private *dev_priv = dev->dev_private;struct intel_crtc *intel_crtc =to_intel_crtc (crtc);uint32_t pf, pipesrc;
@@ -11306,7 +11306,7 @@ static int intel_gen7_queue_flip(struct drm_device *dev, struct drm_i915_gem_request *req, uint32_t flags) { -struct intel_engine_cs *engine = req->ring; +struct intel_engine_cs *engine = req->engine;struct intel_crtc *intel_crtc =to_intel_crtc (crtc);uint32_t plane_bit =0 ;int len, ret;
@@ -11755,18 +11755,18 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc, work->flip_count =I915_READ (PIPE_FLIPCOUNT_G4X (pipe)) +1 ;if (IS_VALLEYVIEW (dev) ||IS_CHERRYVIEW (dev)) { - engine = &dev_priv->ring[BCS ]; + engine = &dev_priv->engine[BCS ];if (obj->tiling_mode !=intel_fb_obj (work->old_fb)->tiling_mode)/* vlv: DISPLAY_FLIP fails to change tiling */ engine =NULL ; }else if (IS_IVYBRIDGE (dev) ||IS_HASWELL (dev)) { - engine = &dev_priv->ring[BCS ]; + engine = &dev_priv->engine[BCS ]; }else if (INTEL_INFO (dev)->gen >=7 ) { engine =i915_gem_request_get_ring (obj->last_write_req);if (engine ==NULL || engine->id !=RCS ) - engine = &dev_priv->ring[BCS ]; + engine = &dev_priv->engine[BCS ]; }else { - engine = &dev_priv->ring[RCS ]; + engine = &dev_priv->engine[RCS ]; } mmio_flip =use_mmio_flip (engine, obj);
drivers/gpu/drm/i915/intel_lrc.c +38 -38
285 lines not on this page · raw message
drivers/gpu/drm/i915/intel_mocs.c +1 -1
@@ -322,7 +322,7 @@ int intel_rcs_context_init_mocs(struct drm_i915_gem_request *req)struct drm_i915_mocs_table t;int ret; -if (get_mocs_settings (req->ring->dev, &t)) { +if (get_mocs_settings (req->engine->dev, &t)) {struct drm_i915_private *dev_priv = req->i915;struct intel_engine_cs *engine;enum intel_ring_id ring_id;
drivers/gpu/drm/i915/intel_overlay.c +4 -4
@@ -233,7 +233,7 @@ static int intel_overlay_on(struct intel_overlay *overlay) {struct drm_device *dev = overlay->dev;struct drm_i915_private *dev_priv = dev->dev_private; -struct intel_engine_cs *engine = &dev_priv->ring[RCS ]; +struct intel_engine_cs *engine = &dev_priv->engine[RCS ];struct drm_i915_gem_request *req;int ret;
@@ -267,7 +267,7 @@ static int intel_overlay_continue(struct intel_overlay *overlay, {struct drm_device *dev = overlay->dev;struct drm_i915_private *dev_priv = dev->dev_private; -struct intel_engine_cs *engine = &dev_priv->ring[RCS ]; +struct intel_engine_cs *engine = &dev_priv->engine[RCS ];struct drm_i915_gem_request *req;u32 flip_addr = overlay->flip_addr;u32 tmp;
@@ -336,7 +336,7 @@ static int intel_overlay_off(struct intel_overlay *overlay) {struct drm_device *dev = overlay->dev;struct drm_i915_private *dev_priv = dev->dev_private; -struct intel_engine_cs *engine = &dev_priv->ring[RCS ]; +struct intel_engine_cs *engine = &dev_priv->engine[RCS ];struct drm_i915_gem_request *req;u32 flip_addr = overlay->flip_addr;int ret;
@@ -409,7 +409,7 @@ static int intel_overlay_release_old_vid(struct intel_overlay *overlay) {struct drm_device *dev = overlay->dev;struct drm_i915_private *dev_priv = dev->dev_private; -struct intel_engine_cs *engine = &dev_priv->ring[RCS ]; +struct intel_engine_cs *engine = &dev_priv->engine[RCS ];int ret;WARN_ON (!mutex_is_locked (&dev->struct_mutex));
drivers/gpu/drm/i915/intel_pm.c +1 -1
@@ -7365,7 +7365,7 @@ static void __intel_rps_boost_work(struct work_struct *work)struct drm_i915_gem_request *req = boost->req;if (!i915_gem_request_completed (req, true)) -gen6_rps_boost (to_i915 (req->ring->dev),NULL , +gen6_rps_boost (to_i915 (req->engine->dev),NULL , req->emitted_jiffies);i915_gem_request_unreference__unlocked (req);
drivers/gpu/drm/i915/intel_ringbuffer.c +37 -37
296 lines not on this page · raw message
drivers/gpu/drm/i915/intel_ringbuffer.h +1 -1
@@ -99,7 +99,7 @@ struct intel_ringbuffer {void __iomem *virtual_start;struct i915_vma *vma; -struct intel_engine_cs *ring; +struct intel_engine_cs *engine;struct list_head link;u32 head;
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
kbuild test robot
build botRe: [PATCH 3/5] drm/i915: Rename intel_engine_cs struct members
reproduce:
Hi Tvrtko,
[auto build test ERROR on drm-intel/for-linux-next]
[also build test ERROR on next-20160310]
[cannot apply to v4.5-rc7]
[if your patch is applied to the wrong git tree, please drop us a note to help improving the system]
url: https://github.com/0day-ci/linux/commits/Tvrtko-Ursulin/drm-i915-Rename-local-struct-intel_engine_cs-variables/20160310-222447 base: git://anongit.freedesktop.org/drm-intel for-linux-next config: i386-defconfig (attached as .config) reproduce: # save the attached .config to linux build tree make ARCH=i386
All error/warnings (new ones prefixed by >>):
In file included from include/trace/define_trace.h:95:0,
from drivers/gpu/drm/i915/i915_trace.h:807,
from drivers/gpu/drm/i915/i915_trace_points.c:12:
drivers/gpu/drm/i915/./i915_trace.h: In function 'trace_event_raw_event_i915_gem_ring_sync_to':
>> drivers/gpu/drm/i915/./i915_trace.h:467:32: error: 'struct drm_i915_gem_request' has no member named 'ring'
__entry->sync_to = to_req->ring->id;
^
include/trace/trace_events.h:689:4: note: in definition of macro 'DECLARE_EVENT_CLASS'
{ assign; } \
^
include/trace/trace_events.h:64:9: note: in expansion of macro 'PARAMS'
PARAMS(assign), \
^
>> drivers/gpu/drm/i915/./i915_trace.h:451:1: note: in expansion of macro 'TRACE_EVENT'
TRACE_EVENT(i915_gem_ring_sync_to,
^
>> drivers/gpu/drm/i915/./i915_trace.h:464:6: note: in expansion of macro 'TP_fast_assign'
TP_fast_assign(
^
drivers/gpu/drm/i915/./i915_trace.h: In function 'trace_event_raw_event_i915_gem_ring_flush':
drivers/gpu/drm/i915/./i915_trace.h:514:25: error: 'struct drm_i915_gem_request' has no member named 'ring'
__entry->dev = req->ring->dev->primary->index;
^
include/trace/trace_events.h:689:4: note: in definition of macro 'DECLARE_EVENT_CLASS'
{ assign; } \
^
include/trace/trace_events.h:64:9: note: in expansion of macro 'PARAMS'
PARAMS(assign), \
^
drivers/gpu/drm/i915/./i915_trace.h:502:1: note: in expansion of macro 'TRACE_EVENT'
TRACE_EVENT(i915_gem_ring_flush,
^
drivers/gpu/drm/i915/./i915_trace.h:513:6: note: in expansion of macro 'TP_fast_assign'
TP_fast_assign(
^
drivers/gpu/drm/i915/./i915_trace.h:515:26: error: 'struct drm_i915_gem_request' has no member named 'ring'
__entry->ring = req->ring->id;
^
include/trace/trace_events.h:689:4: note: in definition of macro 'DECLARE_EVENT_CLASS'
{ assign; } \
^
include/trace/trace_events.h:64:9: note: in expansion of macro 'PARAMS'
PARAMS(assign), \
^
drivers/gpu/drm/i915/./i915_trace.h:502:1: note: in expansion of macro 'TRACE_EVENT'
TRACE_EVENT(i915_gem_ring_flush,
^
drivers/gpu/drm/i915/./i915_trace.h:513:6: note: in expansion of macro 'TP_fast_assign'
TP_fast_assign(
^
In file included from include/trace/define_trace.h:96:0,
from drivers/gpu/drm/i915/i915_trace.h:807,
from drivers/gpu/drm/i915/i915_trace_points.c:12:
drivers/gpu/drm/i915/./i915_trace.h: In function 'perf_trace_i915_gem_ring_sync_to':
>> drivers/gpu/drm/i915/./i915_trace.h:467:32: error: 'struct drm_i915_gem_request' has no member named 'ring'
__entry->sync_to = to_req->ring->id;
^
include/trace/perf.h:68:4: note: in definition of macro 'DECLARE_EVENT_CLASS'
{ assign; } \
^
include/trace/trace_events.h:64:9: note: in expansion of macro 'PARAMS'
PARAMS(assign), \
^
>> drivers/gpu/drm/i915/./i915_trace.h:451:1: note: in expansion of macro 'TRACE_EVENT'
TRACE_EVENT(i915_gem_ring_sync_to,
^
>> drivers/gpu/drm/i915/./i915_trace.h:464:6: note: in expansion of macro 'TP_fast_assign'
TP_fast_assign(
^
drivers/gpu/drm/i915/./i915_trace.h: In function 'perf_trace_i915_gem_ring_flush':
drivers/gpu/drm/i915/./i915_trace.h:514:25: error: 'struct drm_i915_gem_request' has no member named 'ring'
__entry->dev = req->ring->dev->primary->index;
^
include/trace/perf.h:68:4: note: in definition of macro 'DECLARE_EVENT_CLASS'
{ assign; } \
^
include/trace/trace_events.h:64:9: note: in expansion of macro 'PARAMS'
PARAMS(assign), \
^
drivers/gpu/drm/i915/./i915_trace.h:502:1: note: in expansion of macro 'TRACE_EVENT'
TRACE_EVENT(i915_gem_ring_flush,
^
drivers/gpu/drm/i915/./i915_trace.h:513:6: note: in expansion of macro 'TP_fast_assign'
TP_fast_assign(
^
drivers/gpu/drm/i915/./i915_trace.h:515:26: error: 'struct drm_i915_gem_request' has no member named 'ring'
__entry->ring = req->ring->id;
^
include/trace/perf.h:68:4: note: in definition of macro 'DECLARE_EVENT_CLASS'
{ assign; } \
^
include/trace/trace_events.h:64:9: note: in expansion of macro 'PARAMS'
PARAMS(assign), \
^
drivers/gpu/drm/i915/./i915_trace.h:502:1: note: in expansion of macro 'TRACE_EVENT'
TRACE_EVENT(i915_gem_ring_flush,
^
drivers/gpu/drm/i915/./i915_trace.h:513:6: note: in expansion of macro 'TP_fast_assign'
TP_fast_assign(
^vim +467 drivers/gpu/drm/i915/./i915_trace.h
bcccff84 Ben Widawsky 2013-09-24 445 __entry->vm = vm;
bcccff84 Ben Widawsky 2013-09-24 446 ),
bcccff84 Ben Widawsky 2013-09-24 447
9297ebf2 Steven Rostedt 2014-03-18 448 TP_printk("dev=%d, vm=%p", __entry->dev, __entry->vm)
bcccff84 Ben Widawsky 2013-09-24 449 );
bcccff84 Ben Widawsky 2013-09-24 450
b52b89da Chris Wilson 2013-09-25 @451 TRACE_EVENT(i915_gem_ring_sync_to,
599d924c John Harrison 2015-05-29 452 TP_PROTO(struct drm_i915_gem_request *to_req,
599d924c John Harrison 2015-05-29 453 struct intel_engine_cs *from,
74328ee5 John Harrison 2014-11-24 454 struct drm_i915_gem_request *req),
599d924c John Harrison 2015-05-29 455 TP_ARGS(to_req, from, req),
b52b89da Chris Wilson 2013-09-25 456
b52b89da Chris Wilson 2013-09-25 457 TP_STRUCT__entry(
b52b89da Chris Wilson 2013-09-25 458 __field(u32, dev)
b52b89da Chris Wilson 2013-09-25 459 __field(u32, sync_from)
b52b89da Chris Wilson 2013-09-25 460 __field(u32, sync_to)
b52b89da Chris Wilson 2013-09-25 461 __field(u32, seqno)
b52b89da Chris Wilson 2013-09-25 462 ),
b52b89da Chris Wilson 2013-09-25 463
b52b89da Chris Wilson 2013-09-25 @464 TP_fast_assign(
b52b89da Chris Wilson 2013-09-25 465 __entry->dev = from->dev->primary->index;
b52b89da Chris Wilson 2013-09-25 466 __entry->sync_from = from->id;
599d924c John Harrison 2015-05-29 @467 __entry->sync_to = to_req->ring->id;
74328ee5 John Harrison 2014-11-24 468 __entry->seqno = i915_gem_request_get_seqno(req);
b52b89da Chris Wilson 2013-09-25 469 ),
b52b89da Chris Wilson 2013-09-25 470 :::::: The code at line 467 was first introduced by commit
:::::: 599d924c6b01e89b53c7879e7d7d89baa8d677d2 drm/i915: Update ring->sync_to() to take a request structure
:::::: TO: John Harrison <[email protected]> :::::: CC: Daniel Vetter <[email protected]>
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 3/5 drm/i915: Rename intel_engine_cs struct members
In reply to Tvrtko UrsulinFrom: Tvrtko Ursulin <[email protected]>
From ring to engine, by the virtue of Coccinelle patch below and a couple manual fixups.
@@
identifier I, J;
@@
struct I {
...
- struct intel_engine_cs *J;
+ struct intel_engine_cs *engine;
...
}
@@
identifier I, J;
@@
struct I {
...
- struct intel_engine_cs J;
+ struct intel_engine_cs engine;
...
}
@@
struct drm_i915_private *d;
@@
(
- d->ring
+ d->engine
)
@@
struct i915_execbuffer_params *p;
@@
(
- p->ring
+ p->engine
)
@@
struct intel_ringbuffer *r;
@@
(
- r->ring
+ r->engine
)
@@
struct drm_i915_gem_request *req;
@@
(
- req->ring
+ req->engine
)
v2: Script missed the tracepoint code - fixed up by hand.
--- drivers/gpu/drm/i915/i915_debugfs.c | 2 +- drivers/gpu/drm/i915/i915_dma.c | 8 +-- drivers/gpu/drm/i915/i915_drv.h | 18 +++---- drivers/gpu/drm/i915/i915_gem.c | 38 +++++++------- drivers/gpu/drm/i915/i915_gem_context.c | 24 ++++----- drivers/gpu/drm/i915/i915_gem_execbuffer.c | 24 ++++----- drivers/gpu/drm/i915/i915_gem_gtt.c | 14 ++--- drivers/gpu/drm/i915/i915_gem_render_state.c | 6 +-- drivers/gpu/drm/i915/i915_gpu_error.c | 18 +++---- drivers/gpu/drm/i915/i915_guc_submission.c | 9 ++-- drivers/gpu/drm/i915/i915_irq.c | 40 +++++++-------- drivers/gpu/drm/i915/i915_trace.h | 46 ++++++++--------- drivers/gpu/drm/i915/intel_display.c | 18 +++---- drivers/gpu/drm/i915/intel_lrc.c | 76 ++++++++++++++-------------- drivers/gpu/drm/i915/intel_mocs.c | 2 +- drivers/gpu/drm/i915/intel_overlay.c | 8 +-- drivers/gpu/drm/i915/intel_pm.c | 2 +- drivers/gpu/drm/i915/intel_ringbuffer.c | 74 +++++++++++++-------------- drivers/gpu/drm/i915/intel_ringbuffer.h | 2 +- 19 files changed, 215 insertions(+), 214 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +1 -1
@@ -984,7 +984,7 @@ static int i915_hws_info(struct seq_file *m, void *data)const u32 *hws;int i; - engine = &dev_priv->ring[(uintptr_t )node->info_ent->data]; + engine = &dev_priv->engine[(uintptr_t )node->info_ent->data]; hws = engine->status_page.page_addr;if (hws ==NULL )return 0 ;
drivers/gpu/drm/i915/i915_dma.c +4 -4
@@ -87,16 +87,16 @@ static int i915_getparam(struct drm_device *dev, void *data, value =1 ;break ;case I915_PARAM_HAS_BSD : - value =intel_ring_initialized (&dev_priv->ring[VCS ]); + value =intel_ring_initialized (&dev_priv->engine[VCS ]);break ;case I915_PARAM_HAS_BLT : - value =intel_ring_initialized (&dev_priv->ring[BCS ]); + value =intel_ring_initialized (&dev_priv->engine[BCS ]);break ;case I915_PARAM_HAS_VEBOX : - value =intel_ring_initialized (&dev_priv->ring[VECS ]); + value =intel_ring_initialized (&dev_priv->engine[VECS ]);break ;case I915_PARAM_HAS_BSD2 : - value =intel_ring_initialized (&dev_priv->ring[VCS2 ]); + value =intel_ring_initialized (&dev_priv->engine[VCS2 ]);break ;case I915_PARAM_HAS_RELAXED_FENCING : value =1 ;
drivers/gpu/drm/i915/i915_drv.h +9 -9
@@ -1726,7 +1726,7 @@ struct i915_execbuffer_params {uint32_t dispatch_flags;uint32_t args_batch_start_offset;uint64_t batch_obj_vm_offset; -struct intel_engine_cs *ring; +struct intel_engine_cs *engine;struct drm_i915_gem_object *batch_obj;struct intel_context *ctx;struct drm_i915_gem_request *request;
@@ -1778,7 +1778,7 @@ struct drm_i915_private {wait_queue_head_t gmbus_wait_queue;struct pci_dev *bridge_dev; -struct intel_engine_cs ring[I915_NUM_RINGS ]; +struct intel_engine_cs engine[I915_NUM_RINGS ];struct drm_i915_gem_object *semaphore_obj;uint32_t last_seqno, next_seqno;
@@ -2042,7 +2042,7 @@ static inline struct drm_i915_private *guc_to_i915(struct intel_guc *guc)/* Iterate over initialised rings */ #define for_each_ring (ring__, dev_priv__, i__) \ for ((i__) = 0; (i__) < I915_NUM_RINGS; (i__)++) \ - for_each_if ((((ring__) = &(dev_priv__)->ring[(i__)]), intel_ring_initialized((ring__)))) + for_each_if ((((ring__) = &(dev_priv__)->engine[(i__)]), intel_ring_initialized((ring__))))enum hdmi_force_audio {HDMI_AUDIO_OFF_DVI =-2 ,/* no aux data for HDMI-DVI converter */
@@ -2257,7 +2257,7 @@ struct drm_i915_gem_request {/** On Which ring this request was generated */ struct drm_i915_private *i915; -struct intel_engine_cs *ring; +struct intel_engine_cs *engine;/** GEM sequence number associated with the previous request, * when the HWS breadcrumb is equal to this the GPU is processing
@@ -2352,7 +2352,7 @@ i915_gem_request_get_seqno(struct drm_i915_gem_request *req)static inline struct intel_engine_cs *i915_gem_request_get_ring (struct drm_i915_gem_request *req) { -return req ? req->ring :NULL ; +return req ? req->engine :NULL ; } static inline struct drm_i915_gem_request *
@@ -2366,7 +2366,7 @@ i915_gem_request_reference(struct drm_i915_gem_request *req)static inline void i915_gem_request_unreference (struct drm_i915_gem_request *req) { -WARN_ON (!mutex_is_locked (&req->ring->dev->struct_mutex)); +WARN_ON (!mutex_is_locked (&req->engine->dev->struct_mutex));kref_put (&req->ref, i915_gem_request_free); }
@@ -2378,7 +2378,7 @@ i915_gem_request_unreference__unlocked(struct drm_i915_gem_request *req)if (!req)return ; - dev = req->ring->dev; + dev = req->engine->dev;if (kref_put_mutex (&req->ref, i915_gem_request_free, &dev->struct_mutex))mutex_unlock (&dev->struct_mutex); }
@@ -3022,14 +3022,14 @@ i915_seqno_passed(uint32_t seq1, uint32_t seq2)static inline bool i915_gem_request_started (struct drm_i915_gem_request *req,bool lazy_coherency) { -u32 seqno = req->ring->get_seqno (req->ring, lazy_coherency); +u32 seqno = req->engine->get_seqno (req->engine, lazy_coherency);return i915_seqno_passed (seqno, req->previous_seqno); }static inline bool i915_gem_request_completed (struct drm_i915_gem_request *req,bool lazy_coherency) { -u32 seqno = req->ring->get_seqno (req->ring, lazy_coherency); +u32 seqno = req->engine->get_seqno (req->engine, lazy_coherency);return i915_seqno_passed (seqno, req->seqno); }
drivers/gpu/drm/i915/i915_gem.c +19 -19
@@ -1193,7 +1193,7 @@ static int __i915_spin_request(struct drm_i915_gem_request *req, int state)* takes to sleep on a request, on the order of a microsecond. */ -if (req->ring->irq_refcount) +if (req->engine->irq_refcount)return -EBUSY ;/* Only spin if we know the GPU is processing this request */
@@ -1381,7 +1381,7 @@ int i915_gem_request_add_to_client(struct drm_i915_gem_request *req,if (req->file_priv)return -EINVAL ; - dev_private = req->ring->dev->dev_private; + dev_private = req->engine->dev->dev_private; file_priv = file->driver_priv;spin_lock (&file_priv->mm.lock);
@@ -1434,7 +1434,7 @@ static void i915_gem_request_retire(struct drm_i915_gem_request *request)static void __i915_gem_request_retire__upto (struct drm_i915_gem_request *req) { -struct intel_engine_cs *engine = req->ring; +struct intel_engine_cs *engine = req->engine;struct drm_i915_gem_request *tmp;lockdep_assert_held (&engine->dev->struct_mutex);
@@ -1466,7 +1466,7 @@ i915_wait_request(struct drm_i915_gem_request *req)BUG_ON (req ==NULL ); - dev = req->ring->dev; + dev = req->engine->dev; dev_priv = dev->dev_private; interruptible = dev_priv->mm.interruptible;
@@ -1505,7 +1505,7 @@ i915_gem_object_wait_rendering(struct drm_i915_gem_object *obj,if (ret)return ret; - i = obj->last_write_req->ring->id; + i = obj->last_write_req->engine->id;if (obj->last_read_req[i] == obj->last_write_req)i915_gem_object_retire__read (obj, i);else
@@ -1532,7 +1532,7 @@ static void i915_gem_object_retire_request(struct drm_i915_gem_object *obj, struct drm_i915_gem_request *req) { - int ring = req->ring->id; + int ring = req->engine->id;if (obj->last_read_req[ring] == req)i915_gem_object_retire__read (obj, ring);
@@ -2423,7 +2423,7 @@ static void i915_gem_object_retire__write(struct drm_i915_gem_object *obj) {RQ_BUG_ON (obj->last_write_req ==NULL ); -RQ_BUG_ON (!(obj->active &intel_ring_flag (obj->last_write_req->ring))); +RQ_BUG_ON (!(obj->active &intel_ring_flag (obj->last_write_req->engine)));i915_gem_request_assign (&obj->last_write_req,NULL );intel_fb_obj_flush (obj, true,ORIGIN_CS );
@@ -2440,7 +2440,7 @@ i915_gem_object_retire__read(struct drm_i915_gem_object *obj, int ring)list_del_init (&obj->ring_list[ring]);i915_gem_request_assign (&obj->last_read_req[ring],NULL ); -if (obj->last_write_req && obj->last_write_req->ring->id == ring) +if (obj->last_write_req && obj->last_write_req->engine->id == ring)i915_gem_object_retire__write (obj); obj->active &= ~(1 << ring);
@@ -2551,7 +2551,7 @@ void __i915_add_request(struct drm_i915_gem_request *request,if (WARN_ON (request ==NULL ))return ; - engine = request->ring; + engine = request->engine; dev_priv = engine->dev->dev_private; ringbuf = request->ringbuf;
@@ -2680,7 +2680,7 @@ void i915_gem_request_free(struct kref *req_ref)if (ctx) {if (i915.enable_execlists && ctx != req->i915->kernel_context) -intel_lr_context_unpin (ctx, req->ring); +intel_lr_context_unpin (ctx, req->engine);i915_gem_context_unreference (ctx); }
@@ -2712,7 +2712,7 @@ __i915_gem_request_alloc(struct intel_engine_cs *engine,kref_init (&req->ref); req->i915 = dev_priv; - req->ring = engine; + req->engine = engine; req->ctx = ctx;i915_gem_context_reference (req->ctx);
@@ -4364,10 +4364,10 @@ i915_gem_busy_ioctl(struct drm_device *dev, void *data, req = obj->last_read_req[i];if (req) - args->busy |=1 << (16 + req->ring->exec_id); + args->busy |=1 << (16 + req->engine->exec_id); }if (obj->last_write_req) - args->busy |= obj->last_write_req->ring->exec_id; + args->busy |= obj->last_write_req->engine->exec_id; } unref:
@@ -4697,7 +4697,7 @@ err:int i915_gem_l3_remap (struct drm_i915_gem_request *req,int slice) { -struct intel_engine_cs *engine = req->ring; +struct intel_engine_cs *engine = req->engine;struct drm_device *dev = engine->dev;struct drm_i915_private *dev_priv = dev->dev_private;u32 *remap_info = dev_priv->l3_parity.remap_info[slice];
@@ -4814,13 +4814,13 @@ int i915_gem_init_rings(struct drm_device *dev)return 0 ; cleanup_vebox_ring: -intel_cleanup_ring_buffer (&dev_priv->ring[VECS ]); +intel_cleanup_ring_buffer (&dev_priv->engine[VECS ]); cleanup_blt_ring: -intel_cleanup_ring_buffer (&dev_priv->ring[BCS ]); +intel_cleanup_ring_buffer (&dev_priv->engine[BCS ]); cleanup_bsd_ring: -intel_cleanup_ring_buffer (&dev_priv->ring[VCS ]); +intel_cleanup_ring_buffer (&dev_priv->engine[VCS ]); cleanup_render_ring: -intel_cleanup_ring_buffer (&dev_priv->ring[RCS ]); +intel_cleanup_ring_buffer (&dev_priv->engine[RCS ]);return ret; }
@@ -5056,7 +5056,7 @@ i915_gem_load_init(struct drm_device *dev)INIT_LIST_HEAD (&dev_priv->mm.bound_list);INIT_LIST_HEAD (&dev_priv->mm.fence_list);for (i =0 ; i <I915_NUM_RINGS ; i++) -init_ring_lists (&dev_priv->ring[i]); +init_ring_lists (&dev_priv->engine[i]);for (i =0 ; i <I915_MAX_NUM_FENCES ; i++)INIT_LIST_HEAD (&dev_priv->fence_regs[i].lru_list); INIT_DELAYED_WORK(&dev_priv->mm.retire_work,
drivers/gpu/drm/i915/i915_gem_context.c +12 -12
@@ -346,7 +346,7 @@ void i915_gem_context_reset(struct drm_device *dev) }for (i =0 ; i <I915_NUM_RINGS ; i++) { -struct intel_engine_cs *engine = &dev_priv->ring[i]; +struct intel_engine_cs *engine = &dev_priv->engine[i];if (engine->last_context) {i915_gem_context_unpin (engine->last_context, engine);
@@ -421,13 +421,13 @@ void i915_gem_context_fini(struct drm_device *dev)* to default context. So we need to unreference the base object once * to offset the do_switch part, so that i915_gem_context_unreference() * can then free the base object correctly. */ -WARN_ON (!dev_priv->ring[RCS ].last_context); +WARN_ON (!dev_priv->engine[RCS ].last_context);i915_gem_object_ggtt_unpin (dctx->legacy_hw_ctx.rcs_state); }for (i =I915_NUM_RINGS ; --i >=0 ;) { -struct intel_engine_cs *engine = &dev_priv->ring[i]; +struct intel_engine_cs *engine = &dev_priv->engine[i];if (engine->last_context) {i915_gem_context_unpin (engine->last_context, engine);
@@ -441,7 +441,7 @@ void i915_gem_context_fini(struct drm_device *dev)int i915_gem_context_enable (struct drm_i915_gem_request *req) { -struct intel_engine_cs *engine = req->ring; +struct intel_engine_cs *engine = req->engine;int ret;if (i915.enable_execlists) {
@@ -510,7 +510,7 @@ i915_gem_context_get(struct drm_i915_file_private *file_priv, u32 id)static inline int mi_set_context (struct drm_i915_gem_request *req,u32 hw_flags) { -struct intel_engine_cs *engine = req->ring; +struct intel_engine_cs *engine = req->engine;u32 flags = hw_flags |MI_MM_SPACE_GTT ;const int num_rings = /* Use an extended w/a on ivb+ if signalling from other rings */
@@ -625,7 +625,7 @@ needs_pd_load_pre(struct intel_engine_cs *engine, struct intel_context *to)if (INTEL_INFO (engine->dev)->gen <8 )return true; -if (engine != &dev_priv->ring[RCS ]) +if (engine != &dev_priv->engine[RCS ])return true;return false;
@@ -643,7 +643,7 @@ needs_pd_load_post(struct intel_engine_cs *engine, struct intel_context *to,if (!IS_GEN8 (engine->dev))return false; -if (engine != &dev_priv->ring[RCS ]) +if (engine != &dev_priv->engine[RCS ])return false;if (hw_flags &MI_RESTORE_INHIBIT )
@@ -655,14 +655,14 @@ needs_pd_load_post(struct intel_engine_cs *engine, struct intel_context *to,static int do_switch (struct drm_i915_gem_request *req) {struct intel_context *to = req->ctx; -struct intel_engine_cs *engine = req->ring; +struct intel_engine_cs *engine = req->engine;struct drm_i915_private *dev_priv = engine->dev->dev_private;struct intel_context *from = engine->last_context;u32 hw_flags =0 ;bool uninitialized = false;int ret, i; -if (from !=NULL && engine == &dev_priv->ring[RCS ]) { +if (from !=NULL && engine == &dev_priv->engine[RCS ]) {BUG_ON (from->legacy_hw_ctx.rcs_state ==NULL );BUG_ON (!i915_gem_obj_is_pinned (from->legacy_hw_ctx.rcs_state)); }
@@ -671,7 +671,7 @@ static int do_switch(struct drm_i915_gem_request *req)return 0 ;/* Trying to pin first makes error handling easier. */ -if (engine == &dev_priv->ring[RCS ]) { +if (engine == &dev_priv->engine[RCS ]) { ret =i915_gem_obj_ggtt_pin (to->legacy_hw_ctx.rcs_state,get_context_alignment (engine->dev),0 );
@@ -700,7 +700,7 @@ static int do_switch(struct drm_i915_gem_request *req) to->ppgtt->pd_dirty_rings &= ~intel_ring_flag (engine); } -if (engine != &dev_priv->ring[RCS ]) { +if (engine != &dev_priv->engine[RCS ]) {if (from)i915_gem_context_unreference (from); goto done;
@@ -828,7 +828,7 @@ unpin_out:*/ int i915_switch_context (struct drm_i915_gem_request *req) { -struct intel_engine_cs *engine = req->ring; +struct intel_engine_cs *engine = req->engine;struct drm_i915_private *dev_priv = engine->dev->dev_private;WARN_ON (i915.enable_execlists);
drivers/gpu/drm/i915/i915_gem_execbuffer.c +12 -12
@@ -942,7 +942,7 @@ static int i915_gem_execbuffer_move_to_gpu(struct drm_i915_gem_request *req, struct list_head *vmas) { - const unsigned other_rings = ~intel_ring_flag(req->ring); + const unsigned other_rings = ~intel_ring_flag(req->engine);struct i915_vma *vma;uint32_t flush_domains =0 ;bool flush_chipset = false;
@@ -952,7 +952,7 @@ i915_gem_execbuffer_move_to_gpu(struct drm_i915_gem_request *req,struct drm_i915_gem_object *obj = vma->obj;if (obj->active & other_rings) { - ret =i915_gem_object_sync (obj, req->ring, &req); + ret =i915_gem_object_sync (obj, req->engine, &req);if (ret)return ret; }
@@ -964,7 +964,7 @@ i915_gem_execbuffer_move_to_gpu(struct drm_i915_gem_request *req, }if (flush_chipset) -i915_gem_chipset_flush (req->ring->dev); +i915_gem_chipset_flush (req->engine->dev);if (flush_domains &I915_GEM_DOMAIN_GTT )wmb ();
@@ -1140,7 +1140,7 @@ void i915_gem_execbuffer_retire_commands(struct i915_execbuffer_params *params) {/* Unconditionally force add_request to emit a full flush. */ - params->ring->gpu_caches_dirty = true; + params->engine->gpu_caches_dirty = true;/* Add a breadcrumb for the completion of the batch buffer */ __i915_add_request (params->request, params->batch_obj, true);
@@ -1150,11 +1150,11 @@ static int i915_reset_gen7_sol_offsets(struct drm_device *dev, struct drm_i915_gem_request *req) { - struct intel_engine_cs *engine = req->ring; + struct intel_engine_cs *engine = req->engine;struct drm_i915_private *dev_priv = dev->dev_private;int ret, i; -if (!IS_GEN7 (dev) || engine != &dev_priv->ring[RCS ]) { +if (!IS_GEN7 (dev) || engine != &dev_priv->engine[RCS ]) {DRM_DEBUG ("sol reset is gen7/rcs only\n" );return -EINVAL ; }
@@ -1233,7 +1233,7 @@ i915_gem_ringbuffer_submission(struct i915_execbuffer_params *params, struct list_head *vmas) {struct drm_device *dev = params->dev; -struct intel_engine_cs *engine = params->ring; +struct intel_engine_cs *engine = params->engine;struct drm_i915_private *dev_priv = dev->dev_private;u64 exec_start, exec_len;int instp_mode;
@@ -1257,7 +1257,7 @@ i915_gem_ringbuffer_submission(struct i915_execbuffer_params *params,case I915_EXEC_CONSTANTS_REL_GENERAL :case I915_EXEC_CONSTANTS_ABSOLUTE :case I915_EXEC_CONSTANTS_REL_SURFACE : -if (instp_mode !=0 && engine != &dev_priv->ring[RCS ]) { +if (instp_mode !=0 && engine != &dev_priv->engine[RCS ]) {DRM_DEBUG ("non-0 rel constants mode on non-RCS\n" );return -EINVAL ; }
@@ -1284,7 +1284,7 @@ i915_gem_ringbuffer_submission(struct i915_execbuffer_params *params,return -EINVAL ; } -if (engine == &dev_priv->ring[RCS ] && +if (engine == &dev_priv->engine[RCS ] && instp_mode != dev_priv->relative_constants_mode) { ret =intel_ring_begin (params->request,4 );if (ret)
@@ -1412,9 +1412,9 @@ eb_select_ring(struct drm_i915_private *dev_priv,return -EINVAL ; } - *ring = &dev_priv->ring[_VCS (bsd_idx)]; + *ring = &dev_priv->engine[_VCS (bsd_idx)]; }else { - *ring = &dev_priv->ring[user_ring_map[user_ring_id]]; + *ring = &dev_priv->engine[user_ring_map[user_ring_id]]; }if (!intel_ring_initialized (*ring)) {
@@ -1632,7 +1632,7 @@ i915_gem_do_execbuffer(struct drm_device *dev, void *data,*/ params->dev = dev; params->file = file; - params->ring = engine; + params->engine = engine; params->dispatch_flags = dispatch_flags; params->batch_obj = batch_obj; params->ctx = ctx;
drivers/gpu/drm/i915/i915_gem_gtt.c +7 -7
@@ -658,7 +658,7 @@ static int gen8_write_pdp(struct drm_i915_gem_request *req, unsigned entry, dma_addr_t addr) { -struct intel_engine_cs *engine = req->ring; +struct intel_engine_cs *engine = req->engine;int ret;BUG_ON (entry >=4 );
@@ -1650,7 +1650,7 @@ static uint32_t get_pd_offset(struct i915_hw_ppgtt *ppgtt)static int hsw_mm_switch (struct i915_hw_ppgtt *ppgtt,struct drm_i915_gem_request *req) { -struct intel_engine_cs *engine = req->ring; +struct intel_engine_cs *engine = req->engine;int ret;/* NB: TLBs must be flushed and invalidated before a switch */
@@ -1676,7 +1676,7 @@ static int hsw_mm_switch(struct i915_hw_ppgtt *ppgtt,static int vgpu_mm_switch (struct i915_hw_ppgtt *ppgtt,struct drm_i915_gem_request *req) { -struct intel_engine_cs *engine = req->ring; +struct intel_engine_cs *engine = req->engine;struct drm_i915_private *dev_priv =to_i915 (ppgtt->base.dev);I915_WRITE (RING_PP_DIR_DCLV (engine),PP_DIR_DCLV_2G );
@@ -1687,7 +1687,7 @@ static int vgpu_mm_switch(struct i915_hw_ppgtt *ppgtt,static int gen7_mm_switch (struct i915_hw_ppgtt *ppgtt,struct drm_i915_gem_request *req) { -struct intel_engine_cs *engine = req->ring; +struct intel_engine_cs *engine = req->engine;int ret;/* NB: TLBs must be flushed and invalidated before a switch */
@@ -1720,7 +1720,7 @@ static int gen7_mm_switch(struct i915_hw_ppgtt *ppgtt,static int gen6_mm_switch (struct i915_hw_ppgtt *ppgtt,struct drm_i915_gem_request *req) { -struct intel_engine_cs *engine = req->ring; +struct intel_engine_cs *engine = req->engine;struct drm_device *dev = ppgtt->base.dev;struct drm_i915_private *dev_priv = dev->dev_private;
@@ -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->ring->dev->dev_private; +struct drm_i915_private *dev_priv = req->engine->dev->dev_private;struct i915_hw_ppgtt *ppgtt = dev_priv->mm.aliasing_ppgtt;if (i915.enable_execlists)
@@ -2309,7 +2309,7 @@ void i915_check_and_clear_faults(struct drm_device *dev) fault_reg & ~RING_FAULT_VALID); } } -POSTING_READ (RING_FAULT_REG (&dev_priv->ring[RCS ])); +POSTING_READ (RING_FAULT_REG (&dev_priv->engine[RCS ])); }static void i915_ggtt_flush (struct drm_i915_private *dev_priv)
drivers/gpu/drm/i915/i915_gem_render_state.c +3 -3
@@ -198,21 +198,21 @@ int i915_gem_render_state_init(struct drm_i915_gem_request *req)struct render_state so;int ret; - ret =i915_gem_render_state_prepare (req->ring, &so); + ret =i915_gem_render_state_prepare (req->engine, &so);if (ret)return ret;if (so.rodata ==NULL )return 0 ; - ret = req->ring->dispatch_execbuffer (req, so.ggtt_offset, + ret = req->engine->dispatch_execbuffer (req, so.ggtt_offset, so.rodata->batch_items *4 ,I915_DISPATCH_SECURE );if (ret) goto out;if (so.aux_batch_size >8 ) { - ret = req->ring->dispatch_execbuffer(req, + ret = req->engine->dispatch_execbuffer(req, (so.ggtt_offset + so.aux_batch_offset), so.aux_batch_size,
drivers/gpu/drm/i915/i915_gpu_error.c +9 -9
@@ -431,7 +431,7 @@ int i915_error_state_to_str(struct drm_i915_error_state_buf *m,for (i =0 ; i <ARRAY_SIZE (error->ring); i++) { obj = error->ring[i].batchbuffer;if (obj) { -err_puts (m, dev_priv->ring[i].name); +err_puts (m, dev_priv->engine[i].name);if (error->ring[i].pid !=-1 ) err_printf(m, " (submitted by %s [%d])", error->ring[i].comm,
@@ -445,14 +445,14 @@ int i915_error_state_to_str(struct drm_i915_error_state_buf *m, obj = error->ring[i].wa_batchbuffer;if (obj) {err_printf (m,"%s (w/a) --- gtt_offset = 0x%08x\n" , - dev_priv->ring[i].name, + dev_priv->engine[i].name,lower_32_bits (obj->gtt_offset));print_error_obj (m, obj); }if (error->ring[i].num_requests) {err_printf (m,"%s --- %d requests\n" , - dev_priv->ring[i].name, + dev_priv->engine[i].name, error->ring[i].num_requests);for (j =0 ; j < error->ring[i].num_requests; j++) { err_printf(m, " seqno 0x%08x, emitted %ld, tail 0x%08x\n",
@@ -464,7 +464,7 @@ int i915_error_state_to_str(struct drm_i915_error_state_buf *m,if ((obj = error->ring[i].ringbuffer)) {err_printf (m,"%s --- ringbuffer = 0x%08x\n" , - dev_priv->ring[i].name, + dev_priv->engine[i].name,lower_32_bits (obj->gtt_offset));print_error_obj (m, obj); }
@@ -478,7 +478,7 @@ int i915_error_state_to_str(struct drm_i915_error_state_buf *m, hws_page = &obj->pages[LRC_PPHWSP_PN ][0 ]; }err_printf (m,"%s --- HW Status = 0x%08llx\n" , - dev_priv->ring[i].name, hws_offset); + dev_priv->engine[i].name, hws_offset); offset =0 ;for (elt =0 ; elt <PAGE_SIZE /16 ; elt +=4 ) { err_printf(m, "[%04x] %08x %08x %08x %08x\n",
@@ -495,12 +495,12 @@ int i915_error_state_to_str(struct drm_i915_error_state_buf *m,if (obj) {u64 wa_ctx_offset = obj->gtt_offset;u32 *wa_ctx_page = &obj->pages[0 ][0 ]; -struct intel_engine_cs *engine = &dev_priv->ring[RCS ]; +struct intel_engine_cs *engine = &dev_priv->engine[RCS ];u32 wa_ctx_size = (engine->wa_ctx.indirect_ctx.size + engine->wa_ctx.per_ctx.size);err_printf (m,"%s --- WA ctx batch buffer = 0x%08llx\n" , - dev_priv->ring[i].name, wa_ctx_offset); + dev_priv->engine[i].name, wa_ctx_offset); offset =0 ;for (elt =0 ; elt < wa_ctx_size; elt +=4 ) { err_printf(m, "[%04x] %08x %08x %08x %08x\n",
@@ -515,7 +515,7 @@ int i915_error_state_to_str(struct drm_i915_error_state_buf *m,if ((obj = error->ring[i].ctx)) {err_printf (m,"%s --- HW Context = 0x%08x\n" , - dev_priv->ring[i].name, + dev_priv->engine[i].name,lower_32_bits (obj->gtt_offset));print_error_obj (m, obj); }
@@ -1020,7 +1020,7 @@ static void i915_gem_record_rings(struct drm_device *dev,int i, count;for (i =0 ; i <I915_NUM_RINGS ; i++) { -struct intel_engine_cs *engine = &dev_priv->ring[i]; +struct intel_engine_cs *engine = &dev_priv->engine[i];struct intel_ringbuffer *rbuf; error->ring[i].pid =-1 ;
drivers/gpu/drm/i915/i915_guc_submission.c +5 -4
@@ -542,11 +542,12 @@ static int guc_add_workqueue_item(struct i915_guc_client *gc, wq_len =sizeof (struct guc_wq_item ) /sizeof (u32) -1 ; wqi->header =WQ_TYPE_INORDER | (wq_len <<WQ_LEN_SHIFT ) | - (rq->ring->guc_id <<WQ_TARGET_SHIFT ) | + (rq->engine->guc_id <<WQ_TARGET_SHIFT ) |WQ_NO_WCFLUSH_WAIT ;/* The GuC wants only the low-order word of the context descriptor */ - wqi->context_desc = (u32 )intel_lr_context_descriptor (rq->ctx, rq->ring); + wqi->context_desc = (u32 )intel_lr_context_descriptor (rq->ctx, + rq->engine);/* The GuC firmware wants the tail index in QWords, not bytes */ tail = rq->ringbuf->tail >>3 ;
@@ -569,7 +570,7 @@ int i915_guc_submit(struct i915_guc_client *client, struct drm_i915_gem_request *rq) {struct intel_guc *guc = client->guc; -unsigned int engine_id = rq->ring->guc_id; +unsigned int engine_id = rq->engine->guc_id;int q_ret, b_ret; q_ret =guc_add_workqueue_item (client, rq);
@@ -867,7 +868,7 @@ static void guc_create_ads(struct intel_guc *guc)* so its address won't change after we've told the GuC where * to find it. */ - engine = &dev_priv->ring[RCS ]; + engine = &dev_priv->engine[RCS ]; ads->golden_context_lrca = engine->status_page.gfx_addr;for_each_ring (engine, dev_priv, i)
drivers/gpu/drm/i915/i915_irq.c +20 -20
@@ -1291,9 +1291,9 @@ static void ilk_gt_irq_handler(struct drm_device *dev, {if (gt_iir & (GT_RENDER_USER_INTERRUPT |GT_RENDER_PIPECTL_NOTIFY_INTERRUPT )) -notify_ring (&dev_priv->ring[RCS ]); +notify_ring (&dev_priv->engine[RCS ]);if (gt_iir &ILK_BSD_USER_INTERRUPT ) -notify_ring (&dev_priv->ring[VCS ]); +notify_ring (&dev_priv->engine[VCS ]); } static void snb_gt_irq_handler(struct drm_device *dev,
@@ -1303,11 +1303,11 @@ static void snb_gt_irq_handler(struct drm_device *dev,if (gt_iir & (GT_RENDER_USER_INTERRUPT |GT_RENDER_PIPECTL_NOTIFY_INTERRUPT )) -notify_ring (&dev_priv->ring[RCS ]); +notify_ring (&dev_priv->engine[RCS ]);if (gt_iir >_BSD_USER_INTERRUPT ) -notify_ring (&dev_priv->ring[VCS ]); +notify_ring (&dev_priv->engine[VCS ]);if (gt_iir >_BLT_USER_INTERRUPT ) -notify_ring (&dev_priv->ring[BCS ]); +notify_ring (&dev_priv->engine[BCS ]); if (gt_iir & (GT_BLT_CS_ERROR_INTERRUPT | GT_BSD_CS_ERROR_INTERRUPT |
@@ -1338,11 +1338,11 @@ static irqreturn_t gen8_gt_irq_handler(struct drm_i915_private *dev_priv,I915_WRITE_FW (GEN8_GT_IIR (0 ), iir); ret =IRQ_HANDLED ; -gen8_cs_irq_handler (&dev_priv->ring[RCS ], - iir,GEN8_RCS_IRQ_SHIFT ); +gen8_cs_irq_handler (&dev_priv->engine[RCS ], + iir,GEN8_RCS_IRQ_SHIFT ); -gen8_cs_irq_handler (&dev_priv->ring[BCS ], - iir,GEN8_BCS_IRQ_SHIFT ); +gen8_cs_irq_handler (&dev_priv->engine[BCS ], + iir,GEN8_BCS_IRQ_SHIFT ); }else DRM_ERROR ("The master control interrupt lied (GT0)!\n" ); }
@@ -1353,11 +1353,11 @@ static irqreturn_t gen8_gt_irq_handler(struct drm_i915_private *dev_priv,I915_WRITE_FW (GEN8_GT_IIR (1 ), iir); ret =IRQ_HANDLED ; -gen8_cs_irq_handler (&dev_priv->ring[VCS ], - iir,GEN8_VCS1_IRQ_SHIFT ); +gen8_cs_irq_handler (&dev_priv->engine[VCS ], + iir,GEN8_VCS1_IRQ_SHIFT ); -gen8_cs_irq_handler (&dev_priv->ring[VCS2 ], - iir,GEN8_VCS2_IRQ_SHIFT ); +gen8_cs_irq_handler (&dev_priv->engine[VCS2 ], + iir,GEN8_VCS2_IRQ_SHIFT ); }else DRM_ERROR ("The master control interrupt lied (GT1)!\n" ); }
@@ -1368,8 +1368,8 @@ static irqreturn_t gen8_gt_irq_handler(struct drm_i915_private *dev_priv,I915_WRITE_FW (GEN8_GT_IIR (3 ), iir); ret =IRQ_HANDLED ; -gen8_cs_irq_handler (&dev_priv->ring[VECS ], - iir,GEN8_VECS_IRQ_SHIFT ); +gen8_cs_irq_handler (&dev_priv->engine[VECS ], + iir,GEN8_VECS_IRQ_SHIFT ); }else DRM_ERROR ("The master control interrupt lied (GT3)!\n" ); }
@@ -1629,7 +1629,7 @@ static void gen6_rps_irq_handler(struct drm_i915_private *dev_priv, u32 pm_iir)if (HAS_VEBOX (dev_priv->dev)) {if (pm_iir &PM_VEBOX_USER_INTERRUPT ) -notify_ring (&dev_priv->ring[VECS ]); +notify_ring (&dev_priv->engine[VECS ]);if (pm_iir &PM_VEBOX_CS_ERROR_INTERRUPT )DRM_DEBUG ("Command parser error, pm_iir 0x%08x\n" , pm_iir);
@@ -4042,7 +4042,7 @@ static irqreturn_t i8xx_irq_handler(int irq, void *arg) new_iir =I915_READ16 (IIR );/* Flush posted writes */ if (iir &I915_USER_INTERRUPT ) -notify_ring (&dev_priv->ring[RCS ]); +notify_ring (&dev_priv->engine[RCS ]);for_each_pipe (dev_priv, pipe) {int plane = pipe;
@@ -4238,7 +4238,7 @@ static irqreturn_t i915_irq_handler(int irq, void *arg) new_iir =I915_READ (IIR );/* Flush posted writes */ if (iir &I915_USER_INTERRUPT ) -notify_ring (&dev_priv->ring[RCS ]); +notify_ring (&dev_priv->engine[RCS ]);for_each_pipe (dev_priv, pipe) {int plane = pipe;
@@ -4468,9 +4468,9 @@ static irqreturn_t i965_irq_handler(int irq, void *arg) new_iir =I915_READ (IIR );/* Flush posted writes */ if (iir &I915_USER_INTERRUPT ) -notify_ring (&dev_priv->ring[RCS ]); +notify_ring (&dev_priv->engine[RCS ]);if (iir &I915_BSD_USER_INTERRUPT ) -notify_ring (&dev_priv->ring[VCS ]); +notify_ring (&dev_priv->engine[VCS ]);for_each_pipe (dev_priv, pipe) { if (pipe_stats[pipe] & PIPE_START_VBLANK_INTERRUPT_STATUS &&
drivers/gpu/drm/i915/i915_trace.h +23 -23
110 lines not on this page · raw message
drivers/gpu/drm/i915/intel_display.c +9 -9
@@ -11164,7 +11164,7 @@ static int intel_gen2_queue_flip(struct drm_device *dev, struct drm_i915_gem_request *req, uint32_t flags) { -struct intel_engine_cs *engine = req->ring; +struct intel_engine_cs *engine = req->engine;struct intel_crtc *intel_crtc =to_intel_crtc (crtc);u32 flip_mask;int ret;
@@ -11199,7 +11199,7 @@ static int intel_gen3_queue_flip(struct drm_device *dev, struct drm_i915_gem_request *req, uint32_t flags) { -struct intel_engine_cs *engine = req->ring; +struct intel_engine_cs *engine = req->engine;struct intel_crtc *intel_crtc =to_intel_crtc (crtc);u32 flip_mask;int ret;
@@ -11231,7 +11231,7 @@ static int intel_gen4_queue_flip(struct drm_device *dev, struct drm_i915_gem_request *req, uint32_t flags) { -struct intel_engine_cs *engine = req->ring; +struct intel_engine_cs *engine = req->engine;struct drm_i915_private *dev_priv = dev->dev_private;struct intel_crtc *intel_crtc =to_intel_crtc (crtc);uint32_t pf, pipesrc;
@@ -11270,7 +11270,7 @@ static int intel_gen6_queue_flip(struct drm_device *dev, struct drm_i915_gem_request *req, uint32_t flags) { -struct intel_engine_cs *engine = req->ring; +struct intel_engine_cs *engine = req->engine;struct drm_i915_private *dev_priv = dev->dev_private;struct intel_crtc *intel_crtc =to_intel_crtc (crtc);uint32_t pf, pipesrc;
@@ -11306,7 +11306,7 @@ static int intel_gen7_queue_flip(struct drm_device *dev, struct drm_i915_gem_request *req, uint32_t flags) { -struct intel_engine_cs *engine = req->ring; +struct intel_engine_cs *engine = req->engine;struct intel_crtc *intel_crtc =to_intel_crtc (crtc);uint32_t plane_bit =0 ;int len, ret;
@@ -11755,18 +11755,18 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc, work->flip_count =I915_READ (PIPE_FLIPCOUNT_G4X (pipe)) +1 ;if (IS_VALLEYVIEW (dev) ||IS_CHERRYVIEW (dev)) { - engine = &dev_priv->ring[BCS ]; + engine = &dev_priv->engine[BCS ];if (obj->tiling_mode !=intel_fb_obj (work->old_fb)->tiling_mode)/* vlv: DISPLAY_FLIP fails to change tiling */ engine =NULL ; }else if (IS_IVYBRIDGE (dev) ||IS_HASWELL (dev)) { - engine = &dev_priv->ring[BCS ]; + engine = &dev_priv->engine[BCS ]; }else if (INTEL_INFO (dev)->gen >=7 ) { engine =i915_gem_request_get_ring (obj->last_write_req);if (engine ==NULL || engine->id !=RCS ) - engine = &dev_priv->ring[BCS ]; + engine = &dev_priv->engine[BCS ]; }else { - engine = &dev_priv->ring[RCS ]; + engine = &dev_priv->engine[RCS ]; } mmio_flip =use_mmio_flip (engine, obj);
drivers/gpu/drm/i915/intel_lrc.c +38 -38
285 lines not on this page · raw message
drivers/gpu/drm/i915/intel_mocs.c +1 -1
@@ -322,7 +322,7 @@ int intel_rcs_context_init_mocs(struct drm_i915_gem_request *req)struct drm_i915_mocs_table t;int ret; -if (get_mocs_settings (req->ring->dev, &t)) { +if (get_mocs_settings (req->engine->dev, &t)) {struct drm_i915_private *dev_priv = req->i915;struct intel_engine_cs *engine;enum intel_ring_id ring_id;
drivers/gpu/drm/i915/intel_overlay.c +4 -4
@@ -233,7 +233,7 @@ static int intel_overlay_on(struct intel_overlay *overlay) {struct drm_device *dev = overlay->dev;struct drm_i915_private *dev_priv = dev->dev_private; -struct intel_engine_cs *engine = &dev_priv->ring[RCS ]; +struct intel_engine_cs *engine = &dev_priv->engine[RCS ];struct drm_i915_gem_request *req;int ret;
@@ -267,7 +267,7 @@ static int intel_overlay_continue(struct intel_overlay *overlay, {struct drm_device *dev = overlay->dev;struct drm_i915_private *dev_priv = dev->dev_private; -struct intel_engine_cs *engine = &dev_priv->ring[RCS ]; +struct intel_engine_cs *engine = &dev_priv->engine[RCS ];struct drm_i915_gem_request *req;u32 flip_addr = overlay->flip_addr;u32 tmp;
@@ -336,7 +336,7 @@ static int intel_overlay_off(struct intel_overlay *overlay) {struct drm_device *dev = overlay->dev;struct drm_i915_private *dev_priv = dev->dev_private; -struct intel_engine_cs *engine = &dev_priv->ring[RCS ]; +struct intel_engine_cs *engine = &dev_priv->engine[RCS ];struct drm_i915_gem_request *req;u32 flip_addr = overlay->flip_addr;int ret;
@@ -409,7 +409,7 @@ static int intel_overlay_release_old_vid(struct intel_overlay *overlay) {struct drm_device *dev = overlay->dev;struct drm_i915_private *dev_priv = dev->dev_private; -struct intel_engine_cs *engine = &dev_priv->ring[RCS ]; +struct intel_engine_cs *engine = &dev_priv->engine[RCS ];int ret;WARN_ON (!mutex_is_locked (&dev->struct_mutex));
drivers/gpu/drm/i915/intel_pm.c +1 -1
@@ -7365,7 +7365,7 @@ static void __intel_rps_boost_work(struct work_struct *work)struct drm_i915_gem_request *req = boost->req;if (!i915_gem_request_completed (req, true)) -gen6_rps_boost (to_i915 (req->ring->dev),NULL , +gen6_rps_boost (to_i915 (req->engine->dev),NULL , req->emitted_jiffies);i915_gem_request_unreference__unlocked (req);
drivers/gpu/drm/i915/intel_ringbuffer.c +37 -37
296 lines not on this page · raw message
drivers/gpu/drm/i915/intel_ringbuffer.h +1 -1
@@ -99,7 +99,7 @@ struct intel_ringbuffer {void __iomem *virtual_start;struct i915_vma *vma; -struct intel_engine_cs *ring; +struct intel_engine_cs *engine;struct list_head link;u32 head;
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 4/5 drm/i915: More intel_engine_cs renaming
In reply to Tvrtko UrsulinFrom: Tvrtko Ursulin <[email protected]>
Some trivial ones, first pass done with Coccinelle:
@@
@@
(
- I915_NUM_RINGS
+ I915_NUM_ENGINES
|
- intel_ring_flag
+ intel_engine_flag
|
- for_each_ring
+ for_each_engine
|
- i915_gem_request_get_ring
+ i915_gem_request_get_engine
|
- intel_ring_idle
+ intel_engine_idle
|
- i915_gem_reset_ring_status
+ i915_gem_reset_engine_status
|
- i915_gem_reset_ring_cleanup
+ i915_gem_reset_engine_cleanup
|
- init_ring_lists
+ init_engine_lists
)
But that didn't fully work so I cleaned it up with:
for f in *.[hc]; do sed -i -e s/I915_NUM_RINGS/I915_NUM_ENGINES/ $f; done
for f in *.[hc]; do sed -i -e s/i915_gem_request_get_ring/i915_gem_request_get_engine/ $f; done for f in *.[hc]; do sed -i -e s/intel_ring_flag/intel_engine_flag/ $f; done
for f in *.[hc]; do sed -i -e s/intel_ring_idle/intel_engine_idle/ $f; done
for f in *.[hc]; do sed -i -e s/init_ring_lists/init_engine_lists/ $f; done
for f in *.[hc]; do sed -i -e s/i915_gem_reset_ring_cleanup/i915_gem_reset_engine_cleanup/ $f; done for f in *.[hc]; do sed -i -e s/i915_gem_reset_ring_status/i915_gem_reset_engine_status/ $f; done
--- drivers/gpu/drm/i915/i915_debugfs.c | 52 ++++++++++----------- drivers/gpu/drm/i915/i915_drv.h | 26 +++++------ drivers/gpu/drm/i915/i915_gem.c | 74 +++++++++++++++--------------- drivers/gpu/drm/i915/i915_gem_context.c | 16 +++---- drivers/gpu/drm/i915/i915_gem_debug.c | 2 +- drivers/gpu/drm/i915/i915_gem_execbuffer.c | 4 +- drivers/gpu/drm/i915/i915_gem_gtt.c | 6 +-- drivers/gpu/drm/i915/i915_gpu_error.c | 12 ++--- drivers/gpu/drm/i915/i915_guc_submission.c | 6 +-- drivers/gpu/drm/i915/i915_irq.c | 20 ++++---- drivers/gpu/drm/i915/i915_trace.h | 6 +-- drivers/gpu/drm/i915/intel_display.c | 4 +- drivers/gpu/drm/i915/intel_guc_loader.c | 4 +- drivers/gpu/drm/i915/intel_lrc.c | 12 ++--- drivers/gpu/drm/i915/intel_mocs.c | 2 +- drivers/gpu/drm/i915/intel_pm.c | 12 ++--- drivers/gpu/drm/i915/intel_ringbuffer.c | 12 ++--- drivers/gpu/drm/i915/intel_ringbuffer.h | 20 ++++---- drivers/gpu/drm/i915/intel_uncore.c | 4 +- 19 files changed, 147 insertions(+), 147 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +26 -26
@@ -143,7 +143,7 @@ describe_obj(struct seq_file *m, struct drm_i915_gem_object *obj) obj->base.size /1024 , obj->base.read_domains, obj->base.write_domain); -for_each_ring (engine, dev_priv, i) +for_each_engine (engine, dev_priv, i)seq_printf (m,"%x " ,i915_gem_request_get_seqno (obj->last_read_req[i])); seq_printf(m, "] %x %x%s%s%s",
@@ -184,7 +184,7 @@ describe_obj(struct seq_file *m, struct drm_i915_gem_object *obj) }if (obj->last_write_req !=NULL )seq_printf (m," (%s)" , -i915_gem_request_get_ring (obj->last_write_req)->name); +i915_gem_request_get_engine (obj->last_write_req)->name);if (obj->frontbuffer_bits)seq_printf (m," (frontbuffer: 0x%03x)" , obj->frontbuffer_bits); }
@@ -402,7 +402,7 @@ static void print_batch_pool_stats(struct seq_file *m,memset (&stats,0 ,sizeof (stats)); -for_each_ring (engine, dev_priv, i) { +for_each_engine (engine, dev_priv, i) {for (j =0 ; j <ARRAY_SIZE (engine->batch_pool.cache_list); j++) { list_for_each_entry(obj, &engine->batch_pool.cache_list[j],
@@ -591,7 +591,7 @@ static int i915_gem_pageflip_info(struct seq_file *m, void *data) pipe, plane); }if (work->flip_queued_req) { -struct intel_engine_cs *engine =i915_gem_request_get_ring (work->flip_queued_req); +struct intel_engine_cs *engine =i915_gem_request_get_engine (work->flip_queued_req); seq_printf(m, "Flip queued on %s at seqno %x, next seqno %x [current breadcrumb %x], completed? %d\n", engine->name,
@@ -644,7 +644,7 @@ static int i915_gem_batch_pool_info(struct seq_file *m, void *data)if (ret)return ret; -for_each_ring (engine, dev_priv, i) { +for_each_engine (engine, dev_priv, i) {for (j =0 ; j <ARRAY_SIZE (engine->batch_pool.cache_list); j++) {int count;
@@ -689,7 +689,7 @@ static int i915_gem_request_info(struct seq_file *m, void *data)return ret; any =0 ; -for_each_ring (engine, dev_priv, i) { +for_each_engine (engine, dev_priv, i) {int count; count =0 ;
@@ -746,7 +746,7 @@ static int i915_gem_seqno_info(struct seq_file *m, void *data)return ret;intel_runtime_pm_get (dev_priv); -for_each_ring (engine, dev_priv, i) +for_each_engine (engine, dev_priv, i)i915_ring_seqno_info (m, engine);intel_runtime_pm_put (dev_priv);
@@ -933,7 +933,7 @@ static int i915_interrupt_info(struct seq_file *m, void *data)seq_printf (m,"Graphics Interrupt mask: %08x\n" ,I915_READ (GTIMR )); } -for_each_ring (engine, dev_priv, i) { +for_each_engine (engine, dev_priv, i) {if (INTEL_INFO (dev)->gen >=6 ) { seq_printf(m, "Graphics Interrupt mask (%s): %08x\n",
@@ -1331,8 +1331,8 @@ static int i915_hangcheck_info(struct seq_file *m, void *unused)struct drm_device *dev = node->minor->dev;struct drm_i915_private *dev_priv = dev->dev_private;struct intel_engine_cs *engine; -u64 acthd[I915_NUM_RINGS ]; -u32 seqno[I915_NUM_RINGS ]; +u64 acthd[I915_NUM_ENGINES ]; +u32 seqno[I915_NUM_ENGINES ];u32 instdone[I915_NUM_INSTDONE_REG ];int i, j;
@@ -1343,7 +1343,7 @@ static int i915_hangcheck_info(struct seq_file *m, void *unused)intel_runtime_pm_get (dev_priv); -for_each_ring (engine, dev_priv, i) { +for_each_engine (engine, dev_priv, i) { seqno[i] = engine->get_seqno (engine, false); acthd[i] =intel_ring_get_active_head (engine); }
@@ -1359,7 +1359,7 @@ static int i915_hangcheck_info(struct seq_file *m, void *unused) }else seq_printf (m,"Hangcheck inactive\n" ); -for_each_ring (engine, dev_priv, i) { +for_each_engine (engine, dev_priv, i) {seq_printf (m,"%s:\n" , engine->name);seq_printf (m,"\tseqno = %x [current %x]\n" , engine->hangcheck.seqno, seqno[i]);
@@ -1965,7 +1965,7 @@ static int i915_context_status(struct seq_file *m, void *unused)if (i915.enable_execlists) {seq_putc (m,'\n' ); -for_each_ring (engine, dev_priv, i) { +for_each_engine (engine, dev_priv, i) {struct drm_i915_gem_object *ctx_obj = ctx->engine[i].state; struct intel_ringbuffer *ringbuf =
@@ -2055,7 +2055,7 @@ static int i915_dump_lrc(struct seq_file *m, void *unused)list_for_each_entry (ctx, &dev_priv->context_list, link)if (ctx != dev_priv->kernel_context) -for_each_ring (engine, dev_priv, i) +for_each_engine (engine, dev_priv, i)i915_dump_lrc_obj (m, ctx, engine);mutex_unlock (&dev->struct_mutex);
@@ -2089,7 +2089,7 @@ static int i915_execlists(struct seq_file *m, void *data)intel_runtime_pm_get (dev_priv); -for_each_ring (engine, dev_priv, ring_id) { +for_each_engine (engine, dev_priv, ring_id) {struct drm_i915_gem_request *head_req =NULL ;int count =0 ;unsigned long flags;
@@ -2253,7 +2253,7 @@ static void gen8_ppgtt_info(struct seq_file *m, struct drm_device *dev)if (!ppgtt)return ; -for_each_ring (engine, dev_priv, unused) { +for_each_engine (engine, dev_priv, unused) {seq_printf (m,"%s\n" , engine->name);for (i =0 ; i <4 ; i++) {u64 pdp =I915_READ (GEN8_RING_PDP_UDW (engine, i));
@@ -2273,7 +2273,7 @@ static void gen6_ppgtt_info(struct seq_file *m, struct drm_device *dev)if (INTEL_INFO (dev)->gen ==6 )seq_printf (m,"GFX_MODE: 0x%08x\n" ,I915_READ (GFX_MODE )); -for_each_ring (engine, dev_priv, i) { +for_each_engine (engine, dev_priv, i) {seq_printf (m,"%s\n" , engine->name);if (INTEL_INFO (dev)->gen ==7 ) seq_printf(m, "GFX_MODE: 0x%08x\n",
@@ -2342,7 +2342,7 @@ static int count_irq_waiters(struct drm_i915_private *i915)int count =0 ;int i; -for_each_ring (engine, i915, i) +for_each_engine (engine, i915, i) count += engine->irq_refcount;return count;
@@ -2466,7 +2466,7 @@ static void i915_guc_client_info(struct seq_file *m,seq_printf (m,"\tFailed doorbell: %u\n" , client->b_fail);seq_printf (m,"\tLast submission result: %d\n" , client->retcode); -for_each_ring (engine, dev_priv, i) { +for_each_engine (engine, dev_priv, i) {seq_printf (m,"\tSubmissions: %llu %s\n" , client->submissions[engine->guc_id], engine->name);
@@ -2506,7 +2506,7 @@ static int i915_guc_info(struct seq_file *m, void *data)seq_printf (m,"GuC last action error code: %d\n" , guc.action_err);seq_printf (m,"\nGuC submissions:\n" ); -for_each_ring (engine, dev_priv, i) { +for_each_engine (engine, dev_priv, i) {seq_printf (m,"\t%-24s: %10llu, last seqno 0x%08x\n" , engine->name, guc.submissions[engine->guc_id], guc.last_seqno[engine->guc_id]);
@@ -3153,14 +3153,14 @@ static int i915_semaphore_status(struct seq_file *m, void *unused) page =i915_gem_object_get_page (dev_priv->semaphore_obj,0 ); seqno = (uint64_t *)kmap_atomic (page); -for_each_ring (engine, dev_priv, i) { +for_each_engine (engine, dev_priv, i) {uint64_t offset;seq_printf (m,"%s\n" , engine->name);seq_puts (m," Last signal:" );for (j =0 ; j < num_rings; j++) { - offset = i *I915_NUM_RINGS + j; + offset = i *I915_NUM_ENGINES + j;seq_printf (m,"0x%08llx (0x%02llx) " , seqno[offset], offset *8 ); }
@@ -3168,7 +3168,7 @@ static int i915_semaphore_status(struct seq_file *m, void *unused)seq_puts (m," Last wait: " );for (j =0 ; j < num_rings; j++) { - offset = i + (j *I915_NUM_RINGS ); + offset = i + (j *I915_NUM_ENGINES );seq_printf (m,"0x%08llx (0x%02llx) " , seqno[offset], offset *8 ); }
@@ -3178,7 +3178,7 @@ static int i915_semaphore_status(struct seq_file *m, void *unused)kunmap_atomic (seqno); }else {seq_puts (m," Last signal:" ); -for_each_ring (engine, dev_priv, i) +for_each_engine (engine, dev_priv, i)for (j =0 ; j < num_rings; j++)seq_printf (m,"0x%08x\n" ,I915_READ (engine->semaphore.mbox.signal[j]));
@@ -3186,7 +3186,7 @@ static int i915_semaphore_status(struct seq_file *m, void *unused) }seq_puts (m,"\nSync seqno:\n" ); -for_each_ring (engine, dev_priv, i) { +for_each_engine (engine, dev_priv, i) {for (j =0 ; j < num_rings; j++) {seq_printf (m," 0x%08x " , engine->semaphore.sync_seqno[j]);
@@ -3244,7 +3244,7 @@ static int i915_wa_registers(struct seq_file *m, void *unused)intel_runtime_pm_get (dev_priv);seq_printf (m,"Workarounds applied: %d\n" , workarounds->count); -for_each_ring (engine, dev_priv, i) +for_each_engine (engine, dev_priv, i)seq_printf (m,"HW whitelist count for %s: %d\n" , engine->name, workarounds->hw_whitelist_count[i]);for (i =0 ; i < workarounds->count; ++i) {
drivers/gpu/drm/i915/i915_drv.h +13 -13
@@ -533,7 +533,7 @@ struct drm_i915_error_state {u32 cpu_ring_head;u32 cpu_ring_tail; -u32 semaphore_seqno[I915_NUM_RINGS -1 ]; +u32 semaphore_seqno[I915_NUM_ENGINES -1 ];/* Register state */ u32 start;
@@ -553,7 +553,7 @@ struct drm_i915_error_state {u32 fault_reg;u64 faddr;u32 rc_psmi;/* sleep state */ -u32 semaphore_mboxes[I915_NUM_RINGS -1 ]; +u32 semaphore_mboxes[I915_NUM_ENGINES -1 ];struct drm_i915_error_object {int page_count;
@@ -579,12 +579,12 @@ struct drm_i915_error_state {pid_t pid;char comm[TASK_COMM_LEN ]; - } ring[I915_NUM_RINGS ]; + } ring[I915_NUM_ENGINES ];struct drm_i915_error_buffer {u32 size;u32 name; -u32 rseqno[I915_NUM_RINGS ], wseqno; +u32 rseqno[I915_NUM_ENGINES ], wseqno;u64 gtt_offset;u32 read_domains;u32 write_domain;
@@ -898,7 +898,7 @@ struct intel_context {struct i915_vma *lrc_vma;u64 lrc_desc;uint32_t *lrc_reg_state; - } engine[I915_NUM_RINGS ]; + } engine[I915_NUM_ENGINES ];struct list_head link; };
@@ -1713,7 +1713,7 @@ struct i915_wa_reg {struct i915_workarounds {struct i915_wa_reg reg[I915_MAX_WA_REGS ];u32 count; -u32 hw_whitelist_count[I915_NUM_RINGS ]; +u32 hw_whitelist_count[I915_NUM_ENGINES ]; };struct i915_virtual_gpu {
@@ -1778,7 +1778,7 @@ struct drm_i915_private {wait_queue_head_t gmbus_wait_queue;struct pci_dev *bridge_dev; -struct intel_engine_cs engine[I915_NUM_RINGS ]; +struct intel_engine_cs engine[I915_NUM_ENGINES ];struct drm_i915_gem_object *semaphore_obj;uint32_t last_seqno, next_seqno;
@@ -2040,8 +2040,8 @@ static inline struct drm_i915_private *guc_to_i915(struct intel_guc *guc) }/* Iterate over initialised rings */ -#define for_each_ring (ring__, dev_priv__, i__) \ - for ((i__) = 0; (i__) < I915_NUM_RINGS; (i__)++) \ +#define for_each_engine (ring__, dev_priv__, i__) \ + for ((i__) = 0; (i__) < I915_NUM_ENGINES; (i__)++) \ for_each_if ((((ring__) = &(dev_priv__)->engine[(i__)]), intel_ring_initialized((ring__))))enum hdmi_force_audio {
@@ -2112,7 +2112,7 @@ struct drm_i915_gem_object {struct drm_mm_node *stolen;struct list_head global_list; -struct list_head ring_list[I915_NUM_RINGS ]; +struct list_head ring_list[I915_NUM_ENGINES ];/** Used in execbuf to temporarily hold a ref */ struct list_head obj_exec_link;
@@ -2123,7 +2123,7 @@ struct drm_i915_gem_object {* rendering and so a non-zero seqno), and is not set if it i s on * inactive (ready to be unbound) list. */ - unsigned int active:I915_NUM_RINGS; + unsigned int active:I915_NUM_ENGINES;/** * This is set if the object has been written to since last bound
@@ -2202,7 +2202,7 @@ struct drm_i915_gem_object {* read request. This allows for the CPU to read from an active * buffer by only waiting for the write to complete. * */ -struct drm_i915_gem_request *last_read_req[I915_NUM_RINGS ]; +struct drm_i915_gem_request *last_read_req[I915_NUM_ENGINES ];struct drm_i915_gem_request *last_write_req;/** Breadcrumb of last fenced GPU access to the buffer. */ struct drm_i915_gem_request *last_fenced_req;
@@ -2350,7 +2350,7 @@ i915_gem_request_get_seqno(struct drm_i915_gem_request *req) }static inline struct intel_engine_cs * -i915_gem_request_get_ring (struct drm_i915_gem_request *req) +i915_gem_request_get_engine (struct drm_i915_gem_request *req) {return req ? req->engine :NULL ; }
drivers/gpu/drm/i915/i915_gem.c +37 -37
262 lines not on this page · raw message
drivers/gpu/drm/i915/i915_gem_context.c +8 -8
@@ -345,7 +345,7 @@ void i915_gem_context_reset(struct drm_device *dev)intel_lr_context_reset (dev, ctx); } -for (i =0 ; i <I915_NUM_RINGS ; i++) { +for (i =0 ; i <I915_NUM_ENGINES ; i++) {struct intel_engine_cs *engine = &dev_priv->engine[i];if (engine->last_context) {
@@ -426,7 +426,7 @@ void i915_gem_context_fini(struct drm_device *dev)i915_gem_object_ggtt_unpin (dctx->legacy_hw_ctx.rcs_state); } -for (i =I915_NUM_RINGS ; --i >=0 ;) { +for (i =I915_NUM_ENGINES ; --i >=0 ;) {struct intel_engine_cs *engine = &dev_priv->engine[i];if (engine->last_context) {
@@ -553,7 +553,7 @@ mi_set_context(struct drm_i915_gem_request *req, u32 hw_flags)intel_ring_emit (engine,MI_LOAD_REGISTER_IMM (num_rings)); -for_each_ring (signaller,to_i915 (engine->dev), i) { +for_each_engine (signaller,to_i915 (engine->dev), i) {if (signaller == engine)continue ;
@@ -582,7 +582,7 @@ mi_set_context(struct drm_i915_gem_request *req, u32 hw_flags)intel_ring_emit (engine,MI_LOAD_REGISTER_IMM (num_rings)); -for_each_ring (signaller,to_i915 (engine->dev), i) { +for_each_engine (signaller,to_i915 (engine->dev), i) {if (signaller == engine)continue ;
@@ -608,7 +608,7 @@ static inline bool should_skip_switch(struct intel_engine_cs *engine,return false;if (to->ppgtt && from == to && - !(intel_ring_flag (engine) & to->ppgtt->pd_dirty_rings)) + !(intel_engine_flag (engine) & to->ppgtt->pd_dirty_rings))return true;return false;
@@ -697,7 +697,7 @@ static int do_switch(struct drm_i915_gem_request *req) goto unpin_out;/* Doing a PD load always reloads the page dirs */ - to->ppgtt->pd_dirty_rings &= ~intel_ring_flag (engine); + to->ppgtt->pd_dirty_rings &= ~intel_engine_flag (engine); }if (engine != &dev_priv->engine[RCS ]) {
@@ -725,9 +725,9 @@ static int do_switch(struct drm_i915_gem_request *req)* space. This means we must enforce that a page table load * occur when this occurs. */ }else if (to->ppgtt && - (intel_ring_flag (engine) & to->ppgtt->pd_dirty_rings)) { + (intel_engine_flag (engine) & to->ppgtt->pd_dirty_rings)) { hw_flags |=MI_FORCE_RESTORE ; - to->ppgtt->pd_dirty_rings &= ~intel_ring_flag (engine); + to->ppgtt->pd_dirty_rings &= ~intel_engine_flag (engine); }/* We should never emit switch_mm more than once */
drivers/gpu/drm/i915/i915_gem_debug.c +1 -1
@@ -43,7 +43,7 @@ i915_verify_lists(struct drm_device *dev)if (warned)return 0 ; -for_each_ring (engine, dev_priv, i) { +for_each_engine (engine, dev_priv, i) {list_for_each_entry (obj, &engine->active_list, ring_list[engine->id]) { if (obj->base.dev != dev ||
drivers/gpu/drm/i915/i915_gem_execbuffer.c +2 -2
@@ -942,7 +942,7 @@ static int i915_gem_execbuffer_move_to_gpu(struct drm_i915_gem_request *req, struct list_head *vmas) { - const unsigned other_rings = ~intel_ring_flag(req->engine); + const unsigned other_rings = ~intel_engine_flag(req->engine);struct i915_vma *vma;uint32_t flush_domains =0 ;bool flush_chipset = false;
@@ -1099,7 +1099,7 @@ void i915_gem_execbuffer_move_to_active(struct list_head *vmas, struct drm_i915_gem_request *req) { - struct intel_engine_cs *engine = i915_gem_request_get_ring(req); + struct intel_engine_cs *engine = i915_gem_request_get_engine(req);struct i915_vma *vma;list_for_each_entry (vma, vmas, exec_list) {
drivers/gpu/drm/i915/i915_gem_gtt.c +3 -3
@@ -1739,7 +1739,7 @@ static void gen8_ppgtt_enable(struct drm_device *dev)struct intel_engine_cs *engine;int j; -for_each_ring (engine, dev_priv, j) { +for_each_engine (engine, dev_priv, j) {u32 four_level =USES_FULL_48BIT_PPGTT (dev) ?GEN8_GFX_PPGTT_48B :0 ;I915_WRITE (RING_MODE_GEN7 (engine),_MASKED_BIT_ENABLE (GFX_PPGTT_ENABLE | four_level));
@@ -1765,7 +1765,7 @@ static void gen7_ppgtt_enable(struct drm_device *dev) }I915_WRITE (GAM_ECOCHK , ecochk); -for_each_ring (engine, dev_priv, i) { +for_each_engine (engine, dev_priv, i) {/* GFX_MODE is per-ring on gen7+ */ I915_WRITE (RING_MODE_GEN7 (engine),_MASKED_BIT_ENABLE (GFX_PPGTT_ENABLE ));
@@ -2292,7 +2292,7 @@ void i915_check_and_clear_faults(struct drm_device *dev)if (INTEL_INFO (dev)->gen <6 )return ; -for_each_ring (engine, dev_priv, i) { +for_each_engine (engine, dev_priv, i) {u32 fault_reg; fault_reg =I915_READ (RING_FAULT_REG (engine));if (fault_reg &RING_FAULT_VALID ) {
drivers/gpu/drm/i915/i915_gpu_error.c +6 -6
@@ -198,7 +198,7 @@ static void print_error_buffers(struct drm_i915_error_state_buf *m, err->size, err->read_domains, err->write_domain); -for (i =0 ; i <I915_NUM_RINGS ; i++) +for (i =0 ; i <I915_NUM_ENGINES ; i++)err_printf (m,"%02x " , err->rseqno[i]);err_printf (m,"] %02x" , err->wseqno);
@@ -732,7 +732,7 @@ static void capture_bo(struct drm_i915_error_buffer *err, err->size = obj->base.size; err->name = obj->base.name; -for (i =0 ; i <I915_NUM_RINGS ; i++) +for (i =0 ; i <I915_NUM_ENGINES ; i++) err->rseqno[i] =i915_gem_request_get_seqno (obj->last_read_req[i]); err->wseqno =i915_gem_request_get_seqno (obj->last_write_req); err->gtt_offset = vma->node.start;
@@ -747,7 +747,7 @@ static void capture_bo(struct drm_i915_error_buffer *err, err->purgeable = obj->madv !=I915_MADV_WILLNEED ; err->userptr = obj->userptr.mm !=NULL ; err->ring = obj->last_write_req ? -i915_gem_request_get_ring (obj->last_write_req)->id :-1 ; +i915_gem_request_get_engine (obj->last_write_req)->id :-1 ; err->cache_level = obj->cache_level; }
@@ -809,7 +809,7 @@ static uint32_t i915_error_generate_code(struct drm_i915_private *dev_priv,* synchronization commands which almost always appear in the case * strictly a client bug. Use instdone to differentiate those some. */ -for (i =0 ; i <I915_NUM_RINGS ; i++) { +for (i =0 ; i <I915_NUM_ENGINES ; i++) {if (error->ring[i].hangcheck_action ==HANGCHECK_HUNG ) {if (ring_id) *ring_id = i;
@@ -856,7 +856,7 @@ static void gen8_record_semaphore_state(struct drm_i915_private *dev_priv,i915_error_ggtt_object_create (dev_priv, dev_priv->semaphore_obj); -for_each_ring (to, dev_priv, i) { +for_each_engine (to, dev_priv, i) {int idx;u16 signal_offset;u32 *tmp;
@@ -1019,7 +1019,7 @@ static void i915_gem_record_rings(struct drm_device *dev,struct drm_i915_gem_request *request;int i, count; -for (i =0 ; i <I915_NUM_RINGS ; i++) { +for (i =0 ; i <I915_NUM_ENGINES ; i++) {struct intel_engine_cs *engine = &dev_priv->engine[i];struct intel_ringbuffer *rbuf;
drivers/gpu/drm/i915/i915_guc_submission.c +3 -3
@@ -390,7 +390,7 @@ static void guc_init_ctx_desc(struct intel_guc *guc, desc.priority = client->priority; desc.db_id = client->doorbell_id; -for_each_ring (engine, dev_priv, i) { +for_each_engine (engine, dev_priv, i) {struct guc_execlist_context *lrc = &desc.lrc[engine->guc_id];struct drm_i915_gem_object *obj;uint64_t ctx_desc;
@@ -871,7 +871,7 @@ static void guc_create_ads(struct intel_guc *guc) engine = &dev_priv->engine[RCS ]; ads->golden_context_lrca = engine->status_page.gfx_addr; -for_each_ring (engine, dev_priv, i) +for_each_engine (engine, dev_priv, i) ads->eng_state_size[engine->guc_id] =intel_lr_context_size (engine);/* GuC scheduling policies */
@@ -884,7 +884,7 @@ static void guc_create_ads(struct intel_guc *guc)/* MMIO reg state */ reg_state = (void *)policies +sizeof (struct guc_policies ); -for_each_ring (engine, dev_priv, i) { +for_each_engine (engine, dev_priv, i) { reg_state->mmio_white_list[engine->guc_id].mmio_start = engine->mmio_base +GUC_MMIO_WHITE_LIST_START ;
drivers/gpu/drm/i915/i915_irq.c +10 -10
@@ -1082,7 +1082,7 @@ static bool any_waiters(struct drm_i915_private *dev_priv)struct intel_engine_cs *engine;int i; -for_each_ring (engine, dev_priv, i) +for_each_engine (engine, dev_priv, i)if (engine->irq_refcount)return true;
@@ -2460,7 +2460,7 @@ static void i915_error_wake_up(struct drm_i915_private *dev_priv,*/ /* Wake up __wait_seqno, potentially holding dev->struct_mutex. */ -for_each_ring (engine, dev_priv, i) +for_each_engine (engine, dev_priv, i)wake_up_all (&engine->irq_queue);/* Wake up intel_crtc_wait_for_pending_flips, holding crtc->mutex. */
@@ -2832,7 +2832,7 @@ semaphore_wait_to_signaller_ring(struct intel_engine_cs *engine, u32 ipehr,int i;if (INTEL_INFO (dev_priv->dev)->gen >=8 ) { -for_each_ring (signaller, dev_priv, i) { +for_each_engine (signaller, dev_priv, i) {if (engine == signaller)continue ;
@@ -2842,7 +2842,7 @@ semaphore_wait_to_signaller_ring(struct intel_engine_cs *engine, u32 ipehr, }else {u32 sync_bits = ipehr &MI_SEMAPHORE_SYNC_MASK ; -for_each_ring (signaller, dev_priv, i) { +for_each_engine (signaller, dev_priv, i) {if (engine == signaller)continue ;
@@ -2941,7 +2941,7 @@ static int semaphore_passed(struct intel_engine_cs *engine)return -1 ;/* Prevent pathological recursion due to driver bugs */ -if (signaller->hangcheck.deadlock >=I915_NUM_RINGS ) +if (signaller->hangcheck.deadlock >=I915_NUM_ENGINES )return -1 ;if (i915_seqno_passed (signaller->get_seqno (signaller, false), seqno))
@@ -2960,7 +2960,7 @@ static void semaphore_clear_deadlocks(struct drm_i915_private *dev_priv)struct intel_engine_cs *engine;int i; -for_each_ring (engine, dev_priv, i) +for_each_engine (engine, dev_priv, i) engine->hangcheck.deadlock =0 ; }
@@ -3075,7 +3075,7 @@ static void i915_hangcheck_elapsed(struct work_struct *work)struct intel_engine_cs *engine;int i;int busy_count =0 , rings_hung =0 ; -bool stuck[I915_NUM_RINGS ] = {0 }; +bool stuck[I915_NUM_ENGINES ] = {0 };#define BUSY 1#define KICK 5#define HUNG 20
@@ -3097,7 +3097,7 @@ static void i915_hangcheck_elapsed(struct work_struct *work)*/ intel_uncore_arm_unclaimed_mmio_detection (dev_priv); -for_each_ring (engine, dev_priv, i) { +for_each_engine (engine, dev_priv, i) {u64 acthd;u32 seqno;bool busy = true;
@@ -3114,7 +3114,7 @@ static void i915_hangcheck_elapsed(struct work_struct *work)if (waitqueue_active (&engine->irq_queue)) {/* Issue a wake-up to catch stuck h/w. */ if (!test_and_set_bit (engine->id, &dev_priv->gpu_error.missed_irq_rings)) { -if (!(dev_priv->gpu_error.test_irq_rings &intel_ring_flag (engine))) +if (!(dev_priv->gpu_error.test_irq_rings &intel_engine_flag (engine)))DRM_ERROR ("Hangcheck timer elapsed... %s idle\n" , engine->name);else
@@ -3184,7 +3184,7 @@ static void i915_hangcheck_elapsed(struct work_struct *work) busy_count += busy; } -for_each_ring (engine, dev_priv, i) { +for_each_engine (engine, dev_priv, i) {if (engine->hangcheck.score >=HANGCHECK_SCORE_RING_HUNG ) { DRM_INFO("%s on %s\n", stuck[i] ? "stuck" : "no progress",
drivers/gpu/drm/i915/i915_trace.h +3 -3
@@ -487,7 +487,7 @@ TRACE_EVENT(i915_gem_ring_dispatch,TP_fast_assign ( struct intel_engine_cs *ring = -i915_gem_request_get_ring (req); +i915_gem_request_get_engine (req); __entry->dev = ring->dev->primary->index; __entry->ring = ring->id; __entry->seqno =i915_gem_request_get_seqno (req);
@@ -534,7 +534,7 @@ DECLARE_EVENT_CLASS(i915_gem_request,TP_fast_assign ( struct intel_engine_cs *ring = -i915_gem_request_get_ring (req); +i915_gem_request_get_engine (req); __entry->dev = ring->dev->primary->index; __entry->ring = ring->id; __entry->seqno =i915_gem_request_get_seqno (req);
@@ -598,7 +598,7 @@ TRACE_EVENT(i915_gem_request_wait_begin,*/ TP_fast_assign ( struct intel_engine_cs *ring = -i915_gem_request_get_ring (req); +i915_gem_request_get_engine (req); __entry->dev = ring->dev->primary->index; __entry->ring = ring->id; __entry->seqno =i915_gem_request_get_seqno (req);
drivers/gpu/drm/i915/intel_display.c +2 -2
@@ -11422,7 +11422,7 @@ static bool use_mmio_flip(struct intel_engine_cs *engine, false))return true; else - return engine != i915_gem_request_get_ring(obj->last_write_req); + return engine != i915_gem_request_get_engine(obj->last_write_req); } static void skl_do_mmio_flip(struct intel_crtc *intel_crtc,
@@ -11762,7 +11762,7 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc, }else if (IS_IVYBRIDGE (dev) ||IS_HASWELL (dev)) { engine = &dev_priv->engine[BCS ]; }else if (INTEL_INFO (dev)->gen >=7 ) { - engine =i915_gem_request_get_ring (obj->last_write_req); + engine =i915_gem_request_get_engine (obj->last_write_req);if (engine ==NULL || engine->id !=RCS ) engine = &dev_priv->engine[BCS ]; }else {
drivers/gpu/drm/i915/intel_guc_loader.c +2 -2
@@ -87,7 +87,7 @@ static void direct_interrupts_to_host(struct drm_i915_private *dev_priv)/* tell all command streamers NOT to forward interrupts and vblank to GuC */ irqs =_MASKED_FIELD (GFX_FORWARD_VBLANK_MASK ,GFX_FORWARD_VBLANK_NEVER ); irqs |=_MASKED_BIT_DISABLE (GFX_INTERRUPT_STEERING ); -for_each_ring (engine, dev_priv, i) +for_each_engine (engine, dev_priv, i)I915_WRITE (RING_MODE_GEN7 (engine), irqs);/* route all GT interrupts to the host */
@@ -104,7 +104,7 @@ static void direct_interrupts_to_guc(struct drm_i915_private *dev_priv)/* tell all command streamers to forward interrupts and vblank to GuC */ irqs =_MASKED_FIELD (GFX_FORWARD_VBLANK_MASK ,GFX_FORWARD_VBLANK_ALWAYS ); irqs |=_MASKED_BIT_ENABLE (GFX_INTERRUPT_STEERING ); -for_each_ring (engine, dev_priv, i) +for_each_engine (engine, dev_priv, i)I915_WRITE (RING_MODE_GEN7 (engine), irqs);/* route USER_INTERRUPT to Host, all others are sent to GuC. */
drivers/gpu/drm/i915/intel_lrc.c +6 -6
@@ -669,7 +669,7 @@ static int logical_ring_invalidate_all_caches(struct drm_i915_gem_request *req)static int execlists_move_to_gpu (struct drm_i915_gem_request *req,struct list_head *vmas) { -const unsigned other_rings = ~intel_ring_flag (req->engine); +const unsigned other_rings = ~intel_engine_flag (req->engine);struct i915_vma *vma;uint32_t flush_domains =0 ;bool flush_chipset = false;
@@ -1057,7 +1057,7 @@ void intel_logical_ring_stop(struct intel_engine_cs *engine)if (!intel_ring_initialized (engine))return ; - ret =intel_ring_idle (engine); + ret =intel_engine_idle (engine);if (ret && !i915_reset_in_progress (&to_i915 (engine->dev)->gpu_error))DRM_ERROR ("failed to quiesce %s whilst cleaning up: %d\n" , engine->name, ret);
@@ -1688,7 +1688,7 @@ static int gen8_emit_bb_start(struct drm_i915_gem_request *req,* not idle). PML4 is allocated during ppgtt init so this is * not needed in 48-bit.*/ if (req->ctx->ppgtt && - (intel_ring_flag (req->engine) & req->ctx->ppgtt->pd_dirty_rings)) { + (intel_engine_flag (req->engine) & req->ctx->ppgtt->pd_dirty_rings)) {if (!USES_FULL_48BIT_PPGTT (req->i915) && !intel_vgpu_active (req->i915->dev)) { ret =intel_logical_ring_emit_pdps (req);
@@ -1696,7 +1696,7 @@ static int gen8_emit_bb_start(struct drm_i915_gem_request *req,return ret; } - req->ctx->ppgtt->pd_dirty_rings &= ~intel_ring_flag (req->engine); + req->ctx->ppgtt->pd_dirty_rings &= ~intel_engine_flag (req->engine); } ret =intel_logical_ring_begin (req,4 );
@@ -2511,7 +2511,7 @@ void intel_lr_context_free(struct intel_context *ctx) {int i; -for (i =I915_NUM_RINGS ; --i >=0 ; ) { +for (i =I915_NUM_ENGINES ; --i >=0 ; ) {struct intel_ringbuffer *ringbuf = ctx->engine[i].ringbuf;struct drm_i915_gem_object *ctx_obj = ctx->engine[i].state;
@@ -2674,7 +2674,7 @@ void intel_lr_context_reset(struct drm_device *dev,struct intel_engine_cs *engine;int i; -for_each_ring (engine, dev_priv, i) { +for_each_engine (engine, dev_priv, i) {struct drm_i915_gem_object *ctx_obj = ctx->engine[engine->id].state; struct intel_ringbuffer *ringbuf =
drivers/gpu/drm/i915/intel_mocs.c +1 -1
@@ -328,7 +328,7 @@ int intel_rcs_context_init_mocs(struct drm_i915_gem_request *req)enum intel_ring_id ring_id;/* Program the control registers */ -for_each_ring (engine, dev_priv, ring_id) { +for_each_engine (engine, dev_priv, ring_id) { ret =emit_mocs_control_table (req, &t, ring_id);if (ret)return ret;
drivers/gpu/drm/i915/intel_pm.c +6 -6
@@ -4838,7 +4838,7 @@ static void gen9_enable_rc6(struct drm_device *dev)I915_WRITE (GEN6_RC6_WAKE_RATE_LIMIT ,54 <<16 );I915_WRITE (GEN6_RC_EVALUATION_INTERVAL ,125000 );/* 12500 * 1280ns */ I915_WRITE (GEN6_RC_IDLE_HYSTERSIS ,25 );/* 25 * 1280ns */ -for_each_ring (engine, dev_priv, unused) +for_each_engine (engine, dev_priv, unused)I915_WRITE (RING_MAX_IDLE (engine->mmio_base),10 );if (HAS_GUC_UCODE (dev))
@@ -4906,7 +4906,7 @@ static void gen8_enable_rps(struct drm_device *dev)I915_WRITE (GEN6_RC6_WAKE_RATE_LIMIT ,40 <<16 );I915_WRITE (GEN6_RC_EVALUATION_INTERVAL ,125000 );/* 12500 * 1280ns */ I915_WRITE (GEN6_RC_IDLE_HYSTERSIS ,25 );/* 25 * 1280ns */ -for_each_ring (engine, dev_priv, unused) +for_each_engine (engine, dev_priv, unused)I915_WRITE (RING_MAX_IDLE (engine->mmio_base),10 );I915_WRITE (GEN6_RC_SLEEP ,0 );if (IS_BROADWELL (dev))
@@ -5003,7 +5003,7 @@ static void gen6_enable_rps(struct drm_device *dev)I915_WRITE (GEN6_RC_EVALUATION_INTERVAL ,125000 );I915_WRITE (GEN6_RC_IDLE_HYSTERSIS ,25 ); -for_each_ring (engine, dev_priv, i) +for_each_engine (engine, dev_priv, i)I915_WRITE (RING_MAX_IDLE (engine->mmio_base),10 );I915_WRITE (GEN6_RC_SLEEP ,0 );
@@ -5522,7 +5522,7 @@ static void cherryview_enable_rps(struct drm_device *dev)I915_WRITE (GEN6_RC_EVALUATION_INTERVAL ,125000 );/* 12500 * 1280ns */ I915_WRITE (GEN6_RC_IDLE_HYSTERSIS ,25 );/* 25 * 1280ns */ -for_each_ring (engine, dev_priv, i) +for_each_engine (engine, dev_priv, i)I915_WRITE (RING_MAX_IDLE (engine->mmio_base),10 );I915_WRITE (GEN6_RC_SLEEP ,0 );
@@ -5633,7 +5633,7 @@ static void valleyview_enable_rps(struct drm_device *dev)I915_WRITE (GEN6_RC_EVALUATION_INTERVAL ,125000 );I915_WRITE (GEN6_RC_IDLE_HYSTERSIS ,25 ); -for_each_ring (engine, dev_priv, i) +for_each_engine (engine, dev_priv, i)I915_WRITE (RING_MAX_IDLE (engine->mmio_base),10 );I915_WRITE (GEN6_RC6_THRESHOLD ,0x557 );
@@ -6019,7 +6019,7 @@ bool i915_gpu_busy(void) goto out_unlock; dev_priv = i915_mch_dev; -for_each_ring (engine, dev_priv, i) +for_each_engine (engine, dev_priv, i) ret |= !list_empty (&engine->request_list); out_unlock:
drivers/gpu/drm/i915/intel_ringbuffer.c +6 -6
@@ -62,7 +62,7 @@ int intel_ring_space(struct intel_ringbuffer *ringbuf)bool intel_ring_stopped (struct intel_engine_cs *engine) {struct drm_i915_private *dev_priv = engine->dev->dev_private; -return dev_priv->gpu_error.stop_rings &intel_ring_flag (engine); +return dev_priv->gpu_error.stop_rings &intel_engine_flag (engine); }static void __intel_ring_advance (struct intel_engine_cs *engine)
@@ -1283,7 +1283,7 @@ static int gen8_rcs_signal(struct drm_i915_gem_request *signaller_req,if (ret)return ret; -for_each_ring (waiter, dev_priv, i) { +for_each_engine (waiter, dev_priv, i) {u32 seqno;u64 gtt_offset = signaller->semaphore.signal_ggtt[i];if (gtt_offset ==MI_SEMAPHORE_SYNC_INVALID )
@@ -1324,7 +1324,7 @@ static int gen8_xcs_signal(struct drm_i915_gem_request *signaller_req,if (ret)return ret; -for_each_ring (waiter, dev_priv, i) { +for_each_engine (waiter, dev_priv, i) {u32 seqno;u64 gtt_offset = signaller->semaphore.signal_ggtt[i];if (gtt_offset ==MI_SEMAPHORE_SYNC_INVALID )
@@ -1363,7 +1363,7 @@ static int gen6_signal(struct drm_i915_gem_request *signaller_req,if (ret)return ret; -for_each_ring (useless, dev_priv, i) { +for_each_engine (useless, dev_priv, i) {i915_reg_t mbox_reg = signaller->semaphore.mbox.signal[i];if (i915_mmio_reg_valid (mbox_reg)) {
@@ -2356,7 +2356,7 @@ static void __wrap_ring_buffer(struct intel_ringbuffer *ringbuf)intel_ring_update_space (ringbuf); } -int intel_ring_idle (struct intel_engine_cs *engine) +int intel_engine_idle (struct intel_engine_cs *engine) {struct drm_i915_gem_request *req;
@@ -3170,7 +3170,7 @@ intel_stop_ring_buffer(struct intel_engine_cs *engine)if (!intel_ring_initialized (engine))return ; - ret =intel_ring_idle (engine); + ret =intel_engine_idle (engine);if (ret && !i915_reset_in_progress (&to_i915 (engine->dev)->gpu_error))DRM_ERROR ("failed to quiesce %s whilst cleaning up: %d\n" , engine->name, ret);
drivers/gpu/drm/i915/intel_ringbuffer.h +10 -10
@@ -55,12 +55,12 @@ struct intel_hw_status_page {#define i915_semaphore_seqno_size sizeof(uint64_t)#define GEN8_SIGNAL_OFFSET (__ring, to) \ (i915_gem_obj_ggtt_offset(dev_priv->semaphore_obj) + \ - ((__ring)->id * I915_NUM_RINGS * i915_semaphore_seqno_size) + \ + ((__ring)->id * I915_NUM_ENGINES * i915_semaphore_seqno_size) + \ (i915_semaphore_seqno_size * (to)))#define GEN8_WAIT_OFFSET (__ring, from) \ (i915_gem_obj_ggtt_offset(dev_priv->semaphore_obj) + \ - ((from) * I915_NUM_RINGS * i915_semaphore_seqno_size) + \ + ((from) * I915_NUM_ENGINES * i915_semaphore_seqno_size) + \ (i915_semaphore_seqno_size * (__ring)->id))#define GEN8_RING_SEMAPHORE_INIT (e) do { \
@@ -153,7 +153,7 @@ struct intel_engine_cs {VCS2 ,/* Keep instances of the same type engine together. */ VECS } id; -#define I915_NUM_RINGS 5 +#define I915_NUM_ENGINES 5#define _VCS (n) (VCS + (n))unsigned int exec_id;unsigned int guc_id;
@@ -244,16 +244,16 @@ struct intel_engine_cs {* ie. transpose of f(x, y) */ struct { -u32 sync_seqno[I915_NUM_RINGS -1 ]; +u32 sync_seqno[I915_NUM_ENGINES -1 ];union {struct {/* our mbox written by others */ -u32 wait[I915_NUM_RINGS ]; +u32 wait[I915_NUM_ENGINES ];/* mboxes this ring signals to */ -i915_reg_t signal[I915_NUM_RINGS ]; +i915_reg_t signal[I915_NUM_ENGINES ]; } mbox; -u64 signal_ggtt[I915_NUM_RINGS ]; +u64 signal_ggtt[I915_NUM_ENGINES ]; };/* AKA wait() */
@@ -361,7 +361,7 @@ intel_ring_initialized(struct intel_engine_cs *engine) }static inline unsigned -intel_ring_flag (struct intel_engine_cs *engine) +intel_engine_flag (struct intel_engine_cs *engine) {return 1 << engine->id; }
@@ -382,7 +382,7 @@ intel_ring_sync_index(struct intel_engine_cs *engine, idx = (other - engine) -1 ;if (idx <0 ) - idx +=I915_NUM_RINGS ; + idx +=I915_NUM_ENGINES ;return idx; }
@@ -467,7 +467,7 @@ void intel_ring_update_space(struct intel_ringbuffer *ringbuf);int intel_ring_space (struct intel_ringbuffer *ringbuf);bool intel_ring_stopped (struct intel_engine_cs *engine); -int __must_check intel_ring_idle (struct intel_engine_cs *engine); +int __must_check intel_engine_idle (struct intel_engine_cs *engine);void intel_ring_init_seqno (struct intel_engine_cs *engine,u32 seqno);int intel_ring_flush_all_caches (struct drm_i915_gem_request *req);int intel_ring_invalidate_all_caches (struct drm_i915_gem_request *req);
drivers/gpu/drm/i915/intel_uncore.c +2 -2
@@ -1573,14 +1573,14 @@ static int gen8_do_reset(struct drm_device *dev)struct intel_engine_cs *engine;int i; -for_each_ring (engine, dev_priv, i) +for_each_engine (engine, dev_priv, i)if (gen8_request_engine_reset (engine)) goto not_ready;return gen6_do_reset (dev); not_ready: -for_each_ring (engine, dev_priv, i) +for_each_engine (engine, dev_priv, i)gen8_unrequest_engine_reset (engine);return -EIO ;
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 4/5 drm/i915: More intel_engine_cs renaming
From: Tvrtko Ursulin <[email protected]>
Some trivial ones, first pass done with Coccinelle:
@@
@@
(
- I915_NUM_RINGS
+ I915_NUM_ENGINES
|
- intel_ring_flag
+ intel_engine_flag
|
- for_each_ring
+ for_each_engine
|
- i915_gem_request_get_ring
+ i915_gem_request_get_engine
|
- intel_ring_idle
+ intel_engine_idle
|
- i915_gem_reset_ring_status
+ i915_gem_reset_engine_status
|
- i915_gem_reset_ring_cleanup
+ i915_gem_reset_engine_cleanup
|
- init_ring_lists
+ init_engine_lists
)
But that didn't fully work so I cleaned it up with:
for f in *.[hc]; do sed -i -e s/I915_NUM_RINGS/I915_NUM_ENGINES/ $f; done
for f in *.[hc]; do sed -i -e s/i915_gem_request_get_ring/i915_gem_request_get_engine/ $f; done for f in *.[hc]; do sed -i -e s/intel_ring_flag/intel_engine_flag/ $f; done
for f in *.[hc]; do sed -i -e s/intel_ring_idle/intel_engine_idle/ $f; done
for f in *.[hc]; do sed -i -e s/init_ring_lists/init_engine_lists/ $f; done
for f in *.[hc]; do sed -i -e s/i915_gem_reset_ring_cleanup/i915_gem_reset_engine_cleanup/ $f; done for f in *.[hc]; do sed -i -e s/i915_gem_reset_ring_status/i915_gem_reset_engine_status/ $f; done
v2: Rebase.
--- drivers/gpu/drm/i915/i915_debugfs.c | 52 ++++++++++----------- drivers/gpu/drm/i915/i915_drv.h | 26 +++++------ drivers/gpu/drm/i915/i915_gem.c | 74 +++++++++++++++--------------- drivers/gpu/drm/i915/i915_gem_context.c | 16 +++---- drivers/gpu/drm/i915/i915_gem_debug.c | 2 +- drivers/gpu/drm/i915/i915_gem_execbuffer.c | 4 +- drivers/gpu/drm/i915/i915_gem_gtt.c | 6 +-- drivers/gpu/drm/i915/i915_gpu_error.c | 12 ++--- drivers/gpu/drm/i915/i915_guc_submission.c | 6 +-- drivers/gpu/drm/i915/i915_irq.c | 20 ++++---- drivers/gpu/drm/i915/i915_trace.h | 6 +-- drivers/gpu/drm/i915/intel_display.c | 4 +- drivers/gpu/drm/i915/intel_guc_loader.c | 4 +- drivers/gpu/drm/i915/intel_lrc.c | 12 ++--- drivers/gpu/drm/i915/intel_mocs.c | 2 +- drivers/gpu/drm/i915/intel_pm.c | 12 ++--- drivers/gpu/drm/i915/intel_ringbuffer.c | 12 ++--- drivers/gpu/drm/i915/intel_ringbuffer.h | 20 ++++---- drivers/gpu/drm/i915/intel_uncore.c | 4 +- 19 files changed, 147 insertions(+), 147 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +26 -26
@@ -143,7 +143,7 @@ describe_obj(struct seq_file *m, struct drm_i915_gem_object *obj) obj->base.size /1024 , obj->base.read_domains, obj->base.write_domain); -for_each_ring (engine, dev_priv, i) +for_each_engine (engine, dev_priv, i)seq_printf (m,"%x " ,i915_gem_request_get_seqno (obj->last_read_req[i])); seq_printf(m, "] %x %x%s%s%s",
@@ -184,7 +184,7 @@ describe_obj(struct seq_file *m, struct drm_i915_gem_object *obj) }if (obj->last_write_req !=NULL )seq_printf (m," (%s)" , -i915_gem_request_get_ring (obj->last_write_req)->name); +i915_gem_request_get_engine (obj->last_write_req)->name);if (obj->frontbuffer_bits)seq_printf (m," (frontbuffer: 0x%03x)" , obj->frontbuffer_bits); }
@@ -402,7 +402,7 @@ static void print_batch_pool_stats(struct seq_file *m,memset (&stats,0 ,sizeof (stats)); -for_each_ring (engine, dev_priv, i) { +for_each_engine (engine, dev_priv, i) {for (j =0 ; j <ARRAY_SIZE (engine->batch_pool.cache_list); j++) { list_for_each_entry(obj, &engine->batch_pool.cache_list[j],
@@ -591,7 +591,7 @@ static int i915_gem_pageflip_info(struct seq_file *m, void *data) pipe, plane); }if (work->flip_queued_req) { -struct intel_engine_cs *engine =i915_gem_request_get_ring (work->flip_queued_req); +struct intel_engine_cs *engine =i915_gem_request_get_engine (work->flip_queued_req); seq_printf(m, "Flip queued on %s at seqno %x, next seqno %x [current breadcrumb %x], completed? %d\n", engine->name,
@@ -644,7 +644,7 @@ static int i915_gem_batch_pool_info(struct seq_file *m, void *data)if (ret)return ret; -for_each_ring (engine, dev_priv, i) { +for_each_engine (engine, dev_priv, i) {for (j =0 ; j <ARRAY_SIZE (engine->batch_pool.cache_list); j++) {int count;
@@ -689,7 +689,7 @@ static int i915_gem_request_info(struct seq_file *m, void *data)return ret; any =0 ; -for_each_ring (engine, dev_priv, i) { +for_each_engine (engine, dev_priv, i) {int count; count =0 ;
@@ -746,7 +746,7 @@ static int i915_gem_seqno_info(struct seq_file *m, void *data)return ret;intel_runtime_pm_get (dev_priv); -for_each_ring (engine, dev_priv, i) +for_each_engine (engine, dev_priv, i)i915_ring_seqno_info (m, engine);intel_runtime_pm_put (dev_priv);
@@ -933,7 +933,7 @@ static int i915_interrupt_info(struct seq_file *m, void *data)seq_printf (m,"Graphics Interrupt mask: %08x\n" ,I915_READ (GTIMR )); } -for_each_ring (engine, dev_priv, i) { +for_each_engine (engine, dev_priv, i) {if (INTEL_INFO (dev)->gen >=6 ) { seq_printf(m, "Graphics Interrupt mask (%s): %08x\n",
@@ -1331,8 +1331,8 @@ static int i915_hangcheck_info(struct seq_file *m, void *unused)struct drm_device *dev = node->minor->dev;struct drm_i915_private *dev_priv = dev->dev_private;struct intel_engine_cs *engine; -u64 acthd[I915_NUM_RINGS ]; -u32 seqno[I915_NUM_RINGS ]; +u64 acthd[I915_NUM_ENGINES ]; +u32 seqno[I915_NUM_ENGINES ];u32 instdone[I915_NUM_INSTDONE_REG ];int i, j;
@@ -1343,7 +1343,7 @@ static int i915_hangcheck_info(struct seq_file *m, void *unused)intel_runtime_pm_get (dev_priv); -for_each_ring (engine, dev_priv, i) { +for_each_engine (engine, dev_priv, i) { seqno[i] = engine->get_seqno (engine, false); acthd[i] =intel_ring_get_active_head (engine); }
@@ -1359,7 +1359,7 @@ static int i915_hangcheck_info(struct seq_file *m, void *unused) }else seq_printf (m,"Hangcheck inactive\n" ); -for_each_ring (engine, dev_priv, i) { +for_each_engine (engine, dev_priv, i) {seq_printf (m,"%s:\n" , engine->name);seq_printf (m,"\tseqno = %x [current %x]\n" , engine->hangcheck.seqno, seqno[i]);
@@ -1965,7 +1965,7 @@ static int i915_context_status(struct seq_file *m, void *unused)if (i915.enable_execlists) {seq_putc (m,'\n' ); -for_each_ring (engine, dev_priv, i) { +for_each_engine (engine, dev_priv, i) {struct drm_i915_gem_object *ctx_obj = ctx->engine[i].state; struct intel_ringbuffer *ringbuf =
@@ -2055,7 +2055,7 @@ static int i915_dump_lrc(struct seq_file *m, void *unused)list_for_each_entry (ctx, &dev_priv->context_list, link)if (ctx != dev_priv->kernel_context) -for_each_ring (engine, dev_priv, i) +for_each_engine (engine, dev_priv, i)i915_dump_lrc_obj (m, ctx, engine);mutex_unlock (&dev->struct_mutex);
@@ -2089,7 +2089,7 @@ static int i915_execlists(struct seq_file *m, void *data)intel_runtime_pm_get (dev_priv); -for_each_ring (engine, dev_priv, ring_id) { +for_each_engine (engine, dev_priv, ring_id) {struct drm_i915_gem_request *head_req =NULL ;int count =0 ;unsigned long flags;
@@ -2253,7 +2253,7 @@ static void gen8_ppgtt_info(struct seq_file *m, struct drm_device *dev)if (!ppgtt)return ; -for_each_ring (engine, dev_priv, unused) { +for_each_engine (engine, dev_priv, unused) {seq_printf (m,"%s\n" , engine->name);for (i =0 ; i <4 ; i++) {u64 pdp =I915_READ (GEN8_RING_PDP_UDW (engine, i));
@@ -2273,7 +2273,7 @@ static void gen6_ppgtt_info(struct seq_file *m, struct drm_device *dev)if (INTEL_INFO (dev)->gen ==6 )seq_printf (m,"GFX_MODE: 0x%08x\n" ,I915_READ (GFX_MODE )); -for_each_ring (engine, dev_priv, i) { +for_each_engine (engine, dev_priv, i) {seq_printf (m,"%s\n" , engine->name);if (INTEL_INFO (dev)->gen ==7 ) seq_printf(m, "GFX_MODE: 0x%08x\n",
@@ -2342,7 +2342,7 @@ static int count_irq_waiters(struct drm_i915_private *i915)int count =0 ;int i; -for_each_ring (engine, i915, i) +for_each_engine (engine, i915, i) count += engine->irq_refcount;return count;
@@ -2466,7 +2466,7 @@ static void i915_guc_client_info(struct seq_file *m,seq_printf (m,"\tFailed doorbell: %u\n" , client->b_fail);seq_printf (m,"\tLast submission result: %d\n" , client->retcode); -for_each_ring (engine, dev_priv, i) { +for_each_engine (engine, dev_priv, i) {seq_printf (m,"\tSubmissions: %llu %s\n" , client->submissions[engine->guc_id], engine->name);
@@ -2506,7 +2506,7 @@ static int i915_guc_info(struct seq_file *m, void *data)seq_printf (m,"GuC last action error code: %d\n" , guc.action_err);seq_printf (m,"\nGuC submissions:\n" ); -for_each_ring (engine, dev_priv, i) { +for_each_engine (engine, dev_priv, i) {seq_printf (m,"\t%-24s: %10llu, last seqno 0x%08x\n" , engine->name, guc.submissions[engine->guc_id], guc.last_seqno[engine->guc_id]);
@@ -3153,14 +3153,14 @@ static int i915_semaphore_status(struct seq_file *m, void *unused) page =i915_gem_object_get_page (dev_priv->semaphore_obj,0 ); seqno = (uint64_t *)kmap_atomic (page); -for_each_ring (engine, dev_priv, i) { +for_each_engine (engine, dev_priv, i) {uint64_t offset;seq_printf (m,"%s\n" , engine->name);seq_puts (m," Last signal:" );for (j =0 ; j < num_rings; j++) { - offset = i *I915_NUM_RINGS + j; + offset = i *I915_NUM_ENGINES + j;seq_printf (m,"0x%08llx (0x%02llx) " , seqno[offset], offset *8 ); }
@@ -3168,7 +3168,7 @@ static int i915_semaphore_status(struct seq_file *m, void *unused)seq_puts (m," Last wait: " );for (j =0 ; j < num_rings; j++) { - offset = i + (j *I915_NUM_RINGS ); + offset = i + (j *I915_NUM_ENGINES );seq_printf (m,"0x%08llx (0x%02llx) " , seqno[offset], offset *8 ); }
@@ -3178,7 +3178,7 @@ static int i915_semaphore_status(struct seq_file *m, void *unused)kunmap_atomic (seqno); }else {seq_puts (m," Last signal:" ); -for_each_ring (engine, dev_priv, i) +for_each_engine (engine, dev_priv, i)for (j =0 ; j < num_rings; j++)seq_printf (m,"0x%08x\n" ,I915_READ (engine->semaphore.mbox.signal[j]));
@@ -3186,7 +3186,7 @@ static int i915_semaphore_status(struct seq_file *m, void *unused) }seq_puts (m,"\nSync seqno:\n" ); -for_each_ring (engine, dev_priv, i) { +for_each_engine (engine, dev_priv, i) {for (j =0 ; j < num_rings; j++) {seq_printf (m," 0x%08x " , engine->semaphore.sync_seqno[j]);
@@ -3244,7 +3244,7 @@ static int i915_wa_registers(struct seq_file *m, void *unused)intel_runtime_pm_get (dev_priv);seq_printf (m,"Workarounds applied: %d\n" , workarounds->count); -for_each_ring (engine, dev_priv, i) +for_each_engine (engine, dev_priv, i)seq_printf (m,"HW whitelist count for %s: %d\n" , engine->name, workarounds->hw_whitelist_count[i]);for (i =0 ; i < workarounds->count; ++i) {
drivers/gpu/drm/i915/i915_drv.h +13 -13
@@ -533,7 +533,7 @@ struct drm_i915_error_state {u32 cpu_ring_head;u32 cpu_ring_tail; -u32 semaphore_seqno[I915_NUM_RINGS -1 ]; +u32 semaphore_seqno[I915_NUM_ENGINES -1 ];/* Register state */ u32 start;
@@ -553,7 +553,7 @@ struct drm_i915_error_state {u32 fault_reg;u64 faddr;u32 rc_psmi;/* sleep state */ -u32 semaphore_mboxes[I915_NUM_RINGS -1 ]; +u32 semaphore_mboxes[I915_NUM_ENGINES -1 ];struct drm_i915_error_object {int page_count;
@@ -579,12 +579,12 @@ struct drm_i915_error_state {pid_t pid;char comm[TASK_COMM_LEN ]; - } ring[I915_NUM_RINGS ]; + } ring[I915_NUM_ENGINES ];struct drm_i915_error_buffer {u32 size;u32 name; -u32 rseqno[I915_NUM_RINGS ], wseqno; +u32 rseqno[I915_NUM_ENGINES ], wseqno;u64 gtt_offset;u32 read_domains;u32 write_domain;
@@ -898,7 +898,7 @@ struct intel_context {struct i915_vma *lrc_vma;u64 lrc_desc;uint32_t *lrc_reg_state; - } engine[I915_NUM_RINGS ]; + } engine[I915_NUM_ENGINES ];struct list_head link; };
@@ -1713,7 +1713,7 @@ struct i915_wa_reg {struct i915_workarounds {struct i915_wa_reg reg[I915_MAX_WA_REGS ];u32 count; -u32 hw_whitelist_count[I915_NUM_RINGS ]; +u32 hw_whitelist_count[I915_NUM_ENGINES ]; };struct i915_virtual_gpu {
@@ -1778,7 +1778,7 @@ struct drm_i915_private {wait_queue_head_t gmbus_wait_queue;struct pci_dev *bridge_dev; -struct intel_engine_cs engine[I915_NUM_RINGS ]; +struct intel_engine_cs engine[I915_NUM_ENGINES ];struct drm_i915_gem_object *semaphore_obj;uint32_t last_seqno, next_seqno;
@@ -2040,8 +2040,8 @@ static inline struct drm_i915_private *guc_to_i915(struct intel_guc *guc) }/* Iterate over initialised rings */ -#define for_each_ring (ring__, dev_priv__, i__) \ - for ((i__) = 0; (i__) < I915_NUM_RINGS; (i__)++) \ +#define for_each_engine (ring__, dev_priv__, i__) \ + for ((i__) = 0; (i__) < I915_NUM_ENGINES; (i__)++) \ for_each_if ((((ring__) = &(dev_priv__)->engine[(i__)]), intel_ring_initialized((ring__))))enum hdmi_force_audio {
@@ -2112,7 +2112,7 @@ struct drm_i915_gem_object {struct drm_mm_node *stolen;struct list_head global_list; -struct list_head ring_list[I915_NUM_RINGS ]; +struct list_head ring_list[I915_NUM_ENGINES ];/** Used in execbuf to temporarily hold a ref */ struct list_head obj_exec_link;
@@ -2123,7 +2123,7 @@ struct drm_i915_gem_object {* rendering and so a non-zero seqno), and is not set if it i s on * inactive (ready to be unbound) list. */ - unsigned int active:I915_NUM_RINGS; + unsigned int active:I915_NUM_ENGINES;/** * This is set if the object has been written to since last bound
@@ -2202,7 +2202,7 @@ struct drm_i915_gem_object {* read request. This allows for the CPU to read from an active * buffer by only waiting for the write to complete. * */ -struct drm_i915_gem_request *last_read_req[I915_NUM_RINGS ]; +struct drm_i915_gem_request *last_read_req[I915_NUM_ENGINES ];struct drm_i915_gem_request *last_write_req;/** Breadcrumb of last fenced GPU access to the buffer. */ struct drm_i915_gem_request *last_fenced_req;
@@ -2350,7 +2350,7 @@ i915_gem_request_get_seqno(struct drm_i915_gem_request *req) }static inline struct intel_engine_cs * -i915_gem_request_get_ring (struct drm_i915_gem_request *req) +i915_gem_request_get_engine (struct drm_i915_gem_request *req) {return req ? req->engine :NULL ; }
drivers/gpu/drm/i915/i915_gem.c +37 -37
262 lines not on this page · raw message
drivers/gpu/drm/i915/i915_gem_context.c +8 -8
@@ -345,7 +345,7 @@ void i915_gem_context_reset(struct drm_device *dev)intel_lr_context_reset (dev, ctx); } -for (i =0 ; i <I915_NUM_RINGS ; i++) { +for (i =0 ; i <I915_NUM_ENGINES ; i++) {struct intel_engine_cs *engine = &dev_priv->engine[i];if (engine->last_context) {
@@ -426,7 +426,7 @@ void i915_gem_context_fini(struct drm_device *dev)i915_gem_object_ggtt_unpin (dctx->legacy_hw_ctx.rcs_state); } -for (i =I915_NUM_RINGS ; --i >=0 ;) { +for (i =I915_NUM_ENGINES ; --i >=0 ;) {struct intel_engine_cs *engine = &dev_priv->engine[i];if (engine->last_context) {
@@ -553,7 +553,7 @@ mi_set_context(struct drm_i915_gem_request *req, u32 hw_flags)intel_ring_emit (engine,MI_LOAD_REGISTER_IMM (num_rings)); -for_each_ring (signaller,to_i915 (engine->dev), i) { +for_each_engine (signaller,to_i915 (engine->dev), i) {if (signaller == engine)continue ;
@@ -582,7 +582,7 @@ mi_set_context(struct drm_i915_gem_request *req, u32 hw_flags)intel_ring_emit (engine,MI_LOAD_REGISTER_IMM (num_rings)); -for_each_ring (signaller,to_i915 (engine->dev), i) { +for_each_engine (signaller,to_i915 (engine->dev), i) {if (signaller == engine)continue ;
@@ -608,7 +608,7 @@ static inline bool should_skip_switch(struct intel_engine_cs *engine,return false;if (to->ppgtt && from == to && - !(intel_ring_flag (engine) & to->ppgtt->pd_dirty_rings)) + !(intel_engine_flag (engine) & to->ppgtt->pd_dirty_rings))return true;return false;
@@ -697,7 +697,7 @@ static int do_switch(struct drm_i915_gem_request *req) goto unpin_out;/* Doing a PD load always reloads the page dirs */ - to->ppgtt->pd_dirty_rings &= ~intel_ring_flag (engine); + to->ppgtt->pd_dirty_rings &= ~intel_engine_flag (engine); }if (engine != &dev_priv->engine[RCS ]) {
@@ -725,9 +725,9 @@ static int do_switch(struct drm_i915_gem_request *req)* space. This means we must enforce that a page table load * occur when this occurs. */ }else if (to->ppgtt && - (intel_ring_flag (engine) & to->ppgtt->pd_dirty_rings)) { + (intel_engine_flag (engine) & to->ppgtt->pd_dirty_rings)) { hw_flags |=MI_FORCE_RESTORE ; - to->ppgtt->pd_dirty_rings &= ~intel_ring_flag (engine); + to->ppgtt->pd_dirty_rings &= ~intel_engine_flag (engine); }/* We should never emit switch_mm more than once */
drivers/gpu/drm/i915/i915_gem_debug.c +1 -1
@@ -43,7 +43,7 @@ i915_verify_lists(struct drm_device *dev)if (warned)return 0 ; -for_each_ring (engine, dev_priv, i) { +for_each_engine (engine, dev_priv, i) {list_for_each_entry (obj, &engine->active_list, ring_list[engine->id]) { if (obj->base.dev != dev ||
drivers/gpu/drm/i915/i915_gem_execbuffer.c +2 -2
@@ -942,7 +942,7 @@ static int i915_gem_execbuffer_move_to_gpu(struct drm_i915_gem_request *req, struct list_head *vmas) { - const unsigned other_rings = ~intel_ring_flag(req->engine); + const unsigned other_rings = ~intel_engine_flag(req->engine);struct i915_vma *vma;uint32_t flush_domains =0 ;bool flush_chipset = false;
@@ -1099,7 +1099,7 @@ void i915_gem_execbuffer_move_to_active(struct list_head *vmas, struct drm_i915_gem_request *req) { - struct intel_engine_cs *engine = i915_gem_request_get_ring(req); + struct intel_engine_cs *engine = i915_gem_request_get_engine(req);struct i915_vma *vma;list_for_each_entry (vma, vmas, exec_list) {
drivers/gpu/drm/i915/i915_gem_gtt.c +3 -3
@@ -1739,7 +1739,7 @@ static void gen8_ppgtt_enable(struct drm_device *dev)struct intel_engine_cs *engine;int j; -for_each_ring (engine, dev_priv, j) { +for_each_engine (engine, dev_priv, j) {u32 four_level =USES_FULL_48BIT_PPGTT (dev) ?GEN8_GFX_PPGTT_48B :0 ;I915_WRITE (RING_MODE_GEN7 (engine),_MASKED_BIT_ENABLE (GFX_PPGTT_ENABLE | four_level));
@@ -1765,7 +1765,7 @@ static void gen7_ppgtt_enable(struct drm_device *dev) }I915_WRITE (GAM_ECOCHK , ecochk); -for_each_ring (engine, dev_priv, i) { +for_each_engine (engine, dev_priv, i) {/* GFX_MODE is per-ring on gen7+ */ I915_WRITE (RING_MODE_GEN7 (engine),_MASKED_BIT_ENABLE (GFX_PPGTT_ENABLE ));
@@ -2292,7 +2292,7 @@ void i915_check_and_clear_faults(struct drm_device *dev)if (INTEL_INFO (dev)->gen <6 )return ; -for_each_ring (engine, dev_priv, i) { +for_each_engine (engine, dev_priv, i) {u32 fault_reg; fault_reg =I915_READ (RING_FAULT_REG (engine));if (fault_reg &RING_FAULT_VALID ) {
drivers/gpu/drm/i915/i915_gpu_error.c +6 -6
@@ -198,7 +198,7 @@ static void print_error_buffers(struct drm_i915_error_state_buf *m, err->size, err->read_domains, err->write_domain); -for (i =0 ; i <I915_NUM_RINGS ; i++) +for (i =0 ; i <I915_NUM_ENGINES ; i++)err_printf (m,"%02x " , err->rseqno[i]);err_printf (m,"] %02x" , err->wseqno);
@@ -732,7 +732,7 @@ static void capture_bo(struct drm_i915_error_buffer *err, err->size = obj->base.size; err->name = obj->base.name; -for (i =0 ; i <I915_NUM_RINGS ; i++) +for (i =0 ; i <I915_NUM_ENGINES ; i++) err->rseqno[i] =i915_gem_request_get_seqno (obj->last_read_req[i]); err->wseqno =i915_gem_request_get_seqno (obj->last_write_req); err->gtt_offset = vma->node.start;
@@ -747,7 +747,7 @@ static void capture_bo(struct drm_i915_error_buffer *err, err->purgeable = obj->madv !=I915_MADV_WILLNEED ; err->userptr = obj->userptr.mm !=NULL ; err->ring = obj->last_write_req ? -i915_gem_request_get_ring (obj->last_write_req)->id :-1 ; +i915_gem_request_get_engine (obj->last_write_req)->id :-1 ; err->cache_level = obj->cache_level; }
@@ -809,7 +809,7 @@ static uint32_t i915_error_generate_code(struct drm_i915_private *dev_priv,* synchronization commands which almost always appear in the case * strictly a client bug. Use instdone to differentiate those some. */ -for (i =0 ; i <I915_NUM_RINGS ; i++) { +for (i =0 ; i <I915_NUM_ENGINES ; i++) {if (error->ring[i].hangcheck_action ==HANGCHECK_HUNG ) {if (ring_id) *ring_id = i;
@@ -856,7 +856,7 @@ static void gen8_record_semaphore_state(struct drm_i915_private *dev_priv,i915_error_ggtt_object_create (dev_priv, dev_priv->semaphore_obj); -for_each_ring (to, dev_priv, i) { +for_each_engine (to, dev_priv, i) {int idx;u16 signal_offset;u32 *tmp;
@@ -1019,7 +1019,7 @@ static void i915_gem_record_rings(struct drm_device *dev,struct drm_i915_gem_request *request;int i, count; -for (i =0 ; i <I915_NUM_RINGS ; i++) { +for (i =0 ; i <I915_NUM_ENGINES ; i++) {struct intel_engine_cs *engine = &dev_priv->engine[i];struct intel_ringbuffer *rbuf;
drivers/gpu/drm/i915/i915_guc_submission.c +3 -3
@@ -390,7 +390,7 @@ static void guc_init_ctx_desc(struct intel_guc *guc, desc.priority = client->priority; desc.db_id = client->doorbell_id; -for_each_ring (engine, dev_priv, i) { +for_each_engine (engine, dev_priv, i) {struct guc_execlist_context *lrc = &desc.lrc[engine->guc_id];struct drm_i915_gem_object *obj;uint64_t ctx_desc;
@@ -871,7 +871,7 @@ static void guc_create_ads(struct intel_guc *guc) engine = &dev_priv->engine[RCS ]; ads->golden_context_lrca = engine->status_page.gfx_addr; -for_each_ring (engine, dev_priv, i) +for_each_engine (engine, dev_priv, i) ads->eng_state_size[engine->guc_id] =intel_lr_context_size (engine);/* GuC scheduling policies */
@@ -884,7 +884,7 @@ static void guc_create_ads(struct intel_guc *guc)/* MMIO reg state */ reg_state = (void *)policies +sizeof (struct guc_policies ); -for_each_ring (engine, dev_priv, i) { +for_each_engine (engine, dev_priv, i) { reg_state->mmio_white_list[engine->guc_id].mmio_start = engine->mmio_base +GUC_MMIO_WHITE_LIST_START ;
drivers/gpu/drm/i915/i915_irq.c +10 -10
@@ -1082,7 +1082,7 @@ static bool any_waiters(struct drm_i915_private *dev_priv)struct intel_engine_cs *engine;int i; -for_each_ring (engine, dev_priv, i) +for_each_engine (engine, dev_priv, i)if (engine->irq_refcount)return true;
@@ -2460,7 +2460,7 @@ static void i915_error_wake_up(struct drm_i915_private *dev_priv,*/ /* Wake up __wait_seqno, potentially holding dev->struct_mutex. */ -for_each_ring (engine, dev_priv, i) +for_each_engine (engine, dev_priv, i)wake_up_all (&engine->irq_queue);/* Wake up intel_crtc_wait_for_pending_flips, holding crtc->mutex. */
@@ -2832,7 +2832,7 @@ semaphore_wait_to_signaller_ring(struct intel_engine_cs *engine, u32 ipehr,int i;if (INTEL_INFO (dev_priv->dev)->gen >=8 ) { -for_each_ring (signaller, dev_priv, i) { +for_each_engine (signaller, dev_priv, i) {if (engine == signaller)continue ;
@@ -2842,7 +2842,7 @@ semaphore_wait_to_signaller_ring(struct intel_engine_cs *engine, u32 ipehr, }else {u32 sync_bits = ipehr &MI_SEMAPHORE_SYNC_MASK ; -for_each_ring (signaller, dev_priv, i) { +for_each_engine (signaller, dev_priv, i) {if (engine == signaller)continue ;
@@ -2941,7 +2941,7 @@ static int semaphore_passed(struct intel_engine_cs *engine)return -1 ;/* Prevent pathological recursion due to driver bugs */ -if (signaller->hangcheck.deadlock >=I915_NUM_RINGS ) +if (signaller->hangcheck.deadlock >=I915_NUM_ENGINES )return -1 ;if (i915_seqno_passed (signaller->get_seqno (signaller, false), seqno))
@@ -2960,7 +2960,7 @@ static void semaphore_clear_deadlocks(struct drm_i915_private *dev_priv)struct intel_engine_cs *engine;int i; -for_each_ring (engine, dev_priv, i) +for_each_engine (engine, dev_priv, i) engine->hangcheck.deadlock =0 ; }
@@ -3075,7 +3075,7 @@ static void i915_hangcheck_elapsed(struct work_struct *work)struct intel_engine_cs *engine;int i;int busy_count =0 , rings_hung =0 ; -bool stuck[I915_NUM_RINGS ] = {0 }; +bool stuck[I915_NUM_ENGINES ] = {0 };#define BUSY 1#define KICK 5#define HUNG 20
@@ -3097,7 +3097,7 @@ static void i915_hangcheck_elapsed(struct work_struct *work)*/ intel_uncore_arm_unclaimed_mmio_detection (dev_priv); -for_each_ring (engine, dev_priv, i) { +for_each_engine (engine, dev_priv, i) {u64 acthd;u32 seqno;bool busy = true;
@@ -3114,7 +3114,7 @@ static void i915_hangcheck_elapsed(struct work_struct *work)if (waitqueue_active (&engine->irq_queue)) {/* Issue a wake-up to catch stuck h/w. */ if (!test_and_set_bit (engine->id, &dev_priv->gpu_error.missed_irq_rings)) { -if (!(dev_priv->gpu_error.test_irq_rings &intel_ring_flag (engine))) +if (!(dev_priv->gpu_error.test_irq_rings &intel_engine_flag (engine)))DRM_ERROR ("Hangcheck timer elapsed... %s idle\n" , engine->name);else
@@ -3184,7 +3184,7 @@ static void i915_hangcheck_elapsed(struct work_struct *work) busy_count += busy; } -for_each_ring (engine, dev_priv, i) { +for_each_engine (engine, dev_priv, i) {if (engine->hangcheck.score >=HANGCHECK_SCORE_RING_HUNG ) { DRM_INFO("%s on %s\n", stuck[i] ? "stuck" : "no progress",
drivers/gpu/drm/i915/i915_trace.h +3 -3
@@ -487,7 +487,7 @@ TRACE_EVENT(i915_gem_ring_dispatch,TP_fast_assign ( struct intel_engine_cs *engine = -i915_gem_request_get_ring (req); +i915_gem_request_get_engine (req); __entry->dev = engine->dev->primary->index; __entry->ring = engine->id; __entry->seqno =i915_gem_request_get_seqno (req);
@@ -534,7 +534,7 @@ DECLARE_EVENT_CLASS(i915_gem_request,TP_fast_assign ( struct intel_engine_cs *engine = -i915_gem_request_get_ring (req); +i915_gem_request_get_engine (req); __entry->dev = engine->dev->primary->index; __entry->ring = engine->id; __entry->seqno =i915_gem_request_get_seqno (req);
@@ -598,7 +598,7 @@ TRACE_EVENT(i915_gem_request_wait_begin,*/ TP_fast_assign ( struct intel_engine_cs *engine = -i915_gem_request_get_ring (req); +i915_gem_request_get_engine (req); __entry->dev = engine->dev->primary->index; __entry->ring = engine->id; __entry->seqno =i915_gem_request_get_seqno (req);
drivers/gpu/drm/i915/intel_display.c +2 -2
@@ -11422,7 +11422,7 @@ static bool use_mmio_flip(struct intel_engine_cs *engine, false))return true; else - return engine != i915_gem_request_get_ring(obj->last_write_req); + return engine != i915_gem_request_get_engine(obj->last_write_req); } static void skl_do_mmio_flip(struct intel_crtc *intel_crtc,
@@ -11762,7 +11762,7 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc, }else if (IS_IVYBRIDGE (dev) ||IS_HASWELL (dev)) { engine = &dev_priv->engine[BCS ]; }else if (INTEL_INFO (dev)->gen >=7 ) { - engine =i915_gem_request_get_ring (obj->last_write_req); + engine =i915_gem_request_get_engine (obj->last_write_req);if (engine ==NULL || engine->id !=RCS ) engine = &dev_priv->engine[BCS ]; }else {
drivers/gpu/drm/i915/intel_guc_loader.c +2 -2
@@ -87,7 +87,7 @@ static void direct_interrupts_to_host(struct drm_i915_private *dev_priv)/* tell all command streamers NOT to forward interrupts and vblank to GuC */ irqs =_MASKED_FIELD (GFX_FORWARD_VBLANK_MASK ,GFX_FORWARD_VBLANK_NEVER ); irqs |=_MASKED_BIT_DISABLE (GFX_INTERRUPT_STEERING ); -for_each_ring (engine, dev_priv, i) +for_each_engine (engine, dev_priv, i)I915_WRITE (RING_MODE_GEN7 (engine), irqs);/* route all GT interrupts to the host */
@@ -104,7 +104,7 @@ static void direct_interrupts_to_guc(struct drm_i915_private *dev_priv)/* tell all command streamers to forward interrupts and vblank to GuC */ irqs =_MASKED_FIELD (GFX_FORWARD_VBLANK_MASK ,GFX_FORWARD_VBLANK_ALWAYS ); irqs |=_MASKED_BIT_ENABLE (GFX_INTERRUPT_STEERING ); -for_each_ring (engine, dev_priv, i) +for_each_engine (engine, dev_priv, i)I915_WRITE (RING_MODE_GEN7 (engine), irqs);/* route USER_INTERRUPT to Host, all others are sent to GuC. */
drivers/gpu/drm/i915/intel_lrc.c +6 -6
@@ -669,7 +669,7 @@ static int logical_ring_invalidate_all_caches(struct drm_i915_gem_request *req)static int execlists_move_to_gpu (struct drm_i915_gem_request *req,struct list_head *vmas) { -const unsigned other_rings = ~intel_ring_flag (req->engine); +const unsigned other_rings = ~intel_engine_flag (req->engine);struct i915_vma *vma;uint32_t flush_domains =0 ;bool flush_chipset = false;
@@ -1057,7 +1057,7 @@ void intel_logical_ring_stop(struct intel_engine_cs *engine)if (!intel_ring_initialized (engine))return ; - ret =intel_ring_idle (engine); + ret =intel_engine_idle (engine);if (ret && !i915_reset_in_progress (&to_i915 (engine->dev)->gpu_error))DRM_ERROR ("failed to quiesce %s whilst cleaning up: %d\n" , engine->name, ret);
@@ -1688,7 +1688,7 @@ static int gen8_emit_bb_start(struct drm_i915_gem_request *req,* not idle). PML4 is allocated during ppgtt init so this is * not needed in 48-bit.*/ if (req->ctx->ppgtt && - (intel_ring_flag (req->engine) & req->ctx->ppgtt->pd_dirty_rings)) { + (intel_engine_flag (req->engine) & req->ctx->ppgtt->pd_dirty_rings)) {if (!USES_FULL_48BIT_PPGTT (req->i915) && !intel_vgpu_active (req->i915->dev)) { ret =intel_logical_ring_emit_pdps (req);
@@ -1696,7 +1696,7 @@ static int gen8_emit_bb_start(struct drm_i915_gem_request *req,return ret; } - req->ctx->ppgtt->pd_dirty_rings &= ~intel_ring_flag (req->engine); + req->ctx->ppgtt->pd_dirty_rings &= ~intel_engine_flag (req->engine); } ret =intel_logical_ring_begin (req,4 );
@@ -2511,7 +2511,7 @@ void intel_lr_context_free(struct intel_context *ctx) {int i; -for (i =I915_NUM_RINGS ; --i >=0 ; ) { +for (i =I915_NUM_ENGINES ; --i >=0 ; ) {struct intel_ringbuffer *ringbuf = ctx->engine[i].ringbuf;struct drm_i915_gem_object *ctx_obj = ctx->engine[i].state;
@@ -2674,7 +2674,7 @@ void intel_lr_context_reset(struct drm_device *dev,struct intel_engine_cs *engine;int i; -for_each_ring (engine, dev_priv, i) { +for_each_engine (engine, dev_priv, i) {struct drm_i915_gem_object *ctx_obj = ctx->engine[engine->id].state; struct intel_ringbuffer *ringbuf =
drivers/gpu/drm/i915/intel_mocs.c +1 -1
@@ -328,7 +328,7 @@ int intel_rcs_context_init_mocs(struct drm_i915_gem_request *req)enum intel_ring_id ring_id;/* Program the control registers */ -for_each_ring (engine, dev_priv, ring_id) { +for_each_engine (engine, dev_priv, ring_id) { ret =emit_mocs_control_table (req, &t, ring_id);if (ret)return ret;
drivers/gpu/drm/i915/intel_pm.c +6 -6
@@ -4838,7 +4838,7 @@ static void gen9_enable_rc6(struct drm_device *dev)I915_WRITE (GEN6_RC6_WAKE_RATE_LIMIT ,54 <<16 );I915_WRITE (GEN6_RC_EVALUATION_INTERVAL ,125000 );/* 12500 * 1280ns */ I915_WRITE (GEN6_RC_IDLE_HYSTERSIS ,25 );/* 25 * 1280ns */ -for_each_ring (engine, dev_priv, unused) +for_each_engine (engine, dev_priv, unused)I915_WRITE (RING_MAX_IDLE (engine->mmio_base),10 );if (HAS_GUC_UCODE (dev))
@@ -4906,7 +4906,7 @@ static void gen8_enable_rps(struct drm_device *dev)I915_WRITE (GEN6_RC6_WAKE_RATE_LIMIT ,40 <<16 );I915_WRITE (GEN6_RC_EVALUATION_INTERVAL ,125000 );/* 12500 * 1280ns */ I915_WRITE (GEN6_RC_IDLE_HYSTERSIS ,25 );/* 25 * 1280ns */ -for_each_ring (engine, dev_priv, unused) +for_each_engine (engine, dev_priv, unused)I915_WRITE (RING_MAX_IDLE (engine->mmio_base),10 );I915_WRITE (GEN6_RC_SLEEP ,0 );if (IS_BROADWELL (dev))
@@ -5003,7 +5003,7 @@ static void gen6_enable_rps(struct drm_device *dev)I915_WRITE (GEN6_RC_EVALUATION_INTERVAL ,125000 );I915_WRITE (GEN6_RC_IDLE_HYSTERSIS ,25 ); -for_each_ring (engine, dev_priv, i) +for_each_engine (engine, dev_priv, i)I915_WRITE (RING_MAX_IDLE (engine->mmio_base),10 );I915_WRITE (GEN6_RC_SLEEP ,0 );
@@ -5522,7 +5522,7 @@ static void cherryview_enable_rps(struct drm_device *dev)I915_WRITE (GEN6_RC_EVALUATION_INTERVAL ,125000 );/* 12500 * 1280ns */ I915_WRITE (GEN6_RC_IDLE_HYSTERSIS ,25 );/* 25 * 1280ns */ -for_each_ring (engine, dev_priv, i) +for_each_engine (engine, dev_priv, i)I915_WRITE (RING_MAX_IDLE (engine->mmio_base),10 );I915_WRITE (GEN6_RC_SLEEP ,0 );
@@ -5633,7 +5633,7 @@ static void valleyview_enable_rps(struct drm_device *dev)I915_WRITE (GEN6_RC_EVALUATION_INTERVAL ,125000 );I915_WRITE (GEN6_RC_IDLE_HYSTERSIS ,25 ); -for_each_ring (engine, dev_priv, i) +for_each_engine (engine, dev_priv, i)I915_WRITE (RING_MAX_IDLE (engine->mmio_base),10 );I915_WRITE (GEN6_RC6_THRESHOLD ,0x557 );
@@ -6019,7 +6019,7 @@ bool i915_gpu_busy(void) goto out_unlock; dev_priv = i915_mch_dev; -for_each_ring (engine, dev_priv, i) +for_each_engine (engine, dev_priv, i) ret |= !list_empty (&engine->request_list); out_unlock:
drivers/gpu/drm/i915/intel_ringbuffer.c +6 -6
@@ -62,7 +62,7 @@ int intel_ring_space(struct intel_ringbuffer *ringbuf)bool intel_ring_stopped (struct intel_engine_cs *engine) {struct drm_i915_private *dev_priv = engine->dev->dev_private; -return dev_priv->gpu_error.stop_rings &intel_ring_flag (engine); +return dev_priv->gpu_error.stop_rings &intel_engine_flag (engine); }static void __intel_ring_advance (struct intel_engine_cs *engine)
@@ -1283,7 +1283,7 @@ static int gen8_rcs_signal(struct drm_i915_gem_request *signaller_req,if (ret)return ret; -for_each_ring (waiter, dev_priv, i) { +for_each_engine (waiter, dev_priv, i) {u32 seqno;u64 gtt_offset = signaller->semaphore.signal_ggtt[i];if (gtt_offset ==MI_SEMAPHORE_SYNC_INVALID )
@@ -1324,7 +1324,7 @@ static int gen8_xcs_signal(struct drm_i915_gem_request *signaller_req,if (ret)return ret; -for_each_ring (waiter, dev_priv, i) { +for_each_engine (waiter, dev_priv, i) {u32 seqno;u64 gtt_offset = signaller->semaphore.signal_ggtt[i];if (gtt_offset ==MI_SEMAPHORE_SYNC_INVALID )
@@ -1363,7 +1363,7 @@ static int gen6_signal(struct drm_i915_gem_request *signaller_req,if (ret)return ret; -for_each_ring (useless, dev_priv, i) { +for_each_engine (useless, dev_priv, i) {i915_reg_t mbox_reg = signaller->semaphore.mbox.signal[i];if (i915_mmio_reg_valid (mbox_reg)) {
@@ -2356,7 +2356,7 @@ static void __wrap_ring_buffer(struct intel_ringbuffer *ringbuf)intel_ring_update_space (ringbuf); } -int intel_ring_idle (struct intel_engine_cs *engine) +int intel_engine_idle (struct intel_engine_cs *engine) {struct drm_i915_gem_request *req;
@@ -3170,7 +3170,7 @@ intel_stop_ring_buffer(struct intel_engine_cs *engine)if (!intel_ring_initialized (engine))return ; - ret =intel_ring_idle (engine); + ret =intel_engine_idle (engine);if (ret && !i915_reset_in_progress (&to_i915 (engine->dev)->gpu_error))DRM_ERROR ("failed to quiesce %s whilst cleaning up: %d\n" , engine->name, ret);
drivers/gpu/drm/i915/intel_ringbuffer.h +10 -10
@@ -55,12 +55,12 @@ struct intel_hw_status_page {#define i915_semaphore_seqno_size sizeof(uint64_t)#define GEN8_SIGNAL_OFFSET (__ring, to) \ (i915_gem_obj_ggtt_offset(dev_priv->semaphore_obj) + \ - ((__ring)->id * I915_NUM_RINGS * i915_semaphore_seqno_size) + \ + ((__ring)->id * I915_NUM_ENGINES * i915_semaphore_seqno_size) + \ (i915_semaphore_seqno_size * (to)))#define GEN8_WAIT_OFFSET (__ring, from) \ (i915_gem_obj_ggtt_offset(dev_priv->semaphore_obj) + \ - ((from) * I915_NUM_RINGS * i915_semaphore_seqno_size) + \ + ((from) * I915_NUM_ENGINES * i915_semaphore_seqno_size) + \ (i915_semaphore_seqno_size * (__ring)->id))#define GEN8_RING_SEMAPHORE_INIT (e) do { \
@@ -153,7 +153,7 @@ struct intel_engine_cs {VCS2 ,/* Keep instances of the same type engine together. */ VECS } id; -#define I915_NUM_RINGS 5 +#define I915_NUM_ENGINES 5#define _VCS (n) (VCS + (n))unsigned int exec_id;unsigned int guc_id;
@@ -244,16 +244,16 @@ struct intel_engine_cs {* ie. transpose of f(x, y) */ struct { -u32 sync_seqno[I915_NUM_RINGS -1 ]; +u32 sync_seqno[I915_NUM_ENGINES -1 ];union {struct {/* our mbox written by others */ -u32 wait[I915_NUM_RINGS ]; +u32 wait[I915_NUM_ENGINES ];/* mboxes this ring signals to */ -i915_reg_t signal[I915_NUM_RINGS ]; +i915_reg_t signal[I915_NUM_ENGINES ]; } mbox; -u64 signal_ggtt[I915_NUM_RINGS ]; +u64 signal_ggtt[I915_NUM_ENGINES ]; };/* AKA wait() */
@@ -361,7 +361,7 @@ intel_ring_initialized(struct intel_engine_cs *engine) }static inline unsigned -intel_ring_flag (struct intel_engine_cs *engine) +intel_engine_flag (struct intel_engine_cs *engine) {return 1 << engine->id; }
@@ -382,7 +382,7 @@ intel_ring_sync_index(struct intel_engine_cs *engine, idx = (other - engine) -1 ;if (idx <0 ) - idx +=I915_NUM_RINGS ; + idx +=I915_NUM_ENGINES ;return idx; }
@@ -467,7 +467,7 @@ void intel_ring_update_space(struct intel_ringbuffer *ringbuf);int intel_ring_space (struct intel_ringbuffer *ringbuf);bool intel_ring_stopped (struct intel_engine_cs *engine); -int __must_check intel_ring_idle (struct intel_engine_cs *engine); +int __must_check intel_engine_idle (struct intel_engine_cs *engine);void intel_ring_init_seqno (struct intel_engine_cs *engine,u32 seqno);int intel_ring_flush_all_caches (struct drm_i915_gem_request *req);int intel_ring_invalidate_all_caches (struct drm_i915_gem_request *req);
drivers/gpu/drm/i915/intel_uncore.c +2 -2
@@ -1573,14 +1573,14 @@ static int gen8_do_reset(struct drm_device *dev)struct intel_engine_cs *engine;int i; -for_each_ring (engine, dev_priv, i) +for_each_engine (engine, dev_priv, i)if (gen8_request_engine_reset (engine)) goto not_ready;return gen6_do_reset (dev); not_ready: -for_each_ring (engine, dev_priv, i) +for_each_engine (engine, dev_priv, i)gen8_unrequest_engine_reset (engine);return -EIO ;
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 5/5 drm/i915: More renaming of rings to engines
In reply to Tvrtko UrsulinFrom: Tvrtko Ursulin <[email protected]>
This time using only sed and a few by hand.
--- drivers/gpu/drm/i915/i915_dma.c | 4 +-- drivers/gpu/drm/i915/i915_drv.h | 12 ++++---- drivers/gpu/drm/i915/i915_gem.c | 50 ++++++++++++++++----------------- drivers/gpu/drm/i915/i915_gem_debug.c | 2 +- drivers/gpu/drm/i915/intel_lrc.c | 4 +-- drivers/gpu/drm/i915/intel_ringbuffer.c | 12 ++++---- drivers/gpu/drm/i915/intel_ringbuffer.h | 6 ++-- 7 files changed, 45 insertions(+), 45 deletions(-)
drivers/gpu/drm/i915/i915_dma.c +2 -2
@@ -444,7 +444,7 @@ static int i915_load_modeset_init(struct drm_device *dev) cleanup_gem:mutex_lock (&dev->struct_mutex); -i915_gem_cleanup_ringbuffer (dev); +i915_gem_cleanup_engines (dev);i915_gem_context_fini (dev);mutex_unlock (&dev->struct_mutex); cleanup_irq:
@@ -1261,7 +1261,7 @@ int i915_driver_unload(struct drm_device *dev)intel_guc_ucode_fini (dev);mutex_lock (&dev->struct_mutex); -i915_gem_cleanup_ringbuffer (dev); +i915_gem_cleanup_engines (dev);i915_gem_context_fini (dev);mutex_unlock (&dev->struct_mutex);intel_fbc_cleanup_cfb (dev_priv);
drivers/gpu/drm/i915/i915_drv.h +6 -6
@@ -2004,9 +2004,9 @@ struct drm_i915_private {int (*execbuf_submit)(struct i915_execbuffer_params *params,struct drm_i915_gem_execbuffer2 *args,struct list_head *vmas); -int (*init_rings)(struct drm_device *dev); -void (*cleanup_ring)(struct intel_engine_cs *ring); -void (*stop_ring)(struct intel_engine_cs *ring); +int (*init_engines)(struct drm_device *dev); +void (*cleanup_engine)(struct intel_engine_cs *engine); +void (*stop_engine)(struct intel_engine_cs *engine); } gt;struct intel_context *kernel_context;
@@ -2112,7 +2112,7 @@ struct drm_i915_gem_object {struct drm_mm_node *stolen;struct list_head global_list; -struct list_head ring_list[I915_NUM_ENGINES ]; +struct list_head engine_list[I915_NUM_ENGINES ];/** Used in execbuf to temporarily hold a ref */ struct list_head obj_exec_link;
@@ -3075,11 +3075,11 @@ static inline bool i915_stop_ring_allow_warn(struct drm_i915_private *dev_priv)void i915_gem_reset (struct drm_device *dev);bool i915_gem_clflush_object (struct drm_i915_gem_object *obj,bool force);int __must_check i915_gem_init (struct drm_device *dev); -int i915_gem_init_rings (struct drm_device *dev); +int i915_gem_init_engines (struct drm_device *dev);int __must_check i915_gem_init_hw (struct drm_device *dev);int i915_gem_l3_remap (struct drm_i915_gem_request *req,int slice);void i915_gem_init_swizzling (struct drm_device *dev); -void i915_gem_cleanup_ringbuffer (struct drm_device *dev); +void i915_gem_cleanup_engines (struct drm_device *dev);int __must_check i915_gpu_idle (struct drm_device *dev);int __must_check i915_gem_suspend (struct drm_device *dev); void __i915_add_request(struct drm_i915_gem_request *req,
drivers/gpu/drm/i915/i915_gem.c +25 -25
157 lines not on this page · raw message
drivers/gpu/drm/i915/i915_gem_debug.c +1 -1
@@ -45,7 +45,7 @@ i915_verify_lists(struct drm_device *dev)for_each_engine (engine, dev_priv, i) {list_for_each_entry (obj, &engine->active_list, - ring_list[engine->id]) { + engine_list[engine->id]) {if (obj->base.dev != dev || !atomic_read (&obj->base.refcount.refcount)) { DRM_ERROR("%s: freed active obj %p\n",
drivers/gpu/drm/i915/intel_lrc.c +2 -2
@@ -795,7 +795,7 @@ intel_logical_ring_advance_and_submit(struct drm_i915_gem_request *request)intel_logical_ring_emit (ringbuf,MI_NOOP );intel_logical_ring_advance (ringbuf); -if (intel_ring_stopped (engine)) +if (intel_engine_stopped (engine))return 0 ;if (engine->last_context != request->ctx) {
@@ -2240,7 +2240,7 @@ static int logical_vebox_ring_init(struct drm_device *dev)* @dev: DRM device. * * This function inits the engines for an Execlists submission style (the equivalent in the -* legacy ringbuffer submission world would be i915_gem_init_rings). It does it only for +* legacy ringbuffer submission world would be i915_gem_init_engines). It does it only for * those engines that are present in the hardware. * * Return: non-zero if the initialization failed.
drivers/gpu/drm/i915/intel_ringbuffer.c +6 -6
@@ -59,7 +59,7 @@ int intel_ring_space(struct intel_ringbuffer *ringbuf)return ringbuf->space; } -bool intel_ring_stopped (struct intel_engine_cs *engine) +bool intel_engine_stopped (struct intel_engine_cs *engine) {struct drm_i915_private *dev_priv = engine->dev->dev_private;return dev_priv->gpu_error.stop_rings &intel_engine_flag (engine);
@@ -69,7 +69,7 @@ static void __intel_ring_advance(struct intel_engine_cs *engine) {struct intel_ringbuffer *ringbuf = engine->buffer; ringbuf->tail &= ringbuf->size -1 ; -if (intel_ring_stopped (engine)) +if (intel_engine_stopped (engine))return ; engine->write_tail (engine, ringbuf->tail); }
@@ -2274,11 +2274,11 @@ static int intel_init_ring_buffer(struct drm_device *dev,return 0 ; error: -intel_cleanup_ring_buffer (engine); +intel_cleanup_engine (engine);return ret; } -void intel_cleanup_ring_buffer (struct intel_engine_cs *engine) +void intel_cleanup_engine (struct intel_engine_cs *engine) {struct drm_i915_private *dev_priv;
@@ -2288,7 +2288,7 @@ void intel_cleanup_ring_buffer(struct intel_engine_cs *engine) dev_priv =to_i915 (engine->dev);if (engine->buffer) { -intel_stop_ring_buffer (engine); +intel_stop_engine (engine);WARN_ON (!IS_GEN2 (engine->dev) && (I915_READ_MODE (engine) &MODE_IDLE ) ==0 );intel_unpin_ringbuffer_obj (engine->buffer);
@@ -3163,7 +3163,7 @@ intel_ring_invalidate_all_caches(struct drm_i915_gem_request *req) }void -intel_stop_ring_buffer (struct intel_engine_cs *engine) +intel_stop_engine (struct intel_engine_cs *engine) {int ret;
drivers/gpu/drm/i915/intel_ringbuffer.h +3 -3
@@ -438,8 +438,8 @@ int intel_pin_and_map_ringbuffer_obj(struct drm_device *dev,void intel_unpin_ringbuffer_obj (struct intel_ringbuffer *ringbuf);void intel_ringbuffer_free (struct intel_ringbuffer *ring); -void intel_stop_ring_buffer (struct intel_engine_cs *engine); -void intel_cleanup_ring_buffer (struct intel_engine_cs *engine); +void intel_stop_engine (struct intel_engine_cs *engine); +void intel_cleanup_engine (struct intel_engine_cs *engine);int intel_ring_alloc_request_extras (struct drm_i915_gem_request *request);
@@ -465,7 +465,7 @@ static inline void intel_ring_advance(struct intel_engine_cs *engine)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); -bool intel_ring_stopped (struct intel_engine_cs *engine); +bool intel_engine_stopped (struct intel_engine_cs *engine);int __must_check intel_engine_idle (struct intel_engine_cs *engine);void intel_ring_init_seqno (struct intel_engine_cs *engine,u32 seqno);
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 5/5] drm/i915: More renaming of rings to engines
Quoted 8 lines · Tvrtko Ursulin
drivers/gpu/drm/i915/i915_gem.c +1
-3@@ -4952,14 +4952,14 @@ int i915_gem_init(struct drm_device *dev)if (!i915.enable_execlists) { dev_priv->gt.execbuf_submit = i915_gem_ringbuffer_submission; - dev_priv->gt.init_rings = i915_gem_init_rings; - dev_priv->gt.cleanup_ring = intel_cleanup_ring_buffer; - dev_priv->gt.stop_ring = intel_stop_ring_buffer; + dev_priv->gt.init_engines = i915_gem_init_engines;
drivers/gpu/drm/i915/i915_gem.c int i915_gem_init(struct drm_device *dev) · line 4962
Quoted 10 lines
drivers/gpu/drm/i915/i915_gem.c +5
-3+ dev_priv->gt.cleanup_engine = intel_cleanup_engine; + dev_priv->gt.stop_engine = intel_stop_engine; }else { dev_priv->gt.execbuf_submit = intel_execlists_submission; - dev_priv->gt.init_rings = intel_logical_rings_init; - dev_priv->gt.cleanup_ring = intel_logical_ring_cleanup; - dev_priv->gt.stop_ring = intel_logical_ring_stop; + dev_priv->gt.init_engines = intel_logical_rings_init; + dev_priv->gt.cleanup_engine = intel_logical_ring_cleanup; + dev_priv->gt.stop_engine = intel_logical_ring_stop;
Making these changes manually or another patch?
-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 5/5] drm/i915: More renaming of rings to engines
Quoted 13 lines · Chris Wilson
Quoted 12 lines · Tvrtko Ursulin
drivers/gpu/drm/i915/i915_gem.c +3
-3@@ -4952,14 +4952,14 @@ int i915_gem_init(struct drm_device *dev)if (!i915.enable_execlists) { dev_priv->gt.execbuf_submit = i915_gem_ringbuffer_submission; - dev_priv->gt.init_rings = i915_gem_init_rings; - dev_priv->gt.cleanup_ring = intel_cleanup_ring_buffer; - dev_priv->gt.stop_ring = intel_stop_ring_buffer; + dev_priv->gt.init_engines = i915_gem_init_engines; + dev_priv->gt.cleanup_engine = intel_cleanup_engine; + dev_priv->gt.stop_engine = intel_stop_engine; }else { dev_priv->gt.execbuf_submit = intel_execlists_submission;
Quoted 8 lines
drivers/gpu/drm/i915/i915_gem.c int i915_gem_init(struct drm_device *dev) · line 4962
Quoted 6 lines
drivers/gpu/drm/i915/i915_gem.c +3
-3- dev_priv->gt.init_rings = intel_logical_rings_init; - dev_priv->gt.cleanup_ring = intel_logical_ring_cleanup; - dev_priv->gt.stop_ring = intel_logical_ring_stop; + dev_priv->gt.init_engines = intel_logical_rings_init; + dev_priv->gt.cleanup_engine = intel_logical_ring_cleanup; + dev_priv->gt.stop_engine = intel_logical_ring_stop;Making these changes manually or another patch?
Another *s*patch? No, this was manually. I was running out of steam with Coccinelle and 5/5 are just a few I've spotted and done by hand (or sed). Possibly I've missed some but the main body of churn is all here I think.
Regards,
Tvrtko
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 5/5 drm/i915: More renaming of rings to engines
In reply to Tvrtko UrsulinFrom: Tvrtko Ursulin <[email protected]>
This time using only sed and a few by hand.
v2: Rename also intel_ring_id and intel_ring_initialized.
--- drivers/gpu/drm/i915/i915_debugfs.c | 2 +- drivers/gpu/drm/i915/i915_dma.c | 12 +++---- drivers/gpu/drm/i915/i915_drv.h | 14 ++++----- drivers/gpu/drm/i915/i915_gem.c | 50 +++++++++++++++--------------- drivers/gpu/drm/i915/i915_gem_debug.c | 2 +- drivers/gpu/drm/i915/i915_gem_execbuffer.c | 4 +-- drivers/gpu/drm/i915/i915_irq.c | 2 +- drivers/gpu/drm/i915/intel_lrc.c | 8 ++--- drivers/gpu/drm/i915/intel_mocs.c | 6 ++-- drivers/gpu/drm/i915/intel_ringbuffer.c | 16 +++++----- drivers/gpu/drm/i915/intel_ringbuffer.h | 10 +++--- 11 files changed, 63 insertions(+), 63 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +1 -1
@@ -2483,7 +2483,7 @@ static int i915_guc_info(struct seq_file *m, void *data)struct intel_guc guc;struct i915_guc_client client = {};struct intel_engine_cs *engine; -enum intel_ring_id i; +enum intel_engine_id i;u64 total =0 ;if (!HAS_GUC_SCHED (dev_priv->dev))
drivers/gpu/drm/i915/i915_dma.c +6 -6
@@ -87,16 +87,16 @@ static int i915_getparam(struct drm_device *dev, void *data, value =1 ;break ;case I915_PARAM_HAS_BSD : - value =intel_ring_initialized (&dev_priv->engine[VCS ]); + value =intel_engine_intialized (&dev_priv->engine[VCS ]);break ;case I915_PARAM_HAS_BLT : - value =intel_ring_initialized (&dev_priv->engine[BCS ]); + value =intel_engine_intialized (&dev_priv->engine[BCS ]);break ;case I915_PARAM_HAS_VEBOX : - value =intel_ring_initialized (&dev_priv->engine[VECS ]); + value =intel_engine_intialized (&dev_priv->engine[VECS ]);break ;case I915_PARAM_HAS_BSD2 : - value =intel_ring_initialized (&dev_priv->engine[VCS2 ]); + value =intel_engine_intialized (&dev_priv->engine[VCS2 ]);break ;case I915_PARAM_HAS_RELAXED_FENCING : value =1 ;
@@ -444,7 +444,7 @@ static int i915_load_modeset_init(struct drm_device *dev) cleanup_gem:mutex_lock (&dev->struct_mutex); -i915_gem_cleanup_ringbuffer (dev); +i915_gem_cleanup_engines (dev);i915_gem_context_fini (dev);mutex_unlock (&dev->struct_mutex); cleanup_irq:
@@ -1261,7 +1261,7 @@ int i915_driver_unload(struct drm_device *dev)intel_guc_ucode_fini (dev);mutex_lock (&dev->struct_mutex); -i915_gem_cleanup_ringbuffer (dev); +i915_gem_cleanup_engines (dev);i915_gem_context_fini (dev);mutex_unlock (&dev->struct_mutex);intel_fbc_cleanup_cfb (dev_priv);
drivers/gpu/drm/i915/i915_drv.h +7 -7
@@ -1931,9 +1931,9 @@ struct drm_i915_private {int (*execbuf_submit)(struct i915_execbuffer_params *params,struct drm_i915_gem_execbuffer2 *args,struct list_head *vmas); -int (*init_rings)(struct drm_device *dev); -void (*cleanup_ring)(struct intel_engine_cs *ring); -void (*stop_ring)(struct intel_engine_cs *ring); +int (*init_engines)(struct drm_device *dev); +void (*cleanup_engine)(struct intel_engine_cs *engine); +void (*stop_engine)(struct intel_engine_cs *engine); } gt;struct intel_context *kernel_context;
@@ -1969,7 +1969,7 @@ static inline struct drm_i915_private *guc_to_i915(struct intel_guc *guc)/* Iterate over initialised rings */ #define for_each_engine (ring__, dev_priv__, i__) \ for ((i__) = 0; (i__) < I915_NUM_ENGINES; (i__)++) \ - for_each_if ((((ring__) = &(dev_priv__)->engine[(i__)]), intel_ring_initialized((ring__)))) + for_each_if ((((ring__) = &(dev_priv__)->engine[(i__)]), intel_engine_intialized((ring__))))enum hdmi_force_audio {HDMI_AUDIO_OFF_DVI =-2 ,/* no aux data for HDMI-DVI converter */
@@ -2039,7 +2039,7 @@ struct drm_i915_gem_object {struct drm_mm_node *stolen;struct list_head global_list; -struct list_head ring_list[I915_NUM_ENGINES ]; +struct list_head engine_list[I915_NUM_ENGINES ];/** Used in execbuf to temporarily hold a ref */ struct list_head obj_exec_link;
@@ -3002,11 +3002,11 @@ static inline bool i915_stop_ring_allow_warn(struct drm_i915_private *dev_priv)void i915_gem_reset (struct drm_device *dev);bool i915_gem_clflush_object (struct drm_i915_gem_object *obj,bool force);int __must_check i915_gem_init (struct drm_device *dev); -int i915_gem_init_rings (struct drm_device *dev); +int i915_gem_init_engines (struct drm_device *dev);int __must_check i915_gem_init_hw (struct drm_device *dev);int i915_gem_l3_remap (struct drm_i915_gem_request *req,int slice);void i915_gem_init_swizzling (struct drm_device *dev); -void i915_gem_cleanup_ringbuffer (struct drm_device *dev); +void i915_gem_cleanup_engines (struct drm_device *dev);int __must_check i915_gpu_idle (struct drm_device *dev);int __must_check i915_gem_suspend (struct drm_device *dev); void __i915_add_request(struct drm_i915_gem_request *req,
drivers/gpu/drm/i915/i915_gem.c +25 -25
157 lines not on this page · raw message
drivers/gpu/drm/i915/i915_gem_debug.c +1 -1
@@ -45,7 +45,7 @@ i915_verify_lists(struct drm_device *dev)for_each_engine (engine, dev_priv, i) {list_for_each_entry (obj, &engine->active_list, - ring_list[engine->id]) { + engine_list[engine->id]) {if (obj->base.dev != dev || !atomic_read (&obj->base.refcount.refcount)) { DRM_ERROR("%s: freed active obj %p\n",
drivers/gpu/drm/i915/i915_gem_execbuffer.c +2 -2
@@ -1369,7 +1369,7 @@ eb_get_batch(struct eb_vmas *eb)#define I915_USER_RINGS (4) -static const enum intel_ring_id user_ring_map[I915_USER_RINGS +1 ] = { +static const enum intel_engine_id user_ring_map[I915_USER_RINGS +1 ] = { [I915_EXEC_DEFAULT ] =RCS , [I915_EXEC_RENDER ] =RCS , [I915_EXEC_BLT ] =BCS ,
@@ -1417,7 +1417,7 @@ eb_select_ring(struct drm_i915_private *dev_priv, *ring = &dev_priv->engine[user_ring_map[user_ring_id]]; } -if (!intel_ring_initialized (*ring)) { +if (!intel_engine_intialized (*ring)) {DRM_DEBUG ("execbuf with invalid ring: %u\n" , user_ring_id);return -EINVAL ; }
drivers/gpu/drm/i915/i915_irq.c +1 -1
@@ -996,7 +996,7 @@ static void ironlake_rps_change_irq_handler(struct drm_device *dev)static void notify_ring (struct intel_engine_cs *engine) { -if (!intel_ring_initialized (engine)) +if (!intel_engine_intialized (engine))return ;trace_i915_gem_request_notify (engine);
drivers/gpu/drm/i915/intel_lrc.c +4 -4
@@ -795,7 +795,7 @@ intel_logical_ring_advance_and_submit(struct drm_i915_gem_request *request)intel_logical_ring_emit (ringbuf,MI_NOOP );intel_logical_ring_advance (ringbuf); -if (intel_ring_stopped (engine)) +if (intel_engine_stopped (engine))return 0 ;if (engine->last_context != request->ctx) {
@@ -1054,7 +1054,7 @@ void intel_logical_ring_stop(struct intel_engine_cs *engine)struct drm_i915_private *dev_priv = engine->dev->dev_private;int ret; -if (!intel_ring_initialized (engine)) +if (!intel_engine_intialized (engine))return ; ret =intel_engine_idle (engine);
@@ -2012,7 +2012,7 @@ void intel_logical_ring_cleanup(struct intel_engine_cs *engine) {struct drm_i915_private *dev_priv; -if (!intel_ring_initialized (engine)) +if (!intel_engine_intialized (engine))return ; dev_priv = engine->dev->dev_private;
@@ -2240,7 +2240,7 @@ static int logical_vebox_ring_init(struct drm_device *dev)* @dev: DRM device. * * This function inits the engines for an Execlists submission style (the equivalent in the -* legacy ringbuffer submission world would be i915_gem_init_rings). It does it only for +* legacy ringbuffer submission world would be i915_gem_init_engines). It does it only for * those engines that are present in the hardware. * * Return: non-zero if the initialization failed.
drivers/gpu/drm/i915/intel_mocs.c +3 -3
@@ -159,7 +159,7 @@ static bool get_mocs_settings(struct drm_device *dev,return result; } -static i915_reg_t mocs_register (enum intel_ring_id ring,int index) +static i915_reg_t mocs_register (enum intel_engine_id ring,int index) {switch (ring) {case RCS :
@@ -191,7 +191,7 @@ static i915_reg_t mocs_register(enum intel_ring_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_ring_id ring) +enum intel_engine_id ring) {struct intel_ringbuffer *ringbuf = req->ringbuf;unsigned int index;
@@ -325,7 +325,7 @@ int intel_rcs_context_init_mocs(struct drm_i915_gem_request *req)if (get_mocs_settings (req->engine->dev, &t)) {struct drm_i915_private *dev_priv = req->i915;struct intel_engine_cs *engine; -enum intel_ring_id ring_id; +enum intel_engine_id ring_id;/* Program the control registers */ for_each_engine (engine, dev_priv, ring_id) {
drivers/gpu/drm/i915/intel_ringbuffer.c +8 -8
@@ -59,7 +59,7 @@ int intel_ring_space(struct intel_ringbuffer *ringbuf)return ringbuf->space; } -bool intel_ring_stopped (struct intel_engine_cs *engine) +bool intel_engine_stopped (struct intel_engine_cs *engine) {struct drm_i915_private *dev_priv = engine->dev->dev_private;return dev_priv->gpu_error.stop_rings &intel_engine_flag (engine);
@@ -69,7 +69,7 @@ static void __intel_ring_advance(struct intel_engine_cs *engine) {struct intel_ringbuffer *ringbuf = engine->buffer; ringbuf->tail &= ringbuf->size -1 ; -if (intel_ring_stopped (engine)) +if (intel_engine_stopped (engine))return ; engine->write_tail (engine, ringbuf->tail); }
@@ -2274,21 +2274,21 @@ static int intel_init_ring_buffer(struct drm_device *dev,return 0 ; error: -intel_cleanup_ring_buffer (engine); +intel_cleanup_engine (engine);return ret; } -void intel_cleanup_ring_buffer (struct intel_engine_cs *engine) +void intel_cleanup_engine (struct intel_engine_cs *engine) {struct drm_i915_private *dev_priv; -if (!intel_ring_initialized (engine)) +if (!intel_engine_intialized (engine))return ; dev_priv =to_i915 (engine->dev);if (engine->buffer) { -intel_stop_ring_buffer (engine); +intel_stop_engine (engine);WARN_ON (!IS_GEN2 (engine->dev) && (I915_READ_MODE (engine) &MODE_IDLE ) ==0 );intel_unpin_ringbuffer_obj (engine->buffer);
@@ -3163,11 +3163,11 @@ intel_ring_invalidate_all_caches(struct drm_i915_gem_request *req) }void -intel_stop_ring_buffer (struct intel_engine_cs *engine) +intel_stop_engine (struct intel_engine_cs *engine) {int ret; -if (!intel_ring_initialized (engine)) +if (!intel_engine_intialized (engine))return ; ret =intel_engine_idle (engine);
drivers/gpu/drm/i915/intel_ringbuffer.h +5 -5
@@ -146,7 +146,7 @@ struct i915_ctx_workarounds {struct intel_engine_cs {const char *name; -enum intel_ring_id { +enum intel_engine_id {RCS =0 ,BCS ,VCS ,
@@ -355,7 +355,7 @@ struct intel_engine_cs { };static inline bool -intel_ring_initialized (struct intel_engine_cs *engine) +intel_engine_intialized (struct intel_engine_cs *engine) {return engine->dev !=NULL ; }
@@ -438,8 +438,8 @@ int intel_pin_and_map_ringbuffer_obj(struct drm_device *dev,void intel_unpin_ringbuffer_obj (struct intel_ringbuffer *ringbuf);void intel_ringbuffer_free (struct intel_ringbuffer *ring); -void intel_stop_ring_buffer (struct intel_engine_cs *engine); -void intel_cleanup_ring_buffer (struct intel_engine_cs *engine); +void intel_stop_engine (struct intel_engine_cs *engine); +void intel_cleanup_engine (struct intel_engine_cs *engine);int intel_ring_alloc_request_extras (struct drm_i915_gem_request *request);
@@ -465,7 +465,7 @@ static inline void intel_ring_advance(struct intel_engine_cs *engine)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); -bool intel_ring_stopped (struct intel_engine_cs *engine); +bool intel_engine_stopped (struct intel_engine_cs *engine);int __must_check intel_engine_idle (struct intel_engine_cs *engine);void intel_ring_init_seqno (struct intel_engine_cs *engine,u32 seqno);
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 5/5 drm/i915: More renaming of rings to engines
In reply to Tvrtko UrsulinFrom: Tvrtko Ursulin <[email protected]>
This time using only sed and a few by hand.
v2: Rename also intel_ring_id and intel_ring_initialized.
v3: Fixed typo in intel_ring_initialized.
--- drivers/gpu/drm/i915/i915_debugfs.c | 2 +- drivers/gpu/drm/i915/i915_dma.c | 12 +++---- drivers/gpu/drm/i915/i915_drv.h | 14 ++++----- drivers/gpu/drm/i915/i915_gem.c | 50 +++++++++++++++--------------- drivers/gpu/drm/i915/i915_gem_debug.c | 2 +- drivers/gpu/drm/i915/i915_gem_execbuffer.c | 4 +-- drivers/gpu/drm/i915/i915_irq.c | 2 +- drivers/gpu/drm/i915/intel_lrc.c | 8 ++--- drivers/gpu/drm/i915/intel_mocs.c | 6 ++-- drivers/gpu/drm/i915/intel_ringbuffer.c | 16 +++++----- drivers/gpu/drm/i915/intel_ringbuffer.h | 10 +++--- 11 files changed, 63 insertions(+), 63 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +1 -1
@@ -2483,7 +2483,7 @@ static int i915_guc_info(struct seq_file *m, void *data)struct intel_guc guc;struct i915_guc_client client = {};struct intel_engine_cs *engine; -enum intel_ring_id i; +enum intel_engine_id i;u64 total =0 ;if (!HAS_GUC_SCHED (dev_priv->dev))
drivers/gpu/drm/i915/i915_dma.c +6 -6
@@ -87,16 +87,16 @@ static int i915_getparam(struct drm_device *dev, void *data, value =1 ;break ;case I915_PARAM_HAS_BSD : - value =intel_ring_initialized (&dev_priv->engine[VCS ]); + value =intel_engine_initialized (&dev_priv->engine[VCS ]);break ;case I915_PARAM_HAS_BLT : - value =intel_ring_initialized (&dev_priv->engine[BCS ]); + value =intel_engine_initialized (&dev_priv->engine[BCS ]);break ;case I915_PARAM_HAS_VEBOX : - value =intel_ring_initialized (&dev_priv->engine[VECS ]); + value =intel_engine_initialized (&dev_priv->engine[VECS ]);break ;case I915_PARAM_HAS_BSD2 : - value =intel_ring_initialized (&dev_priv->engine[VCS2 ]); + value =intel_engine_initialized (&dev_priv->engine[VCS2 ]);break ;case I915_PARAM_HAS_RELAXED_FENCING : value =1 ;
@@ -444,7 +444,7 @@ static int i915_load_modeset_init(struct drm_device *dev) cleanup_gem:mutex_lock (&dev->struct_mutex); -i915_gem_cleanup_ringbuffer (dev); +i915_gem_cleanup_engines (dev);i915_gem_context_fini (dev);mutex_unlock (&dev->struct_mutex); cleanup_irq:
@@ -1261,7 +1261,7 @@ int i915_driver_unload(struct drm_device *dev)intel_guc_ucode_fini (dev);mutex_lock (&dev->struct_mutex); -i915_gem_cleanup_ringbuffer (dev); +i915_gem_cleanup_engines (dev);i915_gem_context_fini (dev);mutex_unlock (&dev->struct_mutex);intel_fbc_cleanup_cfb (dev_priv);
drivers/gpu/drm/i915/i915_drv.h +7 -7
@@ -1931,9 +1931,9 @@ struct drm_i915_private {int (*execbuf_submit)(struct i915_execbuffer_params *params,struct drm_i915_gem_execbuffer2 *args,struct list_head *vmas); -int (*init_rings)(struct drm_device *dev); -void (*cleanup_ring)(struct intel_engine_cs *ring); -void (*stop_ring)(struct intel_engine_cs *ring); +int (*init_engines)(struct drm_device *dev); +void (*cleanup_engine)(struct intel_engine_cs *engine); +void (*stop_engine)(struct intel_engine_cs *engine); } gt;struct intel_context *kernel_context;
@@ -1969,7 +1969,7 @@ static inline struct drm_i915_private *guc_to_i915(struct intel_guc *guc)/* Iterate over initialised rings */ #define for_each_engine (ring__, dev_priv__, i__) \ for ((i__) = 0; (i__) < I915_NUM_ENGINES; (i__)++) \ - for_each_if ((((ring__) = &(dev_priv__)->engine[(i__)]), intel_ring_initialized((ring__)))) + for_each_if ((((ring__) = &(dev_priv__)->engine[(i__)]), intel_engine_initialized((ring__))))enum hdmi_force_audio {HDMI_AUDIO_OFF_DVI =-2 ,/* no aux data for HDMI-DVI converter */
@@ -2039,7 +2039,7 @@ struct drm_i915_gem_object {struct drm_mm_node *stolen;struct list_head global_list; -struct list_head ring_list[I915_NUM_ENGINES ]; +struct list_head engine_list[I915_NUM_ENGINES ];/** Used in execbuf to temporarily hold a ref */ struct list_head obj_exec_link;
@@ -3002,11 +3002,11 @@ static inline bool i915_stop_ring_allow_warn(struct drm_i915_private *dev_priv)void i915_gem_reset (struct drm_device *dev);bool i915_gem_clflush_object (struct drm_i915_gem_object *obj,bool force);int __must_check i915_gem_init (struct drm_device *dev); -int i915_gem_init_rings (struct drm_device *dev); +int i915_gem_init_engines (struct drm_device *dev);int __must_check i915_gem_init_hw (struct drm_device *dev);int i915_gem_l3_remap (struct drm_i915_gem_request *req,int slice);void i915_gem_init_swizzling (struct drm_device *dev); -void i915_gem_cleanup_ringbuffer (struct drm_device *dev); +void i915_gem_cleanup_engines (struct drm_device *dev);int __must_check i915_gpu_idle (struct drm_device *dev);int __must_check i915_gem_suspend (struct drm_device *dev); void __i915_add_request(struct drm_i915_gem_request *req,
drivers/gpu/drm/i915/i915_gem.c +25 -25
157 lines not on this page · raw message
drivers/gpu/drm/i915/i915_gem_debug.c +1 -1
@@ -45,7 +45,7 @@ i915_verify_lists(struct drm_device *dev)for_each_engine (engine, dev_priv, i) {list_for_each_entry (obj, &engine->active_list, - ring_list[engine->id]) { + engine_list[engine->id]) {if (obj->base.dev != dev || !atomic_read (&obj->base.refcount.refcount)) { DRM_ERROR("%s: freed active obj %p\n",
drivers/gpu/drm/i915/i915_gem_execbuffer.c +2 -2
@@ -1369,7 +1369,7 @@ eb_get_batch(struct eb_vmas *eb)#define I915_USER_RINGS (4) -static const enum intel_ring_id user_ring_map[I915_USER_RINGS +1 ] = { +static const enum intel_engine_id user_ring_map[I915_USER_RINGS +1 ] = { [I915_EXEC_DEFAULT ] =RCS , [I915_EXEC_RENDER ] =RCS , [I915_EXEC_BLT ] =BCS ,
@@ -1417,7 +1417,7 @@ eb_select_ring(struct drm_i915_private *dev_priv, *ring = &dev_priv->engine[user_ring_map[user_ring_id]]; } -if (!intel_ring_initialized (*ring)) { +if (!intel_engine_initialized (*ring)) {DRM_DEBUG ("execbuf with invalid ring: %u\n" , user_ring_id);return -EINVAL ; }
drivers/gpu/drm/i915/i915_irq.c +1 -1
@@ -996,7 +996,7 @@ static void ironlake_rps_change_irq_handler(struct drm_device *dev)static void notify_ring (struct intel_engine_cs *engine) { -if (!intel_ring_initialized (engine)) +if (!intel_engine_initialized (engine))return ;trace_i915_gem_request_notify (engine);
drivers/gpu/drm/i915/intel_lrc.c +4 -4
@@ -795,7 +795,7 @@ intel_logical_ring_advance_and_submit(struct drm_i915_gem_request *request)intel_logical_ring_emit (ringbuf,MI_NOOP );intel_logical_ring_advance (ringbuf); -if (intel_ring_stopped (engine)) +if (intel_engine_stopped (engine))return 0 ;if (engine->last_context != request->ctx) {
@@ -1054,7 +1054,7 @@ void intel_logical_ring_stop(struct intel_engine_cs *engine)struct drm_i915_private *dev_priv = engine->dev->dev_private;int ret; -if (!intel_ring_initialized (engine)) +if (!intel_engine_initialized (engine))return ; ret =intel_engine_idle (engine);
@@ -2012,7 +2012,7 @@ void intel_logical_ring_cleanup(struct intel_engine_cs *engine) {struct drm_i915_private *dev_priv; -if (!intel_ring_initialized (engine)) +if (!intel_engine_initialized (engine))return ; dev_priv = engine->dev->dev_private;
@@ -2240,7 +2240,7 @@ static int logical_vebox_ring_init(struct drm_device *dev)* @dev: DRM device. * * This function inits the engines for an Execlists submission style (the equivalent in the -* legacy ringbuffer submission world would be i915_gem_init_rings). It does it only for +* legacy ringbuffer submission world would be i915_gem_init_engines). It does it only for * those engines that are present in the hardware. * * Return: non-zero if the initialization failed.
drivers/gpu/drm/i915/intel_mocs.c +3 -3
@@ -159,7 +159,7 @@ static bool get_mocs_settings(struct drm_device *dev,return result; } -static i915_reg_t mocs_register (enum intel_ring_id ring,int index) +static i915_reg_t mocs_register (enum intel_engine_id ring,int index) {switch (ring) {case RCS :
@@ -191,7 +191,7 @@ static i915_reg_t mocs_register(enum intel_ring_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_ring_id ring) +enum intel_engine_id ring) {struct intel_ringbuffer *ringbuf = req->ringbuf;unsigned int index;
@@ -325,7 +325,7 @@ int intel_rcs_context_init_mocs(struct drm_i915_gem_request *req)if (get_mocs_settings (req->engine->dev, &t)) {struct drm_i915_private *dev_priv = req->i915;struct intel_engine_cs *engine; -enum intel_ring_id ring_id; +enum intel_engine_id ring_id;/* Program the control registers */ for_each_engine (engine, dev_priv, ring_id) {
drivers/gpu/drm/i915/intel_ringbuffer.c +8 -8
@@ -59,7 +59,7 @@ int intel_ring_space(struct intel_ringbuffer *ringbuf)return ringbuf->space; } -bool intel_ring_stopped (struct intel_engine_cs *engine) +bool intel_engine_stopped (struct intel_engine_cs *engine) {struct drm_i915_private *dev_priv = engine->dev->dev_private;return dev_priv->gpu_error.stop_rings &intel_engine_flag (engine);
@@ -69,7 +69,7 @@ static void __intel_ring_advance(struct intel_engine_cs *engine) {struct intel_ringbuffer *ringbuf = engine->buffer; ringbuf->tail &= ringbuf->size -1 ; -if (intel_ring_stopped (engine)) +if (intel_engine_stopped (engine))return ; engine->write_tail (engine, ringbuf->tail); }
@@ -2274,21 +2274,21 @@ static int intel_init_ring_buffer(struct drm_device *dev,return 0 ; error: -intel_cleanup_ring_buffer (engine); +intel_cleanup_engine (engine);return ret; } -void intel_cleanup_ring_buffer (struct intel_engine_cs *engine) +void intel_cleanup_engine (struct intel_engine_cs *engine) {struct drm_i915_private *dev_priv; -if (!intel_ring_initialized (engine)) +if (!intel_engine_initialized (engine))return ; dev_priv =to_i915 (engine->dev);if (engine->buffer) { -intel_stop_ring_buffer (engine); +intel_stop_engine (engine);WARN_ON (!IS_GEN2 (engine->dev) && (I915_READ_MODE (engine) &MODE_IDLE ) ==0 );intel_unpin_ringbuffer_obj (engine->buffer);
@@ -3163,11 +3163,11 @@ intel_ring_invalidate_all_caches(struct drm_i915_gem_request *req) }void -intel_stop_ring_buffer (struct intel_engine_cs *engine) +intel_stop_engine (struct intel_engine_cs *engine) {int ret; -if (!intel_ring_initialized (engine)) +if (!intel_engine_initialized (engine))return ; ret =intel_engine_idle (engine);
drivers/gpu/drm/i915/intel_ringbuffer.h +5 -5
@@ -146,7 +146,7 @@ struct i915_ctx_workarounds {struct intel_engine_cs {const char *name; -enum intel_ring_id { +enum intel_engine_id {RCS =0 ,BCS ,VCS ,
@@ -355,7 +355,7 @@ struct intel_engine_cs { };static inline bool -intel_ring_initialized (struct intel_engine_cs *engine) +intel_engine_initialized (struct intel_engine_cs *engine) {return engine->dev !=NULL ; }
@@ -438,8 +438,8 @@ int intel_pin_and_map_ringbuffer_obj(struct drm_device *dev,void intel_unpin_ringbuffer_obj (struct intel_ringbuffer *ringbuf);void intel_ringbuffer_free (struct intel_ringbuffer *ring); -void intel_stop_ring_buffer (struct intel_engine_cs *engine); -void intel_cleanup_ring_buffer (struct intel_engine_cs *engine); +void intel_stop_engine (struct intel_engine_cs *engine); +void intel_cleanup_engine (struct intel_engine_cs *engine);int intel_ring_alloc_request_extras (struct drm_i915_gem_request *request);
@@ -465,7 +465,7 @@ static inline void intel_ring_advance(struct intel_engine_cs *engine)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); -bool intel_ring_stopped (struct intel_engine_cs *engine); +bool intel_engine_stopped (struct intel_engine_cs *engine);int __must_check intel_engine_idle (struct intel_engine_cs *engine);void intel_ring_init_seqno (struct intel_engine_cs *engine,u32 seqno);
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 10 lines · Tvrtko Ursulin
From: Tvrtko Ursulin <[email protected]>
I think there is consesus to do this, but the question is whether now is the time to do it?
If desired, needs to go in quickly before it goes stale.
But if not, it was an interesting exercise of learning Coccinelle nevertheless.
Quoted 6 lines
Tvrtko Ursulin (5):
drm/i915: Rename local structintel_engine_csvariables drm/i915: Renameintel_engine_csfunction parameters drm/i915: Renameintel_engine_csstruct members drm/i915: Moreintel_engine_csrenaming drm/i915: More renaming of rings to engines
Actually read all 5, some I felt missing from the manual fixup in 5, but I am very much in favour and could not spot a mistake in the mechanical changes.
-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
Quoted 35 lines · Tvrtko Ursulin
From: Tvrtko Ursulin <[email protected]>
I think there is consesus to do this, but the question is whether now is the time to do it?
If desired, needs to go in quickly before it goes stale.
But if not, it was an interesting exercise of learning Coccinelle nevertheless.
Tvrtko Ursulin (5):
drm/i915: Rename local structintel_engine_csvariables drm/i915: Renameintel_engine_csfunction parameters drm/i915: Renameintel_engine_csstruct members drm/i915: Moreintel_engine_csrenaming drm/i915: More renaming of rings to enginesdrivers/gpu/drm/i915/i915_cmd_parser.c | 122 +-- drivers/gpu/drm/i915/i915_debugfs.c | 229 +++-- drivers/gpu/drm/i915/i915_dma.c | 12 +- drivers/gpu/drm/i915/i915_drv.h | 70 +- drivers/gpu/drm/i915/i915_gem.c | 316 +++--- drivers/gpu/drm/i915/i915_gem_context.c | 168 +-- drivers/gpu/drm/i915/i915_gem_debug.c | 15 +- drivers/gpu/drm/i915/i915_gem_execbuffer.c | 120 +-- drivers/gpu/drm/i915/i915_gem_gtt.c | 94 +- drivers/gpu/drm/i915/i915_gem_render_state.c | 12 +- drivers/gpu/drm/i915/i915_gem_render_state.h | 2 +- drivers/gpu/drm/i915/i915_gpu_error.c | 158 +-- drivers/gpu/drm/i915/i915_guc_submission.c | 37 +- drivers/gpu/drm/i915/i915_irq.c | 243 ++--- drivers/gpu/drm/i915/i915_trace.h | 6 +- drivers/gpu/drm/i915/intel_display.c | 114 +-- drivers/gpu/drm/i915/intel_guc_loader.c | 12 +- drivers/gpu/drm/i915/intel_lrc.c | 826 ++++++++-------
Quoted 9 lines
drivers/gpu/drm/i915/intel_lrc.h | 16 +- drivers/gpu/drm/i915/intel_mocs.c | 6 +- drivers/gpu/drm/i915/intel_overlay.c | 60 +- drivers/gpu/drm/i915/intel_pm.c | 38 +- drivers/gpu/drm/i915/intel_ringbuffer.c | 1425 +++++++++++++------------- drivers/gpu/drm/i915/intel_ringbuffer.h | 86 +- drivers/gpu/drm/i915/intel_uncore.c | 4 +- 25 files changed, 2132 insertions(+), 2059 deletions(-)
Are the filenames also going to be renamed?
regards
Arun
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Hi,
Quoted 47 lines · Arun Siluvery
Quoted 36 lines · Tvrtko Ursulin
From: Tvrtko Ursulin <[email protected]>
I think there is consesus to do this, but the question is whether now is the time to do it?
If desired, needs to go in quickly before it goes stale.
But if not, it was an interesting exercise of learning Coccinelle nevertheless.
Tvrtko Ursulin (5):
drm/i915: Rename local structintel_engine_csvariables drm/i915: Renameintel_engine_csfunction parameters drm/i915: Renameintel_engine_csstruct members drm/i915: Moreintel_engine_csrenaming drm/i915: More renaming of rings to enginesdrivers/gpu/drm/i915/i915_cmd_parser.c | 122 +-- drivers/gpu/drm/i915/i915_debugfs.c | 229 +++-- drivers/gpu/drm/i915/i915_dma.c | 12 +- drivers/gpu/drm/i915/i915_drv.h | 70 +- drivers/gpu/drm/i915/i915_gem.c | 316 +++--- drivers/gpu/drm/i915/i915_gem_context.c | 168 +-- drivers/gpu/drm/i915/i915_gem_debug.c | 15 +- drivers/gpu/drm/i915/i915_gem_execbuffer.c | 120 +-- drivers/gpu/drm/i915/i915_gem_gtt.c | 94 +- drivers/gpu/drm/i915/i915_gem_render_state.c | 12 +- drivers/gpu/drm/i915/i915_gem_render_state.h | 2 +- drivers/gpu/drm/i915/i915_gpu_error.c | 158 +-- drivers/gpu/drm/i915/i915_guc_submission.c | 37 +- drivers/gpu/drm/i915/i915_irq.c | 243 ++--- drivers/gpu/drm/i915/i915_trace.h | 6 +- drivers/gpu/drm/i915/intel_display.c | 114 +-- drivers/gpu/drm/i915/intel_guc_loader.c | 12 +- drivers/gpu/drm/i915/intel_lrc.c | 826 ++++++++------- drivers/gpu/drm/i915/intel_lrc.h | 16 +-Quoted 9 lines
drivers/gpu/drm/i915/intel_mocs.c | 6 +- drivers/gpu/drm/i915/intel_overlay.c | 60 +- drivers/gpu/drm/i915/intel_pm.c | 38 +- drivers/gpu/drm/i915/intel_ringbuffer.c | 1425 +++++++++++++------------- drivers/gpu/drm/i915/intel_ringbuffer.h | 86 +- drivers/gpu/drm/i915/intel_uncore.c | 4 +- 25 files changed, 2132 insertions(+), 2059 deletions(-)
Quoted 1 line
Are the filenames also going to be renamed?
I can't spot any files to rename, which ones you had in mind?
Regards,
Tvrtko
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 51 lines · Tvrtko Ursulin
Hi,
Quoted 47 lines · Arun Siluvery
Quoted 45 lines · Tvrtko Ursulin
From: Tvrtko Ursulin <[email protected]>
I think there is consesus to do this, but the question is whether now is the time to do it?
If desired, needs to go in quickly before it goes stale.
But if not, it was an interesting exercise of learning Coccinelle nevertheless.
Tvrtko Ursulin (5):
drm/i915: Rename local structintel_engine_csvariables drm/i915: Renameintel_engine_csfunction parameters drm/i915: Renameintel_engine_csstruct members drm/i915: Moreintel_engine_csrenaming drm/i915: More renaming of rings to enginesdrivers/gpu/drm/i915/i915_cmd_parser.c | 122 +-- drivers/gpu/drm/i915/i915_debugfs.c | 229 +++-- drivers/gpu/drm/i915/i915_dma.c | 12 +- drivers/gpu/drm/i915/i915_drv.h | 70 +- drivers/gpu/drm/i915/i915_gem.c | 316 +++--- drivers/gpu/drm/i915/i915_gem_context.c | 168 +-- drivers/gpu/drm/i915/i915_gem_debug.c | 15 +- drivers/gpu/drm/i915/i915_gem_execbuffer.c | 120 +-- drivers/gpu/drm/i915/i915_gem_gtt.c | 94 +- drivers/gpu/drm/i915/i915_gem_render_state.c | 12 +- drivers/gpu/drm/i915/i915_gem_render_state.h | 2 +- drivers/gpu/drm/i915/i915_gpu_error.c | 158 +-- drivers/gpu/drm/i915/i915_guc_submission.c | 37 +- drivers/gpu/drm/i915/i915_irq.c | 243 ++--- drivers/gpu/drm/i915/i915_trace.h | 6 +- drivers/gpu/drm/i915/intel_display.c | 114 +-- drivers/gpu/drm/i915/intel_guc_loader.c | 12 +- drivers/gpu/drm/i915/intel_lrc.c | 826 ++++++++------- drivers/gpu/drm/i915/intel_lrc.h | 16 +- drivers/gpu/drm/i915/intel_mocs.c | 6 +- drivers/gpu/drm/i915/intel_overlay.c | 60 +- drivers/gpu/drm/i915/intel_pm.c | 38 +- drivers/gpu/drm/i915/intel_ringbuffer.c | 1425 +++++++++++++------------- drivers/gpu/drm/i915/intel_ringbuffer.h | 86 +- drivers/gpu/drm/i915/intel_uncore.c | 4 +- 25 files changed, 2132 insertions(+), 2059 deletions(-)
Quoted 3 lines
Quoted 1 line
Are the filenames also going to be renamed?
I can't spot any files to rename, which ones you had in mind?
I mean intel_ringbuffer.c -> intel_engine.c ? or may not be necessary.
regards
Arun
Quoted 5 lines
Regards,
Tvrtko
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 52 lines · Arun Siluvery
Quoted 51 lines · Tvrtko Ursulin
Hi,
Quoted 47 lines · Arun Siluvery
Quoted 45 lines · Tvrtko Ursulin
From: Tvrtko Ursulin <[email protected]>
I think there is consesus to do this, but the question is whether now is the time to do it?
If desired, needs to go in quickly before it goes stale.
But if not, it was an interesting exercise of learning Coccinelle nevertheless.
Tvrtko Ursulin (5):
drm/i915: Rename local structintel_engine_csvariables drm/i915: Renameintel_engine_csfunction parameters drm/i915: Renameintel_engine_csstruct members drm/i915: Moreintel_engine_csrenaming drm/i915: More renaming of rings to enginesdrivers/gpu/drm/i915/i915_cmd_parser.c | 122 +-- drivers/gpu/drm/i915/i915_debugfs.c | 229 +++-- drivers/gpu/drm/i915/i915_dma.c | 12 +- drivers/gpu/drm/i915/i915_drv.h | 70 +- drivers/gpu/drm/i915/i915_gem.c | 316 +++--- drivers/gpu/drm/i915/i915_gem_context.c | 168 +-- drivers/gpu/drm/i915/i915_gem_debug.c | 15 +- drivers/gpu/drm/i915/i915_gem_execbuffer.c | 120 +-- drivers/gpu/drm/i915/i915_gem_gtt.c | 94 +- drivers/gpu/drm/i915/i915_gem_render_state.c | 12 +- drivers/gpu/drm/i915/i915_gem_render_state.h | 2 +- drivers/gpu/drm/i915/i915_gpu_error.c | 158 +-- drivers/gpu/drm/i915/i915_guc_submission.c | 37 +- drivers/gpu/drm/i915/i915_irq.c | 243 ++--- drivers/gpu/drm/i915/i915_trace.h | 6 +- drivers/gpu/drm/i915/intel_display.c | 114 +-- drivers/gpu/drm/i915/intel_guc_loader.c | 12 +- drivers/gpu/drm/i915/intel_lrc.c | 826 ++++++++------- drivers/gpu/drm/i915/intel_lrc.h | 16 +- drivers/gpu/drm/i915/intel_mocs.c | 6 +- drivers/gpu/drm/i915/intel_overlay.c | 60 +- drivers/gpu/drm/i915/intel_pm.c | 38 +- drivers/gpu/drm/i915/intel_ringbuffer.c | 1425 +++++++++++++------------- drivers/gpu/drm/i915/intel_ringbuffer.h | 86 +- drivers/gpu/drm/i915/intel_uncore.c | 4 +- 25 files changed, 2132 insertions(+), 2059 deletions(-)
Quoted 5 lines
Quoted 3 lines
Quoted 1 line
Are the filenames also going to be renamed?
I can't spot any files to rename, which ones you had in mind?
I mean
intel_ringbuffer.c->intel_engine.c? or may not be necessary.
I would leave it since everyone calls the it legacy ringbuffer submission, so it makes sense for it to implemented in an adequately named file.
In fact I have second thoughts on a couple renames I did in 5/5, should probably undo them.
Regards,
Tvrtko
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: failure for intel_engine_cs renaming bomb
In reply to Tvrtko Ursulin== Series Details ==
== Series Details ==
Series: intel_engine_cs renaming bomb
URL : https://patchwork.freedesktop.org/series/4303/
State : failure
== Summary ==
^
include/trace/perf.h:68:4: note: in definition of macro 'DECLARE_EVENT_CLASS'
{ assign; } \
^
include/trace/trace_events.h:64:9: note: in expansion of macro 'PARAMS'
PARAMS(assign), \
^drivers/gpu/drm/i915/./i915_trace.h:502:1: note: in expansion of macro 'TRACE_EVENT'
TRACE_EVENT(i915_gem_ring_flush,
^drivers/gpu/drm/i915/./i915_trace.h:513:6: note: in expansion of macro 'TP_fast_assign'
TP_fast_assign(
^
scripts/Makefile.build:258: recipe for target 'drivers/gpu/drm/i915/i915_trace_points.o' failed
make[4]: *** [drivers/gpu/drm/i915/i915_trace_points.o] Error 1
make[4]: *** Waiting for unfinished jobs....
LD drivers/usb/host/xhci-hcd.o
LD drivers/usb/host/built-in.o
LD drivers/usb/built-in.o
LD [M] drivers/net/ethernet/intel/igb/igb.o
LD drivers/net/ethernet/built-in.o
LD drivers/net/built-in.oscripts/Makefile.build:407: recipe for target 'drivers/gpu/drm/i915' failed make[3]: *** [drivers/gpu/drm/i915] Error 2 scripts/Makefile.build:407: recipe for target 'drivers/gpu/drm' failed make[2]: *** [drivers/gpu/drm] Error 2 scripts/Makefile.build:407: recipe for target 'drivers/gpu' failed make[1]: *** [drivers/gpu] Error 2
Makefile:950: recipe for target 'drivers' failed
make: *** [drivers] Error 2
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: warning for intel_engine_cs renaming bomb (rev3)
In reply to Tvrtko Ursulin== Series Details ==
== Series Details ==
Series: intel_engine_cs renaming bomb (rev3)
URL : https://patchwork.freedesktop.org/series/4303/
State : warning
== Summary ==
Series 4303v3 intel_engine_cs renaming bomb
http://patchwork.freedesktop.org/api/1.0/series/4303/revisions/3/mbox/
Test kms_flip:
Subgroup basic-flip-vs-dpms:
pass -> DMESG-WARN (ilk-hp8440p) UNSTABLE
Subgroup basic-flip-vs-modeset:
dmesg-warn -> PASS (bdw-ultra)
Subgroup basic-plain-flip:
pass -> DMESG-WARN (hsw-brixbox)
Test kms_pipe_crc_basic:
Subgroup suspend-read-crc-pipe-b:
incomplete -> PASS (hsw-gt2)
Test pm_rpm:
Subgroup basic-pci-d3-state:
fail -> DMESG-FAIL (snb-x220t)
dmesg-warn -> PASS (snb-dellxps)
dmesg-warn -> PASS (hsw-brixbox)
Subgroup basic-rte:
dmesg-warn -> PASS (snb-x220t)
dmesg-warn -> PASS (bsw-nuc-2)bdw-nuci7 total:193 pass:181 dwarn:0 dfail:0 fail:0 skip:12 bdw-ultra total:193 pass:172 dwarn:0 dfail:0 fail:0 skip:21 bsw-nuc-2 total:193 pass:156 dwarn:0 dfail:0 fail:0 skip:37 byt-nuc total:193 pass:158 dwarn:0 dfail:0 fail:0 skip:35 hsw-brixbox total:193 pass:170 dwarn:1 dfail:0 fail:0 skip:22 hsw-gt2 total:193 pass:176 dwarn:0 dfail:0 fail:0 skip:17 ilk-hp8440p total:193 pass:129 dwarn:1 dfail:0 fail:0 skip:63 ivb-t430s total:193 pass:168 dwarn:0 dfail:0 fail:0 skip:25 skl-i5k-2 total:193 pass:170 dwarn:0 dfail:0 fail:0 skip:23 skl-i7k-2 total:193 pass:170 dwarn:0 dfail:0 fail:0 skip:23 skl-nuci5 total:161 pass:152 dwarn:0 dfail:0 fail:0 skip:9 snb-dellxps total:193 pass:158 dwarn:1 dfail:0 fail:0 skip:34 snb-x220t total:193 pass:159 dwarn:0 dfail:1 fail:0 skip:33
Results at /archive/results/CI_IGT_test/Patchwork_1565/
63461ba49f1bc63fe9dcccdbbaa3a5049c57ae37 drm-intel-nightly: 2016y-03m-10d-13h-21m-51s UTC integration manifest 434af94ce2882d30b6a179231e7e15de9c32f78c drm/i915: More renaming of rings to engines e21ab7713d974e6d1001ea13fab23c80aaa46500 drm/i915: More intel_engine_cs renaming f9c4ea7fc64c8a4a28c8315f908711e959261d95 drm/i915: Rename intel_engine_cs struct members c038a428c10d8f6976cd42b94371d8b97890945a drm/i915: Rename intel_engine_cs function parameters 310c63e721cbc868fc15d831da6abb09be5de102 drm/i915: Rename local struct intel_engine_cs variables
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: ✗ Fi.CI.BAT: warning for intel_engine_cs renaming bomb (rev3)
Quoted 6 lines · Patchwork
== Series Details ==
Series:
intel_engine_csrenaming bomb (rev3)
URL : https://patchwork.freedesktop.org/series/4303/
State : warning
Quoted 8 lines
== Summary ==
Series 4303v3
intel_engine_csrenaming bomb
http://patchwork.freedesktop.org/api/1.0/series/4303/revisions/3/mbox/Test
kms_flip:Subgroup basic-flip-vs-dpms: pass -> DMESG-WARN (ilk-hp8440p) UNSTABLE
Unrelated https://bugs.freedesktop.org/show_bug.cgi?id=93787
Quoted 4 lines
Subgroup basic-flip-vs-modeset:
dmesg-warn -> PASS (bdw-ultra)
Subgroup basic-plain-flip:
pass -> DMESG-WARN (hsw-brixbox)Unrelated https://bugs.freedesktop.org/show_bug.cgi?id=94349
Quoted 6 lines
Test
kms_pipe_crc_basic:Subgroup suspend-read-crc-pipe-b: incomplete -> PASS (hsw-gt2) Test pm_rpm: Subgroup basic-pci-d3-state: fail -> DMESG-FAIL (snb-x220t)
Again unrelated https://bugs.freedesktop.org/show_bug.cgi?id=94349
Quoted 20 lines
dmesg-warn -> PASS (snb-dellxps) dmesg-warn -> PASS (hsw-brixbox) Subgroup basic-rte: dmesg-warn -> PASS (snb-x220t) dmesg-warn -> PASS (bsw-nuc-2)bdw-nuci7 total:193 pass:181 dwarn:0 dfail:0 fail:0 skip:12 bdw-ultra total:193 pass:172 dwarn:0 dfail:0 fail:0 skip:21 bsw-nuc-2 total:193 pass:156 dwarn:0 dfail:0 fail:0 skip:37 byt-nuc total:193 pass:158 dwarn:0 dfail:0 fail:0 skip:35 hsw-brixbox total:193 pass:170 dwarn:1 dfail:0 fail:0 skip:22 hsw-gt2 total:193 pass:176 dwarn:0 dfail:0 fail:0 skip:17 ilk-hp8440p total:193 pass:129 dwarn:1 dfail:0 fail:0 skip:63 ivb-t430s total:193 pass:168 dwarn:0 dfail:0 fail:0 skip:25 skl-i5k-2 total:193 pass:170 dwarn:0 dfail:0 fail:0 skip:23 skl-i7k-2 total:193 pass:170 dwarn:0 dfail:0 fail:0 skip:23 skl-nuci5 total:161 pass:152 dwarn:0 dfail:0 fail:0 skip:9 snb-dellxps total:193 pass:158 dwarn:1 dfail:0 fail:0 skip:34 snb-x220t total:193 pass:159 dwarn:0 dfail:1 fail:0 skip:33
Quoted 8 lines
Results at /archive/results/CI_IGT_test/Patchwork_1565/
63461ba49f1bc63fe9dcccdbbaa3a5049c57ae37drm-intel-nightly: 2016y-03m-10d-13h-21m-51s UTC integration manifest434af94ce2882d30b6a179231e7e15de9c32f78cdrm/i915: More renaming of rings to enginese21ab7713d974e6d1001ea13fab23c80aaa46500drm/i915: Moreintel_engine_csrenamingf9c4ea7fc64c8a4a28c8315f908711e959261d95drm/i915: Renameintel_engine_csstruct membersc038a428c10d8f6976cd42b94371d8b97890945adrm/i915: Renameintel_engine_csfunction parameters310c63e721cbc868fc15d831da6abb09be5de102drm/i915: Rename local structintel_engine_csvariables
So looking good to merge.
Any objections wrt rebasing pain? John maybe? :) How exposed your patch series are to code which deals a lot with intel_engine_cs?
Regards,
Tvrtko
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: ✗ Fi.CI.BAT: warning for intel_engine_cs renaming bomb (rev3)
Quoted 82 lines · Tvrtko Ursulin
Quoted 6 lines · Patchwork
== Series Details ==
Series:
intel_engine_csrenaming bomb (rev3)
URL : https://patchwork.freedesktop.org/series/4303/
State : warningQuoted 8 lines
== Summary ==
Series 4303v3
intel_engine_csrenaming bomb
http://patchwork.freedesktop.org/api/1.0/series/4303/revisions/3/mbox/Test
kms_flip:Subgroup basic-flip-vs-dpms: pass -> DMESG-WARN (ilk-hp8440p) UNSTABLEUnrelated https://bugs.freedesktop.org/show_bug.cgi?id=93787
Quoted 4 lines
Subgroup basic-flip-vs-modeset: dmesg-warn -> PASS (bdw-ultra) Subgroup basic-plain-flip: pass -> DMESG-WARN (hsw-brixbox)Unrelated https://bugs.freedesktop.org/show_bug.cgi?id=94349
Quoted 6 lines
Test
kms_pipe_crc_basic:Subgroup suspend-read-crc-pipe-b: incomplete -> PASS (hsw-gt2) Test pm_rpm: Subgroup basic-pci-d3-state: fail -> DMESG-FAIL (snb-x220t)Again unrelated https://bugs.freedesktop.org/show_bug.cgi?id=94349
Quoted 34 lines
dmesg-warn -> PASS (snb-dellxps) dmesg-warn -> PASS (hsw-brixbox) Subgroup basic-rte: dmesg-warn -> PASS (snb-x220t) dmesg-warn -> PASS (bsw-nuc-2)bdw-nuci7 total:193 pass:181 dwarn:0 dfail:0 fail:0
skip:12
bdw-ultra total:193 pass:172 dwarn:0 dfail:0 fail:0
skip:21
bsw-nuc-2 total:193 pass:156 dwarn:0 dfail:0 fail:0
skip:37
byt-nuc total:193 pass:158 dwarn:0 dfail:0 fail:0
skip:35
hsw-brixbox total:193 pass:170 dwarn:1 dfail:0 fail:0
skip:22
hsw-gt2 total:193 pass:176 dwarn:0 dfail:0 fail:0
skip:17
ilk-hp8440p total:193 pass:129 dwarn:1 dfail:0 fail:0
skip:63
ivb-t430s total:193 pass:168 dwarn:0 dfail:0 fail:0
skip:25
skl-i5k-2 total:193 pass:170 dwarn:0 dfail:0 fail:0
skip:23
skl-i7k-2 total:193 pass:170 dwarn:0 dfail:0 fail:0
skip:23skl-nuci5 total:161 pass:152 dwarn:0 dfail:0 fail:0 skip:9 snb-dellxps total:193 pass:158 dwarn:1 dfail:0 fail:0skip:34
snb-x220t total:193 pass:159 dwarn:0 dfail:1 fail:0
skip:33Results at /archive/results/CI_IGT_test/Patchwork_1565/
Quoted 12 lines
63461ba49f1bc63fe9dcccdbbaa3a5049c57ae37drm-intel-nightly:
2016y-03m-10d-13h-21m-51s UTC integration manifest434af94ce2882d30b6a179231e7e15de9c32f78cdrm/i915: More renaming of rings to enginese21ab7713d974e6d1001ea13fab23c80aaa46500drm/i915: Moreintel_engine_csrenamingf9c4ea7fc64c8a4a28c8315f908711e959261d95drm/i915: Renameintel_engine_csstruct membersc038a428c10d8f6976cd42b94371d8b97890945adrm/i915: Renameintel_engine_csfunction parameters310c63e721cbc868fc15d831da6abb09be5de102drm/i915: Rename local structintel_engine_csvariables
Quoted 4 lines
So looking good to merge.
Any objections wrt rebasing pain? John maybe? :) How exposed your patch series are to code which deals a lot with
intel_engine_cs?
It also affects engine reset patches but I tried to use engine where possible so hopefully won't be that bad, atleast we will have consistent naming throughout with this.
regard
Arun
Quoted 10 lines
Regards,
Tvrtko
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: warning for intel_engine_cs renaming bomb (rev4)
In reply to Tvrtko Ursulin== Series Details ==
== Series Details ==
Series: intel_engine_cs renaming bomb (rev4)
URL : https://patchwork.freedesktop.org/series/4303/
State : warning
== Summary ==
Series 4303v4 intel_engine_cs renaming bomb
http://patchwork.freedesktop.org/api/1.0/series/4303/revisions/4/mbox/
Test gem_mmap_gtt:
Subgroup basic-small-copy:
pass -> DMESG-WARN (bsw-nuc-2)
Test kms_flip:
Subgroup basic-flip-vs-dpms:
pass -> DMESG-WARN (ilk-hp8440p) UNSTABLE
Subgroup basic-flip-vs-modeset:
dmesg-warn -> PASS (bdw-ultra)
Test kms_pipe_crc_basic:
Subgroup nonblocking-crc-pipe-a-frame-sequence:
pass -> DMESG-WARN (bdw-nuci7)
Subgroup suspend-read-crc-pipe-b:
incomplete -> PASS (hsw-gt2)
Test pm_rpm:
Subgroup basic-pci-d3-state:
dmesg-warn -> PASS (hsw-brixbox)
Subgroup basic-rte:
dmesg-warn -> PASS (snb-dellxps)bdw-nuci7 total:193 pass:180 dwarn:1 dfail:0 fail:0 skip:12 bdw-ultra total:193 pass:172 dwarn:0 dfail:0 fail:0 skip:21 bsw-nuc-2 total:193 pass:154 dwarn:2 dfail:0 fail:0 skip:37 byt-nuc total:193 pass:158 dwarn:0 dfail:0 fail:0 skip:35 hsw-brixbox total:193 pass:171 dwarn:0 dfail:0 fail:0 skip:22 hsw-gt2 total:193 pass:176 dwarn:0 dfail:0 fail:0 skip:17 ilk-hp8440p total:193 pass:129 dwarn:1 dfail:0 fail:0 skip:63 ivb-t430s total:193 pass:168 dwarn:0 dfail:0 fail:0 skip:25 skl-i5k-2 total:193 pass:170 dwarn:0 dfail:0 fail:0 skip:23 skl-i7k-2 total:193 pass:170 dwarn:0 dfail:0 fail:0 skip:23 skl-nuci5 total:193 pass:182 dwarn:0 dfail:0 fail:0 skip:11 snb-dellxps total:193 pass:158 dwarn:1 dfail:0 fail:0 skip:34 snb-x220t total:193 pass:158 dwarn:1 dfail:0 fail:1 skip:33
Results at /archive/results/CI_IGT_test/Patchwork_1574/
63461ba49f1bc63fe9dcccdbbaa3a5049c57ae37 drm-intel-nightly: 2016y-03m-10d-13h-21m-51s UTC integration manifest f0d58a6d14e3467318001899d9616345ea662de5 drm/i915: More renaming of rings to engines bbdd96e1e87a9f110d78e1f40d521af6354620d7 drm/i915: More intel_engine_cs renaming 9c91c0e1f3b3f22c780b072eb855f4763dbfca01 drm/i915: Rename intel_engine_cs struct members 045cc0c8994afd55c02038459ea7a89274d364af drm/i915: Rename intel_engine_cs function parameters 544349bce470e3b6958bebc31d1f4b901d09d8c5 drm/i915: Rename local struct intel_engine_cs variables
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: failure for intel_engine_cs renaming bomb (rev5)
In reply to Tvrtko Ursulin== Series Details ==
== Series Details ==
Series: intel_engine_cs renaming bomb (rev5)
URL : https://patchwork.freedesktop.org/series/4303/
State : failure
== Summary ==
Series 4303v5 intel_engine_cs renaming bomb
http://patchwork.freedesktop.org/api/1.0/series/4303/revisions/5/mbox/
Test core_prop_blob:
Subgroup basic:
incomplete -> PASS (bsw-nuc-2)
Test gem_ctx_param_basic:
Subgroup invalid-param-get:
incomplete -> PASS (bsw-nuc-2)
Subgroup invalid-size-set:
incomplete -> PASS (bsw-nuc-2)
Test gem_exec_basic:
Subgroup gtt-bsd1:
incomplete -> SKIP (bsw-nuc-2)
Subgroup readonly-bsd:
incomplete -> PASS (bsw-nuc-2)
Test gem_flink_basic:
Subgroup flink-lifetime:
incomplete -> PASS (bsw-nuc-2)
Test gem_mmap_gtt:
Subgroup basic-small-bo-tiledy:
pass -> DMESG-FAIL (ilk-hp8440p)
Subgroup basic-small-copy-xy:
incomplete -> PASS (bsw-nuc-2)
Test gem_ringfill:
Subgroup basic-default-bomb:
pass -> DMESG-WARN (ilk-hp8440p)
Subgroup basic-default-hang:
incomplete -> PASS (bsw-nuc-2)
Subgroup basic-default-s3:
dmesg-warn -> FAIL (byt-nuc)
Test gem_storedw_loop:
Subgroup basic-bsd1:
incomplete -> SKIP (bsw-nuc-2)
Test gem_sync:
Subgroup basic-blt:
incomplete -> PASS (bsw-nuc-2)
Subgroup basic-default:
pass -> DMESG-WARN (ilk-hp8440p)
Test gem_tiled_blits:
Subgroup basic:
incomplete -> PASS (bsw-nuc-2)
Test gem_tiled_pread_basic:
pass -> INCOMPLETE (byt-nuc)
Test kms_addfb_basic:
Subgroup basic:
incomplete -> PASS (bsw-nuc-2)
Subgroup basic-x-tiled:
incomplete -> PASS (bsw-nuc-2)
Subgroup bo-too-small-due-to-tiling:
incomplete -> PASS (bsw-nuc-2)
Subgroup clobberred-modifier:
incomplete -> PASS (bsw-nuc-2)
Test kms_force_connector_basic:
Subgroup prune-stale-modes:
pass -> DMESG-WARN (ilk-hp8440p)
Test kms_pipe_crc_basic:
Subgroup bad-pipe:
incomplete -> PASS (bsw-nuc-2)
Subgroup hang-read-crc-pipe-b:
pass -> DMESG-WARN (ilk-hp8440p)
Subgroup nonblocking-crc-pipe-a:
incomplete -> SKIP (bsw-nuc-2)
Subgroup nonblocking-crc-pipe-a-frame-sequence:
incomplete -> SKIP (bsw-nuc-2)
Subgroup nonblocking-crc-pipe-b:
incomplete -> SKIP (bsw-nuc-2)
Subgroup suspend-read-crc-pipe-a:
pass -> INCOMPLETE (hsw-gt2)
dmesg-warn -> DMESG-FAIL (ilk-hp8440p)
dmesg-warn -> FAIL (byt-nuc)
Subgroup suspend-read-crc-pipe-b:
dmesg-warn -> FAIL (byt-nuc)
Subgroup suspend-read-crc-pipe-c:
skip -> DMESG-FAIL (ilk-hp8440p)
skip -> FAIL (byt-nuc)
Test kms_sink_crc_basic:
incomplete -> SKIP (bsw-nuc-2)
Test pm_rpm:
Subgroup basic-pci-d3-state:
incomplete -> PASS (bsw-nuc-2)
pass -> DMESG-WARN (snb-dellxps)
dmesg-warn -> PASS (byt-nuc)
Subgroup basic-rte:
dmesg-warn -> PASS (snb-dellxps)
Test prime_self_import:
Subgroup basic-llseek-size:
incomplete -> PASS (bsw-nuc-2)bdw-nuci7 total:194 pass:182 dwarn:0 dfail:0 fail:0 skip:12 bdw-ultra total:194 pass:173 dwarn:0 dfail:0 fail:0 skip:21 bsw-nuc-2 total:194 pass:157 dwarn:0 dfail:0 fail:0 skip:37 byt-nuc total:173 pass:136 dwarn:1 dfail:0 fail:4 skip:31 hsw-brixbox total:194 pass:172 dwarn:0 dfail:0 fail:0 skip:22 hsw-gt2 total:163 pass:151 dwarn:0 dfail:0 fail:0 skip:11 ilk-hp8440p total:194 pass:122 dwarn:7 dfail:3 fail:0 skip:62 ivb-t430s total:194 pass:169 dwarn:0 dfail:0 fail:0 skip:25 skl-i5k-2 total:194 pass:171 dwarn:0 dfail:0 fail:0 skip:23 skl-i7k-2 total:194 pass:171 dwarn:0 dfail:0 fail:0 skip:23 skl-nuci5 total:194 pass:183 dwarn:0 dfail:0 fail:0 skip:11 snb-dellxps total:194 pass:159 dwarn:1 dfail:0 fail:0 skip:34 snb-x220t total:194 pass:160 dwarn:0 dfail:1 fail:0 skip:33
Results at /archive/results/CI_IGT_test/Patchwork_1577/
571147d0be8b04cbbe99db761e82ef105c6f82ad drm-intel-nightly: 2016y-03m-11d-13h-31m-03s UTC integration manifest 734bd47f0c7276313a6997c378ab51f84635bd72 drm/i915: More renaming of rings to engines 282234a1f052115e90e41e03a5263078789e1e78 drm/i915: More intel_engine_cs renaming f746eeed264330eb1ad48db607eee00da061ae7d drm/i915: Rename intel_engine_cs struct members f680449b52cac36bd326781e74d48089147579ca drm/i915: Rename intel_engine_cs function parameters f5147ae327baffd33b04f46847959b4d36990933 drm/i915: Rename local struct intel_engine_cs variables
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx