Commit 87004abf authored by Alex Deucher's avatar Alex Deucher
Browse files

Revert "drm/amdgpu: Fix NULL dereference in dpm sysfs handlers" 



This regressed some working configurations so revert it.  Will
fix this properly for 5.9 and backport then.

This reverts commit 38e0c89a.

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

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

+6 −3
Original line number Diff line number Diff line
@@ -778,7 +778,8 @@ static ssize_t amdgpu_set_pp_od_clk_voltage(struct device *dev, 
		tmp_str++;

	while (isspace(*++tmp_str));



	while ((sub_str = strsep(&tmp_str, delimiter)) != NULL) {

	while (tmp_str[0]) {

		sub_str = strsep(&tmp_str, delimiter);

		ret = kstrtol(sub_str, 0, &parameter[parameter_size]);

		if (ret)

			return -EINVAL;
@@ -1038,7 +1039,8 @@ static ssize_t amdgpu_read_mask(const char *buf, size_t count, uint32_t *mask) 
	memcpy(buf_cpy, buf, bytes);

	buf_cpy[bytes] = '\0';

	tmp = buf_cpy;

	while ((sub_str = strsep(&tmp, delimiter)) != NULL) {

	while (tmp[0]) {

		sub_str = strsep(&tmp, delimiter);

		if (strlen(sub_str)) {

			ret = kstrtol(sub_str, 0, &level);

			if (ret)
@@ -1635,7 +1637,8 @@ static ssize_t amdgpu_set_pp_power_profile_mode(struct device *dev, 
			i++;

		memcpy(buf_cpy, buf, count-i);

		tmp_str = buf_cpy;

		while ((sub_str = strsep(&tmp_str, delimiter)) != NULL) {

		while (tmp_str[0]) {

			sub_str = strsep(&tmp_str, delimiter);

			ret = kstrtol(sub_str, 0, &parameter[parameter_size]);

			if (ret)

				return -EINVAL;

CRA Git | Maintained and supported by SUSTech CRA and CCSE