Attachment 42240 Details for Bug 33272 – possible fix

[patch] possible fix

0001-drm-radeon-kms-match-r6xx-r7xx-evergreen-asic_reset-.patch (text/plain), 1.58 KB, created by Alex Deucher on 2011-01-20 13:59:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Deucher

Created: 2011-01-20 13:59:05 UTC

Size: 1.58 KB

patch

obsolete

>From fd76ddaa8ce1bf4ce4d8a0cecf1d5608d138644a Mon Sep 17 00:00:00 2001
>From: Alex Deucher <alexdeucher@gmail.com>
>Date: Thu, 20 Jan 2011 16:56:13 -0500
>Subject: [PATCH] drm/radeon/kms: match r6xx/r7xx/evergreen asic_reset with previous asics
>
>Don't reset if the engine isn't busy.  This matches the behavior of
>previous asics.
>
>May fix:
>https://bugs.freedesktop.org/show_bug.cgi?id=33272
>
>Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
>---
> drivers/gpu/drm/radeon/evergreen.c |    3 +++
> drivers/gpu/drm/radeon/r600.c      |    3 +++
> 2 files changed, 6 insertions(+), 0 deletions(-)
>
>diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c
>index be48bbc..90e6d84 100644
>--- a/drivers/gpu/drm/radeon/evergreen.c
>+++ b/drivers/gpu/drm/radeon/evergreen.c
>@@ -2201,6 +2201,9 @@ static int evergreen_gpu_soft_reset(struct radeon_device *rdev)
> 	struct evergreen_mc_save save;
> 	u32 grbm_reset = 0;
> 
>+	if (!(RREG32(GRBM_STATUS) & GUI_ACTIVE))
>+		return 0;
>+
> 	dev_info(rdev->dev, "GPU softreset \n");
> 	dev_info(rdev->dev, "  GRBM_STATUS=0x%08X\n",
> 		RREG32(GRBM_STATUS));
>diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c
>index becc0a9..f574d9b 100644
>--- a/drivers/gpu/drm/radeon/r600.c
>+++ b/drivers/gpu/drm/radeon/r600.c
>@@ -1288,6 +1288,9 @@ int r600_gpu_soft_reset(struct radeon_device *rdev)
> 			S_008014_CB2_BUSY(1) | S_008014_CB3_BUSY(1);
> 	u32 tmp;
> 
>+	if (!(RREG32(GRBM_STATUS) & GUI_ACTIVE))
>+		return 0;
>+
> 	dev_info(rdev->dev, "GPU softreset \n");
> 	dev_info(rdev->dev, "  R_008010_GRBM_STATUS=0x%08X\n",
> 		RREG32(R_008010_GRBM_STATUS));
>-- 
>1.7.1.1
>

Actions: View | Splinter Review

Attachments on bug 33272: 42226 | 42240

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.