diff options
Diffstat (limited to 'common/recipes-kernel/linux/linux-yocto-4.14.71/5310-drm-amdgpu-fix-unknown-vram-mem-type-for-vega20.patch')
| -rw-r--r-- | common/recipes-kernel/linux/linux-yocto-4.14.71/5310-drm-amdgpu-fix-unknown-vram-mem-type-for-vega20.patch | 69 |
1 files changed, 69 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-4.14.71/5310-drm-amdgpu-fix-unknown-vram-mem-type-for-vega20.patch b/common/recipes-kernel/linux/linux-yocto-4.14.71/5310-drm-amdgpu-fix-unknown-vram-mem-type-for-vega20.patch new file mode 100644 index 00000000..d31373ba --- /dev/null +++ b/common/recipes-kernel/linux/linux-yocto-4.14.71/5310-drm-amdgpu-fix-unknown-vram-mem-type-for-vega20.patch @@ -0,0 +1,69 @@ +From 78950f411da864f192b13ee8bca24fdf7e657544 Mon Sep 17 00:00:00 2001 +From: Hawking Zhang <Hawking.Zhang@amd.com> +Date: Mon, 17 Sep 2018 20:19:48 +0800 +Subject: [PATCH 5310/5725] drm/amdgpu: fix unknown vram mem type for vega20 + +vega20 should use umc_info v3_3 instead of v3_1. There are +serveral versions of umc_info for vega series. Compared to +various versions of these structures, vram_info strucure is +unified for vega series. The patch switch to query mem_type +from vram_info structure for all the vega series dGPU. + +Change-Id: If8d22b687ec5d0f4445527e69841df83479cc485 +Signed-off-by: Hawking Zhang <Hawking.Zhang@amd.com> +Reviewed-by: Alex Deucher <alexander.deucher@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c | 14 +++++++++----- + 1 file changed, 9 insertions(+), 5 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c +index 5461d0d..b61e1dc 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c +@@ -117,6 +117,10 @@ union igp_info { + union umc_info { + struct atom_umc_info_v3_1 v31; + }; ++ ++union vram_info { ++ struct atom_vram_info_header_v2_3 v23; ++}; + /* + * Return vram width from integrated system info table, if available, + * or 0 if not. +@@ -195,7 +199,7 @@ int amdgpu_atomfirmware_get_vram_type(struct amdgpu_device *adev) + int index; + u16 data_offset, size; + union igp_info *igp_info; +- union umc_info *umc_info; ++ union vram_info *vram_info; + u8 frev, crev; + u8 mem_type; + +@@ -204,7 +208,7 @@ int amdgpu_atomfirmware_get_vram_type(struct amdgpu_device *adev) + integratedsysteminfo); + else + index = get_index_into_master_table(atom_master_list_of_data_tables_v2_1, +- umc_info); ++ vram_info); + if (amdgpu_atom_parse_data_header(mode_info->atom_context, + index, &size, + &frev, &crev, &data_offset)) { +@@ -219,11 +223,11 @@ int amdgpu_atomfirmware_get_vram_type(struct amdgpu_device *adev) + return 0; + } + } else { +- umc_info = (union umc_info *) ++ vram_info = (union vram_info *) + (mode_info->atom_context->bios + data_offset); + switch (crev) { +- case 1: +- mem_type = umc_info->v31.vram_type; ++ case 3: ++ mem_type = vram_info->v23.vram_module[0].memory_type; + return convert_atom_mem_type_to_vram_type(adev, mem_type); + default: + return 0; +-- +2.7.4 + |