Commit c0749891 authored by Dave Airlie's avatar Dave Airlie

Revert "drm/amd/display: Don't load DMCU for Raven 1"

This reverts commit 55143dc2.

This causes build breakags with some Kconfigs so revert for now.

Fixes: 55143dc2 ("drm/amd/display: Don't load DMCU for Raven 1")
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent e1e52981
...@@ -29,7 +29,6 @@ ...@@ -29,7 +29,6 @@
#include "dm_services_types.h" #include "dm_services_types.h"
#include "dc.h" #include "dc.h"
#include "dc/inc/core_types.h" #include "dc/inc/core_types.h"
#include "dal_asic_id.h"
#include "vid.h" #include "vid.h"
#include "amdgpu.h" #include "amdgpu.h"
...@@ -641,7 +640,7 @@ static void amdgpu_dm_fini(struct amdgpu_device *adev) ...@@ -641,7 +640,7 @@ static void amdgpu_dm_fini(struct amdgpu_device *adev)
static int load_dmcu_fw(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; int r;
const struct dmcu_firmware_header_v1_0 *hdr; const struct dmcu_firmware_header_v1_0 *hdr;
...@@ -664,14 +663,7 @@ static int load_dmcu_fw(struct amdgpu_device *adev) ...@@ -664,14 +663,7 @@ static int load_dmcu_fw(struct amdgpu_device *adev)
case CHIP_VEGA20: case CHIP_VEGA20:
return 0; return 0;
case CHIP_RAVEN: case CHIP_RAVEN:
if (ASICREV_IS_PICASSO(adev->external_rev_id)) fw_name_dmcu = FIRMWARE_RAVEN_DMCU;
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; break;
default: default:
DRM_ERROR("Unsupported ASIC type: 0x%X\n", adev->asic_type); DRM_ERROR("Unsupported ASIC type: 0x%X\n", adev->asic_type);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment