hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

radeon: Test for PCI root bus before assuming bus->self 

If we assign a Radeon device to a virtual machine, we can no longer
assume a fixed hardware topology, like the GPU having a parent device.
This patch simply adds a few pci_is_root_bus() tests to avoid passing
a NULL pointer to PCI access functions, allowing the radeon driver to
work in a QEMU 440FX machine with an assigned HD8570 on the emulated
PCI root bus.

Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Alex Williamson 2014-08-27 13:01:35 -06:00 committed by Alex Deucher
parent 0a5f6e9d60
commit 0bd252de78
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/gpu/drm/radeon/cik.c
View File

@ -9563,6 +9563,9 @@ static void cik_pcie_gen3_enable(struct radeon_device *rdev)
int ret, i; int ret, i;
u16 tmp16; u16 tmp16;
if (pci_is_root_bus(rdev->pdev->bus))
return;
if (radeon_pcie_gen2 == 0) if (radeon_pcie_gen2 == 0)
return; return;
@ -9789,7 +9792,8 @@ static void cik_program_aspm(struct radeon_device *rdev)
if (orig != data) if (orig != data)
WREG32_PCIE_PORT(PCIE_LC_LINK_WIDTH_CNTL, data); WREG32_PCIE_PORT(PCIE_LC_LINK_WIDTH_CNTL, data);
if (!disable_clkreq) { if (!disable_clkreq &&
!pci_is_root_bus(rdev->pdev->bus)) {
struct pci_dev *root = rdev->pdev->bus->self; struct pci_dev *root = rdev->pdev->bus->self;
u32 lnkcap; u32 lnkcap;

6
drivers/gpu/drm/radeon/si.c
View File

@ -7188,6 +7188,9 @@ static void si_pcie_gen3_enable(struct radeon_device *rdev)
int ret, i; int ret, i;
u16 tmp16; u16 tmp16;
if (pci_is_root_bus(rdev->pdev->bus))
return;
if (radeon_pcie_gen2 == 0) if (radeon_pcie_gen2 == 0)
return; return;
@ -7465,7 +7468,8 @@ static void si_program_aspm(struct radeon_device *rdev)
if (orig != data) if (orig != data)
WREG32_PIF_PHY1(PB1_PIF_CNTL, data); WREG32_PIF_PHY1(PB1_PIF_CNTL, data);
if (!disable_clkreq) { if (!disable_clkreq &&
!pci_is_root_bus(rdev->pdev->bus)) {
struct pci_dev *root = rdev->pdev->bus->self; struct pci_dev *root = rdev->pdev->bus->self;
u32 lnkcap; u32 lnkcap;