Commit 48b426a9 authored by Daniele Ceraolo Spurio's avatar Daniele Ceraolo Spurio Committed by Chris Wilson

drm/i915/guc: init GuC descriptors after GuC load

GuC stores some data in there, which might be stale after a reset.
We already reset the WQ head and tail, but more things are being moved
to the descriptor with the interface updates. Instead of trying to track
them one by one, always memset and init the descriptors from scratch
after GuC is loaded.
The code is also reorganized so that the above operations and the
doorbell creation are grouped as "client enabling"

v2: add proc_desc_fini for symmetry (Daniele), remove unneeded var init,
add guc_is_alive() (Michal)

Cc: Michal Wajdeczko <michal.wajdeczko@intel.com>
Signed-off-by: default avatarDaniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Reviewed-by: default avatarMichal Wajdeczko <michal.wajdeczko@intel.com>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20181002215430.15049-1-daniele.ceraolospurio@intel.com
parent bc2477f7
...@@ -95,6 +95,11 @@ struct intel_guc { ...@@ -95,6 +95,11 @@ struct intel_guc {
void (*notify)(struct intel_guc *guc); void (*notify)(struct intel_guc *guc);
}; };
static inline bool intel_guc_is_alive(struct intel_guc *guc)
{
return intel_uc_fw_is_loaded(&guc->fw);
}
static static
inline int intel_guc_send(struct intel_guc *guc, const u32 *action, u32 len) inline int intel_guc_send(struct intel_guc *guc, const u32 *action, u32 len)
{ {
......
...@@ -282,8 +282,7 @@ __get_process_desc(struct intel_guc_client *client) ...@@ -282,8 +282,7 @@ __get_process_desc(struct intel_guc_client *client)
/* /*
* Initialise the process descriptor shared with the GuC firmware. * Initialise the process descriptor shared with the GuC firmware.
*/ */
static void guc_proc_desc_init(struct intel_guc *guc, static void guc_proc_desc_init(struct intel_guc_client *client)
struct intel_guc_client *client)
{ {
struct guc_process_desc *desc; struct guc_process_desc *desc;
...@@ -304,6 +303,14 @@ static void guc_proc_desc_init(struct intel_guc *guc, ...@@ -304,6 +303,14 @@ static void guc_proc_desc_init(struct intel_guc *guc,
desc->priority = client->priority; desc->priority = client->priority;
} }
static void guc_proc_desc_fini(struct intel_guc_client *client)
{
struct guc_process_desc *desc;
desc = __get_process_desc(client);
memset(desc, 0, sizeof(*desc));
}
static int guc_stage_desc_pool_create(struct intel_guc *guc) static int guc_stage_desc_pool_create(struct intel_guc *guc)
{ {
struct i915_vma *vma; struct i915_vma *vma;
...@@ -341,9 +348,9 @@ static void guc_stage_desc_pool_destroy(struct intel_guc *guc) ...@@ -341,9 +348,9 @@ static void guc_stage_desc_pool_destroy(struct intel_guc *guc)
* data structures relating to this client (doorbell, process descriptor, * data structures relating to this client (doorbell, process descriptor,
* write queue, etc). * write queue, etc).
*/ */
static void guc_stage_desc_init(struct intel_guc *guc, static void guc_stage_desc_init(struct intel_guc_client *client)
struct intel_guc_client *client)
{ {
struct intel_guc *guc = client->guc;
struct drm_i915_private *dev_priv = guc_to_i915(guc); struct drm_i915_private *dev_priv = guc_to_i915(guc);
struct intel_engine_cs *engine; struct intel_engine_cs *engine;
struct i915_gem_context *ctx = client->owner; struct i915_gem_context *ctx = client->owner;
...@@ -424,8 +431,7 @@ static void guc_stage_desc_init(struct intel_guc *guc, ...@@ -424,8 +431,7 @@ static void guc_stage_desc_init(struct intel_guc *guc,
desc->desc_private = ptr_to_u64(client); desc->desc_private = ptr_to_u64(client);
} }
static void guc_stage_desc_fini(struct intel_guc *guc, static void guc_stage_desc_fini(struct intel_guc_client *client)
struct intel_guc_client *client)
{ {
struct guc_stage_desc *desc; struct guc_stage_desc *desc;
...@@ -486,14 +492,6 @@ static void guc_wq_item_append(struct intel_guc_client *client, ...@@ -486,14 +492,6 @@ static void guc_wq_item_append(struct intel_guc_client *client,
WRITE_ONCE(desc->tail, (wq_off + wqi_size) & (GUC_WQ_SIZE - 1)); WRITE_ONCE(desc->tail, (wq_off + wqi_size) & (GUC_WQ_SIZE - 1));
} }
static void guc_reset_wq(struct intel_guc_client *client)
{
struct guc_process_desc *desc = __get_process_desc(client);
desc->head = 0;
desc->tail = 0;
}
static void guc_ring_doorbell(struct intel_guc_client *client) static void guc_ring_doorbell(struct intel_guc_client *client)
{ {
struct guc_doorbell_info *db; struct guc_doorbell_info *db;
...@@ -898,45 +896,6 @@ static bool guc_verify_doorbells(struct intel_guc *guc) ...@@ -898,45 +896,6 @@ static bool guc_verify_doorbells(struct intel_guc *guc)
return true; return true;
} }
static int guc_clients_doorbell_init(struct intel_guc *guc)
{
int ret;
ret = create_doorbell(guc->execbuf_client);
if (ret)
return ret;
if (guc->preempt_client) {
ret = create_doorbell(guc->preempt_client);
if (ret) {
destroy_doorbell(guc->execbuf_client);
return ret;
}
}
return 0;
}
static void guc_clients_doorbell_fini(struct intel_guc *guc)
{
/*
* By the time we're here, GuC has already been reset.
* Instead of trying (in vain) to communicate with it, let's just
* cleanup the doorbell HW and our internal state.
*/
if (guc->preempt_client) {
__destroy_doorbell(guc->preempt_client);
__update_doorbell_desc(guc->preempt_client,
GUC_DOORBELL_INVALID);
}
if (guc->execbuf_client) {
__destroy_doorbell(guc->execbuf_client);
__update_doorbell_desc(guc->execbuf_client,
GUC_DOORBELL_INVALID);
}
}
/** /**
* guc_client_alloc() - Allocate an intel_guc_client * guc_client_alloc() - Allocate an intel_guc_client
* @dev_priv: driver private data structure * @dev_priv: driver private data structure
...@@ -1009,9 +968,6 @@ guc_client_alloc(struct drm_i915_private *dev_priv, ...@@ -1009,9 +968,6 @@ guc_client_alloc(struct drm_i915_private *dev_priv,
else else
client->proc_desc_offset = (GUC_DB_SIZE / 2); client->proc_desc_offset = (GUC_DB_SIZE / 2);
guc_proc_desc_init(guc, client);
guc_stage_desc_init(guc, client);
ret = reserve_doorbell(client); ret = reserve_doorbell(client);
if (ret) if (ret)
goto err_vaddr; goto err_vaddr;
...@@ -1037,7 +993,6 @@ guc_client_alloc(struct drm_i915_private *dev_priv, ...@@ -1037,7 +993,6 @@ guc_client_alloc(struct drm_i915_private *dev_priv,
static void guc_client_free(struct intel_guc_client *client) static void guc_client_free(struct intel_guc_client *client)
{ {
unreserve_doorbell(client); unreserve_doorbell(client);
guc_stage_desc_fini(client->guc, client);
i915_vma_unpin_and_release(&client->vma, I915_VMA_RELEASE_MAP); i915_vma_unpin_and_release(&client->vma, I915_VMA_RELEASE_MAP);
ida_simple_remove(&client->guc->stage_ids, client->stage_id); ida_simple_remove(&client->guc->stage_ids, client->stage_id);
kfree(client); kfree(client);
...@@ -1104,6 +1059,69 @@ static void guc_clients_destroy(struct intel_guc *guc) ...@@ -1104,6 +1059,69 @@ static void guc_clients_destroy(struct intel_guc *guc)
guc_client_free(client); guc_client_free(client);
} }
static int __guc_client_enable(struct intel_guc_client *client)
{
int ret;
guc_proc_desc_init(client);
guc_stage_desc_init(client);
ret = create_doorbell(client);
if (ret)
goto fail;
return 0;
fail:
guc_stage_desc_fini(client);
guc_proc_desc_fini(client);
return ret;
}
static void __guc_client_disable(struct intel_guc_client *client)
{
/*
* By the time we're here, GuC may have already been reset. if that is
* the case, instead of trying (in vain) to communicate with it, let's
* just cleanup the doorbell HW and our internal state.
*/
if (intel_guc_is_alive(client->guc))
destroy_doorbell(client);
else
__destroy_doorbell(client);
guc_stage_desc_fini(client);
guc_proc_desc_fini(client);
}
static int guc_clients_enable(struct intel_guc *guc)
{
int ret;
ret = __guc_client_enable(guc->execbuf_client);
if (ret)
return ret;
if (guc->preempt_client) {
ret = __guc_client_enable(guc->preempt_client);
if (ret) {
__guc_client_disable(guc->execbuf_client);
return ret;
}
}
return 0;
}
static void guc_clients_disable(struct intel_guc *guc)
{
if (guc->preempt_client)
__guc_client_disable(guc->preempt_client);
if (guc->execbuf_client)
__guc_client_disable(guc->execbuf_client);
}
/* /*
* Set up the memory resources to be shared with the GuC (via the GGTT) * Set up the memory resources to be shared with the GuC (via the GGTT)
* at firmware loading time. * at firmware loading time.
...@@ -1287,15 +1305,11 @@ int intel_guc_submission_enable(struct intel_guc *guc) ...@@ -1287,15 +1305,11 @@ int intel_guc_submission_enable(struct intel_guc *guc)
GEM_BUG_ON(!guc->execbuf_client); GEM_BUG_ON(!guc->execbuf_client);
guc_reset_wq(guc->execbuf_client);
if (guc->preempt_client)
guc_reset_wq(guc->preempt_client);
err = intel_guc_sample_forcewake(guc); err = intel_guc_sample_forcewake(guc);
if (err) if (err)
return err; return err;
err = guc_clients_doorbell_init(guc); err = guc_clients_enable(guc);
if (err) if (err)
return err; return err;
...@@ -1317,7 +1331,7 @@ void intel_guc_submission_disable(struct intel_guc *guc) ...@@ -1317,7 +1331,7 @@ void intel_guc_submission_disable(struct intel_guc *guc)
GEM_BUG_ON(dev_priv->gt.awake); /* GT should be parked first */ GEM_BUG_ON(dev_priv->gt.awake); /* GT should be parked first */
guc_interrupts_release(dev_priv); guc_interrupts_release(dev_priv);
guc_clients_doorbell_fini(guc); guc_clients_disable(guc);
} }
#if IS_ENABLED(CONFIG_DRM_I915_SELFTEST) #if IS_ENABLED(CONFIG_DRM_I915_SELFTEST)
......
...@@ -115,9 +115,14 @@ static inline bool intel_uc_fw_is_selected(struct intel_uc_fw *uc_fw) ...@@ -115,9 +115,14 @@ static inline bool intel_uc_fw_is_selected(struct intel_uc_fw *uc_fw)
return uc_fw->path != NULL; return uc_fw->path != NULL;
} }
static inline bool intel_uc_fw_is_loaded(struct intel_uc_fw *uc_fw)
{
return uc_fw->load_status == INTEL_UC_FIRMWARE_SUCCESS;
}
static inline void intel_uc_fw_sanitize(struct intel_uc_fw *uc_fw) static inline void intel_uc_fw_sanitize(struct intel_uc_fw *uc_fw)
{ {
if (uc_fw->load_status == INTEL_UC_FIRMWARE_SUCCESS) if (intel_uc_fw_is_loaded(uc_fw))
uc_fw->load_status = INTEL_UC_FIRMWARE_PENDING; uc_fw->load_status = INTEL_UC_FIRMWARE_PENDING;
} }
......
...@@ -159,6 +159,7 @@ static int igt_guc_clients(void *args) ...@@ -159,6 +159,7 @@ static int igt_guc_clients(void *args)
* Get rid of clients created during driver load because the test will * Get rid of clients created during driver load because the test will
* recreate them. * recreate them.
*/ */
guc_clients_disable(guc);
guc_clients_destroy(guc); guc_clients_destroy(guc);
if (guc->execbuf_client || guc->preempt_client) { if (guc->execbuf_client || guc->preempt_client) {
pr_err("guc_clients_destroy lied!\n"); pr_err("guc_clients_destroy lied!\n");
...@@ -197,8 +198,8 @@ static int igt_guc_clients(void *args) ...@@ -197,8 +198,8 @@ static int igt_guc_clients(void *args)
goto out; goto out;
} }
/* Now create the doorbells */ /* Now enable the clients */
guc_clients_doorbell_init(guc); guc_clients_enable(guc);
/* each client should now have received a doorbell */ /* each client should now have received a doorbell */
if (!client_doorbell_in_sync(guc->execbuf_client) || if (!client_doorbell_in_sync(guc->execbuf_client) ||
...@@ -212,7 +213,7 @@ static int igt_guc_clients(void *args) ...@@ -212,7 +213,7 @@ static int igt_guc_clients(void *args)
* Basic test - an attempt to reallocate a valid doorbell to the * Basic test - an attempt to reallocate a valid doorbell to the
* client it is currently assigned should not cause a failure. * client it is currently assigned should not cause a failure.
*/ */
err = guc_clients_doorbell_init(guc); err = create_doorbell(guc->execbuf_client);
if (err) if (err)
goto out; goto out;
...@@ -263,12 +264,10 @@ static int igt_guc_clients(void *args) ...@@ -263,12 +264,10 @@ static int igt_guc_clients(void *args)
* Leave clean state for other test, plus the driver always destroy the * Leave clean state for other test, plus the driver always destroy the
* clients during unload. * clients during unload.
*/ */
destroy_doorbell(guc->execbuf_client); guc_clients_disable(guc);
if (guc->preempt_client)
destroy_doorbell(guc->preempt_client);
guc_clients_destroy(guc); guc_clients_destroy(guc);
guc_clients_create(guc); guc_clients_create(guc);
guc_clients_doorbell_init(guc); guc_clients_enable(guc);
unlock: unlock:
intel_runtime_pm_put(dev_priv); intel_runtime_pm_put(dev_priv);
mutex_unlock(&dev_priv->drm.struct_mutex); mutex_unlock(&dev_priv->drm.struct_mutex);
...@@ -352,7 +351,7 @@ static int igt_guc_doorbells(void *arg) ...@@ -352,7 +351,7 @@ static int igt_guc_doorbells(void *arg)
db_id = clients[i]->doorbell_id; db_id = clients[i]->doorbell_id;
err = create_doorbell(clients[i]); err = __guc_client_enable(clients[i]);
if (err) { if (err) {
pr_err("[%d] Failed to create a doorbell\n", i); pr_err("[%d] Failed to create a doorbell\n", i);
goto out; goto out;
...@@ -378,7 +377,7 @@ static int igt_guc_doorbells(void *arg) ...@@ -378,7 +377,7 @@ static int igt_guc_doorbells(void *arg)
out: out:
for (i = 0; i < ATTEMPTS; i++) for (i = 0; i < ATTEMPTS; i++)
if (!IS_ERR_OR_NULL(clients[i])) { if (!IS_ERR_OR_NULL(clients[i])) {
destroy_doorbell(clients[i]); __guc_client_disable(clients[i]);
guc_client_free(clients[i]); guc_client_free(clients[i]);
} }
unlock: unlock:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment