drm/radeon/kms: Remove old init path as no hw use it anymore
Subsystems (2)
PATCH 1/5 drm/radeon/kms: Remove old init path as no hw use it anymore
This remove old init path and allow code cleanup, now all hw use the new init path, see top of radeon.h for description of this.
--- drivers/gpu/drm/radeon/r100.c | 1 - drivers/gpu/drm/radeon/r300.c | 1 - drivers/gpu/drm/radeon/r420.c | 1 - drivers/gpu/drm/radeon/r520.c | 1 - drivers/gpu/drm/radeon/r600.c | 5 +- drivers/gpu/drm/radeon/radeon.h | 26 ----- drivers/gpu/drm/radeon/radeon_asic.h | 138 ------------------------ drivers/gpu/drm/radeon/radeon_device.c | 180 +------------------------------- drivers/gpu/drm/radeon/rs400.c | 1 - drivers/gpu/drm/radeon/rs600.c | 1 - drivers/gpu/drm/radeon/rs690.c | 1 - drivers/gpu/drm/radeon/rv515.c | 1 - drivers/gpu/drm/radeon/rv770.c | 5 +- 13 files changed, 7 insertions(+), 355 deletions(-)
drivers/gpu/drm/radeon/r100.c +0 -1
@@ -3176,7 +3176,6 @@ int r100_init(struct radeon_device *rdev) {int r; - rdev->new_init_path = true;/* Register debugfs file specific to this group of asics */ r100_debugfs (rdev);/* Disable VGA */
drivers/gpu/drm/radeon/r300.c +0 -1
@@ -1275,7 +1275,6 @@ int r300_init(struct radeon_device *rdev) {int r; - rdev->new_init_path = true;/* Disable VGA */ r100_vga_render_disable (rdev);/* Initialize scratch registers */
drivers/gpu/drm/radeon/r420.c +0 -1
@@ -272,7 +272,6 @@ int r420_init(struct radeon_device *rdev) {int r; - rdev->new_init_path = true;/* Initialize scratch registers */ radeon_scratch_init (rdev);/* Initialize surface registers */
drivers/gpu/drm/radeon/r520.c +0 -1
@@ -228,7 +228,6 @@ int r520_init(struct radeon_device *rdev) {int r; - rdev->new_init_path = true;/* Initialize scratch registers */ radeon_scratch_init (rdev);/* Initialize surface registers */
drivers/gpu/drm/radeon/r600.c +2 -3
@@ -1531,7 +1531,7 @@ int r600_resume(struct radeon_device *rdev)return r; } - r =radeon_ib_test (rdev); + r =r600_ib_test (rdev);if (r) {DRM_ERROR ("radeon: failled testing IB (%d).\n" , r);return r;
@@ -1562,7 +1562,6 @@ int r600_init(struct radeon_device *rdev) {int r; - rdev->new_init_path = true; r =radeon_dummy_page_init (rdev);if (r)return r;
@@ -1653,7 +1652,7 @@ int r600_init(struct radeon_device *rdev)DRM_ERROR ("radeon: failled initializing IB pool (%d).\n" , r); rdev->accel_working = false; } - r =radeon_ib_test (rdev); + r =r600_ib_test (rdev);if (r) {DRM_ERROR ("radeon: failled testing IB (%d).\n" , r); rdev->accel_working = false;
drivers/gpu/drm/radeon/radeon.h +0 -26
@@ -590,17 +590,7 @@ struct radeon_asic {void (*fini)(struct radeon_device *rdev);int (*resume)(struct radeon_device *rdev);int (*suspend)(struct radeon_device *rdev); -void (*errata)(struct radeon_device *rdev); -void (*vram_info)(struct radeon_device *rdev);int (*gpu_reset)(struct radeon_device *rdev); -int (*mc_init)(struct radeon_device *rdev); -void (*mc_fini)(struct radeon_device *rdev); -int (*wb_init)(struct radeon_device *rdev); -void (*wb_fini)(struct radeon_device *rdev); -int (*gart_init)(struct radeon_device *rdev); -void (*gart_fini)(struct radeon_device *rdev); -int (*gart_enable)(struct radeon_device *rdev); -void (*gart_disable)(struct radeon_device *rdev);void (*gart_tlb_flush)(struct radeon_device *rdev);int (*gart_set_page)(struct radeon_device *rdev,int i,uint64_t addr);int (*cp_init)(struct radeon_device *rdev,unsigned ring_size);
@@ -610,7 +600,6 @@ struct radeon_asic {void (*ring_start)(struct radeon_device *rdev);int (*ring_test)(struct radeon_device *rdev);void (*ring_ib_execute)(struct radeon_device *rdev,struct radeon_ib *ib); -int (*ib_test)(struct radeon_device *rdev);int (*irq_set)(struct radeon_device *rdev);int (*irq_process)(struct radeon_device *rdev);u32 (*get_vblank_counter)(struct radeon_device *rdev,int crtc);
@@ -788,7 +777,6 @@ struct radeon_device {bool shutdown;bool suspend;bool need_dma32; -bool new_init_path;bool accel_working;struct radeon_surface_reg surface_regs[RADEON_GEM_MAX_SURFACES ];const struct firmware *me_fw;/* all family ME firmware */
@@ -948,27 +936,13 @@ static inline void radeon_ring_write(struct radeon_device *rdev, uint32_t v)#define radeon_resume (rdev) (rdev)->asic->resume((rdev))#define radeon_suspend (rdev) (rdev)->asic->suspend((rdev))#define radeon_cs_parse (p) rdev->asic->cs_parse((p)) -#define radeon_errata (rdev) (rdev)->asic->errata((rdev)) -#define radeon_vram_info (rdev) (rdev)->asic->vram_info((rdev))#define radeon_gpu_reset (rdev) (rdev)->asic->gpu_reset((rdev)) -#define radeon_mc_init (rdev) (rdev)->asic->mc_init((rdev)) -#define radeon_mc_fini (rdev) (rdev)->asic->mc_fini((rdev)) -#define radeon_wb_init (rdev) (rdev)->asic->wb_init((rdev)) -#define radeon_wb_fini (rdev) (rdev)->asic->wb_fini((rdev)) -#define radeon_gpu_gart_init (rdev) (rdev)->asic->gart_init((rdev)) -#define radeon_gpu_gart_fini (rdev) (rdev)->asic->gart_fini((rdev)) -#define radeon_gart_enable (rdev) (rdev)->asic->gart_enable((rdev)) -#define radeon_gart_disable (rdev) (rdev)->asic->gart_disable((rdev))#define radeon_gart_tlb_flush (rdev) (rdev)->asic->gart_tlb_flush((rdev))#define radeon_gart_set_page (rdev, i, p) (rdev)->asic->gart_set_page((rdev), (i), (p)) -#define radeon_cp_init (rdev,rsize) (rdev)->asic->cp_init((rdev), (rsize)) -#define radeon_cp_fini (rdev) (rdev)->asic->cp_fini((rdev)) -#define radeon_cp_disable (rdev) (rdev)->asic->cp_disable((rdev))#define radeon_cp_commit (rdev) (rdev)->asic->cp_commit((rdev))#define radeon_ring_start (rdev) (rdev)->asic->ring_start((rdev))#define radeon_ring_test (rdev) (rdev)->asic->ring_test((rdev))#define radeon_ring_ib_execute (rdev, ib) (rdev)->asic->ring_ib_execute((rdev), (ib)) -#define radeon_ib_test (rdev) (rdev)->asic->ib_test((rdev))#define radeon_irq_set (rdev) (rdev)->asic->irq_set((rdev))#define radeon_irq_process (rdev) (rdev)->asic->irq_process((rdev))#define radeon_get_vblank_counter (rdev, crtc) (rdev)->asic->get_vblank_counter((rdev), (crtc))
drivers/gpu/drm/radeon/radeon_asic.h +0 -138
286 lines not on this page · raw message
drivers/gpu/drm/radeon/radeon_device.c +3 -177
231 lines not on this page · raw message
drivers/gpu/drm/radeon/rs400.c +0 -1
@@ -460,7 +460,6 @@ int rs400_init(struct radeon_device *rdev) {int r; - rdev->new_init_path = true;/* Disable VGA */ r100_vga_render_disable (rdev);/* Initialize scratch registers */
drivers/gpu/drm/radeon/rs600.c +0 -1
@@ -439,7 +439,6 @@ int rs600_init(struct radeon_device *rdev) {int r; - rdev->new_init_path = true;/* Disable VGA */ rv515_vga_render_disable (rdev);/* Initialize scratch registers */
drivers/gpu/drm/radeon/rs690.c +0 -1
@@ -672,7 +672,6 @@ int rs690_init(struct radeon_device *rdev) {int r; - rdev->new_init_path = true;/* Disable VGA */ rv515_vga_render_disable (rdev);/* Initialize scratch registers */
drivers/gpu/drm/radeon/rv515.c +0 -1
@@ -553,7 +553,6 @@ int rv515_init(struct radeon_device *rdev) {int r; - rdev->new_init_path = true;/* Initialize scratch registers */ radeon_scratch_init (rdev);/* Initialize surface registers */
drivers/gpu/drm/radeon/rv770.c +2 -3
@@ -915,7 +915,7 @@ int rv770_resume(struct radeon_device *rdev)return r; } - r =radeon_ib_test (rdev); + r =r600_ib_test (rdev);if (r) {DRM_ERROR ("radeon: failled testing IB (%d).\n" , r);return r;
@@ -946,7 +946,6 @@ int rv770_init(struct radeon_device *rdev) {int r; - rdev->new_init_path = true; r =radeon_dummy_page_init (rdev);if (r)return r;
@@ -1034,7 +1033,7 @@ int rv770_init(struct radeon_device *rdev)DRM_ERROR ("radeon: failled initializing IB pool (%d).\n" , r); rdev->accel_working = false; } - r =radeon_ib_test (rdev); + r =r600_ib_test (rdev);if (r) {DRM_ERROR ("radeon: failled testing IB (%d).\n" , r); rdev->accel_working = false;
Signature · 1 line
1.6.4.4
PATCH 2/5 drm/radeon/kms: Fix R600 write back buffer
This split write back buffer handling into 3 functions, wb_fini for cleanup, wb_enable/wb_disable for enabling/disabling write back used for suspend/resume. This should fix potential issue of letting the write back active before suspending. We need to allocate memory in wb_enable because we can only allocate once GART is running.
--- drivers/gpu/drm/radeon/r600.c | 67 +++++++++++++++++++-------------------- drivers/gpu/drm/radeon/radeon.h | 3 +- drivers/gpu/drm/radeon/rv770.c | 8 ++-- 3 files changed, 39 insertions(+), 39 deletions(-)
drivers/gpu/drm/radeon/r600.c +33 -34
@@ -1350,32 +1350,47 @@ int r600_ring_test(struct radeon_device *rdev)return r; } -/* -* Writeback -*/ -int r600_wb_init (struct radeon_device *rdev) +void r600_wb_disable (struct radeon_device *rdev) +{ +WREG32 (SCRATCH_UMSK ,0 ); +if (rdev->wb.wb_obj) { +radeon_object_kunmap (rdev->wb.wb_obj); +radeon_object_unpin (rdev->wb.wb_obj); + } +} + +void r600_wb_fini (struct radeon_device *rdev) +{ +r600_wb_disable (rdev); +if (rdev->wb.wb_obj) { +radeon_object_unref (&rdev->wb.wb_obj); + rdev->wb.wb =NULL ; + rdev->wb.wb_obj =NULL ; + } +} + +int r600_wb_enable (struct radeon_device *rdev) {int r;if (rdev->wb.wb_obj ==NULL ) { - r =radeon_object_create (rdev,NULL ,4096 , - true, -RADEON_GEM_DOMAIN_GTT , - false, &rdev->wb.wb_obj); + r =radeon_object_create (rdev,NULL ,4096 , true, +RADEON_GEM_DOMAIN_GTT , false, &rdev->wb.wb_obj);if (r) { -DRM_ERROR ("radeon: failed to create WB buffer (%d).\n" , r); +dev_warn (rdev->dev,"failed to create WB buffer (%d).\n" , r);return r; } - r =radeon_object_pin (rdev->wb.wb_obj, -RADEON_GEM_DOMAIN_GTT , - &rdev->wb.gpu_addr); + r =radeon_object_pin (rdev->wb.wb_obj,RADEON_GEM_DOMAIN_GTT , + &rdev->wb.gpu_addr);if (r) { -DRM_ERROR ("radeon: failed to pin WB buffer (%d).\n" , r); +dev_warn (rdev->dev,"failed to pin WB buffer (%d).\n" , r); +r600_wb_fini (rdev);return r; } r =radeon_object_kmap (rdev->wb.wb_obj, (void **)&rdev->wb.wb);if (r) { -DRM_ERROR ("radeon: failed to map WB buffer (%d).\n" , r); +dev_warn (rdev->dev,"failed to map WB buffer (%d).\n" , r); +r600_wb_fini (rdev);return r; } }
@@ -1386,21 +1401,6 @@ int r600_wb_init(struct radeon_device *rdev)return 0 ; } -void r600_wb_fini (struct radeon_device *rdev) -{ -if (rdev->wb.wb_obj) { -radeon_object_kunmap (rdev->wb.wb_obj); -radeon_object_unpin (rdev->wb.wb_obj); -radeon_object_unref (&rdev->wb.wb_obj); - rdev->wb.wb =NULL ; - rdev->wb.wb_obj =NULL ; - } -} - - -/* -* CS -*/ void r600_fence_ring_emit (struct radeon_device *rdev,struct radeon_fence *fence) {
@@ -1500,9 +1500,8 @@ int r600_startup(struct radeon_device *rdev) r =r600_cp_resume (rdev);if (r)return r; - r =r600_wb_init (rdev); -if (r) -return r; +/* write back buffer are not vital so don't worry about failure */ +r600_wb_enable (rdev);return 0 ; }
@@ -1539,13 +1538,12 @@ int r600_resume(struct radeon_device *rdev)return r; } -int r600_suspend (struct radeon_device *rdev) {/* FIXME: we should wait for ring to be empty */ r600_cp_stop (rdev); rdev->cp.ready = false; - +r600_wb_disable (rdev);r600_pcie_gart_disable (rdev);/* unpin shaders bo */ radeon_object_unpin (rdev->r600_blit.shader_obj);
@@ -1668,6 +1666,7 @@ void r600_fini(struct radeon_device *rdev)r600_blit_fini (rdev);radeon_ring_fini (rdev); +r600_wb_fini (rdev);r600_pcie_gart_fini (rdev);radeon_gem_fini (rdev);radeon_fence_driver_fini (rdev);
drivers/gpu/drm/radeon/radeon.h +2 -1
@@ -1084,8 +1084,9 @@ extern int r600_pcie_gart_init(struct radeon_device *rdev);extern void r600_pcie_gart_tlb_flush (struct radeon_device *rdev);extern int r600_ib_test (struct radeon_device *rdev);extern int r600_ring_test (struct radeon_device *rdev); -extern int r600_wb_init (struct radeon_device *rdev);extern void r600_wb_fini (struct radeon_device *rdev); +extern int r600_wb_enable (struct radeon_device *rdev); +extern void r600_wb_disable (struct radeon_device *rdev);extern void r600_scratch_init (struct radeon_device *rdev);extern int r600_blit_init (struct radeon_device *rdev);extern void r600_blit_fini (struct radeon_device *rdev);
drivers/gpu/drm/radeon/rv770.c +4 -4
@@ -884,9 +884,8 @@ static int rv770_startup(struct radeon_device *rdev) r =r600_cp_resume (rdev);if (r)return r; - r =r600_wb_init (rdev); -if (r) -return r; +/* write back buffer are not vital so don't worry about failure */ +r600_wb_enable (rdev);return 0 ; }
@@ -929,8 +928,8 @@ int rv770_suspend(struct radeon_device *rdev)/* FIXME: we should wait for ring to be empty */ r700_cp_stop (rdev); rdev->cp.ready = false; +r600_wb_disable (rdev);rv770_pcie_gart_disable (rdev); -/* unpin shaders bo */ radeon_object_unpin (rdev->r600_blit.shader_obj);return 0 ;
@@ -1048,6 +1047,7 @@ void rv770_fini(struct radeon_device *rdev)r600_blit_fini (rdev);radeon_ring_fini (rdev); +r600_wb_fini (rdev);rv770_pcie_gart_fini (rdev);radeon_gem_fini (rdev);radeon_fence_driver_fini (rdev);
Signature · 1 line
1.6.4.4
PATCH 3/5 drm/radeon/kms: Fix R600/RV770 startup path & reset
We were calling reset unconditionaly in the startup path this is bad we need to call GPU reset for a good reason as after reset the GPU is in unknown states. To avoid any more bad things to happen we now also unconditionaly reinitialize the GPU after reset. This patch fix few issues reported by different people regarding KMS & R6XX/RV7XX hw.
--- drivers/gpu/drm/radeon/r600.c | 99 ++++++++++++--------------------------- drivers/gpu/drm/radeon/rv770.c | 72 +++-------------------------- 2 files changed, 39 insertions(+), 132 deletions(-)
drivers/gpu/drm/radeon/r600.c +31 -68
@@ -240,14 +240,9 @@ int r600_mc_wait_for_idle(struct radeon_device *rdev)return -1 ; } -static void r600_mc_resume (struct radeon_device *rdev) +static void r600_mc_program (struct radeon_device *rdev) { -u32 d1vga_control, d2vga_control; -u32 vga_render_control, vga_hdp_control; -u32 d1crtc_control, d2crtc_control; -u32 new_d1grph_primary, new_d1grph_secondary; -u32 new_d2grph_primary, new_d2grph_secondary; -u64 old_vram_start; +struct rv515_mc_save save;u32 tmp;int i, j;
@@ -261,41 +256,12 @@ static void r600_mc_resume(struct radeon_device *rdev) }WREG32 (HDP_REG_COHERENCY_FLUSH_CNTL ,0 ); - d1vga_control =RREG32 (D1VGA_CONTROL ); - d2vga_control =RREG32 (D2VGA_CONTROL ); - vga_render_control =RREG32 (VGA_RENDER_CONTROL ); - vga_hdp_control =RREG32 (VGA_HDP_CONTROL ); - d1crtc_control =RREG32 (D1CRTC_CONTROL ); - d2crtc_control =RREG32 (D2CRTC_CONTROL ); - old_vram_start = (u64)(RREG32 (MC_VM_FB_LOCATION ) &0xFFFF ) <<24 ; - new_d1grph_primary =RREG32 (D1GRPH_PRIMARY_SURFACE_ADDRESS ); - new_d1grph_secondary =RREG32 (D1GRPH_SECONDARY_SURFACE_ADDRESS ); - new_d1grph_primary += rdev->mc.vram_start - old_vram_start; - new_d1grph_secondary += rdev->mc.vram_start - old_vram_start; - new_d2grph_primary =RREG32 (D2GRPH_PRIMARY_SURFACE_ADDRESS ); - new_d2grph_secondary =RREG32 (D2GRPH_SECONDARY_SURFACE_ADDRESS ); - new_d2grph_primary += rdev->mc.vram_start - old_vram_start; - new_d2grph_secondary += rdev->mc.vram_start - old_vram_start; - -/* Stop all video */ -WREG32 (D1VGA_CONTROL ,0 ); -WREG32 (D2VGA_CONTROL ,0 ); -WREG32 (VGA_RENDER_CONTROL ,0 ); -WREG32 (D1CRTC_UPDATE_LOCK ,1 ); -WREG32 (D2CRTC_UPDATE_LOCK ,1 ); -WREG32 (D1CRTC_CONTROL ,0 ); -WREG32 (D2CRTC_CONTROL ,0 ); -WREG32 (D1CRTC_UPDATE_LOCK ,0 ); -WREG32 (D2CRTC_UPDATE_LOCK ,0 ); - -mdelay (1 ); +rv515_mc_stop (rdev, &save);if (r600_mc_wait_for_idle (rdev)) { -printk (KERN_WARNING "[drm] MC not idle !\n" ); +dev_warn (rdev->dev,"Wait for MC idle timedout !\n" ); } - -/* Lockout access through VGA aperture*/ +/* Lockout access through VGA aperture (doesn't exist before R600) */ WREG32 (VGA_HDP_CONTROL ,VGA_MEMORY_DISABLE ); -/* Update configuration */ WREG32 (MC_VM_SYSTEM_APERTURE_LOW_ADDR , rdev->mc.vram_start >>12 );WREG32 (MC_VM_SYSTEM_APERTURE_HIGH_ADDR , (rdev->mc.vram_end -1 ) >>12 );
@@ -315,31 +281,10 @@ static void r600_mc_resume(struct radeon_device *rdev)WREG32 (MC_VM_AGP_TOP ,0x0FFFFFFF );WREG32 (MC_VM_AGP_BOT ,0x0FFFFFFF ); } -WREG32 (D1GRPH_PRIMARY_SURFACE_ADDRESS , new_d1grph_primary); -WREG32 (D1GRPH_SECONDARY_SURFACE_ADDRESS , new_d1grph_secondary); -WREG32 (D2GRPH_PRIMARY_SURFACE_ADDRESS , new_d2grph_primary); -WREG32 (D2GRPH_SECONDARY_SURFACE_ADDRESS , new_d2grph_secondary); -WREG32 (VGA_MEMORY_BASE_ADDRESS , rdev->mc.vram_start); - -/* Unlock host access */ -WREG32 (VGA_HDP_CONTROL , vga_hdp_control); - -mdelay (1 );if (r600_mc_wait_for_idle (rdev)) { -printk (KERN_WARNING "[drm] MC not idle !\n" ); +dev_warn (rdev->dev,"Wait for MC idle timedout !\n" ); } - -/* Restore video state */ -WREG32 (D1CRTC_UPDATE_LOCK ,1 ); -WREG32 (D2CRTC_UPDATE_LOCK ,1 ); -WREG32 (D1CRTC_CONTROL , d1crtc_control); -WREG32 (D2CRTC_CONTROL , d2crtc_control); -WREG32 (D1CRTC_UPDATE_LOCK ,0 ); -WREG32 (D2CRTC_UPDATE_LOCK ,0 ); -WREG32 (D1VGA_CONTROL , d1vga_control); -WREG32 (D2VGA_CONTROL , d2vga_control); -WREG32 (VGA_RENDER_CONTROL , vga_render_control); - +rv515_mc_resume (rdev, &save);/* we need to own VRAM, so turn off the VGA renderer here * to stop it overwriting our objects */ rv515_vga_render_disable (rdev);
@@ -463,6 +408,7 @@ int r600_mc_init(struct radeon_device *rdev)*/ int r600_gpu_soft_reset (struct radeon_device *rdev) { +struct rv515_mc_save save;u32 grbm_busy_mask =S_008010_VC_BUSY (1 ) |S_008010_VGT_BUSY_NO_DMA (1 ) |S_008010_VGT_BUSY (1 ) |S_008010_TA03_BUSY (1 ) | S_008010_TC_BUSY(1) | S_008010_SX_BUSY(1) |
@@ -480,13 +426,21 @@ int r600_gpu_soft_reset(struct radeon_device *rdev)S_008014_CB0_BUSY (1 ) |S_008014_CB1_BUSY (1 ) |S_008014_CB2_BUSY (1 ) |S_008014_CB3_BUSY (1 );u32 srbm_reset =0 ; +u32 tmp; +dev_info (rdev->dev,"GPU softreset (R_008010_GRBM_STATUS=0x%08X " +"R_008014_GRBM_STATUS2=0x%08X)\n" ,RREG32 (R_008010_GRBM_STATUS ), +RREG32 (R_008014_GRBM_STATUS2 )); +rv515_mc_stop (rdev, &save); +if (r600_mc_wait_for_idle (rdev)) { +dev_warn (rdev->dev,"Wait for MC idle timedout !\n" ); + }/* Disable CP parsing/prefetching */ WREG32 (R_0086D8_CP_ME_CNTL ,S_0086D8_CP_ME_HALT (0xff ));/* Check if any of the rendering block is busy and reset it */ if ((RREG32 (R_008010_GRBM_STATUS ) & grbm_busy_mask) || (RREG32 (R_008014_GRBM_STATUS2 ) & grbm2_busy_mask)) { - WREG32(R_008020_GRBM_SOFT_RESET, S_008020_SOFT_RESET_CR(1) | + tmp =S_008020_SOFT_RESET_CR (1 ) |S_008020_SOFT_RESET_DB (1 ) |S_008020_SOFT_RESET_CB (1 ) | S_008020_SOFT_RESET_PA(1) |
@@ -498,14 +452,18 @@ int r600_gpu_soft_reset(struct radeon_device *rdev)S_008020_SOFT_RESET_TC (1 ) |S_008020_SOFT_RESET_TA (1 ) |S_008020_SOFT_RESET_VC (1 ) | - S_008020_SOFT_RESET_VGT(1)); +S_008020_SOFT_RESET_VGT (1 ); +dev_info (rdev->dev,"R_008020_GRBM_SOFT_RESET=0x%08X\n" , tmp); +WREG32 (R_008020_GRBM_SOFT_RESET , tmp); (void )RREG32 (R_008020_GRBM_SOFT_RESET );udelay (50 );WREG32 (R_008020_GRBM_SOFT_RESET ,0 ); (void )RREG32 (R_008020_GRBM_SOFT_RESET ); }/* Reset CP (we always reset CP) */ -WREG32 (R_008020_GRBM_SOFT_RESET ,S_008020_SOFT_RESET_CP (1 )); + tmp =S_008020_SOFT_RESET_CP (1 ); +dev_info (rdev->dev,"R_008020_GRBM_SOFT_RESET=0x%08X\n" , tmp); +WREG32 (R_008020_GRBM_SOFT_RESET , tmp); (void )RREG32 (R_008020_GRBM_SOFT_RESET );udelay (50 );WREG32 (R_008020_GRBM_SOFT_RESET ,0 );
@@ -533,6 +491,7 @@ int r600_gpu_soft_reset(struct radeon_device *rdev) srbm_reset |=S_000E60_SOFT_RESET_RLC (1 );if (G_000E50_SEM_BUSY (RREG32 (R_000E50_SRBM_STATUS ))) srbm_reset |=S_000E60_SOFT_RESET_SEM (1 ); +dev_info (rdev->dev,"R_000E60_SRBM_SOFT_RESET=0x%08X\n" , srbm_reset);WREG32 (R_000E60_SRBM_SOFT_RESET , srbm_reset); (void )RREG32 (R_000E60_SRBM_SOFT_RESET );udelay (50 );
@@ -540,6 +499,11 @@ int r600_gpu_soft_reset(struct radeon_device *rdev) (void )RREG32 (R_000E60_SRBM_SOFT_RESET );/* Wait a little for things to settle down */ udelay (50 ); +/* After reset we need to reinit the asic as GPU often endup in an +* incoherent state. +*/ +atom_asic_init (rdev->mode_info.atom_context); +rv515_mc_resume (rdev, &save);return 0 ; }
@@ -1477,8 +1441,7 @@ int r600_startup(struct radeon_device *rdev) {int r; -r600_gpu_reset (rdev); -r600_mc_resume (rdev); +r600_mc_program (rdev); r =r600_pcie_gart_enable (rdev);if (r)return r;
@@ -1509,7 +1472,7 @@ int r600_resume(struct radeon_device *rdev) {int r; -if (radeon_gpu_reset (rdev)) { +if (r600_gpu_reset (rdev)) {/* FIXME: what do we want to do here ? */ }/* post card */
drivers/gpu/drm/radeon/rv770.c +8 -64
109 lines not on this page · raw message
Signature · 1 line
1.6.4.4
PATCH 4/5 drm/radeon/kms: Fix R600/RV770 disable acceleration path
When acceleration doesn't work we should free associated memory and stop GPU block responsible for hardware acceleration so we don't waste resource or let think one component of the driver that a GPU feature is working/running while it doesn't actualy work.
--- drivers/gpu/drm/radeon/r600.c | 5 +++++ drivers/gpu/drm/radeon/rv770.c | 5 +++++ 2 files changed, 10 insertions(+), 0 deletions(-)
drivers/gpu/drm/radeon/r600.c +5 -0
@@ -1605,6 +1605,11 @@ int r600_init(struct radeon_device *rdev) rdev->flags &= ~RADEON_IS_AGP ;return r600_init (rdev); } +r600_suspend (rdev); +r600_wb_fini (rdev); +radeon_ib_pool_fini (rdev); +radeon_ring_fini (rdev); +r600_pcie_gart_fini (rdev); rdev->accel_working = false; }if (rdev->accel_working) {
drivers/gpu/drm/radeon/rv770.c +5 -0
@@ -968,6 +968,11 @@ int rv770_init(struct radeon_device *rdev) rdev->flags &= ~RADEON_IS_AGP ;return rv770_init (rdev); } +rv770_suspend (rdev); +r600_wb_fini (rdev); +radeon_ib_pool_fini (rdev); +radeon_ring_fini (rdev); +rv770_pcie_gart_fini (rdev); rdev->accel_working = false; }if (rdev->accel_working) {
Signature · 1 line
1.6.4.4
PATCH 5/5 drm/radeon/kms: R600/RV770 remove dead code and print message for wrong BIOS
R600 & RV770 family are all using atombios so remove dead code and print an error message if we fail to find a valid atombios.
--- drivers/gpu/drm/radeon/r600.c | 15 +++++---------- drivers/gpu/drm/radeon/rv770.c | 16 +++++----------- 2 files changed, 10 insertions(+), 21 deletions(-)
drivers/gpu/drm/radeon/r600.c +5 -10
@@ -1476,11 +1476,7 @@ int r600_resume(struct radeon_device *rdev)/* FIXME: what do we want to do here ? */ }/* post card */ -if (rdev->is_atom_bios) { -atom_asic_init (rdev->mode_info.atom_context); - }else { -radeon_combios_asic_init (rdev->ddev); - } +atom_asic_init (rdev->mode_info.atom_context);/* Initialize clocks */ r =radeon_clocks_init (rdev);if (r) {
@@ -1539,8 +1535,10 @@ int r600_init(struct radeon_device *rdev)return -EINVAL ; }/* Must be an ATOMBIOS */ -if (!rdev->is_atom_bios) +if (!rdev->is_atom_bios) { +dev_err (rdev->dev,"Expecting atombios for R600 GPU\n" );return -EINVAL ; + } r =radeon_atombios_init (rdev);if (r)return r;
@@ -1644,10 +1642,7 @@ void r600_fini(struct radeon_device *rdev)radeon_agp_fini (rdev);#endif radeon_object_fini (rdev); -if (rdev->is_atom_bios) -radeon_atombios_fini (rdev); -else -radeon_combios_fini (rdev); +radeon_atombios_fini (rdev);kfree (rdev->bios); rdev->bios =NULL ;radeon_dummy_page_fini (rdev);
drivers/gpu/drm/radeon/rv770.c +5 -11
@@ -841,11 +841,7 @@ int rv770_resume(struct radeon_device *rdev)/* FIXME: what do we want to do here ? */ }/* post card */ -if (rdev->is_atom_bios) { -atom_asic_init (rdev->mode_info.atom_context); - }else { -radeon_combios_asic_init (rdev->ddev); - } +atom_asic_init (rdev->mode_info.atom_context);/* Initialize clocks */ r =radeon_clocks_init (rdev);if (r) {
@@ -902,8 +898,10 @@ int rv770_init(struct radeon_device *rdev)return -EINVAL ; }/* Must be an ATOMBIOS */ -if (!rdev->is_atom_bios) +if (!rdev->is_atom_bios) { +dev_err (rdev->dev,"Expecting atombios for R600 GPU\n" );return -EINVAL ; + } r =radeon_atombios_init (rdev);if (r)return r;
@@ -1006,11 +1004,7 @@ void rv770_fini(struct radeon_device *rdev)radeon_agp_fini (rdev);#endif radeon_object_fini (rdev); -if (rdev->is_atom_bios) { -radeon_atombios_fini (rdev); - }else { -radeon_combios_fini (rdev); - } +radeon_atombios_fini (rdev);kfree (rdev->bios); rdev->bios =NULL ;radeon_dummy_page_fini (rdev);
Signature · 1 line
1.6.4.4