[PATCH] drm/i915: Check the correct variable
There is a copy and paste bug in this code. It's supposed to check "obj2" instead of checking "obj" a second time. Fixes: 80f0b679d6f0 ("drm/i915: Add an implementation for i915_gem_ww_ctx locking, v2.") Signed-off-by: Dan Carpenter --- drivers/gpu/drm/i915/selftests/i915_gem.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/selftests/i915_gem.c b/drivers/gpu/drm/i915/selftests/i915_gem.c index 23a6132c5f4e..412e21604a05 100644 --- a/drivers/gpu/drm/i915/selftests/i915_gem.c +++ b/drivers/gpu/drm/i915/selftests/i915_gem.c @@ -211,8 +211,8 @@ static int igt_gem_ww_ctx(void *arg) return PTR_ERR(obj); obj2 = i915_gem_object_create_internal(i915, PAGE_SIZE); - if (IS_ERR(obj)) { - err = PTR_ERR(obj); + if (IS_ERR(obj2)) { + err = PTR_ERR(obj2); goto put1; } -- 2.29.2 ___ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [Intel-gfx] [PATCH] drm/i915: Check the correct variable
Quoting Andi Shyti (2020-12-03 11:12:24) > Hi Dan, > > > There is a copy and paste bug in this code. It's supposed to check > > "obj2" instead of checking "obj" a second time. > > > > Fixes: 80f0b679d6f0 ("drm/i915: Add an implementation for i915_gem_ww_ctx > > locking, v2.") > > Signed-off-by: Dan Carpenter > > --- > > drivers/gpu/drm/i915/selftests/i915_gem.c | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/drivers/gpu/drm/i915/selftests/i915_gem.c > > b/drivers/gpu/drm/i915/selftests/i915_gem.c > > index 23a6132c5f4e..412e21604a05 100644 > > --- a/drivers/gpu/drm/i915/selftests/i915_gem.c > > +++ b/drivers/gpu/drm/i915/selftests/i915_gem.c > > @@ -211,8 +211,8 @@ static int igt_gem_ww_ctx(void *arg) > > return PTR_ERR(obj); > > > > obj2 = i915_gem_object_create_internal(i915, PAGE_SIZE); > > - if (IS_ERR(obj)) { > > - err = PTR_ERR(obj); > > + if (IS_ERR(obj2)) { > > + err = PTR_ERR(obj2); > > Reviewed-by: Andi Shyti I gave up waiting for patchwork to spot the original patch, and pushed. Thanks, -Chris ___ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH] drm/i915: Check the correct variable
Hi Dan, > There is a copy and paste bug in this code. It's supposed to check > "obj2" instead of checking "obj" a second time. > > Fixes: 80f0b679d6f0 ("drm/i915: Add an implementation for i915_gem_ww_ctx > locking, v2.") > Signed-off-by: Dan Carpenter > --- > drivers/gpu/drm/i915/selftests/i915_gem.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/selftests/i915_gem.c > b/drivers/gpu/drm/i915/selftests/i915_gem.c > index 23a6132c5f4e..412e21604a05 100644 > --- a/drivers/gpu/drm/i915/selftests/i915_gem.c > +++ b/drivers/gpu/drm/i915/selftests/i915_gem.c > @@ -211,8 +211,8 @@ static int igt_gem_ww_ctx(void *arg) > return PTR_ERR(obj); > > obj2 = i915_gem_object_create_internal(i915, PAGE_SIZE); > - if (IS_ERR(obj)) { > - err = PTR_ERR(obj); > + if (IS_ERR(obj2)) { > + err = PTR_ERR(obj2); Reviewed-by: Andi Shyti Thanks, Andi ___ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH] drm/i915: Check the correct variable
Quoting Dan Carpenter (2020-12-03 08:45:17) > There is a copy and paste bug in this code. It's supposed to check > "obj2" instead of checking "obj" a second time. > > Fixes: 80f0b679d6f0 ("drm/i915: Add an implementation for i915_gem_ww_ctx > locking, v2.") > Signed-off-by: Dan Carpenter > --- > drivers/gpu/drm/i915/selftests/i915_gem.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/selftests/i915_gem.c > b/drivers/gpu/drm/i915/selftests/i915_gem.c > index 23a6132c5f4e..412e21604a05 100644 > --- a/drivers/gpu/drm/i915/selftests/i915_gem.c > +++ b/drivers/gpu/drm/i915/selftests/i915_gem.c > @@ -211,8 +211,8 @@ static int igt_gem_ww_ctx(void *arg) > return PTR_ERR(obj); > > obj2 = i915_gem_object_create_internal(i915, PAGE_SIZE); > - if (IS_ERR(obj)) { > - err = PTR_ERR(obj); > + if (IS_ERR(obj2)) { > + err = PTR_ERR(obj2); Reviewed-by: Chris Wilson -Chris ___ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel