Commit e6cd859d authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/amdgpu/display: fix warnings when CONFIG_DRM_AMD_DC_DCN is not set 



Properly protect the relevant code with CONFIG_DRM_AMD_DC_DCN.

Fixes: 0b08c54b ("drm/amd/display: Fix the display corruption issue on Navi10")
Reviewed-by: default avatarNicholas Kazlauskas <nicholas.kazlauskas@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 94ba290d

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

+4 −1
Original line number Diff line number Diff line
@@ -894,6 +894,7 @@ static int dm_dmub_hw_init(struct amdgpu_device *adev) 
	return 0;

}



#if defined(CONFIG_DRM_AMD_DC_DCN)

static void mmhub_read_system_context(struct amdgpu_device *adev, struct dc_phy_addr_space_config *pa_config)

{

	uint64_t pt_base;
@@ -946,6 +947,7 @@ static void mmhub_read_system_context(struct amdgpu_device *adev, struct dc_phy_ 
	pa_config->is_hvm_enabled = 0;



}

#endif



static int amdgpu_dm_init(struct amdgpu_device *adev)

{
@@ -953,7 +955,6 @@ static int amdgpu_dm_init(struct amdgpu_device *adev) 
#ifdef CONFIG_DRM_AMD_DC_HDCP

	struct dc_callback_init init_params;

#endif

	struct dc_phy_addr_space_config pa_config;

	int r;



	adev->dm.ddev = adev_to_drm(adev);
@@ -1059,6 +1060,8 @@ static int amdgpu_dm_init(struct amdgpu_device *adev) 


#if defined(CONFIG_DRM_AMD_DC_DCN)

	if (adev->asic_type == CHIP_RENOIR) {

		struct dc_phy_addr_space_config pa_config;



		mmhub_read_system_context(adev, &pa_config);



		// Call the DC init_memory func

CRA Git | Maintained and supported by SUSTech CRA and CCSE