* [PATCH] drm/amd/display: fix hdmi_encoded_link_bw definition
@ 2023-01-18 16:06 ` Arnd Bergmann
0 siblings, 0 replies; 6+ messages in thread
From: Arnd Bergmann @ 2023-01-18 16:06 UTC (permalink / raw)
To: Harry Wentland, Leo Li, Rodrigo Siqueira
Cc: Arnd Bergmann, Alex Deucher, Christian König, Pan, Xinhui,
David Airlie, Daniel Vetter, Wenjing Liu, Shen, George,
Solomon Chiu, Ian Chen, Po Ting Chen, Michael Strauss,
Wesley Chalmers, amd-gfx, dri-devel, linux-kernel
From: Arnd Bergmann <arnd@arndb.de>
Some of the data structures are hidden when CONFIG_DRM_AMD_DC_DCN is
disabled, which leads to a link failure:
drivers/gpu/drm/amd/amdgpu/../display/dc/link/link_dp_capability.c:234:21: error: 'union hdmi_encoded_link_bw' declared inside parameter list will not be visible outside of this definition or declaration [-Werror]
234 | const union hdmi_encoded_link_bw hdmi_encoded_link_bw)
| ^~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/../display/dc/link/link_dp_capability.c:234:42: error: parameter 2 ('hdmi_encoded_link_bw') has incomplete type
234 | const union hdmi_encoded_link_bw hdmi_encoded_link_bw)
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/../display/dc/link/link_dp_capability.c:232:17: error: function declaration isn't a prototype [-Werror=strict-prototypes]
232 | static uint32_t intersect_frl_link_bw_support(
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/../display/dc/link/link_dp_capability.c: In function 'get_active_converter_info':
drivers/gpu/drm/amd/amdgpu/../display/dc/link/link_dp_capability.c:1126:76: error: storage size of 'hdmi_encoded_link_bw' isn't known
1126 | union hdmi_encoded_link_bw hdmi_encoded_link_bw;
| ^~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/../display/dc/link/link_dp_capability.c:1130:101: error: 'struct <anonymous>' has no member named 'MAX_ENCODED_LINK_BW_SUPPORT'
1130 | hdmi_color_caps.bits.MAX_ENCODED_LINK_BW_SUPPORT);
There is probably no need to hide the data structure, and removing
the #ifdef makes it build cleanly.
Fixes: d5a43956b73b ("drm/amd/display: move dp capability related logic to link_dp_capability")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 6 ------
1 file changed, 6 deletions(-)
diff --git a/drivers/gpu/drm/amd/display/dc/dc_dp_types.h b/drivers/gpu/drm/amd/display/dc/dc_dp_types.h
index b7e53b7dc4ed..84da54358922 100644
--- a/drivers/gpu/drm/amd/display/dc/dc_dp_types.h
+++ b/drivers/gpu/drm/amd/display/dc/dc_dp_types.h
@@ -361,14 +361,10 @@ enum dpcd_downstream_port_detailed_type {
union dwnstream_port_caps_byte2 {
struct {
uint8_t MAX_BITS_PER_COLOR_COMPONENT:2;
-#if defined(CONFIG_DRM_AMD_DC_DCN)
uint8_t MAX_ENCODED_LINK_BW_SUPPORT:3;
uint8_t SOURCE_CONTROL_MODE_SUPPORT:1;
uint8_t CONCURRENT_LINK_BRING_UP_SEQ_SUPPORT:1;
uint8_t RESERVED:1;
-#else
- uint8_t RESERVED:6;
-#endif
} bits;
uint8_t raw;
};
@@ -406,7 +402,6 @@ union dwnstream_port_caps_byte3_hdmi {
uint8_t raw;
};
-#if defined(CONFIG_DRM_AMD_DC_DCN)
union hdmi_sink_encoded_link_bw_support {
struct {
uint8_t HDMI_SINK_ENCODED_LINK_BW_SUPPORT:3;
@@ -428,7 +423,6 @@ union hdmi_encoded_link_bw {
} bits;
uint8_t raw;
};
-#endif
/*4-byte structure for detailed capabilities of a down-stream port
(DP-to-TMDS converter).*/
--
2.39.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH] drm/amd/display: fix hdmi_encoded_link_bw definition
@ 2023-01-18 16:06 ` Arnd Bergmann
0 siblings, 0 replies; 6+ messages in thread
From: Arnd Bergmann @ 2023-01-18 16:06 UTC (permalink / raw)
To: Harry Wentland, Leo Li, Rodrigo Siqueira
Cc: Ian Chen, Wesley Chalmers, Arnd Bergmann, Pan, Xinhui,
Wenjing Liu, linux-kernel, amd-gfx, Solomon Chiu, Michael Strauss,
dri-devel, Shen, George, Alex Deucher, Po Ting Chen,
Christian König
From: Arnd Bergmann <arnd@arndb.de>
Some of the data structures are hidden when CONFIG_DRM_AMD_DC_DCN is
disabled, which leads to a link failure:
drivers/gpu/drm/amd/amdgpu/../display/dc/link/link_dp_capability.c:234:21: error: 'union hdmi_encoded_link_bw' declared inside parameter list will not be visible outside of this definition or declaration [-Werror]
234 | const union hdmi_encoded_link_bw hdmi_encoded_link_bw)
| ^~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/../display/dc/link/link_dp_capability.c:234:42: error: parameter 2 ('hdmi_encoded_link_bw') has incomplete type
234 | const union hdmi_encoded_link_bw hdmi_encoded_link_bw)
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/../display/dc/link/link_dp_capability.c:232:17: error: function declaration isn't a prototype [-Werror=strict-prototypes]
232 | static uint32_t intersect_frl_link_bw_support(
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/../display/dc/link/link_dp_capability.c: In function 'get_active_converter_info':
drivers/gpu/drm/amd/amdgpu/../display/dc/link/link_dp_capability.c:1126:76: error: storage size of 'hdmi_encoded_link_bw' isn't known
1126 | union hdmi_encoded_link_bw hdmi_encoded_link_bw;
| ^~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/../display/dc/link/link_dp_capability.c:1130:101: error: 'struct <anonymous>' has no member named 'MAX_ENCODED_LINK_BW_SUPPORT'
1130 | hdmi_color_caps.bits.MAX_ENCODED_LINK_BW_SUPPORT);
There is probably no need to hide the data structure, and removing
the #ifdef makes it build cleanly.
Fixes: d5a43956b73b ("drm/amd/display: move dp capability related logic to link_dp_capability")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 6 ------
1 file changed, 6 deletions(-)
diff --git a/drivers/gpu/drm/amd/display/dc/dc_dp_types.h b/drivers/gpu/drm/amd/display/dc/dc_dp_types.h
index b7e53b7dc4ed..84da54358922 100644
--- a/drivers/gpu/drm/amd/display/dc/dc_dp_types.h
+++ b/drivers/gpu/drm/amd/display/dc/dc_dp_types.h
@@ -361,14 +361,10 @@ enum dpcd_downstream_port_detailed_type {
union dwnstream_port_caps_byte2 {
struct {
uint8_t MAX_BITS_PER_COLOR_COMPONENT:2;
-#if defined(CONFIG_DRM_AMD_DC_DCN)
uint8_t MAX_ENCODED_LINK_BW_SUPPORT:3;
uint8_t SOURCE_CONTROL_MODE_SUPPORT:1;
uint8_t CONCURRENT_LINK_BRING_UP_SEQ_SUPPORT:1;
uint8_t RESERVED:1;
-#else
- uint8_t RESERVED:6;
-#endif
} bits;
uint8_t raw;
};
@@ -406,7 +402,6 @@ union dwnstream_port_caps_byte3_hdmi {
uint8_t raw;
};
-#if defined(CONFIG_DRM_AMD_DC_DCN)
union hdmi_sink_encoded_link_bw_support {
struct {
uint8_t HDMI_SINK_ENCODED_LINK_BW_SUPPORT:3;
@@ -428,7 +423,6 @@ union hdmi_encoded_link_bw {
} bits;
uint8_t raw;
};
-#endif
/*4-byte structure for detailed capabilities of a down-stream port
(DP-to-TMDS converter).*/
--
2.39.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] drm/amd/display: fix hdmi_encoded_link_bw definition
2023-01-18 16:06 ` Arnd Bergmann
(?)
@ 2023-01-18 16:32 ` Alex Deucher
-1 siblings, 0 replies; 6+ messages in thread
From: Alex Deucher @ 2023-01-18 16:32 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Ian Chen, Wesley Chalmers, Arnd Bergmann, Leo Li, Wenjing Liu,
Pan, Xinhui, Rodrigo Siqueira, linux-kernel, amd-gfx,
Solomon Chiu, Michael Strauss, dri-devel, Daniel Vetter,
Shen, George, Alex Deucher, David Airlie, Po Ting Chen,
Harry Wentland, Christian König
Applied. Thanks!
Alex
On Wed, Jan 18, 2023 at 11:07 AM Arnd Bergmann <arnd@kernel.org> wrote:
>
> From: Arnd Bergmann <arnd@arndb.de>
>
> Some of the data structures are hidden when CONFIG_DRM_AMD_DC_DCN is
> disabled, which leads to a link failure:
>
> drivers/gpu/drm/amd/amdgpu/../display/dc/link/link_dp_capability.c:234:21: error: 'union hdmi_encoded_link_bw' declared inside parameter list will not be visible outside of this definition or declaration [-Werror]
> 234 | const union hdmi_encoded_link_bw hdmi_encoded_link_bw)
> | ^~~~~~~~~~~~~~~~~~~~
> drivers/gpu/drm/amd/amdgpu/../display/dc/link/link_dp_capability.c:234:42: error: parameter 2 ('hdmi_encoded_link_bw') has incomplete type
> 234 | const union hdmi_encoded_link_bw hdmi_encoded_link_bw)
> | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~
> drivers/gpu/drm/amd/amdgpu/../display/dc/link/link_dp_capability.c:232:17: error: function declaration isn't a prototype [-Werror=strict-prototypes]
> 232 | static uint32_t intersect_frl_link_bw_support(
> | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> drivers/gpu/drm/amd/amdgpu/../display/dc/link/link_dp_capability.c: In function 'get_active_converter_info':
> drivers/gpu/drm/amd/amdgpu/../display/dc/link/link_dp_capability.c:1126:76: error: storage size of 'hdmi_encoded_link_bw' isn't known
> 1126 | union hdmi_encoded_link_bw hdmi_encoded_link_bw;
> | ^~~~~~~~~~~~~~~~~~~~
> drivers/gpu/drm/amd/amdgpu/../display/dc/link/link_dp_capability.c:1130:101: error: 'struct <anonymous>' has no member named 'MAX_ENCODED_LINK_BW_SUPPORT'
> 1130 | hdmi_color_caps.bits.MAX_ENCODED_LINK_BW_SUPPORT);
>
> There is probably no need to hide the data structure, and removing
> the #ifdef makes it build cleanly.
>
> Fixes: d5a43956b73b ("drm/amd/display: move dp capability related logic to link_dp_capability")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
> drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 6 ------
> 1 file changed, 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/display/dc/dc_dp_types.h b/drivers/gpu/drm/amd/display/dc/dc_dp_types.h
> index b7e53b7dc4ed..84da54358922 100644
> --- a/drivers/gpu/drm/amd/display/dc/dc_dp_types.h
> +++ b/drivers/gpu/drm/amd/display/dc/dc_dp_types.h
> @@ -361,14 +361,10 @@ enum dpcd_downstream_port_detailed_type {
> union dwnstream_port_caps_byte2 {
> struct {
> uint8_t MAX_BITS_PER_COLOR_COMPONENT:2;
> -#if defined(CONFIG_DRM_AMD_DC_DCN)
> uint8_t MAX_ENCODED_LINK_BW_SUPPORT:3;
> uint8_t SOURCE_CONTROL_MODE_SUPPORT:1;
> uint8_t CONCURRENT_LINK_BRING_UP_SEQ_SUPPORT:1;
> uint8_t RESERVED:1;
> -#else
> - uint8_t RESERVED:6;
> -#endif
> } bits;
> uint8_t raw;
> };
> @@ -406,7 +402,6 @@ union dwnstream_port_caps_byte3_hdmi {
> uint8_t raw;
> };
>
> -#if defined(CONFIG_DRM_AMD_DC_DCN)
> union hdmi_sink_encoded_link_bw_support {
> struct {
> uint8_t HDMI_SINK_ENCODED_LINK_BW_SUPPORT:3;
> @@ -428,7 +423,6 @@ union hdmi_encoded_link_bw {
> } bits;
> uint8_t raw;
> };
> -#endif
>
> /*4-byte structure for detailed capabilities of a down-stream port
> (DP-to-TMDS converter).*/
> --
> 2.39.0
>
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] drm/amd/display: fix hdmi_encoded_link_bw definition
@ 2023-01-18 16:32 ` Alex Deucher
0 siblings, 0 replies; 6+ messages in thread
From: Alex Deucher @ 2023-01-18 16:32 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Harry Wentland, Leo Li, Rodrigo Siqueira, Ian Chen,
Wesley Chalmers, Arnd Bergmann, Pan, Xinhui, Wenjing Liu,
linux-kernel, amd-gfx, Solomon Chiu, Michael Strauss, dri-devel,
Daniel Vetter, Shen, George, Alex Deucher, Po Ting Chen,
David Airlie, Christian König
Applied. Thanks!
Alex
On Wed, Jan 18, 2023 at 11:07 AM Arnd Bergmann <arnd@kernel.org> wrote:
>
> From: Arnd Bergmann <arnd@arndb.de>
>
> Some of the data structures are hidden when CONFIG_DRM_AMD_DC_DCN is
> disabled, which leads to a link failure:
>
> drivers/gpu/drm/amd/amdgpu/../display/dc/link/link_dp_capability.c:234:21: error: 'union hdmi_encoded_link_bw' declared inside parameter list will not be visible outside of this definition or declaration [-Werror]
> 234 | const union hdmi_encoded_link_bw hdmi_encoded_link_bw)
> | ^~~~~~~~~~~~~~~~~~~~
> drivers/gpu/drm/amd/amdgpu/../display/dc/link/link_dp_capability.c:234:42: error: parameter 2 ('hdmi_encoded_link_bw') has incomplete type
> 234 | const union hdmi_encoded_link_bw hdmi_encoded_link_bw)
> | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~
> drivers/gpu/drm/amd/amdgpu/../display/dc/link/link_dp_capability.c:232:17: error: function declaration isn't a prototype [-Werror=strict-prototypes]
> 232 | static uint32_t intersect_frl_link_bw_support(
> | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> drivers/gpu/drm/amd/amdgpu/../display/dc/link/link_dp_capability.c: In function 'get_active_converter_info':
> drivers/gpu/drm/amd/amdgpu/../display/dc/link/link_dp_capability.c:1126:76: error: storage size of 'hdmi_encoded_link_bw' isn't known
> 1126 | union hdmi_encoded_link_bw hdmi_encoded_link_bw;
> | ^~~~~~~~~~~~~~~~~~~~
> drivers/gpu/drm/amd/amdgpu/../display/dc/link/link_dp_capability.c:1130:101: error: 'struct <anonymous>' has no member named 'MAX_ENCODED_LINK_BW_SUPPORT'
> 1130 | hdmi_color_caps.bits.MAX_ENCODED_LINK_BW_SUPPORT);
>
> There is probably no need to hide the data structure, and removing
> the #ifdef makes it build cleanly.
>
> Fixes: d5a43956b73b ("drm/amd/display: move dp capability related logic to link_dp_capability")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
> drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 6 ------
> 1 file changed, 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/display/dc/dc_dp_types.h b/drivers/gpu/drm/amd/display/dc/dc_dp_types.h
> index b7e53b7dc4ed..84da54358922 100644
> --- a/drivers/gpu/drm/amd/display/dc/dc_dp_types.h
> +++ b/drivers/gpu/drm/amd/display/dc/dc_dp_types.h
> @@ -361,14 +361,10 @@ enum dpcd_downstream_port_detailed_type {
> union dwnstream_port_caps_byte2 {
> struct {
> uint8_t MAX_BITS_PER_COLOR_COMPONENT:2;
> -#if defined(CONFIG_DRM_AMD_DC_DCN)
> uint8_t MAX_ENCODED_LINK_BW_SUPPORT:3;
> uint8_t SOURCE_CONTROL_MODE_SUPPORT:1;
> uint8_t CONCURRENT_LINK_BRING_UP_SEQ_SUPPORT:1;
> uint8_t RESERVED:1;
> -#else
> - uint8_t RESERVED:6;
> -#endif
> } bits;
> uint8_t raw;
> };
> @@ -406,7 +402,6 @@ union dwnstream_port_caps_byte3_hdmi {
> uint8_t raw;
> };
>
> -#if defined(CONFIG_DRM_AMD_DC_DCN)
> union hdmi_sink_encoded_link_bw_support {
> struct {
> uint8_t HDMI_SINK_ENCODED_LINK_BW_SUPPORT:3;
> @@ -428,7 +423,6 @@ union hdmi_encoded_link_bw {
> } bits;
> uint8_t raw;
> };
> -#endif
>
> /*4-byte structure for detailed capabilities of a down-stream port
> (DP-to-TMDS converter).*/
> --
> 2.39.0
>
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] drm/amd/display: fix hdmi_encoded_link_bw definition
@ 2023-01-18 16:32 ` Alex Deucher
0 siblings, 0 replies; 6+ messages in thread
From: Alex Deucher @ 2023-01-18 16:32 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Ian Chen, Wesley Chalmers, Arnd Bergmann, Leo Li, Wenjing Liu,
Pan, Xinhui, Rodrigo Siqueira, linux-kernel, amd-gfx,
Solomon Chiu, Michael Strauss, dri-devel, Shen, George,
Alex Deucher, Po Ting Chen, Christian König
Applied. Thanks!
Alex
On Wed, Jan 18, 2023 at 11:07 AM Arnd Bergmann <arnd@kernel.org> wrote:
>
> From: Arnd Bergmann <arnd@arndb.de>
>
> Some of the data structures are hidden when CONFIG_DRM_AMD_DC_DCN is
> disabled, which leads to a link failure:
>
> drivers/gpu/drm/amd/amdgpu/../display/dc/link/link_dp_capability.c:234:21: error: 'union hdmi_encoded_link_bw' declared inside parameter list will not be visible outside of this definition or declaration [-Werror]
> 234 | const union hdmi_encoded_link_bw hdmi_encoded_link_bw)
> | ^~~~~~~~~~~~~~~~~~~~
> drivers/gpu/drm/amd/amdgpu/../display/dc/link/link_dp_capability.c:234:42: error: parameter 2 ('hdmi_encoded_link_bw') has incomplete type
> 234 | const union hdmi_encoded_link_bw hdmi_encoded_link_bw)
> | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~
> drivers/gpu/drm/amd/amdgpu/../display/dc/link/link_dp_capability.c:232:17: error: function declaration isn't a prototype [-Werror=strict-prototypes]
> 232 | static uint32_t intersect_frl_link_bw_support(
> | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> drivers/gpu/drm/amd/amdgpu/../display/dc/link/link_dp_capability.c: In function 'get_active_converter_info':
> drivers/gpu/drm/amd/amdgpu/../display/dc/link/link_dp_capability.c:1126:76: error: storage size of 'hdmi_encoded_link_bw' isn't known
> 1126 | union hdmi_encoded_link_bw hdmi_encoded_link_bw;
> | ^~~~~~~~~~~~~~~~~~~~
> drivers/gpu/drm/amd/amdgpu/../display/dc/link/link_dp_capability.c:1130:101: error: 'struct <anonymous>' has no member named 'MAX_ENCODED_LINK_BW_SUPPORT'
> 1130 | hdmi_color_caps.bits.MAX_ENCODED_LINK_BW_SUPPORT);
>
> There is probably no need to hide the data structure, and removing
> the #ifdef makes it build cleanly.
>
> Fixes: d5a43956b73b ("drm/amd/display: move dp capability related logic to link_dp_capability")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
> drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 6 ------
> 1 file changed, 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/display/dc/dc_dp_types.h b/drivers/gpu/drm/amd/display/dc/dc_dp_types.h
> index b7e53b7dc4ed..84da54358922 100644
> --- a/drivers/gpu/drm/amd/display/dc/dc_dp_types.h
> +++ b/drivers/gpu/drm/amd/display/dc/dc_dp_types.h
> @@ -361,14 +361,10 @@ enum dpcd_downstream_port_detailed_type {
> union dwnstream_port_caps_byte2 {
> struct {
> uint8_t MAX_BITS_PER_COLOR_COMPONENT:2;
> -#if defined(CONFIG_DRM_AMD_DC_DCN)
> uint8_t MAX_ENCODED_LINK_BW_SUPPORT:3;
> uint8_t SOURCE_CONTROL_MODE_SUPPORT:1;
> uint8_t CONCURRENT_LINK_BRING_UP_SEQ_SUPPORT:1;
> uint8_t RESERVED:1;
> -#else
> - uint8_t RESERVED:6;
> -#endif
> } bits;
> uint8_t raw;
> };
> @@ -406,7 +402,6 @@ union dwnstream_port_caps_byte3_hdmi {
> uint8_t raw;
> };
>
> -#if defined(CONFIG_DRM_AMD_DC_DCN)
> union hdmi_sink_encoded_link_bw_support {
> struct {
> uint8_t HDMI_SINK_ENCODED_LINK_BW_SUPPORT:3;
> @@ -428,7 +423,6 @@ union hdmi_encoded_link_bw {
> } bits;
> uint8_t raw;
> };
> -#endif
>
> /*4-byte structure for detailed capabilities of a down-stream port
> (DP-to-TMDS converter).*/
> --
> 2.39.0
>
^ permalink raw reply [flat|nested] 6+ messages in thread