All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] drm/i915/selftests: fix inconsistent IS_ERR and PTR_ERR
@ 2018-02-14 21:12 Gustavo A. R. Silva
  2018-02-15  9:13 ` Jani Nikula
  0 siblings, 1 reply; 7+ messages in thread
From: Gustavo A. R. Silva @ 2018-02-14 21:12 UTC (permalink / raw)
  To: Jani Nikula, Joonas Lahtinen, Rodrigo Vivi, David Airlie
  Cc: intel-gfx, dri-devel, linux-kernel, Gustavo A. R. Silva

Fix inconsistent IS_ERR and PTR_ERR in shrink_boom.
The proper pointer to use is _explode_ instead of _purge_.

This issue was detected with the help of Coccinelle.

Fixes: fe215c8bc426 ("drm/i915/selftests: add missing gtt shrinker test")
Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
---
 drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c b/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c
index d806427..89b6ca9 100644
--- a/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c
+++ b/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c
@@ -927,7 +927,7 @@ static int shrink_boom(struct drm_i915_private *i915,
 
 		explode = fake_dma_object(i915, size);
 		if (IS_ERR(explode)) {
-			err = PTR_ERR(purge);
+			err = PTR_ERR(explode);
 			goto err_purge;
 		}
 
-- 
2.7.4

^ permalink raw reply related	[flat|nested] 7+ messages in thread
* Re: [PATCH] drm/i915/selftests: fix inconsistent IS_ERR and PTR_ERR
  2018-02-14 21:12 [PATCH] drm/i915/selftests: fix inconsistent IS_ERR and PTR_ERR Gustavo A. R. Silva
@ 2018-02-15  9:13 ` Jani Nikula
  2018-02-15 16:09   ` Gustavo A. R. Silva
  0 siblings, 1 reply; 7+ messages in thread
From: Jani Nikula @ 2018-02-15  9:13 UTC (permalink / raw)
  To: Gustavo A. R. Silva, Joonas Lahtinen, Rodrigo Vivi, David Airlie
  Cc: intel-gfx, dri-devel, linux-kernel, Gustavo A. R. Silva

On Wed, 14 Feb 2018, "Gustavo A. R. Silva" <gustavo@embeddedor.com> wrote:
> Fix inconsistent IS_ERR and PTR_ERR in shrink_boom.
> The proper pointer to use is _explode_ instead of _purge_.
>
> This issue was detected with the help of Coccinelle.
>
> Fixes: fe215c8bc426 ("drm/i915/selftests: add missing gtt shrinker test")
> Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>

Reviewed-by: Jani Nikula <jani.nikula@intel.com>

(Having some issues with fdo connections, thus not pushing.)

> ---
>  drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c b/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c
> index d806427..89b6ca9 100644
> --- a/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c
> +++ b/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c
> @@ -927,7 +927,7 @@ static int shrink_boom(struct drm_i915_private *i915,
>  
>  		explode = fake_dma_object(i915, size);
>  		if (IS_ERR(explode)) {
> -			err = PTR_ERR(purge);
> +			err = PTR_ERR(explode);
>  			goto err_purge;
>  		}

-- 
Jani Nikula, Intel Open Source Technology Center

^ permalink raw reply	[flat|nested] 7+ messages in thread
* Re: [PATCH] drm/i915/selftests: fix inconsistent IS_ERR and PTR_ERR
  2018-02-15  9:13 ` Jani Nikula
@ 2018-02-15 16:09   ` Gustavo A. R. Silva
  2018-02-15 16:34       ` Chris Wilson
  0 siblings, 1 reply; 7+ messages in thread
From: Gustavo A. R. Silva @ 2018-02-15 16:09 UTC (permalink / raw)
  To: Jani Nikula, Gustavo A. R. Silva, Joonas Lahtinen, Rodrigo Vivi,
	David Airlie
  Cc: intel-gfx, dri-devel, linux-kernel



On 02/15/2018 03:13 AM, Jani Nikula wrote:
> On Wed, 14 Feb 2018, "Gustavo A. R. Silva" <gustavo@embeddedor.com> wrote:
>> Fix inconsistent IS_ERR and PTR_ERR in shrink_boom.
>> The proper pointer to use is _explode_ instead of _purge_.
>>
>> This issue was detected with the help of Coccinelle.
>>
>> Fixes: fe215c8bc426 ("drm/i915/selftests: add missing gtt shrinker test")
>> Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
> 
> Reviewed-by: Jani Nikula <jani.nikula@intel.com>
> 
> (Having some issues with fdo connections, thus not pushing.)
>

Thanks, Jani
--
Gustavo

>> ---
>>   drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c b/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c
>> index d806427..89b6ca9 100644
>> --- a/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c
>> +++ b/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c
>> @@ -927,7 +927,7 @@ static int shrink_boom(struct drm_i915_private *i915,
>>   
>>   		explode = fake_dma_object(i915, size);
>>   		if (IS_ERR(explode)) {
>> -			err = PTR_ERR(purge);
>> +			err = PTR_ERR(explode);
>>   			goto err_purge;
>>   		}
> 

^ permalink raw reply	[flat|nested] 7+ messages in thread
* Re: [PATCH] drm/i915/selftests: fix inconsistent IS_ERR and PTR_ERR
  2018-02-15 16:09   ` Gustavo A. R. Silva
@ 2018-02-15 16:34       ` Chris Wilson
  0 siblings, 0 replies; 7+ messages in thread
From: Chris Wilson @ 2018-02-15 16:34 UTC (permalink / raw)
  To: Gustavo A. R. Silva, Jani Nikula, Gustavo A. R. Silva,
	Joonas Lahtinen, Rodrigo Vivi, David Airlie
  Cc: intel-gfx, dri-devel, linux-kernel

Quoting Gustavo A. R. Silva (2018-02-15 16:09:09)
> 
> 
> On 02/15/2018 03:13 AM, Jani Nikula wrote:
> > On Wed, 14 Feb 2018, "Gustavo A. R. Silva" <gustavo@embeddedor.com> wrote:
> >> Fix inconsistent IS_ERR and PTR_ERR in shrink_boom.
> >> The proper pointer to use is _explode_ instead of _purge_.
> >>
> >> This issue was detected with the help of Coccinelle.
> >>
> >> Fixes: fe215c8bc426 ("drm/i915/selftests: add missing gtt shrinker test")
> >> Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
> > 
> > Reviewed-by: Jani Nikula <jani.nikula@intel.com>
> > 
> > (Having some issues with fdo connections, thus not pushing.)
> >
> 
> Thanks, Jani

And pushed, thanks for the patch and review.
-Chris

^ permalink raw reply	[flat|nested] 7+ messages in thread
* Re: [PATCH] drm/i915/selftests: fix inconsistent IS_ERR and PTR_ERR
@ 2018-02-15 16:34       ` Chris Wilson
  0 siblings, 0 replies; 7+ messages in thread
From: Chris Wilson @ 2018-02-15 16:34 UTC (permalink / raw)
  To: Gustavo A. R. Silva, Jani Nikula, Gustavo A. R. Silva,
	Joonas Lahtinen, Rodrigo Vivi, David Airlie
  Cc: intel-gfx, linux-kernel, dri-devel

Quoting Gustavo A. R. Silva (2018-02-15 16:09:09)
> 
> 
> On 02/15/2018 03:13 AM, Jani Nikula wrote:
> > On Wed, 14 Feb 2018, "Gustavo A. R. Silva" <gustavo@embeddedor.com> wrote:
> >> Fix inconsistent IS_ERR and PTR_ERR in shrink_boom.
> >> The proper pointer to use is _explode_ instead of _purge_.
> >>
> >> This issue was detected with the help of Coccinelle.
> >>
> >> Fixes: fe215c8bc426 ("drm/i915/selftests: add missing gtt shrinker test")
> >> Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
> > 
> > Reviewed-by: Jani Nikula <jani.nikula@intel.com>
> > 
> > (Having some issues with fdo connections, thus not pushing.)
> >
> 
> Thanks, Jani

And pushed, thanks for the patch and review.
-Chris
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 7+ messages in thread
* Re: [PATCH] drm/i915/selftests: Fix inconsistent IS_ERR and PTR_ERR
  2021-10-22 12:06 [PATCH] drm/i915/selftests: Fix " Kai Song
@ 2021-10-25  8:01 ` Matthew Auld
  0 siblings, 0 replies; 7+ messages in thread
From: Matthew Auld @ 2021-10-25  8:01 UTC (permalink / raw)
  To: Kai Song, jani.nikula, joonas.lahtinen, rodrigo.vivi
  Cc: airlied, daniel, jason, thomas.hellstrom, intel-gfx, dri-devel,
	linux-kernel

On 22/10/2021 13:06, Kai Song wrote:
> Fix inconsistent IS_ERR and PTR_ERR in i915_gem_dmabuf.c
> 
> Signed-off-by: Kai Song <songkai01@inspur.com>

Pushed to drm-intel-gt-next. Thanks.

> ---
>   drivers/gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c b/drivers/gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c
> index 4a6bb64c3a35..3cc74b0fed06 100644
> --- a/drivers/gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c
> +++ b/drivers/gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c
> @@ -102,7 +102,7 @@ static int igt_dmabuf_import_same_driver_lmem(void *arg)
>   	obj = __i915_gem_object_create_user(i915, PAGE_SIZE, &lmem, 1);
>   	if (IS_ERR(obj)) {
>   		pr_err("__i915_gem_object_create_user failed with err=%ld\n",
> -		       PTR_ERR(dmabuf));
> +		       PTR_ERR(obj));
>   		err = PTR_ERR(obj);
>   		goto out_ret;
>   	}
> @@ -158,7 +158,7 @@ static int igt_dmabuf_import_same_driver(struct drm_i915_private *i915,
>   					    regions, num_regions);
>   	if (IS_ERR(obj)) {
>   		pr_err("__i915_gem_object_create_user failed with err=%ld\n",
> -		       PTR_ERR(dmabuf));
> +		       PTR_ERR(obj));
>   		err = PTR_ERR(obj);
>   		goto out_ret;
>   	}
> 

^ permalink raw reply	[flat|nested] 7+ messages in thread
* [PATCH] drm/i915/selftests: Fix inconsistent IS_ERR and PTR_ERR
@ 2021-10-22 12:06 Kai Song
  2021-10-25  8:01 ` Matthew Auld
  0 siblings, 1 reply; 7+ messages in thread
From: Kai Song @ 2021-10-22 12:06 UTC (permalink / raw)
  To: jani.nikula, joonas.lahtinen, rodrigo.vivi
  Cc: airlied, daniel, jason, thomas.hellstrom, matthew.auld,
	intel-gfx, dri-devel, linux-kernel, Kai Song

Fix inconsistent IS_ERR and PTR_ERR in i915_gem_dmabuf.c

Signed-off-by: Kai Song <songkai01@inspur.com>
---
 drivers/gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c b/drivers/gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c
index 4a6bb64c3a35..3cc74b0fed06 100644
--- a/drivers/gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c
+++ b/drivers/gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c
@@ -102,7 +102,7 @@ static int igt_dmabuf_import_same_driver_lmem(void *arg)
 	obj = __i915_gem_object_create_user(i915, PAGE_SIZE, &lmem, 1);
 	if (IS_ERR(obj)) {
 		pr_err("__i915_gem_object_create_user failed with err=%ld\n",
-		       PTR_ERR(dmabuf));
+		       PTR_ERR(obj));
 		err = PTR_ERR(obj);
 		goto out_ret;
 	}
@@ -158,7 +158,7 @@ static int igt_dmabuf_import_same_driver(struct drm_i915_private *i915,
 					    regions, num_regions);
 	if (IS_ERR(obj)) {
 		pr_err("__i915_gem_object_create_user failed with err=%ld\n",
-		       PTR_ERR(dmabuf));
+		       PTR_ERR(obj));
 		err = PTR_ERR(obj);
 		goto out_ret;
 	}
-- 
2.27.0


^ permalink raw reply related	[flat|nested] 7+ messages in thread
end of thread, other threads:[~2021-10-25  8:01 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-02-14 21:12 [PATCH] drm/i915/selftests: fix inconsistent IS_ERR and PTR_ERR Gustavo A. R. Silva
2018-02-15  9:13 ` Jani Nikula
2018-02-15 16:09   ` Gustavo A. R. Silva
2018-02-15 16:34     ` Chris Wilson
2018-02-15 16:34       ` Chris Wilson
2021-10-22 12:06 [PATCH] drm/i915/selftests: Fix " Kai Song
2021-10-25  8:01 ` Matthew Auld

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.