drm/radeon: fix check for port PM availability

The ATPX method does not always exist on the dGPU, it may be located at
the iGPU. The parent device of the iGPU is the root port for which
bridge_d3 is false. This accidentally enables the legacy PM method which
conflicts with port PM and prevented the dGPU from powering on.

Ported from amdgpu commit:
drm/amdgpu: fix check for port PM availability
from Peter Wu.

Fixes: d3ac31f3b4bf9fad (drm/radeon: fix power state when port pm is unavailable (v2))
Signed-off-by: Alex Deucher <[email protected]>
Cc: Peter Wu <[email protected]>
Cc: <[email protected]> # 4.8+

diff --git a/drivers/gpu/drm/radeon/radeon_atpx_handler.c b/drivers/gpu/drm/radeon/radeon_atpx_handler.c
index 4129b12521a67e9296582353a74f418bbf84d1c6..0ae13cd2addaa2f4e53a9b69903c3095912d8460 100644 (file)
--- a/drivers/gpu/drm/radeon/radeon_atpx_handler.c
+++ b/drivers/gpu/drm/radeon/radeon_atpx_handler.c
@@ -479,7 +479,6 @@ static int radeon_atpx_power_state(enum vga_switcheroo_client_id id,
  */
 static bool radeon_atpx_pci_probe_handle(struct pci_dev *pdev)
 {
  */
 static bool radeon_atpx_pci_probe_handle(struct pci_dev *pdev)
 {

-       struct pci_dev *parent_pdev = pci_upstream_bridge(pdev);

        acpi_handle dhandle, atpx_handle;
        acpi_status status;
 
        acpi_handle dhandle, atpx_handle;
        acpi_status status;
 


@@ -493,7 +492,6 @@ static bool radeon_atpx_pci_probe_handle(struct pci_dev *pdev)
 
        radeon_atpx_priv.dhandle = dhandle;
        radeon_atpx_priv.atpx.handle = atpx_handle;
 
        radeon_atpx_priv.dhandle = dhandle;
        radeon_atpx_priv.atpx.handle = atpx_handle;

-       radeon_atpx_priv.bridge_pm_usable = parent_pdev && parent_pdev->bridge_d3;

        return true;
 }
 
        return true;
 }
 


@@ -555,11 +553,16 @@ static bool radeon_atpx_detect(void)
        struct pci_dev *pdev = NULL;
        bool has_atpx = false;
        int vga_count = 0;
        struct pci_dev *pdev = NULL;
        bool has_atpx = false;
        int vga_count = 0;

+       bool d3_supported = false;
+       struct pci_dev *parent_pdev;

 
        while ((pdev = pci_get_class(PCI_CLASS_DISPLAY_VGA << 8, pdev)) != NULL) {
                vga_count++;
 
                has_atpx |= (radeon_atpx_pci_probe_handle(pdev) == true);
 
        while ((pdev = pci_get_class(PCI_CLASS_DISPLAY_VGA << 8, pdev)) != NULL) {
                vga_count++;
 
                has_atpx |= (radeon_atpx_pci_probe_handle(pdev) == true);

+
+               parent_pdev = pci_upstream_bridge(pdev);
+               d3_supported |= parent_pdev && parent_pdev->bridge_d3;

        }
 
        /* some newer PX laptops mark the dGPU as a non-VGA display device */
        }
 
        /* some newer PX laptops mark the dGPU as a non-VGA display device */


@@ -567,6 +570,9 @@ static bool radeon_atpx_detect(void)
                vga_count++;
 
                has_atpx |= (radeon_atpx_pci_probe_handle(pdev) == true);
                vga_count++;
 
                has_atpx |= (radeon_atpx_pci_probe_handle(pdev) == true);

+
+               parent_pdev = pci_upstream_bridge(pdev);
+               d3_supported |= parent_pdev && parent_pdev->bridge_d3;

        }
 
        if (has_atpx && vga_count == 2) {
        }
 
        if (has_atpx && vga_count == 2) {


@@ -574,6 +580,7 @@ static bool radeon_atpx_detect(void)
                printk(KERN_INFO "vga_switcheroo: detected switching method %s handle\n",
                       acpi_method_name);
                radeon_atpx_priv.atpx_detected = true;
                printk(KERN_INFO "vga_switcheroo: detected switching method %s handle\n",
                       acpi_method_name);
                radeon_atpx_priv.atpx_detected = true;

+               radeon_atpx_priv.bridge_pm_usable = d3_supported;

                radeon_atpx_init();
                return true;
        }
                radeon_atpx_init();
                return true;
        }