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

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

drm/amdgpu: don't try to recreate sysfs entries on resume 



Fixes an error on resume caused by:
fa022a9b

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

drivers/gpu/drm/amd/amdgpu/amdgpu.h

+1 −0
Original line number Diff line number Diff line
@@ -1654,6 +1654,7 @@ struct amdgpu_pm { 
	u8                      fan_max_rpm;

	/* dpm */

	bool                    dpm_enabled;

	bool                    sysfs_initialized;

	struct amdgpu_dpm       dpm;

	const struct firmware	*fw;	/* SMC firmware */

	uint32_t                fw_version;

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

+5 −0
Original line number Diff line number Diff line
@@ -695,6 +695,9 @@ int amdgpu_pm_sysfs_init(struct amdgpu_device *adev) 
{

	int ret;



	if (adev->pm.sysfs_initialized)

		return 0;



	if (adev->pm.funcs->get_temperature == NULL)

		return 0;

	adev->pm.int_hwmon_dev = hwmon_device_register_with_groups(adev->dev,
@@ -723,6 +726,8 @@ int amdgpu_pm_sysfs_init(struct amdgpu_device *adev) 
		return ret;

	}



	adev->pm.sysfs_initialized = true;



	return 0;

}