Commit b4e79d0c authored by Alex Deucher's avatar Alex Deucher Committed by Greg Kroah-Hartman
Browse files

drm/amd/display: Properly handle additional cases where DCN is not supported 



[ Upstream commit 6fc547a5 ]

There could be boards with DCN listed in IP discovery, but no
display hardware actually wired up.  In this case the vbios
display table will not be populated.  Detect this case and
skip loading DM when we detect it.

v2: Mark DCN as harvested as well so other display checks
elsewhere in the driver are handled properly.

Cc: Aurabindo Pillai <aurabindo.pillai@amd.com>
Reviewed-by: default avatarAurabindo Pillai <aurabindo.pillai@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent fc64b042

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

+11 −0
Original line number Diff line number Diff line
@@ -4526,6 +4526,17 @@ DEVICE_ATTR_WO(s3_debug); 
static int dm_early_init(void *handle)

{

	struct amdgpu_device *adev = (struct amdgpu_device *)handle;

	struct amdgpu_mode_info *mode_info = &adev->mode_info;

	struct atom_context *ctx = mode_info->atom_context;

	int index = GetIndexIntoMasterTable(DATA, Object_Header);

	u16 data_offset;



	/* if there is no object header, skip DM */

	if (!amdgpu_atom_parse_data_header(ctx, index, NULL, NULL, NULL, &data_offset)) {

		adev->harvest_ip_mask |= AMD_HARVEST_IP_DMU_MASK;

		dev_info(adev->dev, "No object header, skipping DM\n");

		return -ENOENT;

	}



	switch (adev->asic_type) {

#if defined(CONFIG_DRM_AMD_DC_SI)