2021-05-29 04:30:31

by Zhihao Cheng

Subject: [PATCH] drm/i915/selftests: Fix return value check in live_breadcrumbs_smoketest()

In case of error, the function live_context() returns ERR_PTR()
and never returns NULL. The NULL test in the return value check
should be replaced with IS_ERR().

Fixes: 52c0fdb25c7c9 ("drm/i915: Replace global breadcrumbs ...")
Reported-by: Hulk Robot <[email protected]>
Signed-off-by: Zhihao Cheng <[email protected]>
---
drivers/gpu/drm/i915/selftests/i915_request.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/selftests/i915_request.c b/drivers/gpu/drm/i915/selftests/i915_request.c
index ee8e753d98ce..eae0abd614cb 100644
--- a/drivers/gpu/drm/i915/selftests/i915_request.c
+++ b/drivers/gpu/drm/i915/selftests/i915_request.c
@@ -1592,8 +1592,8 @@ static int live_breadcrumbs_smoketest(void *arg)

for (n = 0; n < smoke[0].ncontexts; n++) {
smoke[0].contexts[n] = live_context(i915, file);
- if (!smoke[0].contexts[n]) {
- ret = -ENOMEM;
+ if (IS_ERR(smoke[0].contexts[n])) {
+ ret = PTR_ERR(smoke[0].contexts[n]);
goto out_contexts;
}
}
--
2.25.4

2021-06-01 09:20:38

by Ursulin, Tvrtko

Subject: RE: [PATCH] drm/i915/selftests: Fix return value check in live_breadcrumbs_smoketest()

[Don't see this on intel-gfx so I have to reply with top post.]

Reviewed-by: Tvrtko Ursulin <[email protected]>

Regards,

Tvrtko

-----Original Message-----
From: Zhihao Cheng <[email protected]>
Sent: Saturday, May 29, 2021 5:33 AM
To: [email protected]; [email protected]; Vivi, Rodrigo <[email protected]>; [email protected]; [email protected]; [email protected]; Ursulin, Tvrtko <[email protected]>
Cc: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]
Subject: [PATCH] drm/i915/selftests: Fix return value check in live_breadcrumbs_smoketest()

In case of error, the function live_context() returns ERR_PTR() and never returns NULL. The NULL test in the return value check should be replaced with IS_ERR().

Fixes: 52c0fdb25c7c9 ("drm/i915: Replace global breadcrumbs ...")
Reported-by: Hulk Robot <[email protected]>
Signed-off-by: Zhihao Cheng <[email protected]>
---
drivers/gpu/drm/i915/selftests/i915_request.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/selftests/i915_request.c b/drivers/gpu/drm/i915/selftests/i915_request.c
index ee8e753d98ce..eae0abd614cb 100644
--- a/drivers/gpu/drm/i915/selftests/i915_request.c
+++ b/drivers/gpu/drm/i915/selftests/i915_request.c
@@ -1592,8 +1592,8 @@ static int live_breadcrumbs_smoketest(void *arg)

for (n = 0; n < smoke[0].ncontexts; n++) {
smoke[0].contexts[n] = live_context(i915, file);
- if (!smoke[0].contexts[n]) {
- ret = -ENOMEM;
+ if (IS_ERR(smoke[0].contexts[n])) {
+ ret = PTR_ERR(smoke[0].contexts[n]);
goto out_contexts;
}
}
--
2.25.4

2021-06-02 11:54:57

by Tvrtko Ursulin

Subject: Re: [Intel-gfx] [PATCH] drm/i915/selftests: Fix return value check in live_breadcrumbs_smoketest()

On 01/06/2021 10:19, Ursulin, Tvrtko wrote:
>
> [Don't see this on intel-gfx so I have to reply with top post.]
>
> Reviewed-by: Tvrtko Ursulin <[email protected]>

Pushed with commit text wrapped and Fixes: tag fixed, thanks for the patch!

Regards,

Tvrtko

>
> -----Original Message-----
> From: Zhihao Cheng <[email protected]>
> Sent: Saturday, May 29, 2021 5:33 AM
> To: [email protected]; [email protected]; Vivi, Rodrigo <[email protected]>; [email protected]; [email protected]; [email protected]; Ursulin, Tvrtko <[email protected]>
> Cc: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]
> Subject: [PATCH] drm/i915/selftests: Fix return value check in live_breadcrumbs_smoketest()
>
> In case of error, the function live_context() returns ERR_PTR() and never returns NULL. The NULL test in the return value check should be replaced with IS_ERR().
>
> Fixes: 52c0fdb25c7c9 ("drm/i915: Replace global breadcrumbs ...")
> Reported-by: Hulk Robot <[email protected]>
> Signed-off-by: Zhihao Cheng <[email protected]>
> ---
> drivers/gpu/drm/i915/selftests/i915_request.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/selftests/i915_request.c b/drivers/gpu/drm/i915/selftests/i915_request.c
> index ee8e753d98ce..eae0abd614cb 100644
> --- a/drivers/gpu/drm/i915/selftests/i915_request.c
> +++ b/drivers/gpu/drm/i915/selftests/i915_request.c
> @@ -1592,8 +1592,8 @@ static int live_breadcrumbs_smoketest(void *arg)
>
> for (n = 0; n < smoke[0].ncontexts; n++) {
> smoke[0].contexts[n] = live_context(i915, file);
> - if (!smoke[0].contexts[n]) {
> - ret = -ENOMEM;
> + if (IS_ERR(smoke[0].contexts[n])) {
> + ret = PTR_ERR(smoke[0].contexts[n]);
> goto out_contexts;
> }
> }
> --
> 2.25.4
>
> _______________________________________________
> Intel-gfx mailing list
> [email protected]
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
>