Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/amd/amdgpu: Update debugfs GCA data

The data revision was not changed to 5 from 4 when the CG flags
were extended to 64-bits. Since this was missed I took
the opportunity to add future upper 64-bits of PG flags
as well so we don't need to bump it again when that comes.

Signed-off-by: Tom St Denis <tom.stdenis@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

authored by

Tom St Denis and committed by
Alex Deucher
dc2947b3 d9e50239

+4 -3
+4 -3
drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c
··· 730 730 return -ENOMEM; 731 731 732 732 /* version, increment each time something is added */ 733 - config[no_regs++] = 4; 733 + config[no_regs++] = 5; 734 734 config[no_regs++] = adev->gfx.config.max_shader_engines; 735 735 config[no_regs++] = adev->gfx.config.max_tile_pipes; 736 736 config[no_regs++] = adev->gfx.config.max_cu_per_sh; ··· 757 757 758 758 /* rev==1 */ 759 759 config[no_regs++] = adev->rev_id; 760 - config[no_regs++] = adev->pg_flags; 760 + config[no_regs++] = lower_32_bits(adev->pg_flags); 761 761 config[no_regs++] = lower_32_bits(adev->cg_flags); 762 762 763 763 /* rev==2 */ ··· 773 773 /* rev==4 APU flag */ 774 774 config[no_regs++] = adev->flags & AMD_IS_APU ? 1 : 0; 775 775 776 - /* rev==5 CG flag upper 32bit */ 776 + /* rev==5 PG/CG flag upper 32bit */ 777 + config[no_regs++] = upper_32_bits(adev->pg_flags); 777 778 config[no_regs++] = upper_32_bits(adev->cg_flags); 778 779 779 780 while (size && (*pos < no_regs * 4)) {