From: Mario Limonciello <mario.limonciello@amd.com>
To: Bjorn Helgaas <bhelgaas@google.com>,
Andreas Noever <andreas.noever@gmail.com>,
Mika Westerberg <mika.westerberg@linux.intel.com>,
"open list:PCI SUBSYSTEM" <linux-pci@vger.kernel.org>,
"open list:THUNDERBOLT DRIVER" <linux-usb@vger.kernel.org>,
"open list:RADEON and AMDGPU DRM DRIVERS"
<amd-gfx@lists.freedesktop.org>,
"open list:DRM DRIVERS" <dri-devel@lists.freedesktop.org>,
"open list:DRM DRIVER FOR NVIDIA GEFORCE/QUADRO GPUS"
<nouveau@lists.freedesktop.org>,
"open list:X86 PLATFORM DRIVERS"
<platform-driver-x86@vger.kernel.org>
Cc: Michael Jamet <michael.jamet@intel.com>,
Yehezkel Bernat <YehezkelShB@gmail.com>,
Alexander.Deucher@amd.com, Lukas Wunner <lukas@wunner.de>,
Mario Limonciello <mario.limonciello@amd.com>
Subject: [PATCH v2 5/9] drm/amd: drop the use of `pci_is_thunderbolt_attached`
Date: Thu, 10 Feb 2022 16:43:25 -0600 [thread overview]
Message-ID: <20220210224329.2793-6-mario.limonciello@amd.com> (raw)
In-Reply-To: <20220210224329.2793-1-mario.limonciello@amd.com>
Currently `pci_is_thunderbolt_attached` is used to indicate a device
is connected externally.
The PCI core now marks such devices as removable and downstream drivers
can use this instead.
Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 2 +-
drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
index 1ebb91db2274..6dbf5753b5be 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
@@ -161,7 +161,7 @@ int amdgpu_driver_load_kms(struct amdgpu_device *adev, unsigned long flags)
(amdgpu_is_atpx_hybrid() ||
amdgpu_has_atpx_dgpu_power_cntl()) &&
((flags & AMD_IS_APU) == 0) &&
- !pci_is_thunderbolt_attached(to_pci_dev(dev->dev)))
+ !dev_is_removable(&adev->pdev->dev))
flags |= AMD_IS_PX;
parent = pci_upstream_bridge(adev->pdev);
diff --git a/drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c b/drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c
index ee7cab37dfd5..2c5d74d836f0 100644
--- a/drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c
+++ b/drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c
@@ -382,7 +382,7 @@ static void nbio_v2_3_enable_aspm(struct amdgpu_device *adev,
data |= NAVI10_PCIE__LC_L0S_INACTIVITY_DEFAULT << PCIE_LC_CNTL__LC_L0S_INACTIVITY__SHIFT;
- if (pci_is_thunderbolt_attached(adev->pdev))
+ if (dev_is_removable(&adev->pdev->dev))
data |= NAVI10_PCIE__LC_L1_INACTIVITY_TBT_DEFAULT << PCIE_LC_CNTL__LC_L1_INACTIVITY__SHIFT;
else
data |= NAVI10_PCIE__LC_L1_INACTIVITY_DEFAULT << PCIE_LC_CNTL__LC_L1_INACTIVITY__SHIFT;
--
2.34.1
WARNING: multiple messages have this Message-ID (diff)
From: Mario Limonciello <mario.limonciello@amd.com>
To: Bjorn Helgaas <bhelgaas@google.com>,
Andreas Noever <andreas.noever@gmail.com>,
Mika Westerberg <mika.westerberg@linux.intel.com>,
"open list:PCI SUBSYSTEM" <linux-pci@vger.kernel.org>,
"open list:THUNDERBOLT DRIVER" <linux-usb@vger.kernel.org>,
"open list:RADEON and AMDGPU DRM DRIVERS"
<amd-gfx@lists.freedesktop.org>,
"open list:DRM DRIVERS" <dri-devel@lists.freedesktop.org>,
"open list:DRM DRIVER FOR NVIDIA GEFORCE/QUADRO GPUS"
<nouveau@lists.freedesktop.org>,
"open list:X86 PLATFORM DRIVERS"
<platform-driver-x86@vger.kernel.org>
Cc: Michael Jamet <michael.jamet@intel.com>,
Yehezkel Bernat <YehezkelShB@gmail.com>,
Lukas Wunner <lukas@wunner.de>, <Alexander.Deucher@amd.com>,
Mario Limonciello <mario.limonciello@amd.com>
Subject: [PATCH v2 5/9] drm/amd: drop the use of `pci_is_thunderbolt_attached`
Date: Thu, 10 Feb 2022 16:43:25 -0600 [thread overview]
Message-ID: <20220210224329.2793-6-mario.limonciello@amd.com> (raw)
In-Reply-To: <20220210224329.2793-1-mario.limonciello@amd.com>
Currently `pci_is_thunderbolt_attached` is used to indicate a device
is connected externally.
The PCI core now marks such devices as removable and downstream drivers
can use this instead.
Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 2 +-
drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
index 1ebb91db2274..6dbf5753b5be 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
@@ -161,7 +161,7 @@ int amdgpu_driver_load_kms(struct amdgpu_device *adev, unsigned long flags)
(amdgpu_is_atpx_hybrid() ||
amdgpu_has_atpx_dgpu_power_cntl()) &&
((flags & AMD_IS_APU) == 0) &&
- !pci_is_thunderbolt_attached(to_pci_dev(dev->dev)))
+ !dev_is_removable(&adev->pdev->dev))
flags |= AMD_IS_PX;
parent = pci_upstream_bridge(adev->pdev);
diff --git a/drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c b/drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c
index ee7cab37dfd5..2c5d74d836f0 100644
--- a/drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c
+++ b/drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c
@@ -382,7 +382,7 @@ static void nbio_v2_3_enable_aspm(struct amdgpu_device *adev,
data |= NAVI10_PCIE__LC_L0S_INACTIVITY_DEFAULT << PCIE_LC_CNTL__LC_L0S_INACTIVITY__SHIFT;
- if (pci_is_thunderbolt_attached(adev->pdev))
+ if (dev_is_removable(&adev->pdev->dev))
data |= NAVI10_PCIE__LC_L1_INACTIVITY_TBT_DEFAULT << PCIE_LC_CNTL__LC_L1_INACTIVITY__SHIFT;
else
data |= NAVI10_PCIE__LC_L1_INACTIVITY_DEFAULT << PCIE_LC_CNTL__LC_L1_INACTIVITY__SHIFT;
--
2.34.1
WARNING: multiple messages have this Message-ID (diff)
From: Mario Limonciello <mario.limonciello@amd.com>
To: Bjorn Helgaas <bhelgaas@google.com>,
Andreas Noever <andreas.noever@gmail.com>,
Mika Westerberg <mika.westerberg@linux.intel.com>,
"open list:PCI SUBSYSTEM" <linux-pci@vger.kernel.org>,
"open list:THUNDERBOLT DRIVER" <linux-usb@vger.kernel.org>,
"open list:RADEON and AMDGPU DRM DRIVERS"
<amd-gfx@lists.freedesktop.org>,
"open list:DRM DRIVERS" <dri-devel@lists.freedesktop.org>,
"open list:DRM DRIVER FOR NVIDIA GEFORCE/QUADRO GPUS"
<nouveau@lists.freedesktop.org>,
"open list:X86 PLATFORM DRIVERS"
<platform-driver-x86@vger.kernel.org>
Cc: Michael Jamet <michael.jamet@intel.com>,
Yehezkel Bernat <YehezkelShB@gmail.com>,
Alexander.Deucher@amd.com,
Mario Limonciello <mario.limonciello@amd.com>
Subject: [Nouveau] [PATCH v2 5/9] drm/amd: drop the use of `pci_is_thunderbolt_attached`
Date: Thu, 10 Feb 2022 16:43:25 -0600 [thread overview]
Message-ID: <20220210224329.2793-6-mario.limonciello@amd.com> (raw)
In-Reply-To: <20220210224329.2793-1-mario.limonciello@amd.com>
Currently `pci_is_thunderbolt_attached` is used to indicate a device
is connected externally.
The PCI core now marks such devices as removable and downstream drivers
can use this instead.
Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 2 +-
drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
index 1ebb91db2274..6dbf5753b5be 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
@@ -161,7 +161,7 @@ int amdgpu_driver_load_kms(struct amdgpu_device *adev, unsigned long flags)
(amdgpu_is_atpx_hybrid() ||
amdgpu_has_atpx_dgpu_power_cntl()) &&
((flags & AMD_IS_APU) == 0) &&
- !pci_is_thunderbolt_attached(to_pci_dev(dev->dev)))
+ !dev_is_removable(&adev->pdev->dev))
flags |= AMD_IS_PX;
parent = pci_upstream_bridge(adev->pdev);
diff --git a/drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c b/drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c
index ee7cab37dfd5..2c5d74d836f0 100644
--- a/drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c
+++ b/drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c
@@ -382,7 +382,7 @@ static void nbio_v2_3_enable_aspm(struct amdgpu_device *adev,
data |= NAVI10_PCIE__LC_L0S_INACTIVITY_DEFAULT << PCIE_LC_CNTL__LC_L0S_INACTIVITY__SHIFT;
- if (pci_is_thunderbolt_attached(adev->pdev))
+ if (dev_is_removable(&adev->pdev->dev))
data |= NAVI10_PCIE__LC_L1_INACTIVITY_TBT_DEFAULT << PCIE_LC_CNTL__LC_L1_INACTIVITY__SHIFT;
else
data |= NAVI10_PCIE__LC_L1_INACTIVITY_DEFAULT << PCIE_LC_CNTL__LC_L1_INACTIVITY__SHIFT;
--
2.34.1
WARNING: multiple messages have this Message-ID (diff)
From: Mario Limonciello <mario.limonciello@amd.com>
To: Bjorn Helgaas <bhelgaas@google.com>,
Andreas Noever <andreas.noever@gmail.com>,
Mika Westerberg <mika.westerberg@linux.intel.com>,
"open list:PCI SUBSYSTEM" <linux-pci@vger.kernel.org>,
"open list:THUNDERBOLT DRIVER" <linux-usb@vger.kernel.org>,
"open list:RADEON and AMDGPU DRM DRIVERS"
<amd-gfx@lists.freedesktop.org>,
"open list:DRM DRIVERS" <dri-devel@lists.freedesktop.org>,
"open list:DRM DRIVER FOR NVIDIA GEFORCE/QUADRO GPUS"
<nouveau@lists.freedesktop.org>,
"open list:X86 PLATFORM DRIVERS"
<platform-driver-x86@vger.kernel.org>
Cc: Michael Jamet <michael.jamet@intel.com>,
Yehezkel Bernat <YehezkelShB@gmail.com>,
Alexander.Deucher@amd.com,
Mario Limonciello <mario.limonciello@amd.com>
Subject: [PATCH v2 5/9] drm/amd: drop the use of `pci_is_thunderbolt_attached`
Date: Thu, 10 Feb 2022 16:43:25 -0600 [thread overview]
Message-ID: <20220210224329.2793-6-mario.limonciello@amd.com> (raw)
In-Reply-To: <20220210224329.2793-1-mario.limonciello@amd.com>
Currently `pci_is_thunderbolt_attached` is used to indicate a device
is connected externally.
The PCI core now marks such devices as removable and downstream drivers
can use this instead.
Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 2 +-
drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
index 1ebb91db2274..6dbf5753b5be 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
@@ -161,7 +161,7 @@ int amdgpu_driver_load_kms(struct amdgpu_device *adev, unsigned long flags)
(amdgpu_is_atpx_hybrid() ||
amdgpu_has_atpx_dgpu_power_cntl()) &&
((flags & AMD_IS_APU) == 0) &&
- !pci_is_thunderbolt_attached(to_pci_dev(dev->dev)))
+ !dev_is_removable(&adev->pdev->dev))
flags |= AMD_IS_PX;
parent = pci_upstream_bridge(adev->pdev);
diff --git a/drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c b/drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c
index ee7cab37dfd5..2c5d74d836f0 100644
--- a/drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c
+++ b/drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c
@@ -382,7 +382,7 @@ static void nbio_v2_3_enable_aspm(struct amdgpu_device *adev,
data |= NAVI10_PCIE__LC_L0S_INACTIVITY_DEFAULT << PCIE_LC_CNTL__LC_L0S_INACTIVITY__SHIFT;
- if (pci_is_thunderbolt_attached(adev->pdev))
+ if (dev_is_removable(&adev->pdev->dev))
data |= NAVI10_PCIE__LC_L1_INACTIVITY_TBT_DEFAULT << PCIE_LC_CNTL__LC_L1_INACTIVITY__SHIFT;
else
data |= NAVI10_PCIE__LC_L1_INACTIVITY_DEFAULT << PCIE_LC_CNTL__LC_L1_INACTIVITY__SHIFT;
--
2.34.1
next prev parent reply other threads:[~2022-02-10 22:44 UTC|newest]
Thread overview: 86+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-10 22:43 [PATCH v2 0/9] Overhaul is_thunderbolt Mario Limonciello
2022-02-10 22:43 ` Mario Limonciello
2022-02-10 22:43 ` [Nouveau] " Mario Limonciello
2022-02-10 22:43 ` Mario Limonciello
2022-02-10 22:43 ` [PATCH v2 1/9] thunderbolt: move definition of PCI_CLASS_SERIAL_USB_USB4 Mario Limonciello
2022-02-10 22:43 ` Mario Limonciello
2022-02-10 22:43 ` [Nouveau] " Mario Limonciello
2022-02-10 22:43 ` Mario Limonciello
2022-02-11 10:13 ` Mika Westerberg
2022-02-11 10:13 ` Mika Westerberg
2022-02-11 10:13 ` [Nouveau] " Mika Westerberg
2022-02-11 10:13 ` Mika Westerberg
2022-02-10 22:43 ` [PATCH v2 2/9] PCI: Move `is_thunderbolt` check for lack of command completed to a quirk Mario Limonciello
2022-02-10 22:43 ` Mario Limonciello
2022-02-10 22:43 ` [Nouveau] " Mario Limonciello
2022-02-10 22:43 ` Mario Limonciello
2022-02-10 22:43 ` [PATCH v2 3/9] PCI: drop `is_thunderbolt` attribute Mario Limonciello
2022-02-10 22:43 ` Mario Limonciello
2022-02-10 22:43 ` [Nouveau] " Mario Limonciello
2022-02-10 22:43 ` Mario Limonciello
2022-02-11 10:23 ` Mika Westerberg
2022-02-11 10:23 ` Mika Westerberg
2022-02-11 10:23 ` [Nouveau] " Mika Westerberg
2022-02-11 10:23 ` Mika Westerberg
2022-02-11 19:37 ` Limonciello, Mario
2022-02-11 19:37 ` Limonciello, Mario
2022-02-11 19:37 ` [Nouveau] " Limonciello, Mario
2022-02-11 19:37 ` Limonciello, Mario
2022-02-13 8:39 ` Lukas Wunner
2022-02-13 8:39 ` [Nouveau] " Lukas Wunner
2022-02-13 8:39 ` Lukas Wunner
2022-02-14 6:22 ` Mika Westerberg
2022-02-14 6:22 ` [Nouveau] " Mika Westerberg
2022-02-14 6:22 ` Mika Westerberg
2022-02-10 22:43 ` [PATCH v2 4/9] PCI: mark USB4 devices as removable Mario Limonciello
2022-02-10 22:43 ` Mario Limonciello
2022-02-10 22:43 ` [Nouveau] " Mario Limonciello
2022-02-10 22:43 ` Mario Limonciello
2022-02-11 1:28 ` Macpaul Lin
2022-02-11 1:28 ` Macpaul Lin
2022-02-11 1:28 ` [Nouveau] " Macpaul Lin
2022-02-11 1:28 ` Macpaul Lin
2022-02-11 10:35 ` Mika Westerberg
2022-02-11 10:35 ` Mika Westerberg
2022-02-11 10:35 ` [Nouveau] " Mika Westerberg
2022-02-11 10:35 ` Mika Westerberg
2022-02-11 19:36 ` Limonciello, Mario
2022-02-11 19:36 ` Limonciello, Mario
2022-02-11 19:36 ` [Nouveau] " Limonciello, Mario
2022-02-11 19:36 ` Limonciello, Mario
2022-02-10 22:43 ` Mario Limonciello [this message]
2022-02-10 22:43 ` [PATCH v2 5/9] drm/amd: drop the use of `pci_is_thunderbolt_attached` Mario Limonciello
2022-02-10 22:43 ` [Nouveau] " Mario Limonciello
2022-02-10 22:43 ` Mario Limonciello
2022-02-11 1:31 ` Macpaul Lin
2022-02-11 1:31 ` Macpaul Lin
2022-02-11 1:31 ` [Nouveau] " Macpaul Lin
2022-02-11 1:31 ` Macpaul Lin
2022-02-10 22:43 ` [PATCH v2 6/9] drm/nouveau: " Mario Limonciello
2022-02-10 22:43 ` Mario Limonciello
2022-02-10 22:43 ` [Nouveau] " Mario Limonciello
2022-02-10 22:43 ` Mario Limonciello
2022-02-10 22:43 ` [PATCH v2 7/9] drm/radeon: " Mario Limonciello
2022-02-10 22:43 ` Mario Limonciello
2022-02-10 22:43 ` [Nouveau] " Mario Limonciello
2022-02-10 22:43 ` Mario Limonciello
2022-02-10 22:43 ` [PATCH v2 8/9] platform/x86: amd-gmux: " Mario Limonciello
2022-02-10 22:43 ` Mario Limonciello
2022-02-10 22:43 ` [Nouveau] " Mario Limonciello
2022-02-10 22:43 ` Mario Limonciello
2022-02-11 8:45 ` Hans de Goede
2022-02-11 8:45 ` Hans de Goede
2022-02-11 8:45 ` [Nouveau] " Hans de Goede
2022-02-11 8:45 ` Hans de Goede
2022-02-11 9:00 ` Yehezkel Bernat
2022-02-11 9:00 ` Yehezkel Bernat
2022-02-11 9:00 ` [Nouveau] " Yehezkel Bernat
2022-02-11 9:00 ` Yehezkel Bernat
2022-02-11 9:22 ` Hans de Goede
2022-02-11 9:22 ` Hans de Goede
2022-02-11 9:22 ` [Nouveau] " Hans de Goede
2022-02-11 9:22 ` Hans de Goede
2022-02-10 22:43 ` [PATCH v2 9/9] PCI: drop `pci_is_thunderbolt_attached` Mario Limonciello
2022-02-10 22:43 ` Mario Limonciello
2022-02-10 22:43 ` [Nouveau] " Mario Limonciello
2022-02-10 22:43 ` Mario Limonciello
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220210224329.2793-6-mario.limonciello@amd.com \
--to=mario.limonciello@amd.com \
--cc=Alexander.Deucher@amd.com \
--cc=YehezkelShB@gmail.com \
--cc=amd-gfx@lists.freedesktop.org \
--cc=andreas.noever@gmail.com \
--cc=bhelgaas@google.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-pci@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=lukas@wunner.de \
--cc=michael.jamet@intel.com \
--cc=mika.westerberg@linux.intel.com \
--cc=nouveau@lists.freedesktop.org \
--cc=platform-driver-x86@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.