Rev 1179 | Rev 1221 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 1179 | Rev 1182 | ||
|---|---|---|---|
| Line 656... | Line 656... | ||
| 656 | r = radeon_ib_test(rdev); |
656 | r = radeon_ib_test(rdev); |
| 657 | if (r) |
657 | if (r) |
| 658 | return 0; |
658 | return 0; |
| 659 | #endif |
659 | #endif |
| 660 | rdev->accel_working = true; |
660 | rdev->accel_working = true; |
| 661 | r = radeon_modeset_init(rdev); |
- | |
| 662 | } |
661 | } |
| 663 | DRM_INFO("radeon: kernel modesetting successfully initialized.\n"); |
662 | DRM_INFO("radeon: kernel modesetting successfully initialized.\n"); |
| 664 | // if (radeon_testing) { |
663 | // if (radeon_testing) { |
| 665 | // radeon_test_moves(rdev); |
664 | // radeon_test_moves(rdev); |
| 666 | // } |
665 | // } |
| Line 787... | Line 786... | ||
| 787 | int radeon_driver_load_kms(struct drm_device *dev, unsigned long flags) |
786 | int radeon_driver_load_kms(struct drm_device *dev, unsigned long flags) |
| 788 | { |
787 | { |
| 789 | struct radeon_device *rdev; |
788 | struct radeon_device *rdev; |
| 790 | int r; |
789 | int r; |
| Line 791... | Line 790... | ||
| 791 | 790 | ||
| Line 792... | Line 791... | ||
| 792 | dbgprintf("%s\n",__FUNCTION__); |
791 | ENTER(); |
| 793 | 792 | ||
| 794 | rdev = kzalloc(sizeof(struct radeon_device), GFP_KERNEL); |
793 | rdev = kzalloc(sizeof(struct radeon_device), GFP_KERNEL); |
| 795 | if (rdev == NULL) { |
794 | if (rdev == NULL) { |
| Line 805... | Line 804... | ||
| 805 | // flags |= RADEON_IS_PCIE; |
804 | // flags |= RADEON_IS_PCIE; |
| 806 | // } else { |
805 | // } else { |
| 807 | // flags |= RADEON_IS_PCI; |
806 | // flags |= RADEON_IS_PCI; |
| 808 | // } |
807 | // } |
| Line -... | Line 808... | ||
| - | 808 | ||
| - | 809 | /* radeon_device_init should report only fatal error |
|
| - | 810 | * like memory allocation failure or iomapping failure, |
|
| - | 811 | * or memory manager initialization failure, it must |
|
| - | 812 | * properly initialize the GPU MC controller and permit |
|
| - | 813 | * VRAM allocation |
|
| 809 | 814 | */ |
|
| 810 | r = radeon_device_init(rdev, dev, dev->pdev, flags); |
815 | r = radeon_device_init(rdev, dev, dev->pdev, flags); |
| 811 | if (r) { |
816 | if (r) { |
| - | 817 | DRM_ERROR("Fatal error while trying to initialize radeon.\n"); |
|
| - | 818 | return r; |
|
| - | 819 | } |
|
| - | 820 | /* Again modeset_init should fail only on fatal error |
|
| - | 821 | * otherwise it should provide enough functionalities |
|
| - | 822 | * for shadowfb to run |
|
| 812 | dbgprintf("Failed to initialize Radeon, disabling IOCTL\n"); |
823 | */ |
| - | 824 | r = radeon_modeset_init(rdev); |
|
| 813 | // radeon_device_fini(rdev); |
825 | if (r) { |
| 814 | return r; |
826 | return r; |
| 815 | } |
827 | } |
| 816 | return 0; |
828 | return 0; |
| Line 866... | Line 878... | ||
| 866 | 878 | ||
| 867 | // DRM_INFO("Initialized %s %d.%d.%d %s for %s on minor %d\n", |
879 | // DRM_INFO("Initialized %s %d.%d.%d %s for %s on minor %d\n", |
| 868 | // driver->name, driver->major, driver->minor, driver->patchlevel, |
880 | // driver->name, driver->major, driver->minor, driver->patchlevel, |
| Line 869... | Line 881... | ||
| 869 | // driver->date, pci_name(pdev), dev->primary->index); |
881 | // driver->date, pci_name(pdev), dev->primary->index); |
| Line 870... | Line 882... | ||
| 870 | 882 | ||
| Line 871... | Line 883... | ||
| 871 | set_mode(dev, 1024, 768); |
883 | set_mode(dev, 1280, 1024); |
| 872 | 884 | ||