Skip to contentSkip to conversation

drm/radeon/kms: Convert RS690/RS740 to new init path.

PATCH In review Jerome Glisse 2 participants 2 messages Sep 29, 2009 – Sep 30, 2009

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

PATCH 1/1 drm/radeon/kms: Convert RS690/RS740 to new init path.

Also cleanup register specific to RS690/RS740.

---
 drivers/gpu/drm/radeon/radeon.h      |   10 +
 drivers/gpu/drm/radeon/radeon_asic.h |   41 ++--
 drivers/gpu/drm/radeon/rs600.c       |    7 +-
 drivers/gpu/drm/radeon/rs690.c       |  358 +++++++++++++++++++++------------
 drivers/gpu/drm/radeon/rs690r.h      |   99 ----------
 5 files changed, 266 insertions(+), 249 deletions(-)
 delete mode 100644 drivers/gpu/drm/radeon/rs690r.h
drivers/gpu/drm/radeon/radeon.h +10 -0
index 7b0965f..1b797d2 100644
@@ -1064,6 +1064,16 @@ extern void rv515_clock_startup(struct radeon_device *rdev);
 extern void rv515_debugfs(struct radeon_device *rdev);
 extern int rv515_suspend(struct radeon_device *rdev);
 
+/* rs400 */
+extern int rs400_gart_init(struct radeon_device *rdev);
+extern int rs400_gart_enable(struct radeon_device *rdev);
+extern void rs400_gart_adjust_size(struct radeon_device *rdev);
+extern void rs400_gart_disable(struct radeon_device *rdev);
+extern void rs400_gart_fini(struct radeon_device *rdev);
+
+/* rs600 */
+extern void rs600_set_safe_registers(struct radeon_device *rdev);
+
 /* rs690, rs740 */
 extern void rs690_line_buffer_adjust(struct radeon_device *rdev,
 					struct drm_display_mode *mode1,
drivers/gpu/drm/radeon/radeon_asic.h +22 -19

58 lines not on this page · raw message

drivers/gpu/drm/radeon/rs600.c +6 -1
index 4a4fe1c..fa8e451 100644
@@ -416,9 +416,14 @@ void rs600_mc_wreg(struct radeon_device *rdev, uint32_t reg, uint32_t v)
 	WREG32(RS600_MC_DATA, v);
 }
 
-int rs600_init(struct radeon_device *rdev)
+void rs600_set_safe_registers(struct radeon_device *rdev)
 {
 	rdev->config.r300.reg_safe_bm = rs600_reg_safe_bm;
 	rdev->config.r300.reg_safe_bm_size = ARRAY_SIZE(rs600_reg_safe_bm);
+}
+
+int rs600_init(struct radeon_device *rdev)
+{
+    rs600_set_safe_registers(rdev);
 	return 0;
 }
drivers/gpu/drm/radeon/rs690.c +228 -130

460 lines not on this page · raw message

drivers/gpu/drm/radeon/rs690r.h deleted +0 -99

99 lines not on this page · raw message

Signature · 1 line
1.6.4.4
maintainer
#1 lore raw
Quoted 11 lines · Jerome Glisse

Also cleanup register specific to RS690/RS740.

---
 drivers/gpu/drm/radeon/radeon.h      |   10 +
 drivers/gpu/drm/radeon/radeon_asic.h |   41 ++--

 drivers/gpu/drm/radeon/rs600.c       |    7 +-
 drivers/gpu/drm/radeon/rs690.c       |  358 +++++++++++++++++++++------------
 drivers/gpu/drm/radeon/rs690r.h      |   99 ----------
 5 files changed, 266 insertions(+), 249 deletions(-)

 delete mode 100644 drivers/gpu/drm/radeon/rs690r.h

This forgets to add rs690d.h here so breaks the build.

Dave.