Attachment 56992 Details for Bug 41668 – possible fix

[patch] possible fix

0001-drm-radeon-kms-fix-MSI-re-arm-on-rv370.patch (text/plain), 1.72 KB, created by Alex Deucher on 2012-02-13 13:40:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Deucher

Created: 2012-02-13 13:40:27 UTC

Size: 1.72 KB

patch

obsolete

>From fb7fbfe63c1da5a888c1e90ab1c4d3747cf4425a Mon Sep 17 00:00:00 2001
>From: Alex Deucher <alexander.deucher@amd.com>
>Date: Mon, 13 Feb 2012 16:36:34 -0500
>Subject: [PATCH] drm/radeon/kms: fix MSI re-arm on rv370+
>
>MSI_REARM_EN register is a write only trigger register.
>There is no need RMW when re-arming.
>
>May fix:
>https://bugs.freedesktop.org/show_bug.cgi?id=41668
>
>Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
>CC: stable@vger.kernel.org
>---
> drivers/gpu/drm/radeon/r100.c  |    4 +---
> drivers/gpu/drm/radeon/rs600.c |    4 +---
> 2 files changed, 2 insertions(+), 6 deletions(-)
>
>diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c
>index bfd36ab..18cd84f 100644
>--- a/drivers/gpu/drm/radeon/r100.c
>+++ b/drivers/gpu/drm/radeon/r100.c
>@@ -789,9 +789,7 @@ int r100_irq_process(struct radeon_device *rdev)
> 			WREG32(RADEON_AIC_CNTL, msi_rearm | RS400_MSI_REARM);
> 			break;
> 		default:
>-			msi_rearm = RREG32(RADEON_MSI_REARM_EN) & ~RV370_MSI_REARM_EN;
>-			WREG32(RADEON_MSI_REARM_EN, msi_rearm);
>-			WREG32(RADEON_MSI_REARM_EN, msi_rearm | RV370_MSI_REARM_EN);
>+			WREG32(RADEON_MSI_REARM_EN, RV370_MSI_REARM_EN);
> 			break;
> 		}
> 	}
>diff --git a/drivers/gpu/drm/radeon/rs600.c b/drivers/gpu/drm/radeon/rs600.c
>index ec46eb4..c05865e 100644
>--- a/drivers/gpu/drm/radeon/rs600.c
>+++ b/drivers/gpu/drm/radeon/rs600.c
>@@ -684,9 +684,7 @@ int rs600_irq_process(struct radeon_device *rdev)
> 			WREG32(RADEON_BUS_CNTL, msi_rearm | RS600_MSI_REARM);
> 			break;
> 		default:
>-			msi_rearm = RREG32(RADEON_MSI_REARM_EN) & ~RV370_MSI_REARM_EN;
>-			WREG32(RADEON_MSI_REARM_EN, msi_rearm);
>-			WREG32(RADEON_MSI_REARM_EN, msi_rearm | RV370_MSI_REARM_EN);
>+			WREG32(RADEON_MSI_REARM_EN, RV370_MSI_REARM_EN);
> 			break;
> 		}
> 	}
>-- 
>1.7.7.5
>

Actions: View | Splinter Review

Attachments on bug 41668: 52202 | 52203 | 52204 | 52205 | 52248 | 52249 | 54445 | 54446 | 56992

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.