RE: [PATCH] drm/amdkfd: fix kgd2kfd_device_init() definition conflict error

2019-09-27 Thread Kasiviswanathan, Harish 
Sorry missed it too. Thanks for fixing it.

Best Regards,
Harish


-Original Message-
From: Kuehling, Felix  
Sent: Friday, September 27, 2019 10:19 AM
To: Liang, Prike ; amd-gfx@lists.freedesktop.org
Cc: Kasiviswanathan, Harish ; Huang, Ray 

Subject: Re: [PATCH] drm/amdkfd: fix kgd2kfd_device_init() definition conflict 
error

On 2019-09-27 0:33, Liang, Prike wrote:
> The patch c670707 drm/amd: Pass drm_device to kfd introduced this issue and
> fix the following compiler error.
>
>CC [M]  drivers/gpu/drm/amd/amdgpu//../powerplay/smumgr/fiji_smumgr.o
> drivers/gpu/drm/amd/amdgpu//amdgpu_amdkfd.c:746:6: error: conflicting types 
> for ‘kgd2kfd_device_init’
>   bool kgd2kfd_device_init(struct kfd_dev *kfd,
>^
> In file included from drivers/gpu/drm/amd/amdgpu//amdgpu_amdkfd.c:23:0:
> drivers/gpu/drm/amd/amdgpu//amdgpu_amdkfd.h:253:6: note: previous declaration 
> of ‘kgd2kfd_device_init’ was here
>   bool kgd2kfd_device_init(struct kfd_dev *kfd,
>^
> scripts/Makefile.build:273: recipe for target 
> 'drivers/gpu/drm/amd/amdgpu//amdgpu_amdkfd.o' failed
> make[1]: *** [drivers/gpu/drm/amd/amdgpu//amdgpu_amdkfd.o] Error 1
>
> Signed-off-by: Prike Liang 

This fix is for the case that CONFIG_HSA_AMD is disabled. Sorry for 
missing that when reviewing Harish's code.

Reviewed-by: Felix Kuehling 


> ---
>   drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 1 +
>   1 file changed, 1 insertion(+)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c 
> b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
> index 221047d..92666b1 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
> @@ -744,6 +744,7 @@ struct kfd_dev *kgd2kfd_probe(struct kgd_dev *kgd, struct 
> pci_dev *pdev,
>   }
>   
>   bool kgd2kfd_device_init(struct kfd_dev *kfd,
> +  struct drm_device *ddev,
>const struct kgd2kfd_shared_resources *gpu_resources)
>   {
>   return false;
___
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

Re: [PATCH] drm/amdkfd: fix kgd2kfd_device_init() definition conflict error

2019-09-27 Thread Kuehling, Felix 
On 2019-09-27 0:33, Liang, Prike wrote:
> The patch c670707 drm/amd: Pass drm_device to kfd introduced this issue and
> fix the following compiler error.
>
>CC [M]  drivers/gpu/drm/amd/amdgpu//../powerplay/smumgr/fiji_smumgr.o
> drivers/gpu/drm/amd/amdgpu//amdgpu_amdkfd.c:746:6: error: conflicting types 
> for ‘kgd2kfd_device_init’
>   bool kgd2kfd_device_init(struct kfd_dev *kfd,
>^
> In file included from drivers/gpu/drm/amd/amdgpu//amdgpu_amdkfd.c:23:0:
> drivers/gpu/drm/amd/amdgpu//amdgpu_amdkfd.h:253:6: note: previous declaration 
> of ‘kgd2kfd_device_init’ was here
>   bool kgd2kfd_device_init(struct kfd_dev *kfd,
>^
> scripts/Makefile.build:273: recipe for target 
> 'drivers/gpu/drm/amd/amdgpu//amdgpu_amdkfd.o' failed
> make[1]: *** [drivers/gpu/drm/amd/amdgpu//amdgpu_amdkfd.o] Error 1
>
> Signed-off-by: Prike Liang 

This fix is for the case that CONFIG_HSA_AMD is disabled. Sorry for 
missing that when reviewing Harish's code.

Reviewed-by: Felix Kuehling 


> ---
>   drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 1 +
>   1 file changed, 1 insertion(+)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c 
> b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
> index 221047d..92666b1 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
> @@ -744,6 +744,7 @@ struct kfd_dev *kgd2kfd_probe(struct kgd_dev *kgd, struct 
> pci_dev *pdev,
>   }
>   
>   bool kgd2kfd_device_init(struct kfd_dev *kfd,
> +  struct drm_device *ddev,
>const struct kgd2kfd_shared_resources *gpu_resources)
>   {
>   return false;
___
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

RE: [PATCH] drm/amdkfd: fix kgd2kfd_device_init() definition conflict error

2019-09-27 Thread Quan, Evan 
Acked-by: Evan Quan 

-Original Message-
From: amd-gfx  On Behalf Of Liang, Prike
Sent: Friday, September 27, 2019 12:34 PM
To: amd-gfx@lists.freedesktop.org
Cc: Kuehling, Felix ; Huang, Ray ; 
Kasiviswanathan, Harish ; Liang, Prike 

Subject: [PATCH] drm/amdkfd: fix kgd2kfd_device_init() definition conflict error

The patch c670707 drm/amd: Pass drm_device to kfd introduced this issue and fix 
the following compiler error.

  CC [M]  drivers/gpu/drm/amd/amdgpu//../powerplay/smumgr/fiji_smumgr.o
drivers/gpu/drm/amd/amdgpu//amdgpu_amdkfd.c:746:6: error: conflicting types for 
‘kgd2kfd_device_init’
 bool kgd2kfd_device_init(struct kfd_dev *kfd,
  ^
In file included from drivers/gpu/drm/amd/amdgpu//amdgpu_amdkfd.c:23:0:
drivers/gpu/drm/amd/amdgpu//amdgpu_amdkfd.h:253:6: note: previous declaration 
of ‘kgd2kfd_device_init’ was here  bool kgd2kfd_device_init(struct kfd_dev *kfd,
  ^
scripts/Makefile.build:273: recipe for target 
'drivers/gpu/drm/amd/amdgpu//amdgpu_amdkfd.o' failed
make[1]: *** [drivers/gpu/drm/amd/amdgpu//amdgpu_amdkfd.o] Error 1

Signed-off-by: Prike Liang 
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c 
b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
index 221047d..92666b1 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
@@ -744,6 +744,7 @@ struct kfd_dev *kgd2kfd_probe(struct kgd_dev *kgd, struct 
pci_dev *pdev,  }
 
 bool kgd2kfd_device_init(struct kfd_dev *kfd,
+struct drm_device *ddev,
 const struct kgd2kfd_shared_resources *gpu_resources)  
{
return false;
--
2.7.4

___
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
___
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

[PATCH] drm/amdkfd: fix kgd2kfd_device_init() definition conflict error

2019-09-26 Thread Liang, Prike 
The patch c670707 drm/amd: Pass drm_device to kfd introduced this issue and
fix the following compiler error.

  CC [M]  drivers/gpu/drm/amd/amdgpu//../powerplay/smumgr/fiji_smumgr.o
drivers/gpu/drm/amd/amdgpu//amdgpu_amdkfd.c:746:6: error: conflicting types for 
‘kgd2kfd_device_init’
 bool kgd2kfd_device_init(struct kfd_dev *kfd,
  ^
In file included from drivers/gpu/drm/amd/amdgpu//amdgpu_amdkfd.c:23:0:
drivers/gpu/drm/amd/amdgpu//amdgpu_amdkfd.h:253:6: note: previous declaration 
of ‘kgd2kfd_device_init’ was here
 bool kgd2kfd_device_init(struct kfd_dev *kfd,
  ^
scripts/Makefile.build:273: recipe for target 
'drivers/gpu/drm/amd/amdgpu//amdgpu_amdkfd.o' failed
make[1]: *** [drivers/gpu/drm/amd/amdgpu//amdgpu_amdkfd.o] Error 1

Signed-off-by: Prike Liang 
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c 
b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
index 221047d..92666b1 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
@@ -744,6 +744,7 @@ struct kfd_dev *kgd2kfd_probe(struct kgd_dev *kgd, struct 
pci_dev *pdev,
 }
 
 bool kgd2kfd_device_init(struct kfd_dev *kfd,
+struct drm_device *ddev,
 const struct kgd2kfd_shared_resources *gpu_resources)
 {
return false;
-- 
2.7.4

___
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx