Attachment 39799 Details for Bug 25544 – fix the drm CS checker

[patch] fix the drm CS checker

0001-drm-radeon-kms-fix-handling-of-tex-lookup-disable-in.patch (text/plain), 3.40 KB, created by Alex Deucher on 2010-10-26 14:21:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Deucher

Created: 2010-10-26 14:21:18 UTC

Size: 3.40 KB

patch

obsolete

>From 0f768cac548531423d88866125d5d28068a65a8f Mon Sep 17 00:00:00 2001
>From: Alex Deucher <alexdeucher@gmail.com>
>Date: Tue, 26 Oct 2010 17:17:15 -0400
>Subject: [PATCH] drm/radeon/kms: fix handling of tex lookup disable in cs checker on r2xx
>
>There are cases when multiple texture units have to be enabled,
>but not actually used to sample.  This patch checks to see if
>the lookup_disable bit is set and if so, skips the texture check.
>
>Fixes:
>https://bugs.freedesktop.org/show_bug.cgi?id=25544
>
>Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
>Cc: stable@kernel.org
>---
> drivers/gpu/drm/radeon/r100.c       |    3 +++
> drivers/gpu/drm/radeon/r100_track.h |    1 +
> drivers/gpu/drm/radeon/r200.c       |    2 ++
> drivers/gpu/drm/radeon/radeon_reg.h |    1 +
> 4 files changed, 7 insertions(+), 0 deletions(-)
>
>diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c
>index cde67d1..91cdd3a 100644
>--- a/drivers/gpu/drm/radeon/r100.c
>+++ b/drivers/gpu/drm/radeon/r100.c
>@@ -3268,6 +3268,8 @@ static int r100_cs_track_texture_check(struct radeon_device *rdev,
> 	for (u = 0; u < track->num_texture; u++) {
> 		if (!track->textures[u].enabled)
> 			continue;
>+		if (track->textures[u].lookup_disable)
>+			continue;
> 		robj = track->textures[u].robj;
> 		if (robj == NULL) {
> 			DRM_ERROR("No texture bound to unit %u\n", u);
>@@ -3502,6 +3504,7 @@ void r100_cs_track_clear(struct radeon_device *rdev, struct r100_cs_track *track
> 		track->textures[i].robj = NULL;
> 		/* CS IB emission code makes sure texture unit are disabled */
> 		track->textures[i].enabled = false;
>+		track->textures[i].lookup_disable = false;
> 		track->textures[i].roundup_w = true;
> 		track->textures[i].roundup_h = true;
> 		if (track->separate_cube)
>diff --git a/drivers/gpu/drm/radeon/r100_track.h b/drivers/gpu/drm/radeon/r100_track.h
>index f47cdca..af65600 100644
>--- a/drivers/gpu/drm/radeon/r100_track.h
>+++ b/drivers/gpu/drm/radeon/r100_track.h
>@@ -46,6 +46,7 @@ struct r100_cs_track_texture {
> 	unsigned		height_11;
> 	bool			use_pitch;
> 	bool			enabled;
>+	bool                    lookup_disable;
> 	bool			roundup_w;
> 	bool			roundup_h;
> 	unsigned                compress_format;
>diff --git a/drivers/gpu/drm/radeon/r200.c b/drivers/gpu/drm/radeon/r200.c
>index 0266d72..d2408c3 100644
>--- a/drivers/gpu/drm/radeon/r200.c
>+++ b/drivers/gpu/drm/radeon/r200.c
>@@ -447,6 +447,8 @@ int r200_packet0_check(struct radeon_cs_parser *p,
> 			track->textures[i].width = 1 << ((idx_value >> RADEON_TXFORMAT_WIDTH_SHIFT) & RADEON_TXFORMAT_WIDTH_MASK);
> 			track->textures[i].height = 1 << ((idx_value >> RADEON_TXFORMAT_HEIGHT_SHIFT) & RADEON_TXFORMAT_HEIGHT_MASK);
> 		}
>+		if (idx_value & R200_TXFORMAT_LOOKUP_DISABLE)
>+			track->textures[i].lookup_disable = true;
> 		switch ((idx_value & RADEON_TXFORMAT_FORMAT_MASK)) {
> 		case R200_TXFORMAT_I8:
> 		case R200_TXFORMAT_RGB332:
>diff --git a/drivers/gpu/drm/radeon/radeon_reg.h b/drivers/gpu/drm/radeon/radeon_reg.h
>index c332f46..6492881 100644
>--- a/drivers/gpu/drm/radeon/radeon_reg.h
>+++ b/drivers/gpu/drm/radeon/radeon_reg.h
>@@ -2836,6 +2836,7 @@
> #       define R200_TXFORMAT_ST_ROUTE_STQ5	(5 << 24)
> #       define R200_TXFORMAT_ST_ROUTE_MASK	(7 << 24)
> #       define R200_TXFORMAT_ST_ROUTE_SHIFT	24
>+#       define R200_TXFORMAT_LOOKUP_DISABLE	(1 << 27)
> #       define R200_TXFORMAT_ALPHA_MASK_ENABLE	(1 << 28)
> #       define R200_TXFORMAT_CHROMA_KEY_ENABLE	(1 << 29)
> #       define R200_TXFORMAT_CUBIC_MAP_ENABLE		(1 << 30)
>-- 
>1.7.1.1
>

Actions: View | Splinter Review

Attachments on bug 25544: 31941 | 33643 | 39799

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.