Rev 1321 | Rev 1404 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 1321 | Rev 1403 | ||
|---|---|---|---|
| Line 354... | Line 354... | ||
| 354 | /* Setup GPU memory space */ |
354 | /* Setup GPU memory space */ |
| 355 | tmp = RREG32(R_00015C_NB_TOM); |
355 | tmp = RREG32(R_00015C_NB_TOM); |
| 356 | rdev->mc.vram_location = G_00015C_MC_FB_START(tmp) << 16; |
356 | rdev->mc.vram_location = G_00015C_MC_FB_START(tmp) << 16; |
| 357 | rdev->mc.gtt_location = 0xFFFFFFFFUL; |
357 | rdev->mc.gtt_location = 0xFFFFFFFFUL; |
| 358 | r = radeon_mc_setup(rdev); |
358 | r = radeon_mc_setup(rdev); |
| - | 359 | rdev->mc.igp_sideport_enabled = radeon_combios_sideport_present(rdev); |
|
| 359 | if (r) |
360 | if (r) |
| 360 | return r; |
361 | return r; |
| 361 | return 0; |
362 | return 0; |
| 362 | } |
363 | } |
| Line 393... | Line 394... | ||
| 393 | r = rs400_gart_enable(rdev); |
394 | r = rs400_gart_enable(rdev); |
| 394 | if (r) |
395 | if (r) |
| 395 | return r; |
396 | return r; |
| 396 | /* Enable IRQ */ |
397 | /* Enable IRQ */ |
| 397 | // r100_irq_set(rdev); |
398 | // r100_irq_set(rdev); |
| - | 399 | rdev->config.r300.hdp_cntl = RREG32(RADEON_HOST_PATH_CNTL); |
|
| 398 | /* 1M ring buffer */ |
400 | /* 1M ring buffer */ |
| 399 | // r = r100_cp_init(rdev, 1024 * 1024); |
401 | // r = r100_cp_init(rdev, 1024 * 1024); |
| 400 | // if (r) { |
402 | // if (r) { |
| 401 | // dev_err(rdev->dev, "failled initializing CP (%d).\n", r); |
403 | // dev_err(rdev->dev, "failled initializing CP (%d).\n", r); |
| 402 | // return r; |
404 | // return r; |
| Line 450... | Line 452... | ||
| 450 | if (radeon_boot_test_post_card(rdev) == false) |
452 | if (radeon_boot_test_post_card(rdev) == false) |
| 451 | return -EINVAL; |
453 | return -EINVAL; |
| Line 452... | Line 454... | ||
| 452 | 454 | ||
| 453 | /* Initialize clocks */ |
455 | /* Initialize clocks */ |
| - | 456 | radeon_get_clock_info(rdev->ddev); |
|
| - | 457 | /* Initialize power management */ |
|
| 454 | radeon_get_clock_info(rdev->ddev); |
458 | radeon_pm_init(rdev); |
| 455 | /* Get vram informations */ |
459 | /* Get vram informations */ |
| 456 | rs400_vram_info(rdev); |
460 | rs400_vram_info(rdev); |
| 457 | /* Initialize memory controller (also test AGP) */ |
461 | /* Initialize memory controller (also test AGP) */ |
| 458 | r = rs400_mc_init(rdev); |
462 | r = rs400_mc_init(rdev); |