Rev 1963 | Rev 2997 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 1963 | Rev 2005 | ||
|---|---|---|---|
| Line 1393... | Line 1393... | ||
| 1393 | r = r100_pci_gart_enable(rdev); |
1393 | r = r100_pci_gart_enable(rdev); |
| 1394 | if (r) |
1394 | if (r) |
| 1395 | return r; |
1395 | return r; |
| 1396 | } |
1396 | } |
| Line -... | Line 1397... | ||
| - | 1397 | ||
| - | 1398 | /* allocate wb buffer */ |
|
| - | 1399 | r = radeon_wb_init(rdev); |
|
| - | 1400 | if (r) |
|
| Line 1397... | Line 1401... | ||
| 1397 | 1401 | return r; |
|
| 1398 | 1402 | ||
| 1399 | /* Enable IRQ */ |
1403 | /* Enable IRQ */ |
| 1400 | // r100_irq_set(rdev); |
1404 | r100_irq_set(rdev); |
| 1401 | rdev->config.r300.hdp_cntl = RREG32(RADEON_HOST_PATH_CNTL); |
1405 | rdev->config.r300.hdp_cntl = RREG32(RADEON_HOST_PATH_CNTL); |
| 1402 | /* 1M ring buffer */ |
1406 | /* 1M ring buffer */ |
| 1403 | r = r100_cp_init(rdev, 1024 * 1024); |
1407 | r = r100_cp_init(rdev, 1024 * 1024); |
| 1404 | if (r) { |
1408 | if (r) { |
| 1405 | dev_err(rdev->dev, "failed initializing CP (%d).\n", r); |
1409 | dev_err(rdev->dev, "failed initializing CP (%d).\n", r); |
| 1406 | return r; |
1410 | return r; |
| 1407 | } |
1411 | } |
| 1408 | // r = r100_ib_init(rdev); |
1412 | r = r100_ib_init(rdev); |
| 1409 | // if (r) { |
1413 | if (r) { |
| 1410 | // dev_err(rdev->dev, "failled initializing IB (%d).\n", r); |
1414 | dev_err(rdev->dev, "failed initializing IB (%d).\n", r); |
| 1411 | // return r; |
1415 | return r; |
| 1412 | // } |
1416 | } |
| Line 1465... | Line 1469... | ||
| 1465 | } |
1469 | } |
| 1466 | } |
1470 | } |
| 1467 | /* initialize memory controller */ |
1471 | /* initialize memory controller */ |
| 1468 | r300_mc_init(rdev); |
1472 | r300_mc_init(rdev); |
| 1469 | /* Fence driver */ |
1473 | /* Fence driver */ |
| 1470 | // r = radeon_fence_driver_init(rdev); |
1474 | r = radeon_fence_driver_init(rdev); |
| 1471 | // if (r) |
1475 | if (r) |
| 1472 | // return r; |
1476 | return r; |
| 1473 | // r = radeon_irq_kms_init(rdev); |
1477 | r = radeon_irq_kms_init(rdev); |
| 1474 | // if (r) |
1478 | if (r) |
| 1475 | // return r; |
1479 | return r; |
| 1476 | /* Memory manager */ |
1480 | /* Memory manager */ |
| 1477 | r = radeon_bo_init(rdev); |
1481 | r = radeon_bo_init(rdev); |
| 1478 | if (r) |
1482 | if (r) |
| 1479 | return r; |
1483 | return r; |
| 1480 | if (rdev->flags & RADEON_IS_PCIE) { |
1484 | if (rdev->flags & RADEON_IS_PCIE) { |