Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f9fb22a2 authored by Shaoyun Liu's avatar Shaoyun Liu Committed by Alex Deucher
Browse files

drm/amdgpu: Update GFX info structure to match what vega20 used 



Update to the latest version from the vbios team.

Signed-off-by: default avatarShaoyun Liu <Shaoyun.Liu@amd.com>
Acked-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent bf20f0ab

drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c

+3 −5
Original line number Diff line number Diff line
@@ -354,11 +354,9 @@ int amdgpu_atomfirmware_get_gfx_info(struct amdgpu_device *adev) 
				le16_to_cpu(gfx_info->v24.gc_gsprim_buff_depth);

			adev->gfx.config.double_offchip_lds_buf =

				gfx_info->v24.gc_double_offchip_lds_buffer;

			adev->gfx.cu_info.wave_front_size = gfx_info->v24.gc_wave_size;

			adev->gfx.cu_info.max_waves_per_simd =

				le16_to_cpu(gfx_info->v24.gc_max_waves_per_simd);

			adev->gfx.cu_info.max_scratch_slots_per_cu =

				gfx_info->v24.gc_max_scratch_slots_per_cu;

			adev->gfx.cu_info.wave_front_size = le16_to_cpu(gfx_info->v24.gc_wave_size);

			adev->gfx.cu_info.max_waves_per_simd = le16_to_cpu(gfx_info->v24.gc_max_waves_per_simd);

			adev->gfx.cu_info.max_scratch_slots_per_cu = gfx_info->v24.gc_max_scratch_slots_per_cu;

			adev->gfx.cu_info.lds_size = le16_to_cpu(gfx_info->v24.gc_lds_size);

			return 0;

		default:

drivers/gpu/drm/amd/include/atomfirmware.h

+2 −1
Original line number Diff line number Diff line
@@ -1240,7 +1240,6 @@ struct atom_gfx_info_v2_4 { 
  uint8_t active_cu_per_sh;

  uint8_t active_rb_per_se;

  uint16_t gcgoldenoffset;

  uint32_t rm21_sram_vmin_value;

  uint16_t gc_num_gprs;

  uint16_t gc_gsprim_buff_depth;

  uint16_t gc_parameter_cache_depth;
@@ -1251,6 +1250,8 @@ struct atom_gfx_info_v2_4 { 
  uint8_t gc_gs_table_depth;

  uint8_t gc_double_offchip_lds_buffer;

  uint8_t gc_max_scratch_slots_per_cu;

  uint32_t sram_rm_fuses_val;

  uint32_t sram_custom_rm_fuses_val;

};



/*