[PATCH 1/3] drm/amdgpu: move discovery gfx config fetching

[Christian König]

Acked-by: Christian König <christian.koenig at amd.com>

Am 22.05.20 um 08:06 schrieb Quan, Evan:
> [AMD Official Use Only - Internal Distribution Only]
>
> Patch1, 2 are reviewed-by: Evan Quan <evan.quan at amd.com>
> Patch3 is acked-by: Evan Quan <evan.quan at amd.com>
>
> -----Original Message-----
> From: amd-gfx <amd-gfx-bounces at lists.freedesktop.org> On Behalf Of Alex Deucher
> Sent: Thursday, May 21, 2020 10:16 PM
> To: amd-gfx list <amd-gfx at lists.freedesktop.org>
> Cc: Deucher, Alexander <Alexander.Deucher at amd.com>
> Subject: Re: [PATCH 1/3] drm/amdgpu: move discovery gfx config fetching
>
> Ping on this series?  It fixes an ordering issue for raven2.
>
> Alex
>
> On Fri, May 15, 2020 at 2:31 PM Alex Deucher <alexdeucher at gmail.com> wrote:
>> Move it into the fw_info function since it's logically part of the
>> same functionality.
>>
>> Signed-off-by: Alex Deucher <alexander.deucher at amd.com>
>> ---
>>   drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 7 +++----
>>   1 file changed, 3 insertions(+), 4 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
>> b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
>> index cc41e8f5ad14..bab1be7abdf0 100644
>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
>> @@ -1617,8 +1617,10 @@ static int amdgpu_device_parse_gpu_info_fw(struct amdgpu_device *adev)
>>                          (const struct gpu_info_firmware_v1_0 *)(adev->firmware.gpu_info_fw->data +
>>
>> le32_to_cpu(hdr->header.ucode_array_offset_bytes));
>>
>> -               if (amdgpu_discovery && adev->asic_type >= CHIP_NAVI10)
>> +               if (amdgpu_discovery && adev->asic_type >= CHIP_NAVI10) {
>> +                       amdgpu_discovery_get_gfx_info(adev);
>>                          goto parse_soc_bounding_box;
>> +               }
>>
>>                  adev->gfx.config.max_shader_engines = le32_to_cpu(gpu_info_fw->gc_num_se);
>>                  adev->gfx.config.max_cu_per_sh =
>> le32_to_cpu(gpu_info_fw->gc_num_cu_per_sh);
>> @@ -1768,9 +1770,6 @@ static int amdgpu_device_ip_early_init(struct amdgpu_device *adev)
>>          if (r)
>>                  return r;
>>
>> -       if (amdgpu_discovery && adev->asic_type >= CHIP_NAVI10)
>> -               amdgpu_discovery_get_gfx_info(adev);
>> -
>>          amdgpu_amdkfd_device_probe(adev);
>>
>>          if (amdgpu_sriov_vf(adev)) {
>> --
>> 2.25.4
>>
> _______________________________________________
> amd-gfx mailing list
> amd-gfx at lists.freedesktop.org
> https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=02%7C01%7Cevan.quan%40amd.com%7Cb692d163dea04a8d9f3208d7fd918cbd%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637256673921983400&sdata=mkNxi6pmkJCpIWNmzHhdmMk6%2BcYR%2BAYJcwwCvoDhlqs%3D&reserved=0
> _______________________________________________
> amd-gfx mailing list
> amd-gfx at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx