Home Explore Help
Register Sign In
phyus
/
linux-vybrid_public
8
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

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
Signed-off-by: Dave Airlie <airlied@redhat.com>
Alex Deucher 13 years ago
parent
6f9f8a6108
commit
b7f5b7dec3
2 changed files with 2 additions and 6 deletions
Split View Show Diff Stats
  1. 1 3
      drivers/gpu/drm/radeon/r100.c
  2. 1 3
      drivers/gpu/drm/radeon/rs600.c

+ 1 - 3
drivers/gpu/drm/radeon/r100.c
View File 

@@ -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;
 
 		}
 
 	}

+ 1 - 3
drivers/gpu/drm/radeon/rs600.c
View File 

@@ -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;
 
 		}
 
 	}