diff options
| author | Alex Deucher <alexander.deucher@amd.com> | 2016-07-27 14:56:12 -0400 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2016-07-29 14:36:44 -0400 |
| commit | 69ee9742f945cda8bd0081961770cd2e3192a77a (patch) | |
| tree | 96b6f91ea101cfefedf3f4a3f626584617b52967 /drivers/gpu/drm/radeon/radeon_atpx_handler.c | |
| parent | 6b1095eedd39b175f5ef7e50cb85f0cebb8e9ead (diff) | |
| download | linux-stable-69ee9742f945cda8bd0081961770cd2e3192a77a.tar.gz linux-stable-69ee9742f945cda8bd0081961770cd2e3192a77a.tar.bz2 linux-stable-69ee9742f945cda8bd0081961770cd2e3192a77a.zip | |
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 <peter@lekensteyn.nl>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: Peter Wu <peter@lekensteyn.nl>
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_atpx_handler.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_atpx_handler.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; |