From c074989171801171af6c5f53dd16b27f36b31deb Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Fri, 24 May 2019 19:55:32 +1000
Subject: [PATCH] Revert "drm/amd/display: Don't load DMCU for Raven 1"
This reverts commit 55143dc23ca4792868ea8c17bce65ca7b3d3e8c4.
This causes build breakags with some Kconfigs so revert for now.
Fixes: 55143dc23ca4 ("drm/amd/display: Don't load DMCU for Raven 1")
Signed-off-by: Dave Airlie <airlied@redhat.com>
---
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 12 ++----------
1 file changed, 2 insertions(+), 10 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 0680c740f6fe2..995f9df66142e 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -29,7 +29,6 @@
#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"
@@ -641,7 +640,7 @@ static void amdgpu_dm_fini(struct amdgpu_device *adev)
static int load_dmcu_fw(struct amdgpu_device *adev)
{
- const char *fw_name_dmcu = NULL;
+ const char *fw_name_dmcu;
int r;
const struct dmcu_firmware_header_v1_0 *hdr;
@@ -664,14 +663,7 @@ static int load_dmcu_fw(struct amdgpu_device *adev)
case CHIP_VEGA20:
return 0;
case CHIP_RAVEN:
- 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;
+ fw_name_dmcu = FIRMWARE_RAVEN_DMCU;
break;
default:
DRM_ERROR("Unsupported ASIC type: 0x%X\n", adev->asic_type);
--
GitLab