[SRU,Bionic,OEM-B,v2,5/6] drm/amdgpu: fix amdgpu_atpx_get_client_id()'s return type

Message ID 1532914344-7055-6-git-send-email-hui.wang@canonical.com
State New
Headers show
  • HDMI/DP audio can't work on the laptop of Dell Latitude 5495
Related show

Commit Message

Hui Wang July 30, 2018, 1:32 a.m.
From: Luc Van Oostenryck <luc.vanoostenryck@gmail.com>

BugLink: http://bugs.launchpad.net/bugs/1782689

The method struct vga_switcheroo_handler::get_client_id() is defined
as returning an 'enum vga_switcheroo_client_id' but the implementation
in this driver, amdgpu_atpx_get_client_id(), returns an 'int'.

Fix this by returning 'enum vga_switcheroo_client_id' in this driver too.

Signed-off-by: Luc Van Oostenryck <luc.vanoostenryck@gmail.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
(cherry picked from commit 09daf474d27aeb9fbd2f665b613d98c76f1e84f0)
Signed-off-by: Hui Wang <hui.wang@canonical.com>
 drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c | 2 +-
 1 file changed, 1 insertion(+), 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 1ae5ae8..1bcb2b2 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c
@@ -550,7 +550,7 @@  static int amdgpu_atpx_init(void)
  * look up whether we are the integrated or discrete GPU (all asics).
  * Returns the client id.
-static int amdgpu_atpx_get_client_id(struct pci_dev *pdev)
+static enum vga_switcheroo_client_id amdgpu_atpx_get_client_id(struct pci_dev *pdev)
 	if (amdgpu_atpx_priv.dhandle == ACPI_HANDLE(&pdev->dev))