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

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

drm/radeon: 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 92821c26

drivers/gpu/drm/radeon/radeon_atpx_handler.c

+4 −4
Original line number Diff line number Diff line
@@ -62,6 +62,10 @@ bool radeon_has_atpx(void) { 
	return radeon_atpx_priv.atpx_detected;

}



bool radeon_has_atpx_dgpu_power_cntl(void) {

	return radeon_atpx_priv.atpx.functions.power_cntl;

}



/**

 * radeon_atpx_call - call an ATPX method

 *
@@ -141,10 +145,6 @@ static void radeon_atpx_parse_functions(struct radeon_atpx_functions *f, u32 mas 
 */

static int radeon_atpx_validate(struct radeon_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/radeon/radeon_device.c

+7 −1
Original line number Diff line number Diff line
@@ -103,6 +103,12 @@ static const char radeon_family_name[][16] = { 
	"LAST",

};



#if defined(CONFIG_VGA_SWITCHEROO)

bool radeon_has_atpx_dgpu_power_cntl(void);

#else

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

#endif



#define RADEON_PX_QUIRK_DISABLE_PX  (1 << 0)

#define RADEON_PX_QUIRK_LONG_WAKEUP (1 << 1)
@@ -1433,7 +1439,7 @@ int radeon_device_init(struct radeon_device *rdev, 
	 * ignore it */

	vga_client_register(rdev->pdev, rdev, NULL, radeon_vga_set_decode);



	if (rdev->flags & RADEON_IS_PX)

	if ((rdev->flags & RADEON_IS_PX) && radeon_has_atpx_dgpu_power_cntl())

		runtime = true;

	vga_switcheroo_register_client(rdev->pdev, &radeon_switcheroo_ops, runtime);

	if (runtime)