Rev 1403 | Rev 1412 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 1403 | Rev 1404 | ||
|---|---|---|---|
| Line 346... | Line 346... | ||
| 346 | if (rdev->flags & RADEON_IS_PCI) { |
346 | if (rdev->flags & RADEON_IS_PCI) { |
| 347 | r = r100_pci_gart_init(rdev); |
347 | r = r100_pci_gart_init(rdev); |
| 348 | if (r) |
348 | if (r) |
| 349 | return r; |
349 | return r; |
| 350 | } |
350 | } |
| 351 | r300_set_reg_safe(rdev); |
351 | r420_set_reg_safe(rdev); |
| 352 | rdev->accel_working = true; |
352 | rdev->accel_working = true; |
| 353 | r = r420_startup(rdev); |
353 | r = r420_startup(rdev); |
| 354 | if (r) { |
354 | if (r) { |
| 355 | /* Somethings want wront with the accel init stop accel */ |
355 | /* Somethings want wront with the accel init stop accel */ |
| 356 | dev_err(rdev->dev, "Disabling GPU acceleration\n"); |
356 | dev_err(rdev->dev, "Disabling GPU acceleration\n"); |
| Line 361... | Line 361... | ||
| 361 | if (rdev->flags & RADEON_IS_PCIE) |
361 | if (rdev->flags & RADEON_IS_PCIE) |
| 362 | rv370_pcie_gart_fini(rdev); |
362 | rv370_pcie_gart_fini(rdev); |
| 363 | if (rdev->flags & RADEON_IS_PCI) |
363 | if (rdev->flags & RADEON_IS_PCI) |
| 364 | r100_pci_gart_fini(rdev); |
364 | r100_pci_gart_fini(rdev); |
| 365 | // radeon_agp_fini(rdev); |
365 | // radeon_agp_fini(rdev); |
| 366 | // radeon_irq_kms_fini(rdev); |
- | |
| 367 | rdev->accel_working = false; |
366 | rdev->accel_working = false; |
| 368 | } |
367 | } |
| 369 | return 0; |
368 | return 0; |
| 370 | } |
369 | } |