| Message ID | 20230209124513.1341645-1-arnd@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/amd/display: fix link_validation build failure | expand |
Applied. Thanks! Alex On Thu, Feb 9, 2023 at 7:45 AM Arnd Bergmann <arnd@kernel.org> wrote: > > From: Arnd Bergmann <arnd@arndb.de> > > When CONFIG_DRM_AMD_DC_DCN is disabled, the is_frl member > is not defined: > > drivers/gpu/drm/amd/amdgpu/../display/dc/link/link_validation.c: In function 'dp_active_dongle_validate_timing': > drivers/gpu/drm/amd/amdgpu/../display/dc/link/link_validation.c:126:66: error: 'const struct dc_dsc_config' has no member named 'is_frl' > 126 | if (timing->flags.DSC && !timing->dsc_cfg.is_frl) > | ^ > > Use the same #ifdef as the other references to this. > > Fixes: 54618888d1ea ("drm/amd/display: break down dc_link.c") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > --- > drivers/gpu/drm/amd/display/dc/link/link_validation.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/drivers/gpu/drm/amd/display/dc/link/link_validation.c b/drivers/gpu/drm/amd/display/dc/link/link_validation.c > index cd821d077d73..8ddebf3bdd46 100644 > --- a/drivers/gpu/drm/amd/display/dc/link/link_validation.c > +++ b/drivers/gpu/drm/amd/display/dc/link/link_validation.c > @@ -123,9 +123,11 @@ static bool dp_active_dongle_validate_timing( > if (dongle_caps->dp_hdmi_frl_max_link_bw_in_kbps > 0) { // DP to HDMI FRL converter > struct dc_crtc_timing outputTiming = *timing; > > +#if defined(CONFIG_DRM_AMD_DC_DCN) > if (timing->flags.DSC && !timing->dsc_cfg.is_frl) > /* DP input has DSC, HDMI FRL output doesn't have DSC, remove DSC from output timing */ > outputTiming.flags.DSC = 0; > +#endif > if (dc_bandwidth_in_kbps_from_timing(&outputTiming) > dongle_caps->dp_hdmi_frl_max_link_bw_in_kbps) > return false; > } else { // DP to HDMI TMDS converter > -- > 2.39.1 >
diff --git a/drivers/gpu/drm/amd/display/dc/link/link_validation.c b/drivers/gpu/drm/amd/display/dc/link/link_validation.c index cd821d077d73..8ddebf3bdd46 100644 --- a/drivers/gpu/drm/amd/display/dc/link/link_validation.c +++ b/drivers/gpu/drm/amd/display/dc/link/link_validation.c @@ -123,9 +123,11 @@ static bool dp_active_dongle_validate_timing( if (dongle_caps->dp_hdmi_frl_max_link_bw_in_kbps > 0) { // DP to HDMI FRL converter struct dc_crtc_timing outputTiming = *timing; +#if defined(CONFIG_DRM_AMD_DC_DCN) if (timing->flags.DSC && !timing->dsc_cfg.is_frl) /* DP input has DSC, HDMI FRL output doesn't have DSC, remove DSC from output timing */ outputTiming.flags.DSC = 0; +#endif if (dc_bandwidth_in_kbps_from_timing(&outputTiming) > dongle_caps->dp_hdmi_frl_max_link_bw_in_kbps) return false; } else { // DP to HDMI TMDS converter