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

[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@amd.com>
Cc: Peter Wu <peter@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

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

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

[Alex Deucher]

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

bug: https://bugzilla.kernel.org/show_bug.cgi?id=115321
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: Peter Wu <peter@lekensteyn.nl>
---
 drivers/gpu/drm/radeon/radeon_atpx_handler.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/radeon/radeon_atpx_handler.c b/drivers/gpu/drm/radeon/radeon_atpx_handler.c
index 86dcdf3..b46b4c4 100644
--- a/drivers/gpu/drm/radeon/radeon_atpx_handler.c
+++ b/drivers/gpu/drm/radeon/radeon_atpx_handler.c
@@ -536,7 +536,7 @@ 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,
+	.init = NULL,
 	.get_client_id = radeon_atpx_get_client_id,
 };
 
@@ -572,6 +572,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;
-- 
2.5.5

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

Re: [PATCH 2/2] drm/radeon: init atpx at switcheroo register time

[Peter Wu]

On Wed, Jul 27, 2016 at 04:10:45PM -0400, Alex Deucher wrote:
> If we do it at enable time, it's too late for the feature
> checks.
> 
> bug: https://bugzilla.kernel.org/show_bug.cgi?id=115321
> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
> Cc: Peter Wu <peter@lekensteyn.nl>
> ---
>  drivers/gpu/drm/radeon/radeon_atpx_handler.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/radeon/radeon_atpx_handler.c b/drivers/gpu/drm/radeon/radeon_atpx_handler.c
> index 86dcdf3..b46b4c4 100644
> --- a/drivers/gpu/drm/radeon/radeon_atpx_handler.c
> +++ b/drivers/gpu/drm/radeon/radeon_atpx_handler.c
> @@ -536,7 +536,7 @@ 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,
> +	.init = NULL,

Let's just remove this initialization, it allows for trivial removal of
the init member later. radeon was the only user of this anyway.

>  	.get_client_id = radeon_atpx_get_client_id,
>  };
>  
> @@ -572,6 +572,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;
> -- 
> 2.5.5
> 

Other than the command above, both patches are
Reviewed-by: Peter Wu <peter@lekensteyn.nl>

I'll be testing this (via your amd-staging-4.6 branch) tomorrow on an
AMD/AMD hybrid (GCN 1.0 unfortunately, so restricted to radeon).
-- 
Kind regards,
Peter Wu
https://lekensteyn.nl
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx