* [PATCH] drm/amd/display: fix link_validation build failure
@ 2023-02-09 12:45 Arnd Bergmann
2023-02-09 14:31 ` Alex Deucher
0 siblings, 1 reply; 2+ messages in thread
From: Arnd Bergmann @ 2023-02-09 12:45 UTC (permalink / raw)
To: Harry Wentland, Leo Li, Rodrigo Siqueira
Cc: Arnd Bergmann, Alex Deucher, Christian König, Pan, Xinhui,
David Airlie, Daniel Vetter, Qingqing Zhuo, George Shen,
Wenjing Liu, amd-gfx, dri-devel, linux-kernel
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] drm/amd/display: fix link_validation build failure
2023-02-09 12:45 [PATCH] drm/amd/display: fix link_validation build failure Arnd Bergmann
@ 2023-02-09 14:31 ` Alex Deucher
0 siblings, 0 replies; 2+ messages in thread
From: Alex Deucher @ 2023-02-09 14:31 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Harry Wentland, Leo Li, Rodrigo Siqueira, Arnd Bergmann,
Qingqing Zhuo, Pan, Xinhui, Wenjing Liu, linux-kernel, amd-gfx,
dri-devel, George Shen, Alex Deucher, Christian König
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
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-02-09 14:32 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-02-09 12:45 [PATCH] drm/amd/display: fix link_validation build failure Arnd Bergmann
2023-02-09 14:31 ` Alex Deucher
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).