diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2020-08-21 12:44:00 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2020-08-21 12:44:00 -0400 |
| commit | 3aadfbef1a16080030d34bd356eeb12b0360c05d (patch) | |
| tree | b69c25c17a67a80bf79a844fa068095ebf307df2 | |
| parent | 55c484494127ef1efe934a0a08518eec9705c18f (diff) | |
| download | longterm-queue-5.2-3aadfbef1a16080030d34bd356eeb12b0360c05d.tar.gz | |
drm: amd: ctxt refresh
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/Revert-drm-amdgpu-Fix-NULL-dereference-in-dpm-sysfs-.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/queue/Revert-drm-amdgpu-Fix-NULL-dereference-in-dpm-sysfs-.patch b/queue/Revert-drm-amdgpu-Fix-NULL-dereference-in-dpm-sysfs-.patch index a407225e..c82e2d0c 100644 --- a/queue/Revert-drm-amdgpu-Fix-NULL-dereference-in-dpm-sysfs-.patch +++ b/queue/Revert-drm-amdgpu-Fix-NULL-dereference-in-dpm-sysfs-.patch @@ -1,4 +1,4 @@ -From 87004abfbc27261edd15716515d89ab42198b405 Mon Sep 17 00:00:00 2001 +From 5ef05c4603c572f52f0ff582b79b2efe14fa63b9 Mon Sep 17 00:00:00 2001 From: Alex Deucher <alexander.deucher@amd.com> Date: Thu, 30 Jul 2020 11:02:30 -0400 Subject: [PATCH] Revert "drm/amdgpu: Fix NULL dereference in dpm sysfs @@ -15,10 +15,10 @@ Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Cc: stable@vger.kernel.org diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c -index ebb8a28ff002..02e6f8c4dde0 100644 +index 557e8deadc9c..059f99534d77 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c -@@ -778,7 +778,8 @@ static ssize_t amdgpu_set_pp_od_clk_voltage(struct device *dev, +@@ -681,7 +681,8 @@ static ssize_t amdgpu_set_pp_od_clk_voltage(struct device *dev, tmp_str++; while (isspace(*++tmp_str)); @@ -28,7 +28,7 @@ index ebb8a28ff002..02e6f8c4dde0 100644 ret = kstrtol(sub_str, 0, ¶meter[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) +@@ -866,7 +867,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; @@ -38,7 +38,7 @@ index ebb8a28ff002..02e6f8c4dde0 100644 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, +@@ -1272,7 +1274,8 @@ static ssize_t amdgpu_set_pp_power_profile_mode(struct device *dev, i++; memcpy(buf_cpy, buf, count-i); tmp_str = buf_cpy; @@ -46,8 +46,8 @@ index ebb8a28ff002..02e6f8c4dde0 100644 + while (tmp_str[0]) { + sub_str = strsep(&tmp_str, delimiter); ret = kstrtol(sub_str, 0, ¶meter[parameter_size]); - if (ret) - return -EINVAL; + if (ret) { + count = -EINVAL; -- 2.27.0 |