drm/radeon/kms: Convert RS600 to new init path
Subsystems (2)
PATCH 1/1 drm/radeon/kms: Convert RS600 to new init path
New init path allow to simply asic initialization and make easier to trace what happen on each different asic. We are removing most callback. Do a massive RS600 register cleanup to clarify RS600 register, we are still bit fuzy on some register and waiting for more informations. I don't have hw to test, so this patch is a best effort to not break anythings and to try to improve things.
--- drivers/gpu/drm/radeon/radeon_asic.h | 44 ++-- drivers/gpu/drm/radeon/rs600.c | 466 ++++++++++++++++++++-------------- drivers/gpu/drm/radeon/rs600d.h | 406 +++++++++++++++++++++++++++++ 3 files changed, 696 insertions(+), 220 deletions(-) create mode 100644 drivers/gpu/drm/radeon/rs600d.h
drivers/gpu/drm/radeon/radeon_asic.h +21 -23
@@ -290,18 +290,13 @@ static struct radeon_asic rs400_asic = {/* * rs600. */ -int rs600_init (struct radeon_device *rdev); -void rs600_errata (struct radeon_device *rdev); -void rs600_vram_info (struct radeon_device *rdev); -int rs600_mc_init (struct radeon_device *rdev); -void rs600_mc_fini (struct radeon_device *rdev); +extern int rs600_init (struct radeon_device *rdev); +extern void rs600_fini (struct radeon_device *rdev); +extern int rs600_suspend (struct radeon_device *rdev); +extern int rs600_resume (struct radeon_device *rdev);int rs600_irq_set (struct radeon_device *rdev);int rs600_irq_process (struct radeon_device *rdev);u32 rs600_get_vblank_counter (struct radeon_device *rdev,int crtc); -int rs600_gart_init (struct radeon_device *rdev); -void rs600_gart_fini (struct radeon_device *rdev); -int rs600_gart_enable (struct radeon_device *rdev); -void rs600_gart_disable (struct radeon_device *rdev);void rs600_gart_tlb_flush (struct radeon_device *rdev);int rs600_gart_set_page (struct radeon_device *rdev,int i,uint64_t addr);uint32_t rs600_mc_rreg (struct radeon_device *rdev,uint32_t reg);
@@ -309,27 +304,30 @@ void rs600_mc_wreg(struct radeon_device *rdev, uint32_t reg, uint32_t v);void rs600_bandwidth_update (struct radeon_device *rdev);static struct radeon_asic rs600_asic = { .init = &rs600_init, - .errata = &rs600_errata, - .vram_info = &rs600_vram_info, + .fini = &rs600_fini, + .suspend = &rs600_suspend, + .resume = &rs600_resume, + .errata =NULL , + .vram_info =NULL , .gpu_reset = &r300_gpu_reset, - .mc_init = &rs600_mc_init, - .mc_fini = &rs600_mc_fini, - .wb_init = &r100_wb_init, - .wb_fini = &r100_wb_fini, - .gart_init = &rs600_gart_init, - .gart_fini = &rs600_gart_fini, - .gart_enable = &rs600_gart_enable, - .gart_disable = &rs600_gart_disable, + .mc_init =NULL , + .mc_fini =NULL , + .wb_init =NULL , + .wb_fini =NULL , + .gart_init =NULL , + .gart_fini =NULL , + .gart_enable =NULL , + .gart_disable =NULL , .gart_tlb_flush = &rs600_gart_tlb_flush, .gart_set_page = &rs600_gart_set_page, - .cp_init = &r100_cp_init, - .cp_fini = &r100_cp_fini, - .cp_disable = &r100_cp_disable, + .cp_init =NULL , + .cp_fini =NULL , + .cp_disable =NULL , .cp_commit = &r100_cp_commit, .ring_start = &r300_ring_start, .ring_test = &r100_ring_test, .ring_ib_execute = &r100_ring_ib_execute, - .ib_test = &r100_ib_test, + .ib_test =NULL , .irq_set = &rs600_irq_set, .irq_process = &rs600_irq_process, .get_vblank_counter = &rs600_get_vblank_counter,
drivers/gpu/drm/radeon/rs600.c +269 -197
605 lines not on this page · raw message
drivers/gpu/drm/radeon/rs600d.h new file +406 -0
406 lines not on this page · raw message
Signature · 1 line
1.6.4.4
Dave Airlie
maintainerQuoted 6 lines · Jerome Glisse
New init path allow to simply asic initialization and make easier to trace what happen on each different asic. We are removing most callback. Do a massive RS600 register cleanup to clarify RS600 register, we are still bit fuzy on some register and waiting for more informations. I don't have hw to test, so this patch is a best effort to not break anythings and to try to improve things.
This patch breaks irq handling on all rs600->r5xx chips.
Quoted 5 lines
}
static inline
uint32_trs600_irq_ack(struct radeon_device *rdev, u32 *r500_disp_int){
-uint32_tirqs =RREG32(RADEON_GEN_INT_STATUS);
^ this was perfectly fine correct code.
Quoted 7 lines
-
uint32_tirq_mask=RADEON_SW_INT_TEST;
-
- if (irqs &AVIVO_DISPLAY_INT_STATUS) {
-*r500_disp_int=RREG32(AVIVO_DISP_INTERRUPT_STATUS);
- if (*r500_disp_int&AVIVO_D1_VBLANK_INTERRUPT) {
-WREG32(AVIVO_D1MODE_VBLANK_STATUS, AVIVO_VBLANK_ACK);
+uint32_tirqs =RREG32(R_000040_GEN_INT_CNTL);
^ this is not doing the same thing at all.
If these auto generated registers are meant to have made life easier I can't see how I'm wasting more time tracking down bugs that weren't there before this, than fixing real problems. I'm about 5 mins from reverting back to just using radeon_reg.h
Dave.