diff options
Diffstat (limited to 'drivers/gpu/drm/radeon/r520.c')
-rw-r--r-- | drivers/gpu/drm/radeon/r520.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/gpu/drm/radeon/r520.c b/drivers/gpu/drm/radeon/r520.c index a555b7b19b48..0f3843b6dac7 100644 --- a/drivers/gpu/drm/radeon/r520.c +++ b/drivers/gpu/drm/radeon/r520.c | |||
@@ -185,7 +185,6 @@ static int r520_startup(struct radeon_device *rdev) | |||
185 | return r; | 185 | return r; |
186 | } | 186 | } |
187 | /* Enable IRQ */ | 187 | /* Enable IRQ */ |
188 | rdev->irq.sw_int = true; | ||
189 | rs600_irq_set(rdev); | 188 | rs600_irq_set(rdev); |
190 | /* 1M ring buffer */ | 189 | /* 1M ring buffer */ |
191 | r = r100_cp_init(rdev, 1024 * 1024); | 190 | r = r100_cp_init(rdev, 1024 * 1024); |
@@ -221,6 +220,8 @@ int r520_resume(struct radeon_device *rdev) | |||
221 | atom_asic_init(rdev->mode_info.atom_context); | 220 | atom_asic_init(rdev->mode_info.atom_context); |
222 | /* Resume clock after posting */ | 221 | /* Resume clock after posting */ |
223 | rv515_clock_startup(rdev); | 222 | rv515_clock_startup(rdev); |
223 | /* Initialize surface registers */ | ||
224 | radeon_surface_init(rdev); | ||
224 | return r520_startup(rdev); | 225 | return r520_startup(rdev); |
225 | } | 226 | } |
226 | 227 | ||
@@ -254,12 +255,17 @@ int r520_init(struct radeon_device *rdev) | |||
254 | RREG32(R_0007C0_CP_STAT)); | 255 | RREG32(R_0007C0_CP_STAT)); |
255 | } | 256 | } |
256 | /* check if cards are posted or not */ | 257 | /* check if cards are posted or not */ |
258 | if (radeon_boot_test_post_card(rdev) == false) | ||
259 | return -EINVAL; | ||
260 | |||
257 | if (!radeon_card_posted(rdev) && rdev->bios) { | 261 | if (!radeon_card_posted(rdev) && rdev->bios) { |
258 | DRM_INFO("GPU not posted. posting now...\n"); | 262 | DRM_INFO("GPU not posted. posting now...\n"); |
259 | atom_asic_init(rdev->mode_info.atom_context); | 263 | atom_asic_init(rdev->mode_info.atom_context); |
260 | } | 264 | } |
261 | /* Initialize clocks */ | 265 | /* Initialize clocks */ |
262 | radeon_get_clock_info(rdev->ddev); | 266 | radeon_get_clock_info(rdev->ddev); |
267 | /* Initialize power management */ | ||
268 | radeon_pm_init(rdev); | ||
263 | /* Get vram informations */ | 269 | /* Get vram informations */ |
264 | r520_vram_info(rdev); | 270 | r520_vram_info(rdev); |
265 | /* Initialize memory controller (also test AGP) */ | 271 | /* Initialize memory controller (also test AGP) */ |
@@ -275,7 +281,7 @@ int r520_init(struct radeon_device *rdev) | |||
275 | if (r) | 281 | if (r) |
276 | return r; | 282 | return r; |
277 | /* Memory manager */ | 283 | /* Memory manager */ |
278 | r = radeon_object_init(rdev); | 284 | r = radeon_bo_init(rdev); |
279 | if (r) | 285 | if (r) |
280 | return r; | 286 | return r; |
281 | r = rv370_pcie_gart_init(rdev); | 287 | r = rv370_pcie_gart_init(rdev); |