Commit 21f6137c authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/amdgpu: skip gpu_info fw loading on navi12 

It's no longer required.

Link: https://gitlab.freedesktop.org/drm/amd/-/issues/2318


Reviewed-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
parent 7e725c20

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

+2 −9
Original line number Diff line number Diff line
@@ -2188,15 +2188,8 @@ static int amdgpu_device_parse_gpu_info_fw(struct amdgpu_device *adev) 


	adev->firmware.gpu_info_fw = NULL;



	if (adev->mman.discovery_bin) {

		/*

		 * FIXME: The bounding box is still needed by Navi12, so

		 * temporarily read it from gpu_info firmware. Should be dropped

		 * when DAL no longer needs it.

		 */

		if (adev->asic_type != CHIP_NAVI12)

	if (adev->mman.discovery_bin)

		return 0;

	}



	switch (adev->asic_type) {

	default: