Skip to content

Commit

Permalink
drm/i915/guc: Introduce CT_DEBUG
Browse files Browse the repository at this point in the history 
As we now have "ct" available almost in all functions we can
start using dev variants of logs also for debug.

Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Reviewed-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20200117082039.65644-6-michal.wajdeczko@intel.com
  • Loading branch information
Michal Wajdeczko authored and Chris Wilson committed Jan 17, 2020
1 parent d624d40 commit 77b2089
Showing 1 changed file with 19 additions and 22 deletions.
41 changes: 19 additions & 22 deletions drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,10 @@
#define CT_ERROR(_ct, _fmt, ...) \
DRM_DEV_ERROR(ct_to_dev(_ct), "CT: " _fmt, ##__VA_ARGS__)
#ifdef CONFIG_DRM_I915_DEBUG_GUC
#define CT_DEBUG_DRIVER(...) DRM_DEBUG_DRIVER(__VA_ARGS__)
#define CT_DEBUG(_ct, _fmt, ...) \
DRM_DEV_DEBUG_DRIVER(ct_to_dev(_ct), "CT: " _fmt, ##__VA_ARGS__)
#else
#define CT_DEBUG_DRIVER(...) do { } while (0)
#define CT_DEBUG(...) do { } while (0)
#endif

struct ct_request {
Expand Down Expand Up @@ -81,7 +82,6 @@ static inline const char *guc_ct_buffer_type_to_str(u32 type)
static void guc_ct_buffer_desc_init(struct guc_ct_buffer_desc *desc,
u32 cmds_addr, u32 size)
{
CT_DEBUG_DRIVER("CT: init addr=%#x size=%u\n", cmds_addr, size);
memset(desc, 0, sizeof(*desc));
desc->addr = cmds_addr;
desc->size = size;
Expand All @@ -90,8 +90,6 @@ static void guc_ct_buffer_desc_init(struct guc_ct_buffer_desc *desc,

static void guc_ct_buffer_desc_reset(struct guc_ct_buffer_desc *desc)
{
CT_DEBUG_DRIVER("CT: desc %p reset head=%u tail=%u\n",
desc, desc->head, desc->tail);
desc->head = 0;
desc->tail = 0;
desc->is_in_error = 0;
Expand Down Expand Up @@ -189,8 +187,7 @@ int intel_guc_ct_init(struct intel_guc_ct *ct)
return err;
}

CT_DEBUG_DRIVER("CT: vma base=%#x\n",
intel_guc_ggtt_offset(guc, ct->vma));
CT_DEBUG(ct, "vma base=%#x\n", intel_guc_ggtt_offset(guc, ct->vma));

/* store pointers to desc and cmds */
for (i = 0; i < ARRAY_SIZE(ct->ctbs); i++) {
Expand Down Expand Up @@ -224,7 +221,7 @@ void intel_guc_ct_fini(struct intel_guc_ct *ct)
int intel_guc_ct_enable(struct intel_guc_ct *ct)
{
struct intel_guc *guc = ct_to_guc(ct);
u32 base;
u32 base, cmds, size;
int err;
int i;

Expand All @@ -239,9 +236,10 @@ int intel_guc_ct_enable(struct intel_guc_ct *ct)
*/
for (i = 0; i < ARRAY_SIZE(ct->ctbs); i++) {
GEM_BUG_ON((i != CTB_SEND) && (i != CTB_RECV));
guc_ct_buffer_desc_init(ct->ctbs[i].desc,
base + PAGE_SIZE/4 * i + PAGE_SIZE/2,
PAGE_SIZE/4);
cmds = base + PAGE_SIZE / 4 * i + PAGE_SIZE / 2;
size = PAGE_SIZE / 4;
CT_DEBUG(ct, "%d: addr=%#x size=%u\n", i, cmds, size);
guc_ct_buffer_desc_init(ct->ctbs[i].desc, cmds, size);
}

/*
Expand Down Expand Up @@ -356,9 +354,8 @@ static int ct_write(struct intel_guc_ct *ct,
(want_response ? GUC_CT_MSG_SEND_STATUS : 0) |
(action[0] << GUC_CT_MSG_ACTION_SHIFT);

CT_DEBUG_DRIVER("CT: writing %*ph %*ph %*ph\n",
4, &header, 4, &fence,
4 * (len - 1), &action[1]);
CT_DEBUG(ct, "writing %*ph %*ph %*ph\n",
4, &header, 4, &fence, 4 * (len - 1), &action[1]);

cmds[tail] = header;
tail = (tail + 1) % size;
Expand Down Expand Up @@ -553,8 +550,8 @@ int intel_guc_ct_send(struct intel_guc_ct *ct, const u32 *action, u32 len,
CT_ERROR(ct, "Sending action %#x failed (err=%d status=%#X)\n",
action[0], ret, status);
} else if (unlikely(ret)) {
CT_DEBUG_DRIVER("CT: send action %#x returned %d (%#x)\n",
action[0], ret, ret);
CT_DEBUG(ct, "send action %#x returned %d (%#x)\n",
action[0], ret, ret);
}

mutex_unlock(&guc->send_mutex);
Expand Down Expand Up @@ -608,7 +605,7 @@ static int ct_read(struct intel_guc_ct *ct, u32 *data)
/* beware of buffer wrap case */
if (unlikely(available < 0))
available += size;
CT_DEBUG_DRIVER("CT: available %d (%u:%u)\n", available, head, tail);
CT_DEBUG(ct, "available %d (%u:%u)\n", available, head, tail);
GEM_BUG_ON(available < 0);

data[0] = cmds[head];
Expand All @@ -630,7 +627,7 @@ static int ct_read(struct intel_guc_ct *ct, u32 *data)
data[i] = cmds[head];
head = (head + 1) % size;
}
CT_DEBUG_DRIVER("CT: received %*ph\n", 4 * len, data);
CT_DEBUG(ct, "received %*ph\n", 4 * len, data);

desc->head = head * 4;
return 0;
Expand Down Expand Up @@ -690,13 +687,13 @@ static int ct_handle_response(struct intel_guc_ct *ct, const u32 *msg)
return -EPROTO;
}

CT_DEBUG_DRIVER("CT: response fence %u status %#x\n", fence, status);
CT_DEBUG(ct, "response fence %u status %#x\n", fence, status);

spin_lock(&ct->requests.lock);
list_for_each_entry(req, &ct->requests.pending, link) {
if (unlikely(fence != req->fence)) {
CT_DEBUG_DRIVER("CT: request %u awaits response\n",
req->fence);
CT_DEBUG(ct, "request %u awaits response\n",
req->fence);
continue;
}
if (unlikely(datalen > req->response_len)) {
Expand Down Expand Up @@ -724,7 +721,7 @@ static void ct_process_request(struct intel_guc_ct *ct,
struct intel_guc *guc = ct_to_guc(ct);
int ret;

CT_DEBUG_DRIVER("CT: request %x %*ph\n", action, 4 * len, payload);
CT_DEBUG(ct, "request %x %*ph\n", action, 4 * len, payload);

switch (action) {
case INTEL_GUC_ACTION_DEFAULT:
Expand Down

0 comments on commit 77b2089

Please sign in to comment.