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

Commit c50f13f9 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'drm-fixes-4.3' of git://people.freedesktop.org/~agd5f/linux into drm-fixes 

Just a crash fix for radeon and amdgpu if the user has forcibly disabled
dpm and tries to access the pwm sysfs controls.

* 'drm-fixes-4.3' of git://people.freedesktop.org/~agd5f/linux:
  drm/amdgpu: add missing dpm check for KV dpm late init
  drm/amdgpu/dpm: don't add pwm attributes if DPM is disabled
  drm/radeon/dpm: don't add pwm attributes if DPM is disabled
parents c2a75586 677c884f

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

+6 −2
Original line number Diff line number Diff line
@@ -294,10 +294,14 @@ static umode_t hwmon_attributes_visible(struct kobject *kobj, 
	struct amdgpu_device *adev = dev_get_drvdata(dev);

	umode_t effective_mode = attr->mode;



	/* Skip limit attributes if DPM is not enabled */

	/* Skip attributes if DPM is not enabled */

	if (!adev->pm.dpm_enabled &&

	    (attr == &sensor_dev_attr_temp1_crit.dev_attr.attr ||

	     attr == &sensor_dev_attr_temp1_crit_hyst.dev_attr.attr))

	     attr == &sensor_dev_attr_temp1_crit_hyst.dev_attr.attr ||

	     attr == &sensor_dev_attr_pwm1.dev_attr.attr ||

	     attr == &sensor_dev_attr_pwm1_enable.dev_attr.attr ||

	     attr == &sensor_dev_attr_pwm1_max.dev_attr.attr ||

	     attr == &sensor_dev_attr_pwm1_min.dev_attr.attr))

		return 0;



	/* Skip fan attributes if fan is not present */

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

+3 −0
Original line number Diff line number Diff line
@@ -2997,6 +2997,9 @@ static int kv_dpm_late_init(void *handle) 
	struct amdgpu_device *adev = (struct amdgpu_device *)handle;

	int ret;



	if (!amdgpu_dpm)

		return 0;



	/* init the sysfs and debugfs files late */

	ret = amdgpu_pm_sysfs_init(adev);

	if (ret)

drivers/gpu/drm/radeon/radeon_pm.c

+6 −2
Original line number Diff line number Diff line
@@ -717,10 +717,14 @@ static umode_t hwmon_attributes_visible(struct kobject *kobj, 
	struct radeon_device *rdev = dev_get_drvdata(dev);

	umode_t effective_mode = attr->mode;



	/* Skip limit attributes if DPM is not enabled */

	/* Skip attributes if DPM is not enabled */

	if (rdev->pm.pm_method != PM_METHOD_DPM &&

	    (attr == &sensor_dev_attr_temp1_crit.dev_attr.attr ||

	     attr == &sensor_dev_attr_temp1_crit_hyst.dev_attr.attr))

	     attr == &sensor_dev_attr_temp1_crit_hyst.dev_attr.attr ||

	     attr == &sensor_dev_attr_pwm1.dev_attr.attr ||

	     attr == &sensor_dev_attr_pwm1_enable.dev_attr.attr ||

	     attr == &sensor_dev_attr_pwm1_max.dev_attr.attr ||

	     attr == &sensor_dev_attr_pwm1_min.dev_attr.attr))

		return 0;



	/* Skip fan attributes if fan is not present */