[PATCH] drm/amdgpu/display: fix build when CONFIG_DRM_AMD_DC_DCN is not set

[Kazlauskas, Nicholas]

On 2021-10-28 10:46 a.m., Alex Deucher wrote:
> Ping
> 
> On Wed, Oct 27, 2021 at 6:40 PM Alex Deucher <alexander.deucher at amd.com> wrote:
>>
>> Need to guard some things with CONFIG_DRM_AMD_DC_DCN.
>>
>> Fixes: 0c865d1d817b77 ("drm/amd/display: fix link training regression for 1 or 2 lane")
>> Signed-off-by: Alex Deucher <alexander.deucher at amd.com>

Reviewed-by: Nicholas Kazlauskas <nicholas.kazlauskas at amd.com>

Regards,
Nicholas Kazlauskas

>> ---
>>   drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 11 +++++++----
>>   1 file changed, 7 insertions(+), 4 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c b/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c
>> index a9e940bd7e83..49a4d8e85bf8 100644
>> --- a/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c
>> +++ b/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c
>> @@ -840,9 +840,11 @@ static void override_lane_settings(const struct link_training_settings *lt_setti
>>          uint32_t lane;
>>
>>          if (lt_settings->voltage_swing == NULL &&
>> -                       lt_settings->pre_emphasis == NULL &&
>> -                       lt_settings->ffe_preset == NULL &&
>> -                       lt_settings->post_cursor2 == NULL)
>> +           lt_settings->pre_emphasis == NULL &&
>> +#if defined(CONFIG_DRM_AMD_DC_DCN)
>> +           lt_settings->ffe_preset == NULL &&
>> +#endif
>> +           lt_settings->post_cursor2 == NULL)
>>
>>                  return;
>>
>> @@ -853,9 +855,10 @@ static void override_lane_settings(const struct link_training_settings *lt_setti
>>                          lane_settings[lane].PRE_EMPHASIS = *lt_settings->pre_emphasis;
>>                  if (lt_settings->post_cursor2)
>>                          lane_settings[lane].POST_CURSOR2 = *lt_settings->post_cursor2;
>> -
>> +#if defined(CONFIG_DRM_AMD_DC_DCN)
>>                  if (lt_settings->ffe_preset)
>>                          lane_settings[lane].FFE_PRESET = *lt_settings->ffe_preset;
>> +#endif
>>          }
>>   }
>>
>> --
>> 2.31.1
>>