]>
Commit | Line | Data |
---|---|---|
1976ca32 GKH |
1 | From b52b6738cc2d50d2a8f4d0095bcb5a86716008a5 Mon Sep 17 00:00:00 2001 |
2 | From: Alex Deucher <alexander.deucher@amd.com> | |
3 | Date: Wed, 28 Nov 2018 23:28:17 -0500 | |
4 | Subject: drm/amdgpu/gmc8: always load MC firmware in the driver | |
5 | MIME-Version: 1.0 | |
6 | Content-Type: text/plain; charset=UTF-8 | |
7 | Content-Transfer-Encoding: 8bit | |
8 | ||
9 | From: Alex Deucher <alexander.deucher@amd.com> | |
10 | ||
11 | commit b52b6738cc2d50d2a8f4d0095bcb5a86716008a5 upstream. | |
12 | ||
13 | Some power features rely on the driver loaded version so always | |
14 | load the MC firmware from the driver even if the vbios loaded | |
15 | a version already. | |
16 | ||
17 | Acked-by: Christian König <christian.koenig@amd.com> | |
18 | Reviewed-by: Junwei Zhang <Jerry.Zhang@amd.com> | |
19 | Signed-off-by: Alex Deucher <alexander.deucher@amd.com> | |
20 | Cc: stable@vger.kernel.org | |
21 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
22 | ||
23 | --- | |
24 | drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 9 +-------- | |
25 | 1 file changed, 1 insertion(+), 8 deletions(-) | |
26 | ||
27 | --- a/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | |
28 | +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | |
29 | @@ -365,7 +365,7 @@ static int gmc_v8_0_polaris_mc_load_micr | |
30 | const struct mc_firmware_header_v1_0 *hdr; | |
31 | const __le32 *fw_data = NULL; | |
32 | const __le32 *io_mc_regs = NULL; | |
33 | - u32 data, vbios_version; | |
34 | + u32 data; | |
35 | int i, ucode_size, regs_size; | |
36 | ||
37 | /* Skip MC ucode loading on SR-IOV capable boards. | |
38 | @@ -376,13 +376,6 @@ static int gmc_v8_0_polaris_mc_load_micr | |
39 | if (amdgpu_sriov_bios(adev)) | |
40 | return 0; | |
41 | ||
42 | - WREG32(mmMC_SEQ_IO_DEBUG_INDEX, 0x9F); | |
43 | - data = RREG32(mmMC_SEQ_IO_DEBUG_DATA); | |
44 | - vbios_version = data & 0xf; | |
45 | - | |
46 | - if (vbios_version == 0) | |
47 | - return 0; | |
48 | - | |
49 | if (!adev->gmc.fw) | |
50 | return -EINVAL; | |
51 |