Simplify radeon MC setup
Subsystems (2)
Ok so here his a new stab a simplifying the MC setup. I am pretty sure i didn't broke or change in fundamental way how we setup MC. See that i left untouch the mc_vram_size tweak. Difference is that now we try to place VRAM at the same address as PCI aperture, which should be fine, we might want to relax that on r6xx and after as they the most likely GPU to have 1G or more of VRAM (did anyone know of some X1xxx GPU with more than 1G of VRAM ?)
Now once i am done with radeon & ttm change for unmappable VRAM should be easy to enable just remove couple of VRAM downsizing in r100.c & r600.c.
Sweet bonus this patch as a negative - vs + countline :)
Cheers,
Jerome
------------------------------------------------------------------------------
SOLARIS 10 is the OS for Data Centers - provides features such as DTrace, Predictive Self Healing and Award Winning ZFS. Get Solaris 10 NOW
http://p.sf.net/sfu/solaris-dev2dev
--
PATCH 1/1 drm/radeon/kms: simplify memory controller setup
Get rid of _location and use _start/_end also simplify the computation of vram_start|end & gtt_start|end. From GPU point of view this patch shouldn't change the setup (take as much care as possible to achieve so) except for R7XX & Evergreen as we use the R6XX placement which try to place VRAM on PCI aperture area.
The invert_mapping functionality haven't is delayed to a future patch.
Tested on (compiz,quake3,suspend/resume):
PCI/PCIE:RV280,R420,RV515,RV570,RV610,RV710
AGP:RV100,RV280,R420,RV350,RV620(RPB*),RV730
IGP:RS480(RPB*),RS690,RS780(RPB*),RS880
RPB: resume previously broken
--- drivers/gpu/drm/radeon/evergreen.c | 51 ++------- drivers/gpu/drm/radeon/r100.c | 91 +++++----------- drivers/gpu/drm/radeon/r300.c | 27 +++-- drivers/gpu/drm/radeon/r420.c | 36 ++----- drivers/gpu/drm/radeon/r520.c | 20 ++-- drivers/gpu/drm/radeon/r600.c | 126 ++++++++++++---------- drivers/gpu/drm/radeon/radeon.h | 13 ++- drivers/gpu/drm/radeon/radeon_agp.c | 4 + drivers/gpu/drm/radeon/radeon_device.c | 155 +++++++++++++++----------- drivers/gpu/drm/radeon/radeon_fb.c | 2 +- drivers/gpu/drm/radeon/radeon_legacy_crtc.c | 2 +- drivers/gpu/drm/radeon/radeon_test.c | 2 +- drivers/gpu/drm/radeon/radeon_ttm.c | 12 +- drivers/gpu/drm/radeon/rs400.c | 34 ++----- drivers/gpu/drm/radeon/rs600.c | 42 ++------ drivers/gpu/drm/radeon/rs690.c | 40 ++------ drivers/gpu/drm/radeon/rv515.c | 20 ++-- drivers/gpu/drm/radeon/rv770.c | 41 +------ 18 files changed, 295 insertions(+), 423 deletions(-)
drivers/gpu/drm/radeon/evergreen.c +11 -40
@@ -439,7 +439,6 @@ int evergreen_mc_init(struct radeon_device *rdev)fixed20_12 a;u32 tmp;int chansize, numchan; -int r;/* Get VRAM informations */ rdev->mc.vram_is_ddr = true;
@@ -475,48 +474,12 @@ int evergreen_mc_init(struct radeon_device *rdev)/* size in MB on evergreen */ rdev->mc.mc_vram_size =RREG32 (CONFIG_MEMSIZE ) *1024 *1024 ; rdev->mc.real_vram_size =RREG32 (CONFIG_MEMSIZE ) *1024 *1024 ; - -if (rdev->mc.mc_vram_size > rdev->mc.aper_size) +/* FIXME remove this once we support unmappable VRAM */ +if (rdev->mc.mc_vram_size > rdev->mc.aper_size) { rdev->mc.mc_vram_size = rdev->mc.aper_size; - -if (rdev->mc.real_vram_size > rdev->mc.aper_size) rdev->mc.real_vram_size = rdev->mc.aper_size; - -if (rdev->flags &RADEON_IS_AGP ) { - r =radeon_agp_init (rdev); -if (r) -return r; -/* gtt_size is setup by radeon_agp_init */ - rdev->mc.gtt_location = rdev->mc.agp_base; - tmp =0xFFFFFFFFUL - rdev->mc.agp_base - rdev->mc.gtt_size; -/* Try to put vram before or after AGP because we -* we want SYSTEM_APERTURE to cover both VRAM and -* AGP so that GPU can catch out of VRAM/AGP access -*/ -if (rdev->mc.gtt_location > rdev->mc.mc_vram_size) { -/* Enought place before */ - rdev->mc.vram_location = rdev->mc.gtt_location - - rdev->mc.mc_vram_size; - }else if (tmp > rdev->mc.mc_vram_size) { -/* Enought place after */ - rdev->mc.vram_location = rdev->mc.gtt_location + - rdev->mc.gtt_size; - }else { -/* Try to setup VRAM then AGP might not -* not work on some card -*/ - rdev->mc.vram_location =0x00000000UL ; - rdev->mc.gtt_location = rdev->mc.mc_vram_size; - } - }else { - rdev->mc.vram_location =0x00000000UL ; - rdev->mc.gtt_location = rdev->mc.mc_vram_size; - rdev->mc.gtt_size = radeon_gart_size *1024 *1024 ; } - 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 ; +r600_vram_gtt_location (rdev, &rdev->mc);/* FIXME: we should enforce default clock in case GPU is not in * default setup */
@@ -525,6 +488,7 @@ int evergreen_mc_init(struct radeon_device *rdev) rdev->pm.sclk.full =rfixed_div (rdev->pm.sclk, a);return 0 ; } +int evergreen_gpu_reset (struct radeon_device *rdev) {/* FIXME: implement for evergreen */
@@ -726,6 +690,13 @@ int evergreen_init(struct radeon_device *rdev) r =radeon_fence_driver_init (rdev);if (r)return r; +/* initialize AGP */ +if (rdev->flags &RADEON_IS_AGP ) { + r =radeon_agp_init (rdev); +if (r) +radeon_agp_disable (rdev); + } +/* initialize memory controller */ r =evergreen_mc_init (rdev);if (r)return r;
drivers/gpu/drm/radeon/r100.c +30 -61
151 lines not on this page · raw message
drivers/gpu/drm/radeon/r300.c +15 -12
@@ -121,15 +121,15 @@ int rv370_pcie_gart_enable(struct radeon_device *rdev)/* discard memory request outside of configured range */ tmp =RADEON_PCIE_TX_GART_UNMAPPED_ACCESS_DISCARD ;WREG32_PCIE (RADEON_PCIE_TX_GART_CNTL , tmp); -WREG32_PCIE (RADEON_PCIE_TX_GART_START_LO , rdev->mc.gtt_location); - tmp = rdev->mc.gtt_location + rdev->mc.gtt_size -RADEON_GPU_PAGE_SIZE ; +WREG32_PCIE (RADEON_PCIE_TX_GART_START_LO , rdev->mc.gtt_start); + tmp = rdev->mc.gtt_end & ~RADEON_GPU_PAGE_MASK ;WREG32_PCIE (RADEON_PCIE_TX_GART_END_LO , tmp);WREG32_PCIE (RADEON_PCIE_TX_GART_START_HI ,0 );WREG32_PCIE (RADEON_PCIE_TX_GART_END_HI ,0 ); table_addr = rdev->gart.table_addr;WREG32_PCIE (RADEON_PCIE_TX_GART_BASE , table_addr);/* FIXME: setup default page */ -WREG32_PCIE (RADEON_PCIE_TX_DISCARD_RD_ADDR_LO , rdev->mc.vram_location); +WREG32_PCIE (RADEON_PCIE_TX_DISCARD_RD_ADDR_LO , rdev->mc.vram_start);WREG32_PCIE (RADEON_PCIE_TX_DISCARD_RD_ADDR_HI ,0 );/* Clear error */ WREG32_PCIE (0x18 ,0 );
@@ -503,13 +503,12 @@ int r300_gpu_reset(struct radeon_device *rdev)/* * r300,r350,rv350,rv380 VRAM info */ -void r300_vram_info (struct radeon_device *rdev) +void r300_mc_init (struct radeon_device *rdev) {uint32_t tmp;/* DDR for all card after R300 & IGP */ rdev->mc.vram_is_ddr = true; - tmp =RREG32 (RADEON_MEM_CNTL ); tmp &=R300_MEM_NUM_CHANNELS_MASK ;switch (tmp) {
@@ -518,8 +517,9 @@ void r300_vram_info(struct radeon_device *rdev)case 2 : rdev->mc.vram_width =256 ;break ;default : rdev->mc.vram_width =128 ;break ; } -r100_vram_init_sizes (rdev); +if (!(rdev->flags &RADEON_IS_AGP )) +radeon_gtt_location (rdev, &rdev->mc); }void rv370_set_pcie_lanes (struct radeon_device *rdev,int lanes)
@@ -1421,12 +1421,15 @@ int r300_init(struct radeon_device *rdev)radeon_get_clock_info (rdev->ddev);/* Initialize power management */ radeon_pm_init (rdev); -/* Get vram informations */ -r300_vram_info (rdev); -/* Initialize memory controller (also test AGP) */ - r =r420_mc_init (rdev); -if (r) -return r; +/* initialize AGP */ +if (rdev->flags &RADEON_IS_AGP ) { + r =radeon_agp_init (rdev); +if (r) { +radeon_agp_disable (rdev); + } + } +/* initialize memory controller */ +r300_mc_init (rdev);/* Fence driver */ r =radeon_fence_driver_init (rdev);if (r)
drivers/gpu/drm/radeon/r420.c +8 -28
@@ -40,28 +40,6 @@ static void r420_set_reg_safe(struct radeon_device *rdev) rdev->config.r300.reg_safe_bm_size =ARRAY_SIZE (r420_reg_safe_bm); } -int r420_mc_init (struct radeon_device *rdev) -{ -int r; - -/* Setup GPU memory space */ - rdev->mc.vram_location =0xFFFFFFFFUL ; - rdev->mc.gtt_location =0xFFFFFFFFUL ; -if (rdev->flags &RADEON_IS_AGP ) { - r =radeon_agp_init (rdev); -if (r) { -radeon_agp_disable (rdev); - }else { - rdev->mc.gtt_location = rdev->mc.agp_base; - } - } - r =radeon_mc_setup (rdev); -if (r) { -return r; - } -return 0 ; -} -void r420_pipes_init (struct radeon_device *rdev) {unsigned tmp;
@@ -349,13 +327,15 @@ int r420_init(struct radeon_device *rdev)radeon_get_clock_info (rdev->ddev);/* Initialize power management */ radeon_pm_init (rdev); -/* Get vram informations */ -r300_vram_info (rdev); -/* Initialize memory controller (also test AGP) */ - r =r420_mc_init (rdev); -if (r) { -return r; +/* initialize AGP */ +if (rdev->flags &RADEON_IS_AGP ) { + r =radeon_agp_init (rdev); +if (r) { +radeon_agp_disable (rdev); + } } +/* initialize memory controller */ +r300_mc_init (rdev);r420_debugfs (rdev);/* Fence driver */ r =radeon_fence_driver_init (rdev);
drivers/gpu/drm/radeon/r520.c +12 -8
@@ -119,13 +119,14 @@ static void r520_vram_get_type(struct radeon_device *rdev) rdev->mc.vram_width *=2 ; } -void r520_vram_info (struct radeon_device *rdev) +void r520_mc_init (struct radeon_device *rdev) {fixed20_12 a;r520_vram_get_type (rdev); -r100_vram_init_sizes (rdev); +if (!(rdev->flags &RADEON_IS_AGP )) +radeon_gtt_location (rdev, &rdev->mc);/* FIXME: we should enforce default clock in case GPU is not in * default setup */
@@ -267,12 +268,15 @@ int r520_init(struct radeon_device *rdev)radeon_get_clock_info (rdev->ddev);/* Initialize power management */ radeon_pm_init (rdev); -/* Get vram informations */ -r520_vram_info (rdev); -/* Initialize memory controller (also test AGP) */ - r =r420_mc_init (rdev); -if (r) -return r; +/* initialize AGP */ +if (rdev->flags &RADEON_IS_AGP ) { + r =radeon_agp_init (rdev); +if (r) { +radeon_agp_disable (rdev); + } + } +/* initialize memory controller */ +r520_mc_init (rdev);rv515_debugfs (rdev);/* Fence driver */ r =radeon_fence_driver_init (rdev);
drivers/gpu/drm/radeon/r600.c +68 -58
149 lines not on this page · raw message
drivers/gpu/drm/radeon/radeon.h +7 -6
@@ -282,6 +282,7 @@ union radeon_gart_table { };#define RADEON_GPU_PAGE_SIZE 4096 +#define RADEON_GPU_PAGE_MASK (RADEON_GPU_PAGE_SIZE - 1)struct radeon_gart {dma_addr_t table_addr;
@@ -316,21 +317,19 @@ struct radeon_mc {/* for some chips with <= 32MB we need to lie * about vram size near mc fb location */ u64 mc_vram_size; -u64 gtt_location; +u64 visible_vram_size;u64 gtt_size;u64 gtt_start;u64 gtt_end; -u64 vram_location;u64 vram_start;u64 vram_end;unsigned vram_width;u64 real_vram_size;int vram_mtrr;bool vram_is_ddr; -bool igp_sideport_enabled; +bool igp_sideport_enabled; }; -int radeon_mc_setup (struct radeon_device *rdev);bool radeon_combios_sideport_present (struct radeon_device *rdev);bool radeon_atombios_sideport_present (struct radeon_device *rdev);
@@ -1160,6 +1159,8 @@ extern void radeon_legacy_set_clock_gating(struct radeon_device *rdev, int enablextern void radeon_atom_set_clock_gating (struct radeon_device *rdev,int enable);extern void radeon_ttm_placement_from_domain (struct radeon_bo *rbo,u32 domain);extern bool radeon_ttm_bo_is_radeon_bo (struct ttm_buffer_object *bo); +extern void radeon_vram_location (struct radeon_device *rdev,struct radeon_mc *mc,u64 base); +extern void radeon_gtt_location (struct radeon_device *rdev,struct radeon_mc *mc);/* r100,rv100,rs100,rv200,rs200,r200,rv250,rs300,rv280 */ struct r100_mc_save {
@@ -1214,7 +1215,7 @@ extern void r200_set_safe_registers(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 r300_mc_init (struct radeon_device *rdev);extern void r300_clock_startup (struct radeon_device *rdev);extern int r300_mc_wait_for_idle (struct radeon_device *rdev);extern int rv370_pcie_gart_init (struct radeon_device *rdev);
@@ -1223,7 +1224,6 @@ extern int rv370_pcie_gart_enable(struct radeon_device *rdev);extern void rv370_pcie_gart_disable (struct radeon_device *rdev);/* r420,r423,rv410 */ -extern int r420_mc_init (struct radeon_device *rdev);extern u32 r420_mc_rreg (struct radeon_device *rdev,u32 reg);extern void r420_mc_wreg (struct radeon_device *rdev,u32 reg,u32 v);extern int r420_debugfs_pipes_info_init (struct radeon_device *rdev);
@@ -1265,6 +1265,7 @@ extern void rs690_line_buffer_adjust(struct radeon_device *rdev, struct drm_display_mode *mode2);/* r600, rv610, rv630, rv620, rv635, rv670, rs780, rs880 */ +extern void r600_vram_gtt_location (struct radeon_device *rdev,struct radeon_mc *mc);extern bool r600_card_posted (struct radeon_device *rdev);extern void r600_cp_stop (struct radeon_device *rdev);extern void r600_ring_init (struct radeon_device *rdev,unsigned ring_size);
drivers/gpu/drm/radeon/radeon_agp.c +4 -0
@@ -237,6 +237,10 @@ int radeon_agp_init(struct radeon_device *rdev) rdev->mc.agp_base = rdev->ddev->agp->agp_info.aper_base; rdev->mc.gtt_size = rdev->ddev->agp->agp_info.aper_size <<20 ; + rdev->mc.gtt_start = rdev->mc.agp_base; + rdev->mc.gtt_end = rdev->mc.gtt_start + rdev->mc.gtt_size -1 ; +dev_info (rdev->dev,"GTT: %lluM 0x%08llX - 0x%08llX\n" , + rdev->mc.gtt_size >>20 , rdev->mc.gtt_start, rdev->mc.gtt_end);/* workaround some hw issues */ if (rdev->family <CHIP_R200 ) {
drivers/gpu/drm/radeon/radeon_device.c +90 -67
170 lines not on this page · raw message
drivers/gpu/drm/radeon/radeon_fb.c +1 -1
@@ -252,7 +252,7 @@ int radeonfb_create(struct drm_device *dev, info->flags =FBINFO_DEFAULT ; info->fbops = &radeonfb_ops; - tmp = fb_gpuaddr - rdev->mc.vram_location; + tmp = fb_gpuaddr - rdev->mc.vram_start; info->fix.smem_start = rdev->mc.aper_base + tmp; info->fix.smem_len = size; info->screen_base = fbptr;
drivers/gpu/drm/radeon/radeon_legacy_crtc.c +1 -1
@@ -403,7 +403,7 @@ int radeon_crtc_set_base(struct drm_crtc *crtc, int x, int y,/* if scanout was in GTT this really wouldn't work */ /* crtc offset is from display base addr not FB location */ - radeon_crtc->legacy_display_base_addr = rdev->mc.vram_location; + radeon_crtc->legacy_display_base_addr = rdev->mc.vram_start; base -= radeon_crtc->legacy_display_base_addr;
drivers/gpu/drm/radeon/radeon_test.c +1 -1
@@ -186,7 +186,7 @@ void radeon_test_moves(struct radeon_device *rdev)radeon_bo_kunmap (gtt_obj[i]);DRM_INFO ("Tested GTT->VRAM and VRAM->GTT copy for GTT offset 0x%llx\n" , - gtt_addr - rdev->mc.gtt_location); + gtt_addr - rdev->mc.gtt_start); } out_cleanup:
drivers/gpu/drm/radeon/radeon_ttm.c +6 -6
@@ -150,7 +150,7 @@ static int radeon_init_mem_type(struct ttm_bo_device *bdev, uint32_t type, man->default_caching =TTM_PL_FLAG_CACHED ;break ;case TTM_PL_TT : - man->gpu_offset = rdev->mc.gtt_location; + man->gpu_offset = rdev->mc.gtt_start; man->available_caching =TTM_PL_MASK_CACHING ; man->default_caching =TTM_PL_FLAG_CACHED ; man->flags =TTM_MEMTYPE_FLAG_MAPPABLE |TTM_MEMTYPE_FLAG_CMA ;
@@ -180,7 +180,7 @@ static int radeon_init_mem_type(struct ttm_bo_device *bdev, uint32_t type,break ;case TTM_PL_VRAM :/* "On-card" video ram */ - man->gpu_offset = rdev->mc.vram_location; + man->gpu_offset = rdev->mc.vram_start; man->flags =TTM_MEMTYPE_FLAG_FIXED |TTM_MEMTYPE_FLAG_NEEDS_IOREMAP |TTM_MEMTYPE_FLAG_MAPPABLE ;
@@ -262,10 +262,10 @@ static int radeon_move_blit(struct ttm_buffer_object *bo,switch (old_mem->mem_type) {case TTM_PL_VRAM : - old_start += rdev->mc.vram_location; + old_start += rdev->mc.vram_start;break ;case TTM_PL_TT : - old_start += rdev->mc.gtt_location; + old_start += rdev->mc.gtt_start;break ;default :DRM_ERROR ("Unknown placement %d\n" , old_mem->mem_type);
@@ -273,10 +273,10 @@ static int radeon_move_blit(struct ttm_buffer_object *bo, }switch (new_mem->mem_type) {case TTM_PL_VRAM : - new_start += rdev->mc.vram_location; + new_start += rdev->mc.vram_start;break ;case TTM_PL_TT : - new_start += rdev->mc.gtt_location; + new_start += rdev->mc.gtt_start;break ;default :DRM_ERROR ("Unknown placement %d\n" , old_mem->mem_type);
drivers/gpu/drm/radeon/rs400.c +7 -27
@@ -151,9 +151,8 @@ int rs400_gart_enable(struct radeon_device *rdev)WREG32 (RADEON_AGP_BASE ,0xFFFFFFFF );WREG32 (RS480_AGP_BASE_2 ,0 ); } - tmp = rdev->mc.gtt_location + rdev->mc.gtt_size -1 ; - tmp =REG_SET (RS690_MC_AGP_TOP , tmp >>16 ); - tmp |=REG_SET (RS690_MC_AGP_START , rdev->mc.gtt_location >>16 ); + tmp =REG_SET (RS690_MC_AGP_TOP , rdev->mc.gtt_end >>16 ); + tmp |=REG_SET (RS690_MC_AGP_START , rdev->mc.gtt_start >>16 );if ((rdev->family ==CHIP_RS690 ) || (rdev->family ==CHIP_RS740 )) {WREG32_MC (RS690_MCCFG_AGP_LOCATION , tmp); tmp =RREG32 (RADEON_BUS_CNTL ) & ~RS600_BUS_MASTER_DIS ;
@@ -252,14 +251,15 @@ void rs400_gpu_init(struct radeon_device *rdev) } } -void rs400_vram_info (struct radeon_device *rdev) +void rs400_mc_init (struct radeon_device *rdev) {rs400_gart_adjust_size (rdev); + rdev->mc.igp_sideport_enabled =radeon_combios_sideport_present (rdev);/* DDR for all card after R300 & IGP */ rdev->mc.vram_is_ddr = true; rdev->mc.vram_width =128 ; -r100_vram_init_sizes (rdev); +radeon_gtt_location (rdev, &rdev->mc); }uint32_t rs400_mc_rreg (struct radeon_device *rdev,uint32_t reg)
@@ -363,22 +363,6 @@ static int rs400_debugfs_pcie_gart_info_init(struct radeon_device *rdev)#endif } -static int rs400_mc_init (struct radeon_device *rdev) -{ -int r; -u32 tmp; - -/* Setup GPU memory space */ - tmp =RREG32 (R_00015C_NB_TOM ); - rdev->mc.vram_location =G_00015C_MC_FB_START (tmp) <<16 ; - rdev->mc.gtt_location =0xFFFFFFFFUL ; - r =radeon_mc_setup (rdev); - rdev->mc.igp_sideport_enabled =radeon_combios_sideport_present (rdev); -if (r) -return r; -return 0 ; -} -void rs400_mc_program (struct radeon_device *rdev) {struct r100_mc_save save;
@@ -517,12 +501,8 @@ int rs400_init(struct radeon_device *rdev)radeon_get_clock_info (rdev->ddev);/* Initialize power management */ radeon_pm_init (rdev); -/* Get vram informations */ -rs400_vram_info (rdev); -/* Initialize memory controller (also test AGP) */ - r =rs400_mc_init (rdev); -if (r) -return r; +/* initialize memory controller */ +rs400_mc_init (rdev);/* Fence driver */ r =radeon_fence_driver_init (rdev);if (r)
drivers/gpu/drm/radeon/rs600.c +10 -32
67 lines not on this page · raw message
drivers/gpu/drm/radeon/rs690.c +8 -32
@@ -129,27 +129,20 @@ void rs690_pm_info(struct radeon_device *rdev) rdev->pm.sideport_bandwidth.full =rfixed_div (rdev->pm.sideport_bandwidth, tmp); } -void rs690_vram_info (struct radeon_device *rdev) +void rs690_mc_init (struct radeon_device *rdev) {fixed20_12 a; +u64 base;rs400_gart_adjust_size (rdev); - rdev->mc.vram_is_ddr = true; rdev->mc.vram_width =128 ; - rdev->mc.real_vram_size =RREG32 (RADEON_CONFIG_MEMSIZE ); rdev->mc.mc_vram_size = rdev->mc.real_vram_size; - rdev->mc.aper_base =drm_get_resource_start (rdev->ddev,0 ); rdev->mc.aper_size =drm_get_resource_len (rdev->ddev,0 ); - -if (rdev->mc.mc_vram_size > rdev->mc.aper_size) - rdev->mc.mc_vram_size = rdev->mc.aper_size; - -if (rdev->mc.real_vram_size > rdev->mc.aper_size) - rdev->mc.real_vram_size = rdev->mc.aper_size; - + base =RREG32_MC (R_000100_MCCFG_FB_LOCATION ); + base =G_000100_MC_FB_START (base) <<16 ;rs690_pm_info (rdev);/* FIXME: we should enforce default clock in case GPU is not in * default setup
@@ -160,22 +153,9 @@ void rs690_vram_info(struct radeon_device *rdev) a.full =rfixed_const (16 );/* core_bandwidth = sclk(Mhz) * 16 */ rdev->pm.core_bandwidth.full =rfixed_div (rdev->pm.sclk, a); -} - -static int rs690_mc_init (struct radeon_device *rdev) -{ -int r; -u32 tmp; - -/* Setup GPU memory space */ - tmp =RREG32_MC (R_000100_MCCFG_FB_LOCATION ); - rdev->mc.vram_location =G_000100_MC_FB_START (tmp) <<16 ; - rdev->mc.gtt_location =0xFFFFFFFFUL ; - r =radeon_mc_setup (rdev); rdev->mc.igp_sideport_enabled =radeon_atombios_sideport_present (rdev); -if (r) -return r; -return 0 ; +radeon_vram_location (rdev, &rdev->mc, base); +radeon_gtt_location (rdev, &rdev->mc); } void rs690_line_buffer_adjust(struct radeon_device *rdev,
@@ -728,12 +708,8 @@ int rs690_init(struct radeon_device *rdev)radeon_get_clock_info (rdev->ddev);/* Initialize power management */ radeon_pm_init (rdev); -/* Get vram informations */ -rs690_vram_info (rdev); -/* Initialize memory controller (also test AGP) */ - r =rs690_mc_init (rdev); -if (r) -return r; +/* initialize memory controller */ +rs690_mc_init (rdev);rv515_debugfs (rdev);/* Fence driver */ r =radeon_fence_driver_init (rdev);
drivers/gpu/drm/radeon/rv515.c +12 -8
@@ -277,13 +277,14 @@ static void rv515_vram_get_type(struct radeon_device *rdev) } } -void rv515_vram_info (struct radeon_device *rdev) +void rv515_mc_init (struct radeon_device *rdev) {fixed20_12 a;rv515_vram_get_type (rdev); -r100_vram_init_sizes (rdev); +if (!(rdev->flags &RADEON_IS_AGP )) +radeon_gtt_location (rdev, &rdev->mc);/* FIXME: we should enforce default clock in case GPU is not in * default setup */
@@ -587,12 +588,15 @@ int rv515_init(struct radeon_device *rdev)radeon_get_clock_info (rdev->ddev);/* Initialize power management */ radeon_pm_init (rdev); -/* Get vram informations */ -rv515_vram_info (rdev); -/* Initialize memory controller (also test AGP) */ - r =r420_mc_init (rdev); -if (r) -return r; +/* initialize AGP */ +if (rdev->flags &RADEON_IS_AGP ) { + r =radeon_agp_init (rdev); +if (r) { +radeon_agp_disable (rdev); + } + } +/* initialize memory controller */ +rv515_mc_init (rdev);rv515_debugfs (rdev);/* Fence driver */ r =radeon_fence_driver_init (rdev);
drivers/gpu/drm/radeon/rv770.c +5 -36
62 lines not on this page · raw message
Signature · 8 lines
1.6.6 ------------------------------------------------------------------------------ SOLARIS 10 is the OS for Data Centers - provides features such as DTrace, Predictive Self Healing and Award Winning ZFS. Get Solaris 10 NOW http://p.sf.net/sfu/solaris-dev2dev --