Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 07bec2df authored by Alex Deucher's avatar Alex Deucher Committed by Dave Airlie
Browse files

drm/radeon/kms: fix hardcoded mmio size in register functions 



newer asics have large mmio apertures

Signed-off-by: default avatarAlex Deucher <alexdeucher@gmail.com>
Signed-off-by: default avatarDave Airlie <airlied@linux.ie>
parent cf57fc7a

drivers/gpu/drm/radeon/radeon.h

+2 −2
Original line number Diff line number Diff line
@@ -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);