public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] drm/i915/gem: remove unused assignments
@ 2022-06-20 10:02 zys.zljxml
  2022-06-20 10:12 ` Jani Nikula
  2022-06-20 10:18 ` Tvrtko Ursulin
  0 siblings, 2 replies; 6+ messages in thread
From: zys.zljxml @ 2022-06-20 10:02 UTC (permalink / raw)
  To: dri-devel, intel-gfx, jani.nikula, joonas.lahtinen, rodrigo.vivi,
	tvrtko.ursulin, airlied, daniel
  Cc: bob.beckett, matthew.auld, thomas.hellstrom, kernel, linux-kernel,
	katrinzhou

From: katrinzhou <katrinzhou@tencent.com>

The variable ret is reassigned and the value EINVAL is never used.
Thus, remove the unused assignments.

Addresses-Coverity: ("Unused value")
Fixes: d4433c7600f7 ("drm/i915/gem: Use the proto-context to handle create parameters (v5)")
Signed-off-by: katrinzhou <katrinzhou@tencent.com>
---
 drivers/gpu/drm/i915/gem/i915_gem_context.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/gem/i915_gem_context.c b/drivers/gpu/drm/i915/gem/i915_gem_context.c
index ab4c5ab28e4d..d5ef5243673a 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_context.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_context.c
@@ -931,8 +931,6 @@ static int set_proto_ctx_param(struct drm_i915_file_private *fpriv,
 		break;
 
 	case I915_CONTEXT_PARAM_PERSISTENCE:
-		if (args->size)
-			ret = -EINVAL;
 		ret = proto_context_set_persistence(fpriv->dev_priv, pc,
 						    args->value);
 		break;
-- 
2.27.0


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: [PATCH] drm/i915/gem: remove unused assignments
  2022-06-20 10:02 [PATCH] drm/i915/gem: remove unused assignments zys.zljxml
@ 2022-06-20 10:12 ` Jani Nikula
  2022-06-21  2:21   ` Katrin Jo
  2022-06-20 10:18 ` Tvrtko Ursulin
  1 sibling, 1 reply; 6+ messages in thread
From: Jani Nikula @ 2022-06-20 10:12 UTC (permalink / raw)
  To: zys.zljxml, dri-devel, intel-gfx, joonas.lahtinen, rodrigo.vivi,
	tvrtko.ursulin, airlied, daniel
  Cc: bob.beckett, matthew.auld, thomas.hellstrom, kernel, linux-kernel,
	katrinzhou

On Mon, 20 Jun 2022, zys.zljxml@gmail.com wrote:
> From: katrinzhou <katrinzhou@tencent.com>
>
> The variable ret is reassigned and the value EINVAL is never used.
> Thus, remove the unused assignments.

It's obviously a bug, but it's not obvious just throwing the code away
is the fix. Maybe there's a missing "else" instead.

BR,
Jani.


>
> Addresses-Coverity: ("Unused value")
> Fixes: d4433c7600f7 ("drm/i915/gem: Use the proto-context to handle create parameters (v5)")
> Signed-off-by: katrinzhou <katrinzhou@tencent.com>
> ---
>  drivers/gpu/drm/i915/gem/i915_gem_context.c | 2 --
>  1 file changed, 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_context.c b/drivers/gpu/drm/i915/gem/i915_gem_context.c
> index ab4c5ab28e4d..d5ef5243673a 100644
> --- a/drivers/gpu/drm/i915/gem/i915_gem_context.c
> +++ b/drivers/gpu/drm/i915/gem/i915_gem_context.c
> @@ -931,8 +931,6 @@ static int set_proto_ctx_param(struct drm_i915_file_private *fpriv,
>  		break;
>  
>  	case I915_CONTEXT_PARAM_PERSISTENCE:
> -		if (args->size)
> -			ret = -EINVAL;
>  		ret = proto_context_set_persistence(fpriv->dev_priv, pc,
>  						    args->value);
>  		break;

-- 
Jani Nikula, Intel Open Source Graphics Center

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] drm/i915/gem: remove unused assignments
  2022-06-20 10:02 [PATCH] drm/i915/gem: remove unused assignments zys.zljxml
  2022-06-20 10:12 ` Jani Nikula
@ 2022-06-20 10:18 ` Tvrtko Ursulin
  2022-06-21  2:26   ` Katrin Jo
  1 sibling, 1 reply; 6+ messages in thread
From: Tvrtko Ursulin @ 2022-06-20 10:18 UTC (permalink / raw)
  To: zys.zljxml, dri-devel, intel-gfx, jani.nikula, joonas.lahtinen,
	rodrigo.vivi, airlied, daniel
  Cc: bob.beckett, matthew.auld, thomas.hellstrom, kernel, linux-kernel,
	katrinzhou


On 20/06/2022 11:02, zys.zljxml@gmail.com wrote:
> From: katrinzhou <katrinzhou@tencent.com>
> 
> The variable ret is reassigned and the value EINVAL is never used.
> Thus, remove the unused assignments.
> 
> Addresses-Coverity: ("Unused value")
> Fixes: d4433c7600f7 ("drm/i915/gem: Use the proto-context to handle create parameters (v5)")
> Signed-off-by: katrinzhou <katrinzhou@tencent.com>
> ---
>   drivers/gpu/drm/i915/gem/i915_gem_context.c | 2 --
>   1 file changed, 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_context.c b/drivers/gpu/drm/i915/gem/i915_gem_context.c
> index ab4c5ab28e4d..d5ef5243673a 100644
> --- a/drivers/gpu/drm/i915/gem/i915_gem_context.c
> +++ b/drivers/gpu/drm/i915/gem/i915_gem_context.c
> @@ -931,8 +931,6 @@ static int set_proto_ctx_param(struct drm_i915_file_private *fpriv,
>   		break;
>   
>   	case I915_CONTEXT_PARAM_PERSISTENCE:
> -		if (args->size)
> -			ret = -EINVAL;
>   		ret = proto_context_set_persistence(fpriv->dev_priv, pc,
>   						    args->value);

AFAICT fix should end up with code like this:

if (args->size)
	ret = -EINVAL;
else
	ret = proto_context_set_persistence(...)
break;


Alternatively move args->size checking into 
proto_context_set_persistence to align with set_persistence().

Regards,

Tvrtko

>   		break;

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] drm/i915/gem: remove unused assignments
  2022-06-20 10:12 ` Jani Nikula
@ 2022-06-21  2:21   ` Katrin Jo
  0 siblings, 0 replies; 6+ messages in thread
From: Katrin Jo @ 2022-06-21  2:21 UTC (permalink / raw)
  To: Jani Nikula
  Cc: dri-devel, intel-gfx, joonas.lahtinen, rodrigo.vivi,
	tvrtko.ursulin, airlied, Daniel Vetter, bob.beckett, matthew.auld,
	thomas.hellstrom, kernel, linux-kernel, katrinzhou

On Mon, Jun 20, 2022 at 6:13 PM Jani Nikula <jani.nikula@linux.intel.com> wrote:
>
> On Mon, 20 Jun 2022, zys.zljxml@gmail.com wrote:
> > From: katrinzhou <katrinzhou@tencent.com>
> >
> > The variable ret is reassigned and the value EINVAL is never used.
> > Thus, remove the unused assignments.
>
> It's obviously a bug, but it's not obvious just throwing the code away
> is the fix. Maybe there's a missing "else" instead.
>
> BR,
> Jani.
>
>
> >
> > Addresses-Coverity: ("Unused value")
> > Fixes: d4433c7600f7 ("drm/i915/gem: Use the proto-context to handle create parameters (v5)")
> > Signed-off-by: katrinzhou <katrinzhou@tencent.com>
> > ---
> >  drivers/gpu/drm/i915/gem/i915_gem_context.c | 2 --
> >  1 file changed, 2 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_context.c b/drivers/gpu/drm/i915/gem/i915_gem_context.c
> > index ab4c5ab28e4d..d5ef5243673a 100644
> > --- a/drivers/gpu/drm/i915/gem/i915_gem_context.c
> > +++ b/drivers/gpu/drm/i915/gem/i915_gem_context.c
> > @@ -931,8 +931,6 @@ static int set_proto_ctx_param(struct drm_i915_file_private *fpriv,
> >               break;
> >
> >       case I915_CONTEXT_PARAM_PERSISTENCE:
> > -             if (args->size)
> > -                     ret = -EINVAL;
> >               ret = proto_context_set_persistence(fpriv->dev_priv, pc,
> >                                                   args->value);
> >               break;
>
> --
> Jani Nikula, Intel Open Source Graphics Center

Thanks for reviewing!

Best Regards,
Katrin

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] drm/i915/gem: remove unused assignments
  2022-06-20 10:18 ` Tvrtko Ursulin
@ 2022-06-21  2:26   ` Katrin Jo
  2022-06-22  6:52     ` Tvrtko Ursulin
  0 siblings, 1 reply; 6+ messages in thread
From: Katrin Jo @ 2022-06-21  2:26 UTC (permalink / raw)
  To: Tvrtko Ursulin
  Cc: dri-devel, intel-gfx, jani.nikula, joonas.lahtinen, rodrigo.vivi,
	airlied, Daniel Vetter, bob.beckett, matthew.auld,
	thomas.hellstrom, kernel, linux-kernel, katrinzhou

On Mon, Jun 20, 2022 at 6:19 PM Tvrtko Ursulin
<tvrtko.ursulin@linux.intel.com> wrote:
>
>
> On 20/06/2022 11:02, zys.zljxml@gmail.com wrote:
> > From: katrinzhou <katrinzhou@tencent.com>
> >
> > The variable ret is reassigned and the value EINVAL is never used.
> > Thus, remove the unused assignments.
> >
> > Addresses-Coverity: ("Unused value")
> > Fixes: d4433c7600f7 ("drm/i915/gem: Use the proto-context to handle create parameters (v5)")
> > Signed-off-by: katrinzhou <katrinzhou@tencent.com>
> > ---
> >   drivers/gpu/drm/i915/gem/i915_gem_context.c | 2 --
> >   1 file changed, 2 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_context.c b/drivers/gpu/drm/i915/gem/i915_gem_context.c
> > index ab4c5ab28e4d..d5ef5243673a 100644
> > --- a/drivers/gpu/drm/i915/gem/i915_gem_context.c
> > +++ b/drivers/gpu/drm/i915/gem/i915_gem_context.c
> > @@ -931,8 +931,6 @@ static int set_proto_ctx_param(struct drm_i915_file_private *fpriv,
> >               break;
> >
> >       case I915_CONTEXT_PARAM_PERSISTENCE:
> > -             if (args->size)
> > -                     ret = -EINVAL;
> >               ret = proto_context_set_persistence(fpriv->dev_priv, pc,
> >                                                   args->value);
>
> AFAICT fix should end up with code like this:
>
> if (args->size)
>         ret = -EINVAL;
> else
>         ret = proto_context_set_persistence(...)
> break;
>
>
> Alternatively move args->size checking into
> proto_context_set_persistence to align with set_persistence().
>
> Regards,
>
> Tvrtko
>
> >               break;

Thanks for reviewing! I sent the V2 patch, modified according to your
suggestion.

Best Regards,
Katrin

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] drm/i915/gem: remove unused assignments
  2022-06-21  2:26   ` Katrin Jo
@ 2022-06-22  6:52     ` Tvrtko Ursulin
  0 siblings, 0 replies; 6+ messages in thread
From: Tvrtko Ursulin @ 2022-06-22  6:52 UTC (permalink / raw)
  To: Katrin Jo
  Cc: dri-devel, intel-gfx, jani.nikula, joonas.lahtinen, rodrigo.vivi,
	airlied, Daniel Vetter, bob.beckett, matthew.auld,
	thomas.hellstrom, kernel, linux-kernel, katrinzhou


On 21/06/2022 03:26, Katrin Jo wrote:
> On Mon, Jun 20, 2022 at 6:19 PM Tvrtko Ursulin
> <tvrtko.ursulin@linux.intel.com> wrote:
>>
>>
>> On 20/06/2022 11:02, zys.zljxml@gmail.com wrote:
>>> From: katrinzhou <katrinzhou@tencent.com>
>>>
>>> The variable ret is reassigned and the value EINVAL is never used.
>>> Thus, remove the unused assignments.
>>>
>>> Addresses-Coverity: ("Unused value")
>>> Fixes: d4433c7600f7 ("drm/i915/gem: Use the proto-context to handle create parameters (v5)")
>>> Signed-off-by: katrinzhou <katrinzhou@tencent.com>
>>> ---
>>>    drivers/gpu/drm/i915/gem/i915_gem_context.c | 2 --
>>>    1 file changed, 2 deletions(-)
>>>
>>> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_context.c b/drivers/gpu/drm/i915/gem/i915_gem_context.c
>>> index ab4c5ab28e4d..d5ef5243673a 100644
>>> --- a/drivers/gpu/drm/i915/gem/i915_gem_context.c
>>> +++ b/drivers/gpu/drm/i915/gem/i915_gem_context.c
>>> @@ -931,8 +931,6 @@ static int set_proto_ctx_param(struct drm_i915_file_private *fpriv,
>>>                break;
>>>
>>>        case I915_CONTEXT_PARAM_PERSISTENCE:
>>> -             if (args->size)
>>> -                     ret = -EINVAL;
>>>                ret = proto_context_set_persistence(fpriv->dev_priv, pc,
>>>                                                    args->value);
>>
>> AFAICT fix should end up with code like this:
>>
>> if (args->size)
>>          ret = -EINVAL;
>> else
>>          ret = proto_context_set_persistence(...)
>> break;
>>
>>
>> Alternatively move args->size checking into
>> proto_context_set_persistence to align with set_persistence().
>>
>> Regards,
>>
>> Tvrtko
>>
>>>                break;
> 
> Thanks for reviewing! I sent the V2 patch, modified according to your
> suggestion.

I have merged the v2 to drm-intel-gt-next - thanks for the fix!

Regards,

Tvrtko

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2022-06-22  6:52 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-06-20 10:02 [PATCH] drm/i915/gem: remove unused assignments zys.zljxml
2022-06-20 10:12 ` Jani Nikula
2022-06-21  2:21   ` Katrin Jo
2022-06-20 10:18 ` Tvrtko Ursulin
2022-06-21  2:26   ` Katrin Jo
2022-06-22  6:52     ` Tvrtko Ursulin

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox