[PATCHv2 1/4] drm/amdgpu: Store CU info from all XCCs for GFX v9.4.3

[Felix Kuehling]

On 2023-09-06 11:44, Mukul Joshi wrote:
> Currently, we store CU info only for a single XCC assuming
> that it is the same for all XCCs. However, that may not be
> true. As a result, store CU info for all XCCs. This info is
> later used for CU masking.
>
> Signed-off-by: Mukul Joshi <mukul.joshi at amd.com>

One last nit-pick inline. With that fixed (or explained), the patch is

Reviewed-by: Felix Kuehling <Felix.Kuehling at amd.com>


> ---
> v1->v2:
> - Incorporate Felix's review comments.
>
>   drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c    |  2 +-
>   drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h       |  3 +-
>   drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c       |  2 +-
>   drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c        |  2 +-
>   drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c        |  2 +-
>   drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c         |  2 +-
>   drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c         |  2 +-
>   drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c         |  2 +-
>   drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c         |  4 +-
>   drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c       | 76 +++++++++----------
>   drivers/gpu/drm/amd/amdkfd/kfd_crat.c         |  3 +-
>   drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c  |  8 +-
>   drivers/gpu/drm/amd/amdkfd/kfd_topology.c     | 11 ++-
>   .../gpu/drm/amd/include/kgd_kfd_interface.h   |  6 +-
>   14 files changed, 60 insertions(+), 65 deletions(-)

[snip]


> diff --git a/drivers/gpu/drm/amd/include/kgd_kfd_interface.h b/drivers/gpu/drm/amd/include/kgd_kfd_interface.h
> index f3f40dbb8ff7..3b5a56585c4b 100644
> --- a/drivers/gpu/drm/amd/include/kgd_kfd_interface.h
> +++ b/drivers/gpu/drm/amd/include/kgd_kfd_interface.h
> @@ -31,12 +31,12 @@
>   #include <linux/types.h>
>   #include <linux/bitmap.h>
>   #include <linux/dma-fence.h>
> +#include "amdgpu_irq.h"
> +#include "amdgpu_gfx.h"

Why do we need to include amdgpu_irq.h here?

Regards,
   Felix


>   
>   struct pci_dev;
>   struct amdgpu_device;
>   
> -#define KGD_MAX_QUEUES 128
> -
>   struct kfd_dev;
>   struct kgd_mem;
>   
> @@ -68,7 +68,7 @@ struct kfd_cu_info {
>   	uint32_t wave_front_size;
>   	uint32_t max_scratch_slots_per_cu;
>   	uint32_t lds_size;
> -	uint32_t cu_bitmap[4][4];
> +	uint32_t cu_bitmap[AMDGPU_MAX_GC_INSTANCES][4][4];
>   };
>   
>   /* For getting GPU local memory information from KGD */