Rev 1123 | Rev 1126 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 1123 | Rev 1125 | ||
---|---|---|---|
Line 35... | Line 35... | ||
35 | #include "radeon_asic.h" |
35 | #include "radeon_asic.h" |
36 | #include "atom.h" |
36 | #include "atom.h" |
Line 37... | Line 37... | ||
37 | 37 | ||
Line 38... | Line -... | ||
38 | #include |
- | |
39 | 38 | #include |
|
40 | int radeon_modeset = -1; |
39 | |
41 | int radeon_dynclks = -1; |
40 | int radeon_dynclks = -1; |
42 | int radeon_r4xx_atom = 0; |
- | |
43 | int radeon_agpmode = 0; |
41 | int radeon_r4xx_atom = 0; |
44 | int radeon_vram_limit = 0; |
42 | int radeon_agpmode = -1; |
45 | int radeon_gart_size = 512; /* default gart size */ |
43 | int radeon_gart_size = 512; /* default gart size */ |
Line 515... | Line 513... | ||
515 | /* Set asic functions */ |
513 | /* Set asic functions */ |
516 | r = radeon_asic_init(rdev); |
514 | r = radeon_asic_init(rdev); |
517 | if (r) { |
515 | if (r) { |
518 | return r; |
516 | return r; |
519 | } |
517 | } |
520 | // r = radeon_init(rdev); |
- | |
Line 521... | Line 518... | ||
521 | 518 | ||
Line 522... | Line 519... | ||
522 | r = rdev->asic->init(rdev); |
519 | r = rdev->asic->init(rdev); |
523 | 520 | ||
Line 637... | Line 634... | ||
637 | 634 | ||
638 | /* 1M ring buffer */ |
635 | /* 1M ring buffer */ |
639 | if (!r) { |
636 | if (!r) { |
640 | r = radeon_cp_init(rdev, 1024 * 1024); |
637 | r = radeon_cp_init(rdev, 1024 * 1024); |
641 | } |
638 | } |
642 | if (!r) { |
639 | // if (!r) { |
643 | r = radeon_wb_init(rdev); |
640 | // r = radeon_wb_init(rdev); |
644 | if (r) { |
641 | // if (r) { |
645 | DRM_ERROR("radeon: failled initializing WB (%d).\n", r); |
642 | // DRM_ERROR("radeon: failled initializing WB (%d).\n", r); |
646 | return r; |
643 | // return r; |
647 | } |
644 | // } |
Line -... | Line 645... | ||
- | 645 | // } |
|
648 | } |
646 | |
649 | 647 | #if 0 |
|
650 | if (!r) { |
648 | if (!r) { |
651 | r = radeon_ib_pool_init(rdev); |
649 | r = radeon_ib_pool_init(rdev); |
652 | if (r) { |
650 | if (r) { |
653 | DRM_ERROR("radeon: failled initializing IB pool (%d).\n", r); |
651 | DRM_ERROR("radeon: failled initializing IB pool (%d).\n", r); |
654 | return r; |
652 | return r; |
655 | } |
- | |
656 | } |
- | |
657 | #if 0 |
653 | } |
658 | 654 | } |
|
659 | if (!r) { |
655 | if (!r) { |
660 | r = radeon_ib_test(rdev); |
656 | r = radeon_ib_test(rdev); |
661 | if (r) { |
657 | if (r) { |
662 | DRM_ERROR("radeon: failled testing IB (%d).\n", r); |
658 | DRM_ERROR("radeon: failled testing IB (%d).\n", r); |
663 | return r; |
659 | return r; |
- | 660 | } |
|
- | 661 | } |
|
664 | } |
662 | #endif |
665 | } |
663 | |
666 | ret = r; |
664 | ret = r; |
667 | r = radeon_modeset_init(rdev); |
665 | r = radeon_modeset_init(rdev); |
668 | if (r) { |
666 | if (r) { |
669 | return r; |
667 | return r; |
670 | } |
668 | } |
671 | if (rdev->fbdev_rfb && rdev->fbdev_rfb->obj) { |
669 | // if (rdev->fbdev_rfb && rdev->fbdev_rfb->obj) { |
672 | rdev->fbdev_robj = rdev->fbdev_rfb->obj->driver_private; |
670 | // rdev->fbdev_robj = rdev->fbdev_rfb->obj->driver_private; |
673 | } |
671 | // } |
674 | if (!ret) { |
672 | if (!ret) { |
675 | DRM_INFO("radeon: kernel modesetting successfully initialized.\n"); |
673 | DRM_INFO("radeon: kernel modesetting successfully initialized.\n"); |
676 | } |
674 | } |
677 | // if (radeon_benchmarking) { |
675 | // if (radeon_benchmarking) { |
Line 678... | Line -... | ||
678 | // radeon_benchmark(rdev); |
- | |
679 | // } |
- | |
680 | 676 | // radeon_benchmark(rdev); |
|
681 | #endif |
677 | // } |
Line 682... | Line 678... | ||
682 | 678 | ||
683 | return ret; |
679 | return -1; |
684 | } |
680 | } |