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

[Quan, Evan]

Acked-by: Evan Quan <evan.quan at amd.com>

> -----Original Message-----
> From: amd-gfx <amd-gfx-bounces at lists.freedesktop.org> On Behalf Of Alex
> Deucher
> Sent: Saturday, December 21, 2019 8:12 AM
> To: amd-gfx at lists.freedesktop.org
> Cc: Deucher, Alexander <Alexander.Deucher at amd.com>
> Subject: [PATCH] Revert "drm/amdgpu: simplify ATPX detection"
> 
> This reverts commit f5fda6d89afe6e9cedaa1c3303903c905262f6e8.
> 
> You can't use BASE_CLASS in pci_get_class.
> 
> Bug:
> https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgitlab.fre
> edesktop.org%2Fdrm%2Famd%2Fissues%2F995&data=02%7C01%7Cevan.q
> uan%40amd.com%7C2347975d48674464206608d785aa63d1%7C3dd8961fe488
> 4e608e11a82d994e183d%7C0%7C0%7C637124839286316424&sdata=iIVA
> BG6tvVYviqAYF8ywRM41C82TNkr1PGgj8%2BAjGjQ%3D&reserved=0
> 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
> 
> _______________________________________________
> amd-gfx mailing list
> amd-gfx at lists.freedesktop.org
> https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.free
> desktop.org%2Fmailman%2Flistinfo%2Famd-
> gfx&data=02%7C01%7Cevan.quan%40amd.com%7C2347975d4867446420
> 6608d785aa63d1%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637
> 124839286316424&sdata=HAa2GZfLSVJnQzPSxwYadxXvaKUIhLIQ30REX%2
> FJN6gU%3D&reserved=0