xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/mm/selftests: fix wrong return type casting

Browse Source 
Function prepare_igt_frag() and get_insert_time() were casting
signed value to unsigned value before returning error.
So error check in igt_frag() would not work with unsigned
return value from get_insert_time() compared against negative
value.

Addresses-Coverity: ("Unsigned compared against 0, no effect")
Signed-off-by: Nirmoy Das <nirmoy.das@amd.com>
Reported-by: Colin Ian King <colin.king@canonical.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Christian König <christian.koenig@amd.com>
Link: https://patchwork.freedesktop.org/patch/370636/
This commit is contained in:
Nirmoy Das
2020-06-22 15:45:33 +02:00
committed by Christian König
parent 5fad79fd66
commit c9bb9d6685
1 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/gpu/drm/selftests/test-drm_mm.c
View File

@@ -1041,13 +1041,12 @@ static int prepare_igt_frag(struct drm_mm *mm,
{ {
unsigned int size = 4096; unsigned int size = 4096;
unsigned int i; unsigned int i;
u64 ret = -EINVAL;
for (i = 0; i < num_insert; i++) { for (i = 0; i < num_insert; i++) {
if (!expect_insert(mm, &nodes[i], size, 0, i, if (!expect_insert(mm, &nodes[i], size, 0, i,
mode) != 0) { mode) != 0) {
pr_err("%s insert failed\n", mode->name); pr_err("%s insert failed\n", mode->name);
goto out; return -EINVAL;
} }
} }
@@ -1057,8 +1056,7 @@ static int prepare_igt_frag(struct drm_mm *mm,
drm_mm_remove_node(&nodes[i]); drm_mm_remove_node(&nodes[i]);
} }
out: return 0;
return ret;
} }
@@ -1070,21 +1068,16 @@ static u64 get_insert_time(struct drm_mm *mm,
unsigned int size = 8192; unsigned int size = 8192;
ktime_t start; ktime_t start;
unsigned int i; unsigned int i;
u64 ret = -EINVAL;
start = ktime_get(); start = ktime_get();
for (i = 0; i < num_insert; i++) { for (i = 0; i < num_insert; i++) {
if (!expect_insert(mm, &nodes[i], size, 0, i, mode) != 0) { if (!expect_insert(mm, &nodes[i], size, 0, i, mode) != 0) {
pr_err("%s insert failed\n", mode->name); pr_err("%s insert failed\n", mode->name);
goto out; return 0;
} }
} }
ret = ktime_to_ns(ktime_sub(ktime_get(), start)); return ktime_to_ns(ktime_sub(ktime_get(), start));
out:
return ret;
} }
static int igt_frag(void *ignored) static int igt_frag(void *ignored)
@@ -1119,17 +1112,17 @@ static int igt_frag(void *ignored)
continue; continue;
ret = prepare_igt_frag(&mm, nodes, insert_size, mode); ret = prepare_igt_frag(&mm, nodes, insert_size, mode);
if (!ret) if (ret)
goto err; goto err;
insert_time1 = get_insert_time(&mm, insert_size, insert_time1 = get_insert_time(&mm, insert_size,
nodes + insert_size, mode); nodes + insert_size, mode);
if (insert_time1 < 0) if (insert_time1 == 0)
goto err; goto err;
insert_time2 = get_insert_time(&mm, (insert_size * 2), insert_time2 = get_insert_time(&mm, (insert_size * 2),
nodes + insert_size * 2, mode); nodes + insert_size * 2, mode);
if (insert_time2 < 0) if (insert_time2 == 0)
goto err; goto err;
pr_info("%s fragmented insert of %u and %u insertions took %llu and %llu nsecs\n", pr_info("%s fragmented insert of %u and %u insertions took %llu and %llu nsecs\n",