Attachment 143133 Details for Bug 109366 – possible fix

[patch] possible fix

0001-drm-radeon-check-if-device-is-root-before-getting-pc.patch (text/plain), 2.21 KB, created by Alex Deucher on 2019-01-15 17:16:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Deucher

Created: 2019-01-15 17:16:12 UTC

Size: 2.21 KB

patch

obsolete

>From 927f223b70a43ae67bdc991cb9302fe8625ada2c Mon Sep 17 00:00:00 2001
>From: Alex Deucher <alexander.deucher@amd.com>
>Date: Tue, 15 Jan 2019 12:05:16 -0500
>Subject: [PATCH] drm/radeon: check if device is root before getting pci speed
> caps
>
>Check if the device is root rather before attempting to see what
>speeds the pcie port supports.  Fixes a crash with pci passthrough
>in a VM.
>
>Bug: https://bugs.freedesktop.org/show_bug.cgi?id=109366
>Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
>---
> drivers/gpu/drm/radeon/ci_dpm.c | 5 +++--
> drivers/gpu/drm/radeon/si_dpm.c | 5 +++--
> 2 files changed, 6 insertions(+), 4 deletions(-)
>
>diff --git a/drivers/gpu/drm/radeon/ci_dpm.c b/drivers/gpu/drm/radeon/ci_dpm.c
>index d587779a80b4..a97294ac96d5 100644
>--- a/drivers/gpu/drm/radeon/ci_dpm.c
>+++ b/drivers/gpu/drm/radeon/ci_dpm.c
>@@ -5676,7 +5676,7 @@ int ci_dpm_init(struct radeon_device *rdev)
> 	u16 data_offset, size;
> 	u8 frev, crev;
> 	struct ci_power_info *pi;
>-	enum pci_bus_speed speed_cap;
>+	enum pci_bus_speed speed_cap = PCI_SPEED_UNKNOWN;
> 	struct pci_dev *root = rdev->pdev->bus->self;
> 	int ret;
> 
>@@ -5685,7 +5685,8 @@ int ci_dpm_init(struct radeon_device *rdev)
> 		return -ENOMEM;
> 	rdev->pm.dpm.priv = pi;
> 
>-	speed_cap = pcie_get_speed_cap(root);
>+	if (!pci_is_root_bus(rdev->pdev->bus))
>+		speed_cap = pcie_get_speed_cap(root);
> 	if (speed_cap == PCI_SPEED_UNKNOWN) {
> 		pi->sys_pcie_mask = 0;
> 	} else {
>diff --git a/drivers/gpu/drm/radeon/si_dpm.c b/drivers/gpu/drm/radeon/si_dpm.c
>index 8fb60b3af015..0a785ef0ab66 100644
>--- a/drivers/gpu/drm/radeon/si_dpm.c
>+++ b/drivers/gpu/drm/radeon/si_dpm.c
>@@ -6899,7 +6899,7 @@ int si_dpm_init(struct radeon_device *rdev)
> 	struct ni_power_info *ni_pi;
> 	struct si_power_info *si_pi;
> 	struct atom_clock_dividers dividers;
>-	enum pci_bus_speed speed_cap;
>+	enum pci_bus_speed speed_cap = PCI_SPEED_UNKNOWN;
> 	struct pci_dev *root = rdev->pdev->bus->self;
> 	int ret;
> 
>@@ -6911,7 +6911,8 @@ int si_dpm_init(struct radeon_device *rdev)
> 	eg_pi = &ni_pi->eg;
> 	pi = &eg_pi->rv7xx;
> 
>-	speed_cap = pcie_get_speed_cap(root);
>+	if (!pci_is_root_bus(rdev->pdev->bus))
>+		speed_cap = pcie_get_speed_cap(root);
> 	if (speed_cap == PCI_SPEED_UNKNOWN) {
> 		si_pi->sys_pcie_mask = 0;
> 	} else {
>-- 
>2.20.1
>

Actions: View | Splinter Review

Attachments on bug 109366: 143131 | 143133

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.