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

Commit 22d3202e authored by Alex Deucher's avatar Alex Deucher Committed by Greg Kroah-Hartman
Browse files

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



commit 87004abfbc27261edd15716515d89ab42198b405 upstream.

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

This reverts commit 38e0c89a19fd13f28d2b4721035160a3e66e270b.

Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent cea6633d

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

+6 −3
Original line number Diff line number Diff line
@@ -691,7 +691,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;
@@ -882,7 +883,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)
@@ -1298,7 +1300,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) {

				count = -EINVAL;