[PATCH] drm/amd/amdgpu: Add APU flag and asic_type to gca_config debugfs data

[PATCH] drm/amd/amdgpu: Add APU flag and asic_type to gca_config debugfs data

[Tom St Denis]

Needed by umr to detect if ip discovered ASIC is an APU or not.

Signed-off-by: Tom St Denis <tom.stdenis@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c
index 4b950de9bf66..3b2341610c16 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c
@@ -728,7 +728,7 @@ static ssize_t amdgpu_debugfs_gca_config_read(struct file *f, char __user *buf,
 		return -ENOMEM;
 
 	/* version, increment each time something is added */
-	config[no_regs++] = 3;
+	config[no_regs++] = 4;
 	config[no_regs++] = adev->gfx.config.max_shader_engines;
 	config[no_regs++] = adev->gfx.config.max_tile_pipes;
 	config[no_regs++] = adev->gfx.config.max_cu_per_sh;
@@ -768,6 +768,11 @@ static ssize_t amdgpu_debugfs_gca_config_read(struct file *f, char __user *buf,
 	config[no_regs++] = adev->pdev->subsystem_device;
 	config[no_regs++] = adev->pdev->subsystem_vendor;
 
+	/* rev==4 asic_type and APU flag */
+	config[no_regs++] = adev->flags & 0xFF;
+	config[no_regs++] = (adev->flags >> 8) & 0xFF;
+	config[no_regs++] = adev->flags & AMD_IS_APU ? 1 : 0;
+
 	while (size && (*pos < no_regs * 4)) {
 		uint32_t value;
 
-- 
2.32.0

Re: [PATCH] drm/amd/amdgpu: Add APU flag and asic_type to gca_config debugfs data

[Alex Deucher]

On Tue, Feb 15, 2022 at 10:29 AM Tom St Denis <tom.stdenis@amd.com> wrote:
>
> Needed by umr to detect if ip discovered ASIC is an APU or not.
>
> Signed-off-by: Tom St Denis <tom.stdenis@amd.com>

I'm not sure we want to expose the asic_type outside of the driver as
we may theoretically change the ordering in the kernel and then
userspace would need to be aware of this.  We already expose the
asic_family and external revision id which encodes basically the same
information.

Alex


> ---
>  drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 7 ++++++-
>  1 file changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c
> index 4b950de9bf66..3b2341610c16 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c
> @@ -728,7 +728,7 @@ static ssize_t amdgpu_debugfs_gca_config_read(struct file *f, char __user *buf,
>                 return -ENOMEM;
>
>         /* version, increment each time something is added */
> -       config[no_regs++] = 3;
> +       config[no_regs++] = 4;
>         config[no_regs++] = adev->gfx.config.max_shader_engines;
>         config[no_regs++] = adev->gfx.config.max_tile_pipes;
>         config[no_regs++] = adev->gfx.config.max_cu_per_sh;
> @@ -768,6 +768,11 @@ static ssize_t amdgpu_debugfs_gca_config_read(struct file *f, char __user *buf,
>         config[no_regs++] = adev->pdev->subsystem_device;
>         config[no_regs++] = adev->pdev->subsystem_vendor;
>
> +       /* rev==4 asic_type and APU flag */
> +       config[no_regs++] = adev->flags & 0xFF;
> +       config[no_regs++] = (adev->flags >> 8) & 0xFF;
> +       config[no_regs++] = adev->flags & AMD_IS_APU ? 1 : 0;
> +
>         while (size && (*pos < no_regs * 4)) {
>                 uint32_t value;
>
> --
> 2.32.0
>