| Message ID | 1460049678-21918-3-git-send-email-david.s.gordon@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
LGTM. Reviewed-by: Alex Dai <yu.dai@intel.com> On 04/07/2016 10:21 AM, Dave Gordon wrote: > Just code movement, no actual change to the function. This is in > preparation for the next patch, which will reorganise all the other > doorbell code, but doesn't change this function. So let's shuffle it > down near its caller rather than leaving it mixed in with the setup > code. Unlike the doorbell management code, this function is somewhat > time-critical, so putting it near its caller may even yield a tiny > performance improvement. > > Signed-off-by: Dave Gordon <david.s.gordon@intel.com> > --- > drivers/gpu/drm/i915/i915_guc_submission.c | 128 +++++++++++++++-------------- > 1 file changed, 67 insertions(+), 61 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_guc_submission.c b/drivers/gpu/drm/i915/i915_guc_submission.c > index da86bdb..2171759 100644 > --- a/drivers/gpu/drm/i915/i915_guc_submission.c > +++ b/drivers/gpu/drm/i915/i915_guc_submission.c > @@ -190,67 +190,6 @@ static void guc_init_doorbell(struct intel_guc *guc, > kunmap_atomic(base); > } > > -static int guc_ring_doorbell(struct i915_guc_client *gc) > -{ > - struct guc_process_desc *desc; > - union guc_doorbell_qw db_cmp, db_exc, db_ret; > - union guc_doorbell_qw *db; > - void *base; > - int attempt = 2, ret = -EAGAIN; > - > - base = kmap_atomic(i915_gem_object_get_page(gc->client_obj, 0)); > - desc = base + gc->proc_desc_offset; > - > - /* Update the tail so it is visible to GuC */ > - desc->tail = gc->wq_tail; > - > - /* current cookie */ > - db_cmp.db_status = GUC_DOORBELL_ENABLED; > - db_cmp.cookie = gc->cookie; > - > - /* cookie to be updated */ > - db_exc.db_status = GUC_DOORBELL_ENABLED; > - db_exc.cookie = gc->cookie + 1; > - if (db_exc.cookie == 0) > - db_exc.cookie = 1; > - > - /* pointer of current doorbell cacheline */ > - db = base + gc->doorbell_offset; > - > - while (attempt--) { > - /* lets ring the doorbell */ > - db_ret.value_qw = atomic64_cmpxchg((atomic64_t *)db, > - db_cmp.value_qw, db_exc.value_qw); > - > - /* if the exchange was successfully executed */ > - if (db_ret.value_qw == db_cmp.value_qw) { > - /* db was successfully rung */ > - gc->cookie = db_exc.cookie; > - ret = 0; > - break; > - } > - > - /* XXX: doorbell was lost and need to acquire it again */ > - if (db_ret.db_status == GUC_DOORBELL_DISABLED) > - break; > - > - DRM_ERROR("Cookie mismatch. Expected %d, returned %d\n", > - db_cmp.cookie, db_ret.cookie); > - > - /* update the cookie to newly read cookie from GuC */ > - db_cmp.cookie = db_ret.cookie; > - db_exc.cookie = db_ret.cookie + 1; > - if (db_exc.cookie == 0) > - db_exc.cookie = 1; > - } > - > - /* Finally, update the cached copy of the GuC's WQ head */ > - gc->wq_head = desc->head; > - > - kunmap_atomic(base); > - return ret; > -} > - > static void guc_disable_doorbell(struct intel_guc *guc, > struct i915_guc_client *client) > { > @@ -471,6 +410,12 @@ static void guc_fini_ctx_desc(struct intel_guc *guc, > sizeof(desc) * client->ctx_index); > } > > +/* > + * Everything above here is concerned with setup & teardown, and is > + * therefore not part of the somewhat time-critical batch-submission > + * path of i915_guc_submit() below. > + */ > + > int i915_guc_wq_check_space(struct i915_guc_client *gc) > { > struct guc_process_desc *desc; > @@ -559,6 +504,67 @@ static int guc_add_workqueue_item(struct i915_guc_client *gc, > return 0; > } > > +static int guc_ring_doorbell(struct i915_guc_client *gc) > +{ > + struct guc_process_desc *desc; > + union guc_doorbell_qw db_cmp, db_exc, db_ret; > + union guc_doorbell_qw *db; > + void *base; > + int attempt = 2, ret = -EAGAIN; > + > + base = kmap_atomic(i915_gem_object_get_page(gc->client_obj, 0)); > + desc = base + gc->proc_desc_offset; > + > + /* Update the tail so it is visible to GuC */ > + desc->tail = gc->wq_tail; > + > + /* current cookie */ > + db_cmp.db_status = GUC_DOORBELL_ENABLED; > + db_cmp.cookie = gc->cookie; > + > + /* cookie to be updated */ > + db_exc.db_status = GUC_DOORBELL_ENABLED; > + db_exc.cookie = gc->cookie + 1; > + if (db_exc.cookie == 0) > + db_exc.cookie = 1; > + > + /* pointer of current doorbell cacheline */ > + db = base + gc->doorbell_offset; > + > + while (attempt--) { > + /* lets ring the doorbell */ > + db_ret.value_qw = atomic64_cmpxchg((atomic64_t *)db, > + db_cmp.value_qw, db_exc.value_qw); > + > + /* if the exchange was successfully executed */ > + if (db_ret.value_qw == db_cmp.value_qw) { > + /* db was successfully rung */ > + gc->cookie = db_exc.cookie; > + ret = 0; > + break; > + } > + > + /* XXX: doorbell was lost and need to acquire it again */ > + if (db_ret.db_status == GUC_DOORBELL_DISABLED) > + break; > + > + DRM_ERROR("Cookie mismatch. Expected %d, returned %d\n", > + db_cmp.cookie, db_ret.cookie); > + > + /* update the cookie to newly read cookie from GuC */ > + db_cmp.cookie = db_ret.cookie; > + db_exc.cookie = db_ret.cookie + 1; > + if (db_exc.cookie == 0) > + db_exc.cookie = 1; > + } > + > + /* Finally, update the cached copy of the GuC's WQ head */ > + gc->wq_head = desc->head; > + > + kunmap_atomic(base); > + return ret; > +} > + > /** > * i915_guc_submit() - Submit commands through GuC > * @client: the guc client where commands will go through
diff --git a/drivers/gpu/drm/i915/i915_guc_submission.c b/drivers/gpu/drm/i915/i915_guc_submission.c index da86bdb..2171759 100644 --- a/drivers/gpu/drm/i915/i915_guc_submission.c +++ b/drivers/gpu/drm/i915/i915_guc_submission.c @@ -190,67 +190,6 @@ static void guc_init_doorbell(struct intel_guc *guc, kunmap_atomic(base); } -static int guc_ring_doorbell(struct i915_guc_client *gc) -{ - struct guc_process_desc *desc; - union guc_doorbell_qw db_cmp, db_exc, db_ret; - union guc_doorbell_qw *db; - void *base; - int attempt = 2, ret = -EAGAIN; - - base = kmap_atomic(i915_gem_object_get_page(gc->client_obj, 0)); - desc = base + gc->proc_desc_offset; - - /* Update the tail so it is visible to GuC */ - desc->tail = gc->wq_tail; - - /* current cookie */ - db_cmp.db_status = GUC_DOORBELL_ENABLED; - db_cmp.cookie = gc->cookie; - - /* cookie to be updated */ - db_exc.db_status = GUC_DOORBELL_ENABLED; - db_exc.cookie = gc->cookie + 1; - if (db_exc.cookie == 0) - db_exc.cookie = 1; - - /* pointer of current doorbell cacheline */ - db = base + gc->doorbell_offset; - - while (attempt--) { - /* lets ring the doorbell */ - db_ret.value_qw = atomic64_cmpxchg((atomic64_t *)db, - db_cmp.value_qw, db_exc.value_qw); - - /* if the exchange was successfully executed */ - if (db_ret.value_qw == db_cmp.value_qw) { - /* db was successfully rung */ - gc->cookie = db_exc.cookie; - ret = 0; - break; - } - - /* XXX: doorbell was lost and need to acquire it again */ - if (db_ret.db_status == GUC_DOORBELL_DISABLED) - break; - - DRM_ERROR("Cookie mismatch. Expected %d, returned %d\n", - db_cmp.cookie, db_ret.cookie); - - /* update the cookie to newly read cookie from GuC */ - db_cmp.cookie = db_ret.cookie; - db_exc.cookie = db_ret.cookie + 1; - if (db_exc.cookie == 0) - db_exc.cookie = 1; - } - - /* Finally, update the cached copy of the GuC's WQ head */ - gc->wq_head = desc->head; - - kunmap_atomic(base); - return ret; -} - static void guc_disable_doorbell(struct intel_guc *guc, struct i915_guc_client *client) { @@ -471,6 +410,12 @@ static void guc_fini_ctx_desc(struct intel_guc *guc, sizeof(desc) * client->ctx_index); } +/* + * Everything above here is concerned with setup & teardown, and is + * therefore not part of the somewhat time-critical batch-submission + * path of i915_guc_submit() below. + */ + int i915_guc_wq_check_space(struct i915_guc_client *gc) { struct guc_process_desc *desc; @@ -559,6 +504,67 @@ static int guc_add_workqueue_item(struct i915_guc_client *gc, return 0; } +static int guc_ring_doorbell(struct i915_guc_client *gc) +{ + struct guc_process_desc *desc; + union guc_doorbell_qw db_cmp, db_exc, db_ret; + union guc_doorbell_qw *db; + void *base; + int attempt = 2, ret = -EAGAIN; + + base = kmap_atomic(i915_gem_object_get_page(gc->client_obj, 0)); + desc = base + gc->proc_desc_offset; + + /* Update the tail so it is visible to GuC */ + desc->tail = gc->wq_tail; + + /* current cookie */ + db_cmp.db_status = GUC_DOORBELL_ENABLED; + db_cmp.cookie = gc->cookie; + + /* cookie to be updated */ + db_exc.db_status = GUC_DOORBELL_ENABLED; + db_exc.cookie = gc->cookie + 1; + if (db_exc.cookie == 0) + db_exc.cookie = 1; + + /* pointer of current doorbell cacheline */ + db = base + gc->doorbell_offset; + + while (attempt--) { + /* lets ring the doorbell */ + db_ret.value_qw = atomic64_cmpxchg((atomic64_t *)db, + db_cmp.value_qw, db_exc.value_qw); + + /* if the exchange was successfully executed */ + if (db_ret.value_qw == db_cmp.value_qw) { + /* db was successfully rung */ + gc->cookie = db_exc.cookie; + ret = 0; + break; + } + + /* XXX: doorbell was lost and need to acquire it again */ + if (db_ret.db_status == GUC_DOORBELL_DISABLED) + break; + + DRM_ERROR("Cookie mismatch. Expected %d, returned %d\n", + db_cmp.cookie, db_ret.cookie); + + /* update the cookie to newly read cookie from GuC */ + db_cmp.cookie = db_ret.cookie; + db_exc.cookie = db_ret.cookie + 1; + if (db_exc.cookie == 0) + db_exc.cookie = 1; + } + + /* Finally, update the cached copy of the GuC's WQ head */ + gc->wq_head = desc->head; + + kunmap_atomic(base); + return ret; +} + /** * i915_guc_submit() - Submit commands through GuC * @client: the guc client where commands will go through
Just code movement, no actual change to the function. This is in preparation for the next patch, which will reorganise all the other doorbell code, but doesn't change this function. So let's shuffle it down near its caller rather than leaving it mixed in with the setup code. Unlike the doorbell management code, this function is somewhat time-critical, so putting it near its caller may even yield a tiny performance improvement. Signed-off-by: Dave Gordon <david.s.gordon@intel.com> --- drivers/gpu/drm/i915/i915_guc_submission.c | 128 +++++++++++++++-------------- 1 file changed, 67 insertions(+), 61 deletions(-)