diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2603-drm-amdgpu-wait-to-fetch-the-vbios-until-after-commo.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2603-drm-amdgpu-wait-to-fetch-the-vbios-until-after-commo.patch | 60 |
1 files changed, 60 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2603-drm-amdgpu-wait-to-fetch-the-vbios-until-after-commo.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2603-drm-amdgpu-wait-to-fetch-the-vbios-until-after-commo.patch new file mode 100644 index 00000000..5a40ae98 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2603-drm-amdgpu-wait-to-fetch-the-vbios-until-after-commo.patch @@ -0,0 +1,60 @@ +From 605644436492dcf1602c2e164d86d74fc619efaf Mon Sep 17 00:00:00 2001 +From: Alex Deucher <alexander.deucher@amd.com> +Date: Mon, 17 Jun 2019 09:37:45 -0500 +Subject: [PATCH 2603/2940] drm/amdgpu: wait to fetch the vbios until after + common init + +We need the asic_funcs set for the get rom callbacks in some +cases. + +Tested-by: Kent Russell <kent.russell@amd.com> +Signed-off-by: Alex Deucher <alexander.deucher@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 24 ++++++++++++---------- + 1 file changed, 13 insertions(+), 11 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +index ab52683442d3..8b75cc05a1c6 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +@@ -1568,17 +1568,6 @@ static int amdgpu_device_ip_early_init(struct amdgpu_device *adev) + if (amdgpu_sriov_vf(adev)) + adev->pm.pp_feature &= ~PP_GFXOFF_MASK; + +- /* Read BIOS */ +- if (!amdgpu_get_bios(adev)) +- return -EINVAL; +- +- r = amdgpu_atombios_init(adev); +- if (r) { +- dev_err(adev->dev, "amdgpu_atombios_init failed\n"); +- amdgpu_vf_error_put(adev, AMDGIM_ERROR_VF_ATOMBIOS_INIT_FAIL, 0, 0); +- return r; +- } +- + for (i = 0; i < adev->num_ip_blocks; i++) { + if ((amdgpu_ip_block_mask & (1 << i)) == 0) { + DRM_ERROR("disabled ip block: %d <%s>\n", +@@ -1600,6 +1589,19 @@ static int amdgpu_device_ip_early_init(struct amdgpu_device *adev) + adev->ip_blocks[i].status.valid = true; + } + } ++ /* get the vbios after the asic_funcs are set up */ ++ if (adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_COMMON) { ++ /* Read BIOS */ ++ if (!amdgpu_get_bios(adev)) ++ return -EINVAL; ++ ++ r = amdgpu_atombios_init(adev); ++ if (r) { ++ dev_err(adev->dev, "amdgpu_atombios_init failed\n"); ++ amdgpu_vf_error_put(adev, AMDGIM_ERROR_VF_ATOMBIOS_INIT_FAIL, 0, 0); ++ return r; ++ } ++ } + } + + adev->cg_flags &= amdgpu_cg_mask; +-- +2.17.1 + |