Skip to contentSkip to conversation

drm/radeon/kms: add R4XX mc register access helper.

PATCH New Jerome Glisse 1 participant 1 message Sep 9, 2009

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/radeon/kms: add R4XX mc register access helper.

Atombios will use the mc register access helper and R4XX hw have a bigger mc range than R3XX so add R4XX specific mc register access helper.

---
 drivers/gpu/drm/radeon/r420.c          |   17 ++++++++++++
 drivers/gpu/drm/radeon/r420d.h         |   43 ++++++++++++++++++++++++++++++++
 drivers/gpu/drm/radeon/radeon.h        |    4 +++
 drivers/gpu/drm/radeon/radeon_device.c |    4 +++
 4 files changed, 68 insertions(+), 0 deletions(-)
 create mode 100644 drivers/gpu/drm/radeon/r420d.h
drivers/gpu/drm/radeon/r420.c +17 -0
index 029cee2..551d699 100644
@@ -29,6 +29,7 @@
 #include "drmP.h"
 #include "radeon_reg.h"
 #include "radeon.h"
+#include "r420d.h"
 
 /* r420,r423,rv410 depends on : */
 void r100_pci_gart_disable(struct radeon_device *rdev);
@@ -237,3 +238,19 @@ int r420_debugfs_pipes_info_init(struct radeon_device *rdev)
 	return 0;
 #endif
 }
+
+u32 r420_mc_rreg(struct radeon_device *rdev, u32 reg)
+{
+	u32 r;
+
+	WREG32(R_0001F8_MC_IND_INDEX, S_0001F8_MC_IND_ADDR(reg));
+	r = RREG32(R_0001FC_MC_IND_DATA);
+	return r;
+}
+
+void r420_mc_wreg(struct radeon_device *rdev, u32 reg, u32 v)
+{
+	WREG32(R_0001F8_MC_IND_INDEX, S_0001F8_MC_IND_ADDR(reg) |
+		S_0001F8_MC_IND_WR_EN(1));
+	WREG32(R_0001FC_MC_IND_DATA, v);
+}
drivers/gpu/drm/radeon/r420d.h new file +43 -0

43 lines not on this page · raw message

drivers/gpu/drm/radeon/radeon.h +4 -0
index fe86b20..868d7c1 100644
@@ -940,4 +940,8 @@ int r100_pci_gart_set_page(struct radeon_device *rdev, int i, uint64_t addr);
 int r100_pci_gart_enable(struct radeon_device *rdev);
 void r100_pci_gart_tlb_flush(struct radeon_device *rdev);
 
+/* r420,r423,rv410 */
+u32 r420_mc_rreg(struct radeon_device *rdev, u32 reg);
+void r420_mc_wreg(struct radeon_device *rdev, u32 reg, u32 v);
+
 #endif
drivers/gpu/drm/radeon/radeon_device.c +4 -0
index da8646a..d1e356b 100644
@@ -266,6 +266,10 @@ void radeon_register_accessor_init(struct radeon_device *rdev)
 		rdev->pll_rreg = &r100_pll_rreg;
 		rdev->pll_wreg = &r100_pll_wreg;
 	}
+	if (rdev->family >= CHIP_R420) {
+		rdev->mc_rreg = &r420_mc_rreg;
+		rdev->mc_wreg = &r420_mc_wreg;
+	}
 	if (rdev->family >= CHIP_RV515) {
 		rdev->mc_rreg = &rv515_mc_rreg;
 		rdev->mc_wreg = &rv515_mc_wreg;
Signature · 1 line
1.6.4.1