drm/i915: Fix i915_error_state_store error defination
diff mbox series

Message ID 20200117073436.6507-1-zhangxiaoxu5@huawei.com
State New
Headers show
Series
  • drm/i915: Fix i915_error_state_store error defination
Related show

Commit Message

zhangxiaoxu (A) Jan. 17, 2020, 7:34 a.m. UTC
Since commit 742379c0c4001 ("drm/i915: Start chopping up the GPU error
capture"), function 'i915_error_state_store' was defined and used with
only one parameter.

But if no 'CONFIG_DRM_I915_CAPTURE_ERROR', this function was defined
with two parameter.

This may lead compile error. This patch fix it.

Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Zhang Xiaoxu <zhangxiaoxu5@huawei.com>
---
 drivers/gpu/drm/i915/i915_gpu_error.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Comments

Andi Shyti Jan. 17, 2020, 12:15 p.m. UTC | #1
Hi Zhang,

On Fri, Jan 17, 2020 at 03:34:36PM +0800, Zhang Xiaoxu wrote:
> Since commit 742379c0c4001 ("drm/i915: Start chopping up the GPU error
> capture"), function 'i915_error_state_store' was defined and used with
> only one parameter.
> 
> But if no 'CONFIG_DRM_I915_CAPTURE_ERROR', this function was defined
> with two parameter.
> 
> This may lead compile error. This patch fix it.
> 
> Reported-by: Hulk Robot <hulkci@huawei.com>

I've never been a fan of non human accounts, we had this discussion
already in a different mailing list. Could you please find a
different way of giving credit to your CI system?

> Signed-off-by: Zhang Xiaoxu <zhangxiaoxu5@huawei.com>
> ---
>  drivers/gpu/drm/i915/i915_gpu_error.h | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_gpu_error.h b/drivers/gpu/drm/i915/i915_gpu_error.h
> index 9109004956bd..41c1475e1500 100644
> --- a/drivers/gpu/drm/i915/i915_gpu_error.h
> +++ b/drivers/gpu/drm/i915/i915_gpu_error.h
> @@ -314,8 +314,7 @@ i915_vma_capture_finish(struct intel_gt_coredump *gt,
>  }
>  
>  static inline void
> -i915_error_state_store(struct drm_i915_private *i915,
> -		       struct i915_gpu_coredump *error)
> +i915_error_state_store(struct i915_gpu_coredump *error)

ouch! that's an oversight.

Thanks for your patch,

Reviewed-by: Andi Shyti <andi.shyti@intel.com>

Andi
Jani Nikula Jan. 17, 2020, 1:14 p.m. UTC | #2
On Fri, 17 Jan 2020, Andi Shyti <andi.shyti@intel.com> wrote:
> Hi Zhang,
>
> On Fri, Jan 17, 2020 at 03:34:36PM +0800, Zhang Xiaoxu wrote:
>> Since commit 742379c0c4001 ("drm/i915: Start chopping up the GPU error
>> capture"), function 'i915_error_state_store' was defined and used with
>> only one parameter.
>> 
>> But if no 'CONFIG_DRM_I915_CAPTURE_ERROR', this function was defined
>> with two parameter.
>> 
>> This may lead compile error. This patch fix it.
>> 
>> Reported-by: Hulk Robot <hulkci@huawei.com>
>
> I've never been a fan of non human accounts, we had this discussion
> already in a different mailing list. Could you please find a
> different way of giving credit to your CI system?

I don't actually mind for Reported-by credits. The history is full of
things like:

    Reported-by: kbuild test robot <lkp@intel.com>
    Reported-by: syzbot+ec24e95ea483de0a24da@syzkaller.appspotmail.com

Care to reference the discussion?

BR,
Janid.

>
>> Signed-off-by: Zhang Xiaoxu <zhangxiaoxu5@huawei.com>
>> ---
>>  drivers/gpu/drm/i915/i915_gpu_error.h | 3 +--
>>  1 file changed, 1 insertion(+), 2 deletions(-)
>> 
>> diff --git a/drivers/gpu/drm/i915/i915_gpu_error.h b/drivers/gpu/drm/i915/i915_gpu_error.h
>> index 9109004956bd..41c1475e1500 100644
>> --- a/drivers/gpu/drm/i915/i915_gpu_error.h
>> +++ b/drivers/gpu/drm/i915/i915_gpu_error.h
>> @@ -314,8 +314,7 @@ i915_vma_capture_finish(struct intel_gt_coredump *gt,
>>  }
>>  
>>  static inline void
>> -i915_error_state_store(struct drm_i915_private *i915,
>> -		       struct i915_gpu_coredump *error)
>> +i915_error_state_store(struct i915_gpu_coredump *error)
>
> ouch! that's an oversight.
>
> Thanks for your patch,
>
> Reviewed-by: Andi Shyti <andi.shyti@intel.com>
>
> Andi
Andi Shyti Jan. 17, 2020, 2:05 p.m. UTC | #3
Hi Jani,

> >> Reported-by: Hulk Robot <hulkci@huawei.com>
> >
> > I've never been a fan of non human accounts, we had this discussion
> > already in a different mailing list. Could you please find a
> > different way of giving credit to your CI system?
> 
> I don't actually mind for Reported-by credits. The history is full of
> things like:
> 
>     Reported-by: kbuild test robot <lkp@intel.com>
>     Reported-by: syzbot+ec24e95ea483de0a24da@syzkaller.appspotmail.com

That's just commit log unnecessary pollution, unwanted mail
reference... no one will ever answer at lkp@intel.com, why
reference it, then?

> Care to reference the discussion?

Here in the Samsung list we had a discussion with another Huawei
developer about the Hulk Robot:

  https://lkml.org/lkml/2019/9/4/635

Andi
Jani Nikula Jan. 17, 2020, 2:13 p.m. UTC | #4
On Fri, 17 Jan 2020, Andi Shyti <andi.shyti@intel.com> wrote:
> Hi Jani,
>
>> >> Reported-by: Hulk Robot <hulkci@huawei.com>
>> >
>> > I've never been a fan of non human accounts, we had this discussion
>> > already in a different mailing list. Could you please find a
>> > different way of giving credit to your CI system?
>> 
>> I don't actually mind for Reported-by credits. The history is full of
>> things like:
>> 
>>     Reported-by: kbuild test robot <lkp@intel.com>
>>     Reported-by: syzbot+ec24e95ea483de0a24da@syzkaller.appspotmail.com
>
> That's just commit log unnecessary pollution, unwanted mail
> reference... no one will ever answer at lkp@intel.com, why
> reference it, then?

It's not about that, it's about giving credit to whom credit is due.

>> Care to reference the discussion?
>
> Here in the Samsung list we had a discussion with another Huawei
> developer about the Hulk Robot:
>
>   https://lkml.org/lkml/2019/9/4/635

Well, there's no consensus there either.

Again, if they want to use that Reported-by: line, I'm fine with it.

BR,
Jani.

Patch
diff mbox series

diff --git a/drivers/gpu/drm/i915/i915_gpu_error.h b/drivers/gpu/drm/i915/i915_gpu_error.h
index 9109004956bd..41c1475e1500 100644
--- a/drivers/gpu/drm/i915/i915_gpu_error.h
+++ b/drivers/gpu/drm/i915/i915_gpu_error.h
@@ -314,8 +314,7 @@  i915_vma_capture_finish(struct intel_gt_coredump *gt,
 }
 
 static inline void
-i915_error_state_store(struct drm_i915_private *i915,
-		       struct i915_gpu_coredump *error)
+i915_error_state_store(struct i915_gpu_coredump *error)
 {
 }