Rev 1986 | Rev 2997 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 1986 | Rev 2005 | ||
|---|---|---|---|
| Line 384... | Line 384... | ||
| 384 | if (rdev->flags & RADEON_IS_PCIE) { |
384 | if (rdev->flags & RADEON_IS_PCIE) { |
| 385 | r = rv370_pcie_gart_enable(rdev); |
385 | r = rv370_pcie_gart_enable(rdev); |
| 386 | if (r) |
386 | if (r) |
| 387 | return r; |
387 | return r; |
| 388 | } |
388 | } |
| - | 389 | ||
| - | 390 | /* allocate wb buffer */ |
|
| - | 391 | r = radeon_wb_init(rdev); |
|
| - | 392 | if (r) |
|
| - | 393 | return r; |
|
| - | 394 | ||
| 389 | /* Enable IRQ */ |
395 | /* Enable IRQ */ |
| 390 | // rs600_irq_set(rdev); |
396 | rs600_irq_set(rdev); |
| 391 | rdev->config.r300.hdp_cntl = RREG32(RADEON_HOST_PATH_CNTL); |
397 | rdev->config.r300.hdp_cntl = RREG32(RADEON_HOST_PATH_CNTL); |
| 392 | /* 1M ring buffer */ |
398 | /* 1M ring buffer */ |
| 393 | r = r100_cp_init(rdev, 1024 * 1024); |
399 | r = r100_cp_init(rdev, 1024 * 1024); |
| 394 | if (r) { |
400 | if (r) { |
| 395 | dev_err(rdev->dev, "failed initializing CP (%d).\n", r); |
401 | dev_err(rdev->dev, "failed initializing CP (%d).\n", r); |
| 396 | return r; |
402 | return r; |
| 397 | } |
403 | } |
| 398 | // r = r100_ib_init(rdev); |
404 | r = r100_ib_init(rdev); |
| 399 | // if (r) { |
405 | if (r) { |
| 400 | // dev_err(rdev->dev, "failled initializing IB (%d).\n", r); |
406 | dev_err(rdev->dev, "failed initializing IB (%d).\n", r); |
| 401 | // return r; |
407 | return r; |
| 402 | // } |
408 | } |
| 403 | return 0; |
409 | return 0; |
| 404 | } |
410 | } |
| Line 405... | Line 411... | ||
| 405 | 411 | ||
| Line 455... | Line 461... | ||
| 455 | } |
461 | } |
| 456 | /* initialize memory controller */ |
462 | /* initialize memory controller */ |
| 457 | rv515_mc_init(rdev); |
463 | rv515_mc_init(rdev); |
| 458 | rv515_debugfs(rdev); |
464 | rv515_debugfs(rdev); |
| 459 | /* Fence driver */ |
465 | /* Fence driver */ |
| 460 | // r = radeon_fence_driver_init(rdev); |
466 | r = radeon_fence_driver_init(rdev); |
| 461 | // if (r) |
467 | if (r) |
| 462 | // return r; |
468 | return r; |
| 463 | // r = radeon_irq_kms_init(rdev); |
469 | r = radeon_irq_kms_init(rdev); |
| 464 | // if (r) |
470 | if (r) |
| 465 | // return r; |
471 | return r; |
| 466 | /* Memory manager */ |
472 | /* Memory manager */ |
| 467 | r = radeon_bo_init(rdev); |
473 | r = radeon_bo_init(rdev); |
| 468 | if (r) |
474 | if (r) |
| 469 | return r; |
475 | return r; |
| 470 | r = rv370_pcie_gart_init(rdev); |
476 | r = rv370_pcie_gart_init(rdev); |