drm/radeon/kms: convert r4xx to new init path
Subsystems (2)
PATCH 1/1 drm/radeon/kms: convert r4xx to new init path
This convert r4xx to new init path it also fix few bugs.
Signed-off-by Jerome Glisse <[email protected]>
--- drivers/gpu/drm/radeon/r100.c | 114 ++++++++- drivers/gpu/drm/radeon/r100d.h | 471 ++++++++++++++++++++++++++++++++ drivers/gpu/drm/radeon/r300.c | 50 +++- drivers/gpu/drm/radeon/r300d.h | 25 ++ drivers/gpu/drm/radeon/r420.c | 293 ++++++++++++++------ drivers/gpu/drm/radeon/r420d.h | 206 ++++++++++++++ drivers/gpu/drm/radeon/radeon.h | 32 ++- drivers/gpu/drm/radeon/radeon_asic.h | 33 ++- drivers/gpu/drm/radeon/radeon_device.c | 14 +- drivers/gpu/drm/radeon/radeon_ring.c | 2 + 10 files changed, 1119 insertions(+), 121 deletions(-)
drivers/gpu/drm/radeon/r100.c +108 -6
@@ -299,6 +299,17 @@ int r100_irq_set(struct radeon_device *rdev)return 0 ; } +void r100_irq_disable (struct radeon_device *rdev) +{ +u32 tmp; + +WREG32 (R_000040_GEN_INT_CNTL ,0 ); +/* Wait and acknowledge irq */ +mdelay (1 ); + tmp =RREG32 (R_000044_GEN_INT_STATUS ); +WREG32 (R_000044_GEN_INT_STATUS , tmp); +} +static inline uint32_t r100_irq_ack (struct radeon_device *rdev) {uint32_t irqs =RREG32 (RADEON_GEN_INT_STATUS );
@@ -396,14 +407,21 @@ int r100_wb_init(struct radeon_device *rdev)return r; } } -WREG32 (RADEON_SCRATCH_ADDR , rdev->wb.gpu_addr); -WREG32 (RADEON_CP_RB_RPTR_ADDR , rdev->wb.gpu_addr +1024 ); -WREG32 (RADEON_SCRATCH_UMSK ,0xff ); +WREG32 (R_000774_SCRATCH_ADDR , rdev->wb.gpu_addr); +WREG32 (R_00070C_CP_RB_RPTR_ADDR , +S_00070C_RB_RPTR_ADDR ((rdev->wb.gpu_addr +1024 ) >>2 )); +WREG32 (R_000770_SCRATCH_UMSK ,0xff );return 0 ; } +void r100_wb_disable (struct radeon_device *rdev) +{ +WREG32 (R_000770_SCRATCH_UMSK ,0 ); +} +void r100_wb_fini (struct radeon_device *rdev) { +r100_wb_disable (rdev);if (rdev->wb.wb_obj) {radeon_object_kunmap (rdev->wb.wb_obj);radeon_object_unpin (rdev->wb.wb_obj);
@@ -1581,11 +1599,12 @@ static int r100_packet3_check(struct radeon_cs_parser *p,int r100_cs_parse (struct radeon_cs_parser *p) {struct radeon_cs_packet pkt; -struct r100_cs_track track; +struct r100_cs_track *track;int r; -r100_cs_track_clear (p->rdev, &track); - p->track = &track; + track =kzalloc (sizeof (*track),GFP_KERNEL ); +r100_cs_track_clear (p->rdev, track); + p->track = track; do { r = r100_cs_packet_parse(p, &pkt, p->idx); if (r) {
@@ -3085,3 +3104,86 @@ int r100_ib_test(struct radeon_device *rdev)radeon_ib_free (rdev, &ib);return r; } + +void r100_ib_fini (struct radeon_device *rdev) +{ +radeon_ib_pool_fini (rdev); +} + +int r100_ib_init (struct radeon_device *rdev) +{ +int r; + + r =radeon_ib_pool_init (rdev); +if (r) { +dev_err (rdev->dev,"failled initializing IB pool (%d).\n" , r); +r100_ib_fini (rdev); +return r; + } + r =r100_ib_test (rdev); +if (r) { +dev_err (rdev->dev,"failled testing IB (%d).\n" , r); +r100_ib_fini (rdev); +return r; + } +return 0 ; +} + +void r100_mc_stop (struct radeon_device *rdev,struct r100_mc_save *save) +{ +/* Shutdown CP we shouldn't need to do that but better be safe than +* sorry +*/ + rdev->cp.ready = false; +WREG32 (R_000740_CP_CSQ_CNTL ,0 ); + +/* Save few CRTC registers */ + save->GENMO_WT =RREG32 (R_0003C0_GENMO_WT ); + save->CRTC_EXT_CNTL =RREG32 (R_000054_CRTC_EXT_CNTL ); + save->CRTC_GEN_CNTL =RREG32 (R_000050_CRTC_GEN_CNTL ); + save->CUR_OFFSET =RREG32 (R_000260_CUR_OFFSET ); +if (!(rdev->flags &RADEON_SINGLE_CRTC )) { + save->CRTC2_GEN_CNTL =RREG32 (R_0003F8_CRTC2_GEN_CNTL ); + save->CUR2_OFFSET =RREG32 (R_000360_CUR2_OFFSET ); + } + +/* Disable VGA aperture access */ +WREG32 (R_0003C0_GENMO_WT ,C_0003C0_VGA_RAM_EN & save->GENMO_WT); +/* Disable cursor, overlay, crtc */ +WREG32 (R_000260_CUR_OFFSET , save->CUR_OFFSET |S_000260_CUR_LOCK (1 )); +WREG32 (R_000054_CRTC_EXT_CNTL , save->CRTC_EXT_CNTL | +S_000054_CRTC_DISPLAY_DIS (1 )); +WREG32 (R_000050_CRTC_GEN_CNTL , + (C_000050_CRTC_CUR_EN & save->CRTC_GEN_CNTL) | +S_000050_CRTC_DISP_REQ_EN_B (1 )); +WREG32 (R_000420_OV0_SCALE_CNTL , +C_000420_OV0_OVERLAY_EN &RREG32 (R_000420_OV0_SCALE_CNTL )); +WREG32 (R_000260_CUR_OFFSET ,C_000260_CUR_LOCK & save->CUR_OFFSET); +if (!(rdev->flags &RADEON_SINGLE_CRTC )) { +WREG32 (R_000360_CUR2_OFFSET , save->CUR2_OFFSET | +S_000360_CUR2_LOCK (1 )); +WREG32 (R_0003F8_CRTC2_GEN_CNTL , + (C_0003F8_CRTC2_CUR_EN & save->CRTC2_GEN_CNTL) | +S_0003F8_CRTC2_DISPLAY_DIS (1 ) | +S_0003F8_CRTC2_DISP_REQ_EN_B (1 )); +WREG32 (R_000360_CUR2_OFFSET , +C_000360_CUR2_LOCK & save->CUR2_OFFSET); + } +} + +void r100_mc_resume (struct radeon_device *rdev,struct r100_mc_save *save) +{ +/* Update base address for crtc */ +WREG32 (R_00023C_DISPLAY_BASE_ADDR , rdev->mc.vram_location); +if (!(rdev->flags &RADEON_SINGLE_CRTC )) { +WREG32 (R_00033C_CRTC2_DISPLAY_BASE_ADDR , + rdev->mc.vram_location); + } +/* Restore CRTC registers */ +WREG32 (R_0003C0_GENMO_WT , save->GENMO_WT); +WREG32 (R_000054_CRTC_EXT_CNTL , save->CRTC_EXT_CNTL); +WREG32 (R_000050_CRTC_GEN_CNTL , save->CRTC_GEN_CNTL); +if (!(rdev->flags &RADEON_SINGLE_CRTC )) { +WREG32 (R_0003F8_CRTC2_GEN_CNTL , save->CRTC2_GEN_CNTL); + } +}
drivers/gpu/drm/radeon/r100d.h +471 -0
477 lines not on this page · raw message
drivers/gpu/drm/radeon/r300.c +46 -4
66 lines not on this page · raw message
drivers/gpu/drm/radeon/r300d.h +25 -0
@@ -73,4 +73,29 @@#define CP_PACKET0_GET_ONE_REG_WR (h) (((h) >> 15) & 1)#define CP_PACKET3_GET_OPCODE (h) (((h) >> 8) & 0xFF) +/* Registers */ +#define R_000148_MC_FB_LOCATION 0x000148 +#define S_000148_MC_FB_START (x) (((x) & 0xFFFF) << 0) +#define G_000148_MC_FB_START (x) (((x) >> 0) & 0xFFFF) +#define C_000148_MC_FB_START 0xFFFF0000 +#define S_000148_MC_FB_TOP (x) (((x) & 0xFFFF) << 16) +#define G_000148_MC_FB_TOP (x) (((x) >> 16) & 0xFFFF) +#define C_000148_MC_FB_TOP 0x0000FFFF +#define R_00014C_MC_AGP_LOCATION 0x00014C +#define S_00014C_MC_AGP_START (x) (((x) & 0xFFFF) << 0) +#define G_00014C_MC_AGP_START (x) (((x) >> 0) & 0xFFFF) +#define C_00014C_MC_AGP_START 0xFFFF0000 +#define S_00014C_MC_AGP_TOP (x) (((x) & 0xFFFF) << 16) +#define G_00014C_MC_AGP_TOP (x) (((x) >> 16) & 0xFFFF) +#define C_00014C_MC_AGP_TOP 0x0000FFFF +#define R_00015C_AGP_BASE_2 0x00015C +#define S_00015C_AGP_BASE_ADDR_2 (x) (((x) & 0xF) << 0) +#define G_00015C_AGP_BASE_ADDR_2 (x) (((x) >> 0) & 0xF) +#define C_00015C_AGP_BASE_ADDR_2 0xFFFFFFF0 +#define R_000170_AGP_BASE 0x000170 +#define S_000170_AGP_BASE_ADDR (x) (((x) & 0xFFFFFFFF) << 0) +#define G_000170_AGP_BASE_ADDR (x) (((x) >> 0) & 0xFFFFFFFF) +#define C_000170_AGP_BASE_ADDR 0x00000000 + +#endif
drivers/gpu/drm/radeon/r420.c +202 -91
332 lines not on this page · raw message
drivers/gpu/drm/radeon/r420d.h +206 -0
211 lines not on this page · raw message
drivers/gpu/drm/radeon/radeon.h +31 -1
@@ -690,6 +690,7 @@ typedef uint32_t (*radeon_rreg_t)(struct radeon_device*, uint32_t);typedef void (*radeon_wreg_t )(struct radeon_device *,uint32_t ,uint32_t );struct radeon_device { +struct device *dev;struct drm_device *ddev;struct pci_dev *pdev;/* ASIC */
@@ -936,16 +937,45 @@ static inline void radeon_ring_write(struct radeon_device *rdev, uint32_t v)/* Common functions */ int radeon_modeset_init (struct radeon_device *rdev);void radeon_modeset_fini (struct radeon_device *rdev); +extern bool radeon_card_posted (struct radeon_device *rdev);/* r100,rv100,rs100,rv200,rs200,r200,rv250,rs300,rv280 */ -void r100_cp_disable (struct radeon_device *rdev); +struct r100_mc_save { +u32 GENMO_WT; +u32 CRTC_EXT_CNTL; +u32 CRTC_GEN_CNTL; +u32 CRTC2_GEN_CNTL; +u32 CUR_OFFSET; +u32 CUR2_OFFSET; +}; +extern void r100_cp_disable (struct radeon_device *rdev); +extern int r100_cp_init (struct radeon_device *rdev,unsigned ring_size); +extern void r100_cp_fini (struct radeon_device *rdev);void r100_pci_gart_tlb_flush (struct radeon_device *rdev);int r100_pci_gart_enable (struct radeon_device *rdev);void r100_pci_gart_disable (struct radeon_device *rdev);int r100_pci_gart_set_page (struct radeon_device *rdev,int i,uint64_t addr); +extern int r100_debugfs_mc_info_init (struct radeon_device *rdev); +extern int r100_gui_wait_for_idle (struct radeon_device *rdev); +extern void r100_ib_fini (struct radeon_device *rdev); +extern int r100_ib_init (struct radeon_device *rdev); +extern void r100_irq_disable (struct radeon_device *rdev); +extern int r100_irq_set (struct radeon_device *rdev); +extern void r100_mc_stop (struct radeon_device *rdev,struct r100_mc_save *save); +extern void r100_mc_resume (struct radeon_device *rdev,struct r100_mc_save *save); +extern void r100_wb_disable (struct radeon_device *rdev); +extern void r100_wb_fini (struct radeon_device *rdev); +extern int r100_wb_init (struct radeon_device *rdev); + +/* r300,r350,rv350,rv370,rv380 */ +extern void r300_set_reg_safe (struct radeon_device *rdev); +extern void r300_mc_program (struct radeon_device *rdev); +extern void r300_vram_info (struct radeon_device *rdev); +extern void rv370_pcie_gart_disable (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); +extern int r420_debugfs_pipes_info_init (struct radeon_device *rdev);#endif
drivers/gpu/drm/radeon/radeon_asic.h +18 -15
@@ -189,31 +189,34 @@ static struct radeon_asic r300_asic = {/* * r420,r423,rv410 */ -void r420_errata (struct radeon_device *rdev); -void r420_vram_info (struct radeon_device *rdev); -int r420_mc_init (struct radeon_device *rdev); -void r420_mc_fini (struct radeon_device *rdev); +extern int r420_init (struct radeon_device *rdev); +extern void r420_fini (struct radeon_device *rdev); +extern int r420_suspend (struct radeon_device *rdev); +extern int r420_resume (struct radeon_device *rdev);static struct radeon_asic r420_asic = { - .init = &r300_init, - .errata = &r420_errata, - .vram_info = &r420_vram_info, + .init = &r420_init, + .fini = &r420_fini, + .suspend = &r420_suspend, + .resume = &r420_resume, + .errata =NULL , + .vram_info =NULL , .gpu_reset = &r300_gpu_reset, - .mc_init = &r420_mc_init, - .mc_fini = &r420_mc_fini, - .wb_init = &r100_wb_init, - .wb_fini = &r100_wb_fini, + .mc_init =NULL , + .mc_fini =NULL , + .wb_init =NULL , + .wb_fini =NULL , .gart_enable = &r300_gart_enable, .gart_disable = &rv370_pcie_gart_disable, .gart_tlb_flush = &rv370_pcie_gart_tlb_flush, .gart_set_page = &rv370_pcie_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 = &r100_irq_set, .irq_process = &r100_irq_process, .get_vblank_counter = &r100_get_vblank_counter,
drivers/gpu/drm/radeon/radeon_device.c +10 -4
@@ -156,6 +156,10 @@ int radeon_mc_setup(struct radeon_device *rdev) tmp = (tmp + rdev->mc.gtt_size -1 ) & ~(rdev->mc.gtt_size -1 ); rdev->mc.gtt_location = tmp; } + rdev->mc.vram_start = rdev->mc.vram_location; + rdev->mc.vram_end = rdev->mc.vram_location + rdev->mc.mc_vram_size -1 ; + rdev->mc.gtt_start = rdev->mc.gtt_location; + rdev->mc.gtt_end = rdev->mc.gtt_location + rdev->mc.gtt_size -1 ;DRM_INFO ("radeon: VRAM %uM\n" , (unsigned )(rdev->mc.mc_vram_size >>20 )); DRM_INFO("radeon: VRAM from 0x%08X to 0x%08X\n", (unsigned)rdev->mc.vram_location,
@@ -171,7 +175,7 @@ int radeon_mc_setup(struct radeon_device *rdev)/* * GPU helpers function. */ -static bool radeon_card_posted (struct radeon_device *rdev) +bool radeon_card_posted (struct radeon_device *rdev) {uint32_t reg;
@@ -483,6 +487,7 @@ int radeon_device_init(struct radeon_device *rdev,DRM_INFO ("radeon: Initializing kernel modesetting.\n" ); rdev->shutdown = false; + rdev->dev = &pdev->dev; rdev->ddev = ddev; rdev->pdev = pdev; rdev->flags = flags;
@@ -497,6 +502,7 @@ int radeon_device_init(struct radeon_device *rdev,mutex_init (&rdev->ib_pool.mutex);mutex_init (&rdev->cp.mutex);rwlock_init (&rdev->fence_drv.lock); +INIT_LIST_HEAD (&rdev->gem.objects);if (radeon_agpmode ==-1 ) { rdev->flags &= ~RADEON_IS_AGP ;
@@ -763,10 +769,10 @@ int radeon_resume_kms(struct drm_device *dev) }pci_set_master (dev->pdev);/* Reset gpu before posting otherwise ATOM will enter infinite loop */ -if (radeon_gpu_reset (rdev)) { -/* FIXME: what do we want to do here ? */ - }if (!rdev->new_init_path) { +if (radeon_gpu_reset (rdev)) { +/* FIXME: what do we want to do here ? */ + }/* post card */ if (rdev->is_atom_bios) {atom_asic_init (rdev->mode_info.atom_context);
drivers/gpu/drm/radeon/radeon_ring.c +2 -0
@@ -151,6 +151,8 @@ int radeon_ib_pool_init(struct radeon_device *rdev)int i;int r =0 ; +if (rdev->ib_pool.robj) +return 0 ;/* Allocate 1M object buffer */ INIT_LIST_HEAD (&rdev->ib_pool.scheduled_ibs); r = radeon_object_create(rdev, NULL, RADEON_IB_POOL_SIZE*64*1024,
Signature · 1 line
1.6.4.2