Attachment 52630 Details for Bug 40221 – possible fix

[patch] possible fix

0001-drm-radeon-kms-rework-texture-cache-flush-in-r6xx-bl.patch (text/plain), 3.60 KB, created by Alex Deucher on 2011-10-22 07:10:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Deucher

Created: 2011-10-22 07:10:48 UTC

Size: 3.60 KB

patch

obsolete

>From ec0014e176671496b5622c9c92661dab9a89d9e6 Mon Sep 17 00:00:00 2001
>From: Alex Deucher <alexander.deucher@amd.com>
>Date: Sat, 22 Oct 2011 10:07:09 -0400
>Subject: [PATCH] drm/radeon/kms: rework texture cache flush in r6xx+ blit code
>
>Move the TC flush before the texture setup to match mesa and
>the ddx. Also, move the TC flush into the texture setup
>function.
>
>May fix:
>https://bugs.freedesktop.org/show_bug.cgi?id=40221
>
>Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
>---
> drivers/gpu/drm/radeon/evergreen_blit_kms.c |    5 ++++-
> drivers/gpu/drm/radeon/r600_blit_kms.c      |   10 +++++-----
> drivers/gpu/drm/radeon/radeon.h             |    2 +-
> 3 files changed, 10 insertions(+), 7 deletions(-)
>
>diff --git a/drivers/gpu/drm/radeon/evergreen_blit_kms.c b/drivers/gpu/drm/radeon/evergreen_blit_kms.c
>index dcf11bb..879f733 100644
>--- a/drivers/gpu/drm/radeon/evergreen_blit_kms.c
>+++ b/drivers/gpu/drm/radeon/evergreen_blit_kms.c
>@@ -174,7 +174,7 @@ set_vtx_resource(struct radeon_device *rdev, u64 gpu_addr)
> static void
> set_tex_resource(struct radeon_device *rdev,
> 		 int format, int w, int h, int pitch,
>-		 u64 gpu_addr)
>+		 u64 gpu_addr, u32 size)
> {
> 	u32 sq_tex_resource_word0, sq_tex_resource_word1;
> 	u32 sq_tex_resource_word4, sq_tex_resource_word7;
>@@ -196,6 +196,9 @@ set_tex_resource(struct radeon_device *rdev,
> 	sq_tex_resource_word7 = format |
> 		S__SQ_CONSTANT_TYPE(SQ_TEX_VTX_VALID_TEXTURE);
> 
>+	cp_set_surface_sync(rdev,
>+			    PACKET3_TC_ACTION_ENA, size, gpu_addr);
>+
> 	radeon_ring_write(rdev, PACKET3(PACKET3_SET_RESOURCE, 8));
> 	radeon_ring_write(rdev, 0);
> 	radeon_ring_write(rdev, sq_tex_resource_word0);
>diff --git a/drivers/gpu/drm/radeon/r600_blit_kms.c b/drivers/gpu/drm/radeon/r600_blit_kms.c
>index c4cf130..ff36532 100644
>--- a/drivers/gpu/drm/radeon/r600_blit_kms.c
>+++ b/drivers/gpu/drm/radeon/r600_blit_kms.c
>@@ -201,7 +201,7 @@ set_vtx_resource(struct radeon_device *rdev, u64 gpu_addr)
> static void
> set_tex_resource(struct radeon_device *rdev,
> 		 int format, int w, int h, int pitch,
>-		 u64 gpu_addr)
>+		 u64 gpu_addr, u32 size)
> {
> 	uint32_t sq_tex_resource_word0, sq_tex_resource_word1, sq_tex_resource_word4;
> 
>@@ -222,6 +222,9 @@ set_tex_resource(struct radeon_device *rdev,
> 		S_038010_DST_SEL_Z(SQ_SEL_Z) |
> 		S_038010_DST_SEL_W(SQ_SEL_W);
> 
>+	cp_set_surface_sync(rdev,
>+			    PACKET3_TC_ACTION_ENA, size, gpu_addr);
>+
> 	radeon_ring_write(rdev, PACKET3(PACKET3_SET_RESOURCE, 7));
> 	radeon_ring_write(rdev, 0);
> 	radeon_ring_write(rdev, sq_tex_resource_word0);
>@@ -760,10 +763,7 @@ void r600_kms_blit_copy(struct radeon_device *rdev,
> 		vb[11] = i2f(h);
> 
> 		rdev->r600_blit.primitives.set_tex_resource(rdev, FMT_8_8_8_8,
>-							    w, h, w, src_gpu_addr);
>-		rdev->r600_blit.primitives.cp_set_surface_sync(rdev,
>-							       PACKET3_TC_ACTION_ENA,
>-							       size_in_bytes, src_gpu_addr);
>+							    w, h, w, src_gpu_addr, size_in_bytes);
> 		rdev->r600_blit.primitives.set_render_target(rdev, COLOR_8_8_8_8,
> 							     w, h, dst_gpu_addr);
> 		rdev->r600_blit.primitives.set_scissors(rdev, 0, 0, w, h);
>diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h
>index aa11ae8..c16724f 100644
>--- a/drivers/gpu/drm/radeon/radeon.h
>+++ b/drivers/gpu/drm/radeon/radeon.h
>@@ -585,7 +585,7 @@ struct r600_blit_cp_primitives {
> 	void (*set_vtx_resource)(struct radeon_device *rdev, u64 gpu_addr);
> 	void (*set_tex_resource)(struct radeon_device *rdev,
> 				 int format, int w, int h, int pitch,
>-				 u64 gpu_addr);
>+				 u64 gpu_addr, u32 size);
> 	void (*set_scissors)(struct radeon_device *rdev, int x1, int y1,
> 			     int x2, int y2);
> 	void (*draw_auto)(struct radeon_device *rdev);
>-- 
>1.7.1.1
>

Actions: View | Splinter Review

Attachments on bug 40221: 50369 | 50370 | 50371 | 50375 | 50378 | 50404 | 50461 | 52630 | 52635 | 52690 | 52697 | 52699 | 52700 | 52762

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.