[PATCH] Revert "drm/amdgpu: simplify ATPX detection"

[Alex Deucher]

Ping?

On Fri, Dec 20, 2019 at 7:11 PM Alex Deucher <alexdeucher at gmail.com> wrote:
>
> This reverts commit f5fda6d89afe6e9cedaa1c3303903c905262f6e8.
>
> You can't use BASE_CLASS in pci_get_class.
>
> Bug: https://gitlab.freedesktop.org/drm/amd/issues/995
> Signed-off-by: Alex Deucher <alexander.deucher at amd.com>
> ---
>  drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c | 12 +++++++++++-
>  1 file changed, 11 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c
> index a97fb759e2f4..3e35a8f2c5e5 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c
> @@ -613,7 +613,17 @@ static bool amdgpu_atpx_detect(void)
>         bool d3_supported = false;
>         struct pci_dev *parent_pdev;
>
> -       while ((pdev = pci_get_class(PCI_BASE_CLASS_DISPLAY << 16, pdev)) != NULL) {
> +       while ((pdev = pci_get_class(PCI_CLASS_DISPLAY_VGA << 8, pdev)) != NULL) {
> +               vga_count++;
> +
> +               has_atpx |= (amdgpu_atpx_pci_probe_handle(pdev) == true);
> +
> +               parent_pdev = pci_upstream_bridge(pdev);
> +               d3_supported |= parent_pdev && parent_pdev->bridge_d3;
> +               amdgpu_atpx_get_quirks(pdev);
> +       }
> +
> +       while ((pdev = pci_get_class(PCI_CLASS_DISPLAY_OTHER << 8, pdev)) != NULL) {
>                 vga_count++;
>
>                 has_atpx |= (amdgpu_atpx_pci_probe_handle(pdev) == true);
> --
> 2.24.1
>