From 38d6be8199331e4739486156c74a64a8ece717a3 Mon Sep 17 00:00:00 2001 From: Alex Deucher Date: Fri, 20 Nov 2020 09:53:55 -0500 Subject: drm/amdgpu: only register VGA devices with the VGA arbiter We only need to arbitrate VGA access on VGA compatible devices. Reviewed-by: Feifei Xu Signed-off-by: Alex Deucher --- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_device.c') diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c index 5b5ca0e13848..79dd85f71fab 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c @@ -3346,7 +3346,8 @@ int amdgpu_device_init(struct amdgpu_device *adev, /* if we have > 1 VGA cards, then disable the amdgpu VGA resources */ /* this will fail for cards that aren't VGA class devices, just * ignore it */ - vga_client_register(adev->pdev, adev, NULL, amdgpu_device_vga_set_decode); + if ((adev->pdev->class >> 8) == PCI_CLASS_DISPLAY_VGA) + vga_client_register(adev->pdev, adev, NULL, amdgpu_device_vga_set_decode); if (amdgpu_device_supports_boco(ddev)) boco = true; @@ -3605,7 +3606,8 @@ void amdgpu_device_fini(struct amdgpu_device *adev) vga_switcheroo_unregister_client(adev->pdev); if (amdgpu_device_supports_boco(adev_to_drm(adev))) vga_switcheroo_fini_domain_pm_ops(adev->dev); - vga_client_register(adev->pdev, NULL, NULL, NULL); + if ((adev->pdev->class >> 8) == PCI_CLASS_DISPLAY_VGA) + vga_client_register(adev->pdev, NULL, NULL, NULL); if (adev->rio_mem) pci_iounmap(adev->pdev, adev->rio_mem); adev->rio_mem = NULL; -- cgit v1.2.3 ethernet/chelsio/cxgb'>stats
AgeCommit message (Expand)AuthorFilesLines
2018-02-14cxgb4: rework on-chip memory readRahul Lakkireddy3-73/+192
2018-02-14net: Move ipv4 set_lwt_redirect helper to lwtunnelDavid Ahern3-23/+18
2018-02-14net: dsa: mv88e6xxx: add workaround for 6341 timestampingBrandon Streiff2-0/+22
2018-02-14net: dsa: mv88e6xxx: add rx/tx timestamping supportBrandon Streiff7-4/+788
2018-02-14net: dsa: forward timestamping callbacks to switch driversBrandon Streiff3-0/+71
2018-02-14net: dsa: forward hardware timestamping ioctls to switch driverBrandon Streiff2-0/+44
2018-02-14net: dsa: mv88e6xxx: add support for event captureBrandon Streiff3-2/+207
2018-02-14net: dsa: mv88e6xxx: add support for GPIO configurationBrandon Streiff6-0/+334
2018-02-14net: dsa: mv88e6xxx: expose switch time as a PTP hardware clockBrandon Streiff6-0/+326
2018-02-14net: dsa: mv88e6xxx: add accessors for PTP/TAI registersBrandon Streiff5-1/+251
2018-02-14net: dsa: mv88e6xxx: export g2 register accessorsBrandon Streiff2-4/+29
2018-02-14net: ptp: Add stub for ptp_classify_raw()Andrew Lunn1-0/+4
2018-02-14tcp: try to keep packet if SYN_RCV race is lostEric Dumazet5-5/+31
2018-02-14net: Remove atalk header from socket.cDavid Ahern1-1/+0
2018-02-14net: Make atalk_ptr depend on ATALK or IRDADavid Ahern2-0/+4
2018-02-14net: Make ax25_ptr depend on CONFIG_AX25David Ahern2-0/+4
2018-02-14net: Make dn_ptr depend on CONFIG_DECNETDavid Ahern2-1/+4