diff options
| author | Alex Deucher <alexander.deucher@amd.com> | 2020-10-27 18:02:26 +0300 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2020-11-02 23:34:33 +0300 |
| commit | e6cd859dc65f19567fdc5e2653cbd543ada2f53c (patch) | |
| tree | b2a9bf48b6058c8ba3a3b47e516c85c5165f8502 | |
| parent | 94ba290da1a9708e52039f38fff1eb4f97ff852a (diff) | |
| download | linux-e6cd859dc65f19567fdc5e2653cbd543ada2f53c.tar.xz | |
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: 0b08c54bb7a3 ("drm/amd/display: Fix the display corruption issue on Navi10")
Reviewed-by: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
| -rw-r--r-- | drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 5 |
1 files changed, 4 insertions, 1 deletions
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 170beee67ccf..f51a1a6160b3 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 |