From dc025af6baa3556a38d76e5bd43099f7977885ae Mon Sep 17 00:00:00 2001 From: Alex Deucher Date: Wed, 13 Jan 2010 19:09:12 -0500 Subject: [PATCH] --- yaml --- r: 179919 b: refs/heads/master c: 07bec2df01cde5590a1700b992d12de3f46b12bc h: refs/heads/master i: 179917: 620d685345e52d3f51698b5997ffb1f9151270fd 179915: 6a690b5060964a102546dec5096ced66cfed6a61 179911: ce0e896e4831ccb8a9960ece24c9a978fdc7235b 179903: ab683f39ae79dd3ff928150da2eb8afe99dbd282 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/radeon/radeon.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index afe1d5e051ea..4264e590874d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cf57fc7aa2ac61d02a29550b99db6a01ccd7917c +refs/heads/master: 07bec2df01cde5590a1700b992d12de3f46b12bc diff --git a/trunk/drivers/gpu/drm/radeon/radeon.h b/trunk/drivers/gpu/drm/radeon/radeon.h index ab37dd0f2e71..c23278240a4e 100644 --- a/trunk/drivers/gpu/drm/radeon/radeon.h +++ b/trunk/drivers/gpu/drm/radeon/radeon.h @@ -847,7 +847,7 @@ void r600_kms_blit_copy(struct radeon_device *rdev, static inline uint32_t r100_mm_rreg(struct radeon_device *rdev, uint32_t reg) { - if (reg < 0x10000) + if (reg < rdev->rmmio_size) return readl(((void __iomem *)rdev->rmmio) + reg); else { writel(reg, ((void __iomem *)rdev->rmmio) + RADEON_MM_INDEX); @@ -857,7 +857,7 @@ static inline uint32_t r100_mm_rreg(struct radeon_device *rdev, uint32_t reg) static inline void r100_mm_wreg(struct radeon_device *rdev, uint32_t reg, uint32_t v) { - if (reg < 0x10000) + if (reg < rdev->rmmio_size) writel(v, ((void __iomem *)rdev->rmmio) + reg); else { writel(reg, ((void __iomem *)rdev->rmmio) + RADEON_MM_INDEX);