Commit 77b20896 authored by Michal Wajdeczko's avatar Michal Wajdeczko Committed by Chris Wilson
Browse files

drm/i915/guc: Introduce CT_DEBUG 



As we now have "ct" available almost in all functions we can
start using dev variants of logs also for debug.

Signed-off-by: default avatarMichal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Reviewed-by: default avatarDaniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20200117082039.65644-6-michal.wajdeczko@intel.com
parent d624d401

drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c

+19 −22
Original line number Original line Diff line number Diff line
@@ -10,9 +10,10 @@ 
#define CT_ERROR(_ct, _fmt, ...) \

#define CT_ERROR(_ct, _fmt, ...) \

	DRM_DEV_ERROR(ct_to_dev(_ct), "CT: " _fmt, ##__VA_ARGS__)

	DRM_DEV_ERROR(ct_to_dev(_ct), "CT: " _fmt, ##__VA_ARGS__)

#ifdef CONFIG_DRM_I915_DEBUG_GUC

#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

#else

#define CT_DEBUG_DRIVER(...)	do { } while (0)

#define CT_DEBUG(...)	do { } while (0)

#endif

#endif





struct ct_request {

struct ct_request {
@@ -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,

static void guc_ct_buffer_desc_init(struct guc_ct_buffer_desc *desc,

				    u32 cmds_addr, u32 size)

				    u32 cmds_addr, u32 size)

{

{

	CT_DEBUG_DRIVER("CT: init addr=%#x size=%u\n", cmds_addr, size);

	memset(desc, 0, sizeof(*desc));

	memset(desc, 0, sizeof(*desc));

	desc->addr = cmds_addr;

	desc->addr = cmds_addr;

	desc->size = size;

	desc->size = size;
@@ -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)

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->head = 0;

	desc->tail = 0;

	desc->tail = 0;

	desc->is_in_error = 0;

	desc->is_in_error = 0;
@@ -189,8 +187,7 @@ int intel_guc_ct_init(struct intel_guc_ct *ct) 
		return err;

		return err;

	}

	}





	CT_DEBUG_DRIVER("CT: vma base=%#x\n",

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

			intel_guc_ggtt_offset(guc, ct->vma));





	/* store pointers to desc and cmds */

	/* store pointers to desc and cmds */

	for (i = 0; i < ARRAY_SIZE(ct->ctbs); i++) {

	for (i = 0; i < ARRAY_SIZE(ct->ctbs); i++) {
@@ -224,7 +221,7 @@ void intel_guc_ct_fini(struct intel_guc_ct *ct) 
int intel_guc_ct_enable(struct intel_guc_ct *ct)

int intel_guc_ct_enable(struct intel_guc_ct *ct)

{

{

	struct intel_guc *guc = ct_to_guc(ct);

	struct intel_guc *guc = ct_to_guc(ct);

	u32 base;

	u32 base, cmds, size;

	int err;

	int err;

	int i;

	int i;
@@ -239,9 +236,10 @@ int intel_guc_ct_enable(struct intel_guc_ct *ct) 
	 */

	 */

	for (i = 0; i < ARRAY_SIZE(ct->ctbs); i++) {

	for (i = 0; i < ARRAY_SIZE(ct->ctbs); i++) {

		GEM_BUG_ON((i != CTB_SEND) && (i != CTB_RECV));

		GEM_BUG_ON((i != CTB_SEND) && (i != CTB_RECV));

		guc_ct_buffer_desc_init(ct->ctbs[i].desc,

		cmds = base + PAGE_SIZE / 4 * i + PAGE_SIZE / 2;

					base + PAGE_SIZE/4 * i + PAGE_SIZE/2,

		size = PAGE_SIZE / 4;

					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);

	}

	}





	/*

	/*
@@ -356,9 +354,8 @@ static int ct_write(struct intel_guc_ct *ct, 
		 (want_response ? GUC_CT_MSG_SEND_STATUS : 0) |

		 (want_response ? GUC_CT_MSG_SEND_STATUS : 0) |

		 (action[0] << GUC_CT_MSG_ACTION_SHIFT);

		 (action[0] << GUC_CT_MSG_ACTION_SHIFT);





	CT_DEBUG_DRIVER("CT: writing %*ph %*ph %*ph\n",

	CT_DEBUG(ct, "writing %*ph %*ph %*ph\n",

			4, &header, 4, &fence,

		 4, &header, 4, &fence, 4 * (len - 1), &action[1]);

			4 * (len - 1), &action[1]);





	cmds[tail] = header;

	cmds[tail] = header;

	tail = (tail + 1) % size;

	tail = (tail + 1) % size;
@@ -553,7 +550,7 @@ 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",

		CT_ERROR(ct, "Sending action %#x failed (err=%d status=%#X)\n",

			 action[0], ret, status);

			 action[0], ret, status);

	} else if (unlikely(ret)) {

	} else if (unlikely(ret)) {

		CT_DEBUG_DRIVER("CT: send action %#x returned %d (%#x)\n",

		CT_DEBUG(ct, "send action %#x returned %d (%#x)\n",

			 action[0], ret, ret);

			 action[0], ret, ret);

	}

	}
@@ -608,7 +605,7 @@ static int ct_read(struct intel_guc_ct *ct, u32 *data) 
	/* beware of buffer wrap case */

	/* beware of buffer wrap case */

	if (unlikely(available < 0))

	if (unlikely(available < 0))

		available += size;

		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);

	GEM_BUG_ON(available < 0);





	data[0] = cmds[head];

	data[0] = cmds[head];
@@ -630,7 +627,7 @@ static int ct_read(struct intel_guc_ct *ct, u32 *data) 
		data[i] = cmds[head];

		data[i] = cmds[head];

		head = (head + 1) % size;

		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;

	desc->head = head * 4;

	return 0;

	return 0;
@@ -690,12 +687,12 @@ static int ct_handle_response(struct intel_guc_ct *ct, const u32 *msg) 
		return -EPROTO;

		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);

	spin_lock(&ct->requests.lock);

	list_for_each_entry(req, &ct->requests.pending, link) {

	list_for_each_entry(req, &ct->requests.pending, link) {

		if (unlikely(fence != req->fence)) {

		if (unlikely(fence != req->fence)) {

			CT_DEBUG_DRIVER("CT: request %u awaits response\n",

			CT_DEBUG(ct, "request %u awaits response\n",

				 req->fence);

				 req->fence);

			continue;

			continue;

		}

		}
@@ -724,7 +721,7 @@ static void ct_process_request(struct intel_guc_ct *ct, 
	struct intel_guc *guc = ct_to_guc(ct);

	struct intel_guc *guc = ct_to_guc(ct);

	int ret;

	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) {

	switch (action) {

	case INTEL_GUC_ACTION_DEFAULT:

	case INTEL_GUC_ACTION_DEFAULT:

CRA Git | Maintained and supported by SUSTech CRA and CCSE