* [PATCH] drm/i915: Fix an error code i915_gem_object_copy_blt()
@ 2020-09-10 10:08 Dan Carpenter
2020-09-10 20:14 ` Mika Kuoppala
0 siblings, 1 reply; 4+ messages in thread
From: Dan Carpenter @ 2020-09-10 10:08 UTC (permalink / raw)
To: Jani Nikula, Maarten Lankhorst
Cc: kernel-janitors, David Airlie, intel-gfx, Chris Wilson, Matthew Auld
This code should use "vma[1]" instead of "vma". The "vma" is a variable
is a valid pointer.
Fixes: 6b05030496f7 ("drm/i915: Convert i915_gem_object/client_blt.c to use ww locking as well, v2.")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
drivers/gpu/drm/i915/gem/i915_gem_object_blt.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_object_blt.c b/drivers/gpu/drm/i915/gem/i915_gem_object_blt.c
index d93eb36160c9..aee7ad3cc3c6 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_object_blt.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_object_blt.c
@@ -364,7 +364,7 @@ int i915_gem_object_copy_blt(struct drm_i915_gem_object *src,
vma[1] = i915_vma_instance(dst, vm, NULL);
if (IS_ERR(vma[1]))
- return PTR_ERR(vma);
+ return PTR_ERR(vma[1]);
i915_gem_ww_ctx_init(&ww, true);
intel_engine_pm_get(ce->engine);
--
2.28.0
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] drm/i915: Fix an error code i915_gem_object_copy_blt()
2020-09-10 10:08 [PATCH] drm/i915: Fix an error code i915_gem_object_copy_blt() Dan Carpenter
@ 2020-09-10 20:14 ` Mika Kuoppala
2020-09-11 7:52 ` [PATCH v2] " Dan Carpenter
0 siblings, 1 reply; 4+ messages in thread
From: Mika Kuoppala @ 2020-09-10 20:14 UTC (permalink / raw)
To: Dan Carpenter, Jani Nikula, Maarten Lankhorst
Cc: David Airlie, kernel-janitors, intel-gfx, Chris Wilson, Matthew Auld
Dan Carpenter <dan.carpenter@oracle.com> writes:
> This code should use "vma[1]" instead of "vma". The "vma" is a variable
> is a valid pointer.
Not quite getting the last sentence with my non native english parser.
"vma" is array would make sense.
>
> Fixes: 6b05030496f7 ("drm/i915: Convert i915_gem_object/client_blt.c to use ww locking as well, v2.")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
> ---
> drivers/gpu/drm/i915/gem/i915_gem_object_blt.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_object_blt.c b/drivers/gpu/drm/i915/gem/i915_gem_object_blt.c
> index d93eb36160c9..aee7ad3cc3c6 100644
> --- a/drivers/gpu/drm/i915/gem/i915_gem_object_blt.c
> +++ b/drivers/gpu/drm/i915/gem/i915_gem_object_blt.c
> @@ -364,7 +364,7 @@ int i915_gem_object_copy_blt(struct drm_i915_gem_object *src,
>
> vma[1] = i915_vma_instance(dst, vm, NULL);
> if (IS_ERR(vma[1]))
> - return PTR_ERR(vma);
> + return PTR_ERR(vma[1]);
>
> i915_gem_ww_ctx_init(&ww, true);
> intel_engine_pm_get(ce->engine);
> --
> 2.28.0
^ permalink raw reply [flat|nested] 4+ messages in thread* [PATCH v2] drm/i915: Fix an error code i915_gem_object_copy_blt()
2020-09-10 20:14 ` Mika Kuoppala
@ 2020-09-11 7:52 ` Dan Carpenter
2020-09-17 10:49 ` Maarten Lankhorst
0 siblings, 1 reply; 4+ messages in thread
From: Dan Carpenter @ 2020-09-11 7:52 UTC (permalink / raw)
To: Jani Nikula, Maarten Lankhorst
Cc: kernel-janitors, David Airlie, intel-gfx, Chris Wilson, Matthew Auld
This code should use "vma[1]" instead of "vma". The "vma" variable is a
valid pointer.
Fixes: 6b05030496f7 ("drm/i915: Convert i915_gem_object/client_blt.c to use ww locking as well, v2.")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
---
v2: Fix confusing typo in the commit message
drivers/gpu/drm/i915/gem/i915_gem_object_blt.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_object_blt.c b/drivers/gpu/drm/i915/gem/i915_gem_object_blt.c
index d93eb36160c9..aee7ad3cc3c6 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_object_blt.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_object_blt.c
@@ -364,7 +364,7 @@ int i915_gem_object_copy_blt(struct drm_i915_gem_object *src,
vma[1] = i915_vma_instance(dst, vm, NULL);
if (IS_ERR(vma[1]))
- return PTR_ERR(vma);
+ return PTR_ERR(vma[1]);
i915_gem_ww_ctx_init(&ww, true);
intel_engine_pm_get(ce->engine);
--
2.28.0
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH v2] drm/i915: Fix an error code i915_gem_object_copy_blt()
2020-09-11 7:52 ` [PATCH v2] " Dan Carpenter
@ 2020-09-17 10:49 ` Maarten Lankhorst
0 siblings, 0 replies; 4+ messages in thread
From: Maarten Lankhorst @ 2020-09-17 10:49 UTC (permalink / raw)
To: Dan Carpenter, Jani Nikula
Cc: David Airlie, intel-gfx, kernel-janitors, Chris Wilson, Matthew Auld
Op 11-09-2020 om 09:52 schreef Dan Carpenter:
> This code should use "vma[1]" instead of "vma". The "vma" variable is a
> valid pointer.
>
> Fixes: 6b05030496f7 ("drm/i915: Convert i915_gem_object/client_blt.c to use ww locking as well, v2.")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
> ---
> v2: Fix confusing typo in the commit message
>
> drivers/gpu/drm/i915/gem/i915_gem_object_blt.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_object_blt.c b/drivers/gpu/drm/i915/gem/i915_gem_object_blt.c
> index d93eb36160c9..aee7ad3cc3c6 100644
> --- a/drivers/gpu/drm/i915/gem/i915_gem_object_blt.c
> +++ b/drivers/gpu/drm/i915/gem/i915_gem_object_blt.c
> @@ -364,7 +364,7 @@ int i915_gem_object_copy_blt(struct drm_i915_gem_object *src,
>
> vma[1] = i915_vma_instance(dst, vm, NULL);
> if (IS_ERR(vma[1]))
> - return PTR_ERR(vma);
> + return PTR_ERR(vma[1]);
>
> i915_gem_ww_ctx_init(&ww, true);
> intel_engine_pm_get(ce->engine);
Thanks, applied to drm-intel-gt-next. :)
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-09-17 10:49 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-09-10 10:08 [PATCH] drm/i915: Fix an error code i915_gem_object_copy_blt() Dan Carpenter
2020-09-10 20:14 ` Mika Kuoppala
2020-09-11 7:52 ` [PATCH v2] " Dan Carpenter
2020-09-17 10:49 ` Maarten Lankhorst
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).