Skip to content

Commit

Permalink
Revert "drm/amd/display: Don't load DMCU for Raven 1"
Browse files Browse the repository at this point in the history
This reverts commit 55143dc.

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

Fixes: 55143dc ("drm/amd/display: Don't load DMCU for Raven 1")

Signed-off-by: Dave Airlie <airlied@redhat.com>
  • Loading branch information
Dave Airlie committed May 24, 2019
1 parent e1e5298 commit c074989
Showing 1 changed file with 2 additions and 10 deletions.
12 changes: 2 additions & 10 deletions drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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;

Expand All @@ -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);
Expand Down

0 comments on commit c074989

Please sign in to comment.