[PATCH 1/2] drm/amdgpu: init atpx at switcheroo register time

[Alex Deucher]

If we do it at enable time, it's too late for the feature
checks.

Signed-off-by: Alex Deucher <alexander.deucher at amd.com>
Cc: Peter Wu <peter at lekensteyn.nl>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c | 3 ++-
 1 file changed, 2 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 0494fe7..bc8dc71 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c
@@ -539,7 +539,7 @@ static int amdgpu_atpx_get_client_id(struct pci_dev *pdev)
 static const struct vga_switcheroo_handler amdgpu_atpx_handler = {
 	.switchto = amdgpu_atpx_switchto,
 	.power_state = amdgpu_atpx_power_state,
-	.init = amdgpu_atpx_init,
+	.init = NULL,
 	.get_client_id = amdgpu_atpx_get_client_id,
 };
 
@@ -574,6 +574,7 @@ static bool amdgpu_atpx_detect(void)
 		printk(KERN_INFO "vga_switcheroo: detected switching method %s handle\n",
 		       acpi_method_name);
 		amdgpu_atpx_priv.atpx_detected = true;
+		amdgpu_atpx_init();
 		return true;
 	}
 	return false;
-- 
2.5.5