Rev 1128 | Rev 1221 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 1128 | Rev 1179 | ||
---|---|---|---|
Line 65... | Line 65... | ||
65 | if (r600_mc_wait_for_idle(rdev)) { |
65 | if (r600_mc_wait_for_idle(rdev)) { |
66 | printk(KERN_WARNING "Failed to wait MC idle while " |
66 | printk(KERN_WARNING "Failed to wait MC idle while " |
67 | "programming pipes. Bad things might happen.\n"); |
67 | "programming pipes. Bad things might happen.\n"); |
68 | } |
68 | } |
Line 69... | Line 69... | ||
69 | 69 | ||
70 | tmp = rdev->mc.vram_location + rdev->mc.vram_size - 1; |
70 | tmp = rdev->mc.vram_location + rdev->mc.mc_vram_size - 1; |
71 | tmp = REG_SET(R600_MC_FB_TOP, tmp >> 24); |
71 | tmp = REG_SET(R600_MC_FB_TOP, tmp >> 24); |
72 | tmp |= REG_SET(R600_MC_FB_BASE, rdev->mc.vram_location >> 24); |
72 | tmp |= REG_SET(R600_MC_FB_BASE, rdev->mc.vram_location >> 24); |
73 | WREG32(R600_MC_VM_FB_LOCATION, tmp); |
73 | WREG32(R600_MC_VM_FB_LOCATION, tmp); |
74 | tmp = rdev->mc.gtt_location + rdev->mc.gtt_size - 1; |
74 | tmp = rdev->mc.gtt_location + rdev->mc.gtt_size - 1; |
Line 138... | Line 138... | ||
138 | } |
138 | } |
Line 139... | Line 139... | ||
139 | 139 | ||
140 | void r600_vram_info(struct radeon_device *rdev) |
140 | void r600_vram_info(struct radeon_device *rdev) |
141 | { |
141 | { |
142 | r600_vram_get_type(rdev); |
142 | r600_vram_get_type(rdev); |
- | 143 | rdev->mc.real_vram_size = RREG32(R600_CONFIG_MEMSIZE); |
|
Line 143... | Line 144... | ||
143 | rdev->mc.vram_size = RREG32(R600_CONFIG_MEMSIZE); |
144 | rdev->mc.mc_vram_size = rdev->mc.real_vram_size; |
144 | 145 | ||
145 | /* Could aper size report 0 ? */ |
146 | /* Could aper size report 0 ? */ |
146 | rdev->mc.aper_base = drm_get_resource_start(rdev->ddev, 0); |
147 | rdev->mc.aper_base = drm_get_resource_start(rdev->ddev, 0); |