Attachment 73088 Details for Bug 58659 – possible fix

[patch] possible fix

0001-drm-radeon-clear-reset-flags-if-engines-are-idle.patch (text/plain), 2.76 KB, created by Alex Deucher on 2013-01-15 14:05:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Deucher

Created: 2013-01-15 14:05:58 UTC

Size: 2.76 KB

patch

obsolete

>From cb5206aa1c6c52b1b459eaf93797c593cff0c8db Mon Sep 17 00:00:00 2001
>From: Alex Deucher <alexander.deucher@amd.com>
>Date: Mon, 14 Jan 2013 11:04:39 -0500
>Subject: [PATCH] drm/radeon: clear reset flags if engines are idle
>
>Fixes a regression in the gpu reset code after the
>rework for DMA support.
>
>Reported-by: Eldad Zack <eldad@fogrefinery.com>
>Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
>---
> drivers/gpu/drm/radeon/evergreen.c |    6 ++++++
> drivers/gpu/drm/radeon/ni.c        |    6 ++++++
> drivers/gpu/drm/radeon/r600.c      |    6 ++++++
> drivers/gpu/drm/radeon/si.c        |    6 ++++++
> 4 files changed, 24 insertions(+), 0 deletions(-)
>
>diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c
>index 061fa0a..4d0e60a 100644
>--- a/drivers/gpu/drm/radeon/evergreen.c
>+++ b/drivers/gpu/drm/radeon/evergreen.c
>@@ -2401,6 +2401,12 @@ static int evergreen_gpu_soft_reset(struct radeon_device *rdev, u32 reset_mask)
> {
> 	struct evergreen_mc_save save;
> 
>+	if (!(RREG32(GRBM_STATUS) & GUI_ACTIVE))
>+		reset_mask &= ~(RADEON_RESET_GFX | RADEON_RESET_COMPUTE);
>+
>+	if (RREG32(DMA_STATUS_REG) & DMA_IDLE)
>+		reset_mask &= ~RADEON_RESET_DMA;
>+
> 	if (reset_mask == 0)
> 		return 0;
> 
>diff --git a/drivers/gpu/drm/radeon/ni.c b/drivers/gpu/drm/radeon/ni.c
>index 896f1cb..59acabb 100644
>--- a/drivers/gpu/drm/radeon/ni.c
>+++ b/drivers/gpu/drm/radeon/ni.c
>@@ -1409,6 +1409,12 @@ static int cayman_gpu_soft_reset(struct radeon_device *rdev, u32 reset_mask)
> {
> 	struct evergreen_mc_save save;
> 
>+	if (!(RREG32(GRBM_STATUS) & GUI_ACTIVE))
>+		reset_mask &= ~(RADEON_RESET_GFX | RADEON_RESET_COMPUTE);
>+
>+	if (RREG32(DMA_STATUS_REG) & DMA_IDLE)
>+		reset_mask &= ~RADEON_RESET_DMA;
>+
> 	if (reset_mask == 0)
> 		return 0;
> 
>diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c
>index 537e259..3cb9d60 100644
>--- a/drivers/gpu/drm/radeon/r600.c
>+++ b/drivers/gpu/drm/radeon/r600.c
>@@ -1378,6 +1378,12 @@ static int r600_gpu_soft_reset(struct radeon_device *rdev, u32 reset_mask)
> {
> 	struct rv515_mc_save save;
> 
>+	if (!(RREG32(GRBM_STATUS) & GUI_ACTIVE))
>+		reset_mask &= ~(RADEON_RESET_GFX | RADEON_RESET_COMPUTE);
>+
>+	if (RREG32(DMA_STATUS_REG) & DMA_IDLE)
>+		reset_mask &= ~RADEON_RESET_DMA;
>+
> 	if (reset_mask == 0)
> 		return 0;
> 
>diff --git a/drivers/gpu/drm/radeon/si.c b/drivers/gpu/drm/radeon/si.c
>index 3240a3d..ae8b482 100644
>--- a/drivers/gpu/drm/radeon/si.c
>+++ b/drivers/gpu/drm/radeon/si.c
>@@ -2215,6 +2215,12 @@ static int si_gpu_soft_reset(struct radeon_device *rdev, u32 reset_mask)
> {
> 	struct evergreen_mc_save save;
> 
>+	if (!(RREG32(GRBM_STATUS) & GUI_ACTIVE))
>+		reset_mask &= ~(RADEON_RESET_GFX | RADEON_RESET_COMPUTE);
>+
>+	if (RREG32(DMA_STATUS_REG) & DMA_IDLE)
>+		reset_mask &= ~RADEON_RESET_DMA;
>+
> 	if (reset_mask == 0)
> 		return 0;
> 
>-- 
>1.7.7.5
>

Actions: View | Splinter Review

Attachments on bug 58659: 71998 | 73018 | 73088 | 73168

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.