diff options
author | Nirmoy Das <nirmoy.aiemd@gmail.com> | 2020-06-22 16:45:33 +0300 |
---|---|---|
committer | Christian König <christian.koenig@amd.com> | 2020-06-23 16:57:30 +0300 |
commit | c9bb9d6685c0e8318c3a70fcdea319c84c94e5af (patch) | |
tree | 1f3efd85133758fd609bda38a64211d0e89657ba /drivers/gpu/drm/selftests | |
parent | 5fad79fd66ff90b8c0a95319dad0b099008f8347 (diff) | |
download | linux-c9bb9d6685c0e8318c3a70fcdea319c84c94e5af.tar.xz |
drm/mm/selftests: fix wrong return type casting
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/
Diffstat (limited to 'drivers/gpu/drm/selftests')
-rw-r--r-- | drivers/gpu/drm/selftests/test-drm_mm.c | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/drivers/gpu/drm/selftests/test-drm_mm.c b/drivers/gpu/drm/selftests/test-drm_mm.c index 910eac289c76..95e212a9a74d 100644 --- a/drivers/gpu/drm/selftests/test-drm_mm.c +++ b/drivers/gpu/drm/selftests/test-drm_mm.c @@ -1041,13 +1041,12 @@ static int prepare_igt_frag(struct drm_mm *mm, { unsigned int size = 4096; unsigned int i; - u64 ret = -EINVAL; for (i = 0; i < num_insert; i++) { if (!expect_insert(mm, &nodes[i], size, 0, i, mode) != 0) { 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]); } -out: - return ret; + return 0; } @@ -1070,21 +1068,16 @@ static u64 get_insert_time(struct drm_mm *mm, unsigned int size = 8192; ktime_t start; unsigned int i; - u64 ret = -EINVAL; start = ktime_get(); for (i = 0; i < num_insert; i++) { if (!expect_insert(mm, &nodes[i], size, 0, i, mode) != 0) { pr_err("%s insert failed\n", mode->name); - goto out; + return 0; } } - ret = ktime_to_ns(ktime_sub(ktime_get(), start)); - -out: - return ret; - + return ktime_to_ns(ktime_sub(ktime_get(), start)); } static int igt_frag(void *ignored) @@ -1119,17 +1112,17 @@ static int igt_frag(void *ignored) continue; ret = prepare_igt_frag(&mm, nodes, insert_size, mode); - if (!ret) + if (ret) goto err; insert_time1 = get_insert_time(&mm, insert_size, nodes + insert_size, mode); - if (insert_time1 < 0) + if (insert_time1 == 0) goto err; insert_time2 = get_insert_time(&mm, (insert_size * 2), nodes + insert_size * 2, mode); - if (insert_time2 < 0) + if (insert_time2 == 0) goto err; pr_info("%s fragmented insert of %u and %u insertions took %llu and %llu nsecs\n", |