Rev 3764 | Rev 6104 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 3764 | Rev 5078 | ||
|---|---|---|---|
| Line 158... | Line 158... | ||
| 158 | /* ATRM is for the discrete card only */ |
158 | /* ATRM is for the discrete card only */ |
| 159 | if (rdev->flags & RADEON_IS_IGP) |
159 | if (rdev->flags & RADEON_IS_IGP) |
| 160 | return false; |
160 | return false; |
| Line 161... | Line 161... | ||
| 161 | 161 | ||
| 162 | while ((pdev = pci_get_class(PCI_CLASS_DISPLAY_VGA << 8, pdev)) != NULL) { |
162 | while ((pdev = pci_get_class(PCI_CLASS_DISPLAY_VGA << 8, pdev)) != NULL) { |
| 163 | dhandle = DEVICE_ACPI_HANDLE(&pdev->dev); |
163 | dhandle = ACPI_HANDLE(&pdev->dev); |
| 164 | if (!dhandle) |
164 | if (!dhandle) |
| Line 165... | Line 165... | ||
| 165 | continue; |
165 | continue; |
| 166 | 166 | ||
| Line 472... | Line 472... | ||
| 472 | crtc_gen_cntl = RREG32(RADEON_CRTC_GEN_CNTL); |
472 | crtc_gen_cntl = RREG32(RADEON_CRTC_GEN_CNTL); |
| 473 | crtc2_gen_cntl = 0; |
473 | crtc2_gen_cntl = 0; |
| 474 | crtc_ext_cntl = RREG32(RADEON_CRTC_EXT_CNTL); |
474 | crtc_ext_cntl = RREG32(RADEON_CRTC_EXT_CNTL); |
| 475 | fp2_gen_cntl = 0; |
475 | fp2_gen_cntl = 0; |
| Line 476... | Line 476... | ||
| 476 | 476 | ||
| 477 | if (rdev->ddev->pci_device == PCI_DEVICE_ID_ATI_RADEON_QY) { |
477 | if (rdev->ddev->pdev->device == PCI_DEVICE_ID_ATI_RADEON_QY) { |
| 478 | fp2_gen_cntl = RREG32(RADEON_FP2_GEN_CNTL); |
478 | fp2_gen_cntl = RREG32(RADEON_FP2_GEN_CNTL); |
| Line 479... | Line 479... | ||
| 479 | } |
479 | } |
| 480 | 480 | ||
| Line 509... | Line 509... | ||
| 509 | WREG32(RADEON_CRTC_EXT_CNTL, |
509 | WREG32(RADEON_CRTC_EXT_CNTL, |
| 510 | ((crtc_ext_cntl & ~RADEON_CRTC_CRT_ON) | |
510 | ((crtc_ext_cntl & ~RADEON_CRTC_CRT_ON) | |
| 511 | (RADEON_CRTC_SYNC_TRISTAT | |
511 | (RADEON_CRTC_SYNC_TRISTAT | |
| 512 | RADEON_CRTC_DISPLAY_DIS))); |
512 | RADEON_CRTC_DISPLAY_DIS))); |
| Line 513... | Line 513... | ||
| 513 | 513 | ||
| 514 | if (rdev->ddev->pci_device == PCI_DEVICE_ID_ATI_RADEON_QY) { |
514 | if (rdev->ddev->pdev->device == PCI_DEVICE_ID_ATI_RADEON_QY) { |
| 515 | WREG32(RADEON_FP2_GEN_CNTL, (fp2_gen_cntl & ~RADEON_FP2_ON)); |
515 | WREG32(RADEON_FP2_GEN_CNTL, (fp2_gen_cntl & ~RADEON_FP2_ON)); |
| Line 516... | Line 516... | ||
| 516 | } |
516 | } |
| Line 527... | Line 527... | ||
| 527 | WREG32(RADEON_CRTC_GEN_CNTL, crtc_gen_cntl); |
527 | WREG32(RADEON_CRTC_GEN_CNTL, crtc_gen_cntl); |
| 528 | if (!(rdev->flags & RADEON_SINGLE_CRTC)) { |
528 | if (!(rdev->flags & RADEON_SINGLE_CRTC)) { |
| 529 | WREG32(RADEON_CRTC2_GEN_CNTL, crtc2_gen_cntl); |
529 | WREG32(RADEON_CRTC2_GEN_CNTL, crtc2_gen_cntl); |
| 530 | } |
530 | } |
| 531 | WREG32(RADEON_CRTC_EXT_CNTL, crtc_ext_cntl); |
531 | WREG32(RADEON_CRTC_EXT_CNTL, crtc_ext_cntl); |
| 532 | if (rdev->ddev->pci_device == PCI_DEVICE_ID_ATI_RADEON_QY) { |
532 | if (rdev->ddev->pdev->device == PCI_DEVICE_ID_ATI_RADEON_QY) { |
| 533 | WREG32(RADEON_FP2_GEN_CNTL, fp2_gen_cntl); |
533 | WREG32(RADEON_FP2_GEN_CNTL, fp2_gen_cntl); |
| 534 | } |
534 | } |
| 535 | return r; |
535 | return r; |
| 536 | } |
536 | } |
| Line 585... | Line 585... | ||
| 585 | vhdr->PCIFunction != PCI_FUNC(rdev->pdev->devfn) || |
585 | vhdr->PCIFunction != PCI_FUNC(rdev->pdev->devfn) || |
| 586 | vhdr->VendorID != rdev->pdev->vendor || |
586 | vhdr->VendorID != rdev->pdev->vendor || |
| 587 | vhdr->DeviceID != rdev->pdev->device) { |
587 | vhdr->DeviceID != rdev->pdev->device) { |
| 588 | DRM_INFO("ACPI VFCT table is not for this card\n"); |
588 | DRM_INFO("ACPI VFCT table is not for this card\n"); |
| 589 | goto out_unmap; |
589 | goto out_unmap; |
| 590 | }; |
590 | } |
| Line 591... | Line 591... | ||
| 591 | 591 | ||
| 592 | if (vfct->VBIOSImageOffset + sizeof(VFCT_IMAGE_HEADER) + vhdr->ImageLength > tbl_size) { |
592 | if (vfct->VBIOSImageOffset + sizeof(VFCT_IMAGE_HEADER) + vhdr->ImageLength > tbl_size) { |
| 593 | DRM_ERROR("ACPI VFCT image truncated\n"); |
593 | DRM_ERROR("ACPI VFCT image truncated\n"); |
| 594 | goto out_unmap; |
594 | goto out_unmap; |