Attachment 144570 Details for Bug 110831 – possible fix

[patch] possible fix

0001-drm-amdgpu-wait-to-fetch-the-vbios-until-after-commo.patch (text/plain), 1.86 KB, created by Alex Deucher on 2019-06-17 14:43:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Deucher

Created: 2019-06-17 14:43:39 UTC

Size: 1.86 KB

patch

obsolete

>From 1f48e705c30e7dc1994bcbdbe05c2e5d396dc6b0 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] 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.
>
>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 4a836db1000f..e26303bc567e 100644
>--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
>+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
>@@ -1534,17 +1534,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",
>@@ -1566,6 +1555,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.20.1
>

Actions: View | Splinter Review

Attachments on bug 110831: 144429 | 144430 | 144570

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.