From: Alex Deucher Date: Wed, 27 Jul 2016 18:56:12 +0000 (-0400) Subject: drm/radeon: init atpx at switcheroo register time v2 X-Git-Tag: v4.8-rc1~62^2~2^2~55 X-Git-Url: http://git.cascardo.eti.br/?a=commitdiff_plain;h=69ee9742f945cda8bd0081961770cd2e3192a77a;p=cascardo%2Flinux.git drm/radeon: init atpx at switcheroo register time v2 If we do it at enable time, it's too late for the feature checks. v2: drop .init setting as per Peter's comments bug: https://bugzilla.kernel.org/show_bug.cgi?id=115321 Reviewed-by: Peter Wu Signed-off-by: Alex Deucher Cc: Peter Wu --- diff --git a/drivers/gpu/drm/radeon/radeon_atpx_handler.c b/drivers/gpu/drm/radeon/radeon_atpx_handler.c index 86dcdf38b732..6de342861202 100644 --- a/drivers/gpu/drm/radeon/radeon_atpx_handler.c +++ b/drivers/gpu/drm/radeon/radeon_atpx_handler.c @@ -536,7 +536,6 @@ static int radeon_atpx_get_client_id(struct pci_dev *pdev) static const struct vga_switcheroo_handler radeon_atpx_handler = { .switchto = radeon_atpx_switchto, .power_state = radeon_atpx_power_state, - .init = radeon_atpx_init, .get_client_id = radeon_atpx_get_client_id, }; @@ -572,6 +571,7 @@ static bool radeon_atpx_detect(void) printk(KERN_INFO "vga_switcheroo: detected switching method %s handle\n", acpi_method_name); radeon_atpx_priv.atpx_detected = true; + radeon_atpx_init(); return true; } return false;