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

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

drm/radeon: fix runpm disabling on non-PX harder 



Make sure runtime pm is disabled on non-PX hardware.
Should fix powerdown problems without displays attached.

Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
parent 45db98e5

drivers/gpu/drm/radeon/radeon_kms.c

+9 −1
Original line number Diff line number Diff line
@@ -33,6 +33,13 @@ 
#include <linux/vga_switcheroo.h>

#include <linux/slab.h>

#include <linux/pm_runtime.h>



#if defined(CONFIG_VGA_SWITCHEROO)

bool radeon_is_px(void);

#else

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

#endif



/**

 * radeon_driver_unload_kms - Main unload function for KMS.

 *
@@ -130,7 +137,8 @@ int radeon_driver_load_kms(struct drm_device *dev, unsigned long flags) 
				"Error during ACPI methods call\n");

	}



	if (radeon_runtime_pm != 0) {

	if ((radeon_runtime_pm == 1) ||

	    ((radeon_runtime_pm == -1) && radeon_is_px())) {

		pm_runtime_use_autosuspend(dev->dev);

		pm_runtime_set_autosuspend_delay(dev->dev, 5000);

		pm_runtime_set_active(dev->dev);