From: Alex Deucher Date: Tue, 27 Oct 2020 15:02:26 +0000 (-0400) Subject: drm/amdgpu/display: fix warnings when CONFIG_DRM_AMD_DC_DCN is not set X-Git-Tag: baikal/mips/sdk5.9~12066^2~12^2~24 X-Git-Url: https://git.baikalelectronics.ru/sdk/?a=commitdiff_plain;h=b2e73f08837d0430e18481da08afa59309f26882;p=kernel.git 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: c4075c7ad6c9 ("drm/amd/display: Fix the display corruption issue on Navi10") Reviewed-by: Nicholas Kazlauskas Signed-off-by: Alex Deucher --- 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 170beee67ccf2..f51a1a6160b34 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -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