Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bedf2a65 authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/amdgpu: disable runtime pm on PX laptops without dGPU power control 



Some PX laptops don't provide an ACPI method to control dGPU power.  On
those systems, the driver is responsible for handling the dGPU power
state.  Disable runtime PM on them until support for this is implemented.

Reviewed-by: default avatarMichel Dänzer <michel.daenzer@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
parent e64c952e

drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c

+4 −4
Original line number Diff line number Diff line
@@ -63,6 +63,10 @@ bool amdgpu_has_atpx(void) { 
	return amdgpu_atpx_priv.atpx_detected;

}



bool amdgpu_has_atpx_dgpu_power_cntl(void) {

	return amdgpu_atpx_priv.atpx.functions.power_cntl;

}



/**

 * amdgpu_atpx_call - call an ATPX method

 *
@@ -142,10 +146,6 @@ static void amdgpu_atpx_parse_functions(struct amdgpu_atpx_functions *f, u32 mas 
 */

static int amdgpu_atpx_validate(struct amdgpu_atpx *atpx)

{

	/* make sure required functions are enabled */

	/* dGPU power control is required */

	atpx->functions.power_cntl = true;



	if (atpx->functions.px_params) {

		union acpi_object *info;

		struct atpx_px_params output;

drivers/gpu/drm/amd/amdgpu/amdgpu_device.c

+7 −1
Original line number Diff line number Diff line
@@ -62,6 +62,12 @@ static const char *amdgpu_asic_name[] = { 
	"LAST",

};



#if defined(CONFIG_VGA_SWITCHEROO)

bool amdgpu_has_atpx_dgpu_power_cntl(void);

#else

static inline bool amdgpu_has_atpx_dgpu_power_cntl(void) { return false; }

#endif



bool amdgpu_device_is_px(struct drm_device *dev)

{

	struct amdgpu_device *adev = dev->dev_private;
@@ -1479,7 +1485,7 @@ int amdgpu_device_init(struct amdgpu_device *adev, 


	if (amdgpu_runtime_pm == 1)

		runtime = true;

	if (amdgpu_device_is_px(ddev))

	if (amdgpu_device_is_px(ddev) && amdgpu_has_atpx_dgpu_power_cntl())

		runtime = true;

	vga_switcheroo_register_client(adev->pdev, &amdgpu_switcheroo_ops, runtime);

	if (runtime)