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 613... | Line 613... | ||
| 613 | /* Initialize GART (initialize after TTM so we can allocate |
613 | /* Initialize GART (initialize after TTM so we can allocate |
| 614 | * memory through TTM but finalize after TTM) */ |
614 | * memory through TTM but finalize after TTM) */ |
| 615 | r = rs400_gart_enable(rdev); |
615 | r = rs400_gart_enable(rdev); |
| 616 | if (r) |
616 | if (r) |
| 617 | return r; |
617 | return r; |
| - | 618 | ||
| - | 619 | /* allocate wb buffer */ |
|
| - | 620 | r = radeon_wb_init(rdev); |
|
| - | 621 | if (r) |
|
| - | 622 | return r; |
|
| - | 623 | ||
| 618 | /* Enable IRQ */ |
624 | /* Enable IRQ */ |
| 619 | // rs600_irq_set(rdev); |
625 | rs600_irq_set(rdev); |
| 620 | rdev->config.r300.hdp_cntl = RREG32(RADEON_HOST_PATH_CNTL); |
626 | rdev->config.r300.hdp_cntl = RREG32(RADEON_HOST_PATH_CNTL); |
| 621 | /* 1M ring buffer */ |
627 | /* 1M ring buffer */ |
| 622 | r = r100_cp_init(rdev, 1024 * 1024); |
628 | r = r100_cp_init(rdev, 1024 * 1024); |
| 623 | if (r) { |
629 | if (r) { |
| 624 | dev_err(rdev->dev, "failed initializing CP (%d).\n", r); |
630 | dev_err(rdev->dev, "failed initializing CP (%d).\n", r); |
| 625 | return r; |
631 | return r; |
| 626 | } |
632 | } |
| 627 | // r = r100_ib_init(rdev); |
633 | r = r100_ib_init(rdev); |
| 628 | // if (r) { |
634 | if (r) { |
| 629 | // dev_err(rdev->dev, "failled initializing IB (%d).\n", r); |
635 | dev_err(rdev->dev, "failed initializing IB (%d).\n", r); |
| 630 | // return r; |
636 | return r; |
| 631 | // } |
637 | } |
| 632 | return 0; |
638 | return 0; |
| 633 | } |
639 | } |
| Line 676... | Line 682... | ||
| 676 | radeon_get_clock_info(rdev->ddev); |
682 | radeon_get_clock_info(rdev->ddev); |
| 677 | /* initialize memory controller */ |
683 | /* initialize memory controller */ |
| 678 | rs690_mc_init(rdev); |
684 | rs690_mc_init(rdev); |
| 679 | rv515_debugfs(rdev); |
685 | rv515_debugfs(rdev); |
| 680 | /* Fence driver */ |
686 | /* Fence driver */ |
| 681 | // r = radeon_fence_driver_init(rdev); |
687 | r = radeon_fence_driver_init(rdev); |
| 682 | // if (r) |
688 | if (r) |
| 683 | // return r; |
689 | return r; |
| 684 | // r = radeon_irq_kms_init(rdev); |
690 | r = radeon_irq_kms_init(rdev); |
| 685 | // if (r) |
691 | if (r) |
| 686 | // return r; |
692 | return r; |
| 687 | /* Memory manager */ |
693 | /* Memory manager */ |
| 688 | r = radeon_bo_init(rdev); |
694 | r = radeon_bo_init(rdev); |
| 689 | if (r) |
695 | if (r) |
| 690 | return r; |
696 | return r; |
| 691 | r = rs400_gart_init(rdev); |
697 | r = rs400_gart_init(rdev); |