diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/1955-drm-amd-display-Don-t-load-DMCU-for-Raven-1.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/1955-drm-amd-display-Don-t-load-DMCU-for-Raven-1.patch | 60 |
1 files changed, 60 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/1955-drm-amd-display-Don-t-load-DMCU-for-Raven-1.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/1955-drm-amd-display-Don-t-load-DMCU-for-Raven-1.patch new file mode 100644 index 00000000..970a0379 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/1955-drm-amd-display-Don-t-load-DMCU-for-Raven-1.patch @@ -0,0 +1,60 @@ +From c1cf0104be3ec75488c3aeaeb3b6d7f1a5daae45 Mon Sep 17 00:00:00 2001 +From: Harry Wentland <harry.wentland@amd.com> +Date: Mon, 29 Apr 2019 09:39:15 -0400 +Subject: [PATCH 1955/2940] drm/amd/display: Don't load DMCU for Raven 1 + +[WHY] +Some early Raven boards had a bad SBIOS that doesn't play nicely with +the DMCU FW. We thought the issues were fixed by ignoring errors on DMCU +load but that doesn't seem to be the case. We've still seen reports of +users unable to boot their systems at all. + +[HOW] +Disable DMCU load on Raven 1. Only load it for Raven 2 and Picasso. + +Signed-off-by: Harry Wentland <harry.wentland@amd.com> +Reviewed-by: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com> +--- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 12 ++++++++++-- + 1 file changed, 10 insertions(+), 2 deletions(-) + +diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +index 834adb729c6d..6750d74e1c85 100644 +--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c ++++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +@@ -29,6 +29,7 @@ + #include "dm_services_types.h" + #include "dc.h" + #include "dc/inc/core_types.h" ++#include "dal_asic_id.h" + + #include "vid.h" + #include "amdgpu.h" +@@ -640,7 +641,7 @@ static void amdgpu_dm_fini(struct amdgpu_device *adev) + + static int load_dmcu_fw(struct amdgpu_device *adev) + { +- const char *fw_name_dmcu; ++ const char *fw_name_dmcu = NULL; + int r; + const struct dmcu_firmware_header_v1_0 *hdr; + +@@ -663,7 +664,14 @@ static int load_dmcu_fw(struct amdgpu_device *adev) + case CHIP_VEGA20: + return 0; + case CHIP_RAVEN: +- fw_name_dmcu = FIRMWARE_RAVEN_DMCU; ++ if (ASICREV_IS_PICASSO(adev->external_rev_id)) ++ fw_name_dmcu = FIRMWARE_RAVEN_DMCU; ++#if defined(CONFIG_DRM_AMD_DC_DCN1_01) ++ else if (ASICREV_IS_RAVEN2(adev->external_rev_id)) ++ fw_name_dmcu = FIRMWARE_RAVEN_DMCU; ++#endif ++ else ++ return 0; + break; + default: + DRM_ERROR("Unsupported ASIC type: 0x%X\n", adev->asic_type); +-- +2.17.1 + |