[PATCH] drm/amdkfd: fix the build when CIK support is disabled

2019-10-04 Thread Alex Deucher 
Add proper ifdefs around CIK code in kfd setup.

Signed-off-by: Alex Deucher 
---
 drivers/gpu/drm/amd/amdkfd/kfd_device.c | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device.c 
b/drivers/gpu/drm/amd/amdkfd/kfd_device.c
index 0db273587af4..d898adf25fbb 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_device.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_device.c
@@ -39,7 +39,9 @@
  */
 static atomic_t kfd_locked = ATOMIC_INIT(0);
 
+#ifdef CONFIG_DRM_AMDGPU_CIK
 extern const struct kfd2kgd_calls gfx_v7_kfd2kgd;
+#endif
 extern const struct kfd2kgd_calls gfx_v8_kfd2kgd;
 extern const struct kfd2kgd_calls gfx_v9_kfd2kgd;
 extern const struct kfd2kgd_calls arcturus_kfd2kgd;
@@ -47,11 +49,15 @@ extern const struct kfd2kgd_calls gfx_v10_kfd2kgd;
 
 static const struct kfd2kgd_calls *kfd2kgd_funcs[] = {
 #ifdef KFD_SUPPORT_IOMMU_V2
+#ifdef CONFIG_DRM_AMDGPU_CIK
[CHIP_KAVERI] = &gfx_v7_kfd2kgd,
+#endif
[CHIP_CARRIZO] = &gfx_v8_kfd2kgd,
[CHIP_RAVEN] = &gfx_v9_kfd2kgd,
 #endif
+#ifdef CONFIG_DRM_AMDGPU_CIK
[CHIP_HAWAII] = &gfx_v7_kfd2kgd,
+#endif
[CHIP_TONGA] = &gfx_v8_kfd2kgd,
[CHIP_FIJI] = &gfx_v8_kfd2kgd,
[CHIP_POLARIS10] = &gfx_v8_kfd2kgd,
-- 
2.20.1

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

Re: [PATCH] drm/amdkfd: fix the build when CIK support is disabled

2019-10-07 Thread Alex Deucher 
Ping...

On Fri, Oct 4, 2019 at 10:15 AM Alex Deucher  wrote:
>
> Add proper ifdefs around CIK code in kfd setup.
>
> Signed-off-by: Alex Deucher 
> ---
>  drivers/gpu/drm/amd/amdkfd/kfd_device.c | 6 ++
>  1 file changed, 6 insertions(+)
>
> diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device.c 
> b/drivers/gpu/drm/amd/amdkfd/kfd_device.c
> index 0db273587af4..d898adf25fbb 100644
> --- a/drivers/gpu/drm/amd/amdkfd/kfd_device.c
> +++ b/drivers/gpu/drm/amd/amdkfd/kfd_device.c
> @@ -39,7 +39,9 @@
>   */
>  static atomic_t kfd_locked = ATOMIC_INIT(0);
>
> +#ifdef CONFIG_DRM_AMDGPU_CIK
>  extern const struct kfd2kgd_calls gfx_v7_kfd2kgd;
> +#endif
>  extern const struct kfd2kgd_calls gfx_v8_kfd2kgd;
>  extern const struct kfd2kgd_calls gfx_v9_kfd2kgd;
>  extern const struct kfd2kgd_calls arcturus_kfd2kgd;
> @@ -47,11 +49,15 @@ extern const struct kfd2kgd_calls gfx_v10_kfd2kgd;
>
>  static const struct kfd2kgd_calls *kfd2kgd_funcs[] = {
>  #ifdef KFD_SUPPORT_IOMMU_V2
> +#ifdef CONFIG_DRM_AMDGPU_CIK
> [CHIP_KAVERI] = &gfx_v7_kfd2kgd,
> +#endif
> [CHIP_CARRIZO] = &gfx_v8_kfd2kgd,
> [CHIP_RAVEN] = &gfx_v9_kfd2kgd,
>  #endif
> +#ifdef CONFIG_DRM_AMDGPU_CIK
> [CHIP_HAWAII] = &gfx_v7_kfd2kgd,
> +#endif
> [CHIP_TONGA] = &gfx_v8_kfd2kgd,
> [CHIP_FIJI] = &gfx_v8_kfd2kgd,
> [CHIP_POLARIS10] = &gfx_v8_kfd2kgd,
> --
> 2.20.1
>
___
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

Re: [PATCH] drm/amdkfd: fix the build when CIK support is disabled

2019-10-07 Thread Kuehling, Felix 
On 2019-10-04 10:15 a.m., Alex Deucher wrote:
> Add proper ifdefs around CIK code in kfd setup.
>
> Signed-off-by: Alex Deucher 

Reviewed-by: Felix Kuehling 

Thanks!

> ---
>   drivers/gpu/drm/amd/amdkfd/kfd_device.c | 6 ++
>   1 file changed, 6 insertions(+)
>
> diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device.c 
> b/drivers/gpu/drm/amd/amdkfd/kfd_device.c
> index 0db273587af4..d898adf25fbb 100644
> --- a/drivers/gpu/drm/amd/amdkfd/kfd_device.c
> +++ b/drivers/gpu/drm/amd/amdkfd/kfd_device.c
> @@ -39,7 +39,9 @@
>*/
>   static atomic_t kfd_locked = ATOMIC_INIT(0);
>   
> +#ifdef CONFIG_DRM_AMDGPU_CIK
>   extern const struct kfd2kgd_calls gfx_v7_kfd2kgd;
> +#endif
>   extern const struct kfd2kgd_calls gfx_v8_kfd2kgd;
>   extern const struct kfd2kgd_calls gfx_v9_kfd2kgd;
>   extern const struct kfd2kgd_calls arcturus_kfd2kgd;
> @@ -47,11 +49,15 @@ extern const struct kfd2kgd_calls gfx_v10_kfd2kgd;
>   
>   static const struct kfd2kgd_calls *kfd2kgd_funcs[] = {
>   #ifdef KFD_SUPPORT_IOMMU_V2
> +#ifdef CONFIG_DRM_AMDGPU_CIK
>   [CHIP_KAVERI] = &gfx_v7_kfd2kgd,
> +#endif
>   [CHIP_CARRIZO] = &gfx_v8_kfd2kgd,
>   [CHIP_RAVEN] = &gfx_v9_kfd2kgd,
>   #endif
> +#ifdef CONFIG_DRM_AMDGPU_CIK
>   [CHIP_HAWAII] = &gfx_v7_kfd2kgd,
> +#endif
>   [CHIP_TONGA] = &gfx_v8_kfd2kgd,
>   [CHIP_FIJI] = &gfx_v8_kfd2kgd,
>   [CHIP_POLARIS10] = &gfx_v8_kfd2kgd,
___
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx