Attachment 42613 Details for Bug 31951 – possible fix

[patch] possible fix

0001-drm-radeon-kms-re-emit-full-context-state-for-evergr.patch (text/plain), 3.83 KB, created by Alex Deucher on 2011-01-27 13:45:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Deucher

Created: 2011-01-27 13:45:51 UTC

Size: 3.83 KB

patch

obsolete

>From 08658426e178824fc7678e021ee828c6315f2e46 Mon Sep 17 00:00:00 2001
>From: Alex Deucher <alexdeucher@gmail.com>
>Date: Thu, 27 Jan 2011 16:31:52 -0500
>Subject: [PATCH] drm/radeon/kms: re-emit full context state for evergreen blits
>
>clear state doesn't seem to work properly in some cases
>
>Fixes hangs in heavy 3D on some evergreen cards.
>
>Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
>Cc: stable@kernel.org
>---
> drivers/gpu/drm/radeon/evergreen_blit_kms.c |   39 ++++++++++++++++++++++----
> 1 files changed, 33 insertions(+), 6 deletions(-)
>
>diff --git a/drivers/gpu/drm/radeon/evergreen_blit_kms.c b/drivers/gpu/drm/radeon/evergreen_blit_kms.c
>index b758dc7..d4d4db4 100644
>--- a/drivers/gpu/drm/radeon/evergreen_blit_kms.c
>+++ b/drivers/gpu/drm/radeon/evergreen_blit_kms.c
>@@ -232,7 +232,7 @@ draw_auto(struct radeon_device *rdev)
> 
> }
> 
>-/* emits 30 */
>+/* emits 34 */
> static void
> set_default_state(struct radeon_device *rdev)
> {
>@@ -245,6 +245,8 @@ set_default_state(struct radeon_device *rdev)
> 	int num_hs_threads, num_ls_threads;
> 	int num_ps_stack_entries, num_vs_stack_entries, num_gs_stack_entries, num_es_stack_entries;
> 	int num_hs_stack_entries, num_ls_stack_entries;
>+	u64 gpu_addr;
>+	int dwords;
> 
> 	switch (rdev->family) {
> 	case CHIP_CEDAR:
>@@ -497,6 +499,14 @@ set_default_state(struct radeon_device *rdev)
> 	radeon_ring_write(rdev, 0x00000000);
> 	radeon_ring_write(rdev, 0x00000000);
> 
>+	/* emit an IB pointing at default state */
>+	dwords = ALIGN(rdev->r600_blit.state_len, 0x10);
>+	gpu_addr = rdev->r600_blit.shader_gpu_addr + rdev->r600_blit.state_offset;
>+	radeon_ring_write(rdev, PACKET3(PACKET3_INDIRECT_BUFFER, 2));
>+	radeon_ring_write(rdev, gpu_addr & 0xFFFFFFFC);
>+	radeon_ring_write(rdev, upper_32_bits(gpu_addr) & 0xFF);
>+	radeon_ring_write(rdev, dwords);
>+
> }
> 
> static inline uint32_t i2f(uint32_t input)
>@@ -527,8 +537,10 @@ static inline uint32_t i2f(uint32_t input)
> int evergreen_blit_init(struct radeon_device *rdev)
> {
> 	u32 obj_size;
>-	int r;
>+	int r, dwords;
> 	void *ptr;
>+	u32 packet2s[16];
>+	int num_packet2s = 0;
> 
> 	/* pin copy shader into vram if already initialized */
> 	if (rdev->r600_blit.shader_obj)
>@@ -536,8 +548,17 @@ int evergreen_blit_init(struct radeon_device *rdev)
> 
> 	mutex_init(&rdev->r600_blit.mutex);
> 	rdev->r600_blit.state_offset = 0;
>-	rdev->r600_blit.state_len = 0;
>-	obj_size = 0;
>+
>+	rdev->r600_blit.state_len = evergreen_default_size;
>+
>+	dwords = rdev->r600_blit.state_len;
>+	while (dwords & 0xf) {
>+		packet2s[num_packet2s++] = PACKET2(0);
>+		dwords++;
>+	}
>+
>+	obj_size = dwords * 4;
>+	obj_size = ALIGN(obj_size, 256);
> 
> 	rdev->r600_blit.vs_offset = obj_size;
> 	obj_size += evergreen_vs_size * 4;
>@@ -567,6 +588,12 @@ int evergreen_blit_init(struct radeon_device *rdev)
> 		return r;
> 	}
> 
>+	memcpy_toio(ptr + rdev->r600_blit.state_offset,
>+		    evergreen_default_state, rdev->r600_blit.state_len * 4);
>+
>+	if (num_packet2s)
>+		memcpy_toio(ptr + rdev->r600_blit.state_offset + (rdev->r600_blit.state_len * 4),
>+			    packet2s, num_packet2s * 4);
> 	memcpy(ptr + rdev->r600_blit.vs_offset, evergreen_vs, evergreen_vs_size * 4);
> 	memcpy(ptr + rdev->r600_blit.ps_offset, evergreen_ps, evergreen_ps_size * 4);
> 	radeon_bo_kunmap(rdev->r600_blit.shader_obj);
>@@ -652,7 +679,7 @@ int evergreen_blit_prepare_copy(struct radeon_device *rdev, int size_bytes)
> 	/* calculate number of loops correctly */
> 	ring_size = num_loops * dwords_per_loop;
> 	/* set default  + shaders */
>-	ring_size += 46; /* shaders + def state */
>+	ring_size += 50; /* shaders + def state */
> 	ring_size += 10; /* fence emit for VB IB */
> 	ring_size += 5; /* done copy */
> 	ring_size += 10; /* fence emit for done copy */
>@@ -660,7 +687,7 @@ int evergreen_blit_prepare_copy(struct radeon_device *rdev, int size_bytes)
> 	if (r)
> 		return r;
> 
>-	set_default_state(rdev); /* 30 */
>+	set_default_state(rdev); /* 34 */
> 	set_shaders(rdev); /* 16 */
> 	return 0;
> }
>-- 
>1.7.1.1
>

Actions: View | Splinter Review

Attachments on bug 31951: 40601 | 42613

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.