Attachment 113620 Details for Bug 89148 – add some debugging output

[patch] add some debugging output

0001-drm-radeon-dump-full-IB-if-we-hit-a-packet-error.patch (text/plain), 2.71 KB, created by Alex Deucher on 2015-02-18 15:19:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Deucher

Created: 2015-02-18 15:19:47 UTC

Size: 2.71 KB

patch

obsolete

>From 64380946bfb38dd18a9dbb5a82ec479d4287cf77 Mon Sep 17 00:00:00 2001
>From: Alex Deucher <alexander.deucher@amd.com>
>Date: Wed, 18 Feb 2015 10:15:10 -0500
>Subject: [PATCH] drm/radeon: dump full IB if we hit a packet error
>
>Dump the whole IB if we run into an invalid packet.
>This makes things much easier to debug.
>
>bug:
>https://bugs.freedesktop.org/show_bug.cgi?id=89148
>
>Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
>---
> drivers/gpu/drm/radeon/radeon_cs.c | 16 ++++++++++++++--
> drivers/gpu/drm/radeon/si.c        | 15 ++++++++-------
> 2 files changed, 22 insertions(+), 9 deletions(-)
>
>diff --git a/drivers/gpu/drm/radeon/radeon_cs.c b/drivers/gpu/drm/radeon/radeon_cs.c
>index c830863..a579ed3 100644
>--- a/drivers/gpu/drm/radeon/radeon_cs.c
>+++ b/drivers/gpu/drm/radeon/radeon_cs.c
>@@ -715,6 +715,7 @@ int radeon_cs_packet_parse(struct radeon_cs_parser *p,
> 	struct radeon_cs_chunk *ib_chunk = p->chunk_ib;
> 	struct radeon_device *rdev = p->rdev;
> 	uint32_t header;
>+	int ret = 0, i;
> 
> 	if (idx >= ib_chunk->length_dw) {
> 		DRM_ERROR("Can not parse packet at %d after CS end %d !\n",
>@@ -743,14 +744,25 @@ int radeon_cs_packet_parse(struct radeon_cs_parser *p,
> 		break;
> 	default:
> 		DRM_ERROR("Unknown packet type %d at %d !\n", pkt->type, idx);
>-		return -EINVAL;
>+		ret = -EINVAL;
>+		goto dump_ib;
> 	}
> 	if ((pkt->count + 1 + pkt->idx) >= ib_chunk->length_dw) {
> 		DRM_ERROR("Packet (%d:%d:%d) end after CS buffer (%d) !\n",
> 			  pkt->idx, pkt->type, pkt->count, ib_chunk->length_dw);
>-		return -EINVAL;
>+		ret = -EINVAL;
>+		goto dump_ib;
> 	}
> 	return 0;
>+
>+dump_ib:
>+	for (i = 0; i < ib_chunk->length_dw; i++) {
>+		if (i == idx)
>+			printk("\t0x%08x <---\n", radeon_get_ib_value(p, i));
>+		else
>+			printk("\t0x%08x\n", radeon_get_ib_value(p, i));
>+	}
>+	return ret;
> }
> 
> /**
>diff --git a/drivers/gpu/drm/radeon/si.c b/drivers/gpu/drm/radeon/si.c
>index 73107fe..ad26973 100644
>--- a/drivers/gpu/drm/radeon/si.c
>+++ b/drivers/gpu/drm/radeon/si.c
>@@ -4699,12 +4699,6 @@ int si_ib_parse(struct radeon_device *rdev, struct radeon_ib *ib)
> 		switch (pkt.type) {
> 		case RADEON_PACKET_TYPE0:
> 			dev_err(rdev->dev, "Packet0 not allowed!\n");
>-			for (i = 0; i < ib->length_dw; i++) {
>-				if (i == idx)
>-					printk("\t0x%08x <---\n", ib->ptr[i]);
>-				else
>-					printk("\t0x%08x\n", ib->ptr[i]);
>-			}
> 			ret = -EINVAL;
> 			break;
> 		case RADEON_PACKET_TYPE2:
>@@ -4736,8 +4730,15 @@ int si_ib_parse(struct radeon_device *rdev, struct radeon_ib *ib)
> 			ret = -EINVAL;
> 			break;
> 		}
>-		if (ret)
>+		if (ret) {
>+			for (i = 0; i < ib->length_dw; i++) {
>+				if (i == idx)
>+					printk("\t0x%08x <---\n", ib->ptr[i]);
>+				else
>+					printk("\t0x%08x\n", ib->ptr[i]);
>+			}
> 			break;
>+		}
> 	} while (idx < ib->length_dw);
> 
> 	return ret;
>-- 
>1.8.3.1
>

Actions: View | Splinter Review

Attachments on bug 89148: 113562 | 113620 | 113719 | 113802

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.