Rev 2004 | Rev 2007 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 2004 | Rev 2005 | ||
|---|---|---|---|
| Line 714... | Line 714... | ||
| 714 | * can recall function without having locking issues */ |
714 | * can recall function without having locking issues */ |
| 715 | mutex_init(&rdev->cs_mutex); |
715 | mutex_init(&rdev->cs_mutex); |
| 716 | mutex_init(&rdev->ib_pool.mutex); |
716 | mutex_init(&rdev->ib_pool.mutex); |
| 717 | mutex_init(&rdev->cp.mutex); |
717 | mutex_init(&rdev->cp.mutex); |
| 718 | mutex_init(&rdev->dc_hw_i2c_mutex); |
718 | mutex_init(&rdev->dc_hw_i2c_mutex); |
| 719 | // if (rdev->family >= CHIP_R600) |
719 | if (rdev->family >= CHIP_R600) |
| 720 | // spin_lock_init(&rdev->ih.lock); |
720 | spin_lock_init(&rdev->ih.lock); |
| 721 | mutex_init(&rdev->gem.mutex); |
721 | mutex_init(&rdev->gem.mutex); |
| 722 | mutex_init(&rdev->pm.mutex); |
722 | mutex_init(&rdev->pm.mutex); |
| 723 | mutex_init(&rdev->vram_mutex); |
723 | mutex_init(&rdev->vram_mutex); |
| 724 | // rwlock_init(&rdev->fence_drv.lock); |
724 | rwlock_init(&rdev->fence_drv.lock); |
| 725 | INIT_LIST_HEAD(&rdev->gem.objects); |
725 | INIT_LIST_HEAD(&rdev->gem.objects); |
| Line 726... | Line 726... | ||
| 726 | 726 | ||
| 727 | /* Set asic functions */ |
727 | /* Set asic functions */ |
| 728 | r = radeon_asic_init(rdev); |
728 | r = radeon_asic_init(rdev); |
| Line 791... | Line 791... | ||
| 791 | return r; |
791 | return r; |
| 792 | } |
792 | } |
| 793 | // if (radeon_testing) { |
793 | // if (radeon_testing) { |
| 794 | // radeon_test_moves(rdev); |
794 | // radeon_test_moves(rdev); |
| 795 | // } |
795 | // } |
| 796 | // if (radeon_benchmarking) { |
796 | if (radeon_benchmarking) { |
| 797 | // radeon_benchmark(rdev); |
797 | radeon_benchmark(rdev); |
| 798 | // } |
798 | } |
| 799 | return 0; |
799 | return 0; |
| 800 | } |
800 | } |
| Line 801... | Line 801... | ||
| 801 | 801 | ||
| Line 1069... | Line 1069... | ||
| 1069 | 1069 | ||
| Line 1070... | Line 1070... | ||
| 1070 | err = drm_get_dev(&device.pci_dev, ent); |
1070 | err = drm_get_dev(&device.pci_dev, ent); |
| Line 1071... | Line -... | ||
| 1071 | - | ||
| 1072 | rdev = rdisplay->ddev->dev_private; |
- | |
| 1073 | - | ||
| 1074 | // if( (rdev->asic == &r600_asic) || |
- | |
| 1075 | // (rdev->asic == &rv770_asic)) |
- | |
| 1076 | // r600_2D_test(rdev); |
- | |
| 1077 | // else if (rdev->asic != &evergreen_asic) |
1071 | |
| Line 1078... | Line 1072... | ||
| 1078 | // r100_2D_test(rdev); |
1072 | rdev = rdisplay->ddev->dev_private; |
| 1079 | 1073 | ||