drm/amdgpu: move PX checking into amdgpu_device_ip_early_init
Subsystems (3)
PATCH 1/2 drm/amdgpu: move PX checking into amdgpu_device_ip_early_init
From: Alex Deucher <[email protected]>
We need to set the APU flag from IP discovery before we evaluate this code.
Acked-by Evan Quan <[email protected]>
Signed-off-by Alex Deucher <[email protected]>
(cherry picked from commit 901e2be20dc55079997ea1885ea77fc72e6826e7)
Modified nearby headers in 5.16.y/5.15.y since matching header changes didn't happen yet.
Signed-off-by Mario Limonciello <[email protected]>
---
Please apply to both 5.15.y and 5.16.y.
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 13 +++++++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 11 ----------- 2 files changed, 13 insertions(+), 11 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +13 -0
@@ -30,6 +30,7 @@#include <linux/module.h> #include <linux/console.h> #include <linux/slab.h> +#include <linux/pci.h> #include <drm/drm_atomic_helper.h> #include <drm/drm_probe_helper.h>
@@ -2070,6 +2071,8 @@ static int amdgpu_device_parse_gpu_info_fw(struct amdgpu_device *adev)*/ static int amdgpu_device_ip_early_init (struct amdgpu_device *adev) { +struct drm_device *dev =adev_to_drm (adev); +struct pci_dev *parent;int i, r;amdgpu_device_enable_virtual_display (adev);
@@ -2134,6 +2137,16 @@ static int amdgpu_device_ip_early_init(struct amdgpu_device *adev)break ; } +if (amdgpu_has_atpx () && + (amdgpu_is_atpx_hybrid () || +amdgpu_has_atpx_dgpu_power_cntl ()) && + ((adev->flags &AMD_IS_APU ) ==0 ) && + !pci_is_thunderbolt_attached (to_pci_dev (dev->dev))) + adev->flags |=AMD_IS_PX ; + + parent =pci_upstream_bridge (adev->pdev); + adev->has_pr3 = parent ?pci_pr3_present (parent) : false; +amdgpu_amdkfd_device_probe (adev); adev->pm.pp_feature = amdgpu_pp_feature_mask;
drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +0 -11
@@ -152,21 +152,10 @@ static void amdgpu_get_audio_func(struct amdgpu_device *adev)int amdgpu_driver_load_kms (struct amdgpu_device *adev,unsigned long flags) {struct drm_device *dev; -struct pci_dev *parent;int r, acpi_status; dev =adev_to_drm (adev); -if (amdgpu_has_atpx () && - (amdgpu_is_atpx_hybrid () || -amdgpu_has_atpx_dgpu_power_cntl ()) && - ((flags &AMD_IS_APU ) ==0 ) && - !pci_is_thunderbolt_attached (to_pci_dev (dev->dev))) - flags |=AMD_IS_PX ; - - parent =pci_upstream_bridge (adev->pdev); - adev->has_pr3 = parent ?pci_pr3_present (parent) : false; -/* amdgpu_device_init should report only fatal error * like memory allocation failure or iomapping failure, * or memory manager initialization failure, it must
Signature · 1 line
2.34.1
PATCH 2/2 drm/amdgpu: only check for _PR3 on dGPUs
From: Alex Deucher <[email protected]>
We don't support runtime pm on APUs. They support more dynamic power savings using clock and powergating.
Reviewed-by Mario Limonciello <[email protected]>
Tested-by Mario Limonciello <[email protected]>
Signed-off-by Alex Deucher <[email protected]>
(cherry picked from commit 85ac2021fe3ace59cc0afd6edf005abad35625b0)
Signed-off-by Mario Limonciello <[email protected]>
---
No modifications from original commit, just sending together with other dependency modification.
Please apply to both 5.15.y and 5.16.y.
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +4 -2
@@ -2144,8 +2144,10 @@ static int amdgpu_device_ip_early_init(struct amdgpu_device *adev) !pci_is_thunderbolt_attached(to_pci_dev(dev->dev))) adev->flags |= AMD_IS_PX; - parent =pci_upstream_bridge (adev->pdev); - adev->has_pr3 = parent ?pci_pr3_present (parent) : false; +if (!(adev->flags &AMD_IS_APU )) { + parent =pci_upstream_bridge (adev->pdev); + adev->has_pr3 = parent ?pci_pr3_present (parent) : false; + }amdgpu_amdkfd_device_probe (adev);
Signature · 1 line
2.34.1