160,7 → 160,7 |
return false; |
|
while ((pdev = pci_get_class(PCI_CLASS_DISPLAY_VGA << 8, pdev)) != NULL) { |
dhandle = DEVICE_ACPI_HANDLE(&pdev->dev); |
dhandle = ACPI_HANDLE(&pdev->dev); |
if (!dhandle) |
continue; |
|
474,7 → 474,7 |
crtc_ext_cntl = RREG32(RADEON_CRTC_EXT_CNTL); |
fp2_gen_cntl = 0; |
|
if (rdev->ddev->pci_device == PCI_DEVICE_ID_ATI_RADEON_QY) { |
if (rdev->ddev->pdev->device == PCI_DEVICE_ID_ATI_RADEON_QY) { |
fp2_gen_cntl = RREG32(RADEON_FP2_GEN_CNTL); |
} |
|
511,7 → 511,7 |
(RADEON_CRTC_SYNC_TRISTAT | |
RADEON_CRTC_DISPLAY_DIS))); |
|
if (rdev->ddev->pci_device == PCI_DEVICE_ID_ATI_RADEON_QY) { |
if (rdev->ddev->pdev->device == PCI_DEVICE_ID_ATI_RADEON_QY) { |
WREG32(RADEON_FP2_GEN_CNTL, (fp2_gen_cntl & ~RADEON_FP2_ON)); |
} |
|
529,7 → 529,7 |
WREG32(RADEON_CRTC2_GEN_CNTL, crtc2_gen_cntl); |
} |
WREG32(RADEON_CRTC_EXT_CNTL, crtc_ext_cntl); |
if (rdev->ddev->pci_device == PCI_DEVICE_ID_ATI_RADEON_QY) { |
if (rdev->ddev->pdev->device == PCI_DEVICE_ID_ATI_RADEON_QY) { |
WREG32(RADEON_FP2_GEN_CNTL, fp2_gen_cntl); |
} |
return r; |
587,7 → 587,7 |
vhdr->DeviceID != rdev->pdev->device) { |
DRM_INFO("ACPI VFCT table is not for this card\n"); |
goto out_unmap; |
}; |
} |
|
if (vfct->VBIOSImageOffset + sizeof(VFCT_IMAGE_HEADER) + vhdr->ImageLength > tbl_size) { |
DRM_ERROR("ACPI VFCT image truncated\n"); |