* [PATCH] drm/rockchip: fix Kconfig dependencies
@ 2017-03-28 10:16 Arnd Bergmann
[not found] ` <20170328101654.73624-1-arnd-r2nGTMty4D4@public.gmane.org>
0 siblings, 1 reply; 3+ messages in thread
From: Arnd Bergmann @ 2017-03-28 10:16 UTC (permalink / raw)
To: Mark Yao, David Airlie, Heiko Stuebner
Cc: Stephen Boyd, Arnd Bergmann, Tobias Jakobi, Daniel Vetter,
Jeffy Chen, linux-kernel, dri-devel, Chris Zhong, Sean Paul,
Yakir Yang, Guenter Roeck, linux-rockchip, linux-arm-kernel
A bug that I had fixed earlier just came back, with CONFIG_EXTCON=m,
the rockchip drm driver will fail to link:
drivers/gpu/drm/rockchip/cdn-dp-core.o: In function `cdn_dp_get_port_lanes':
cdn-dp-core.c:(.text.cdn_dp_get_port_lanes+0x30): undefined reference to `extcon_get_state'
cdn-dp-core.c:(.text.cdn_dp_get_port_lanes+0x6c): undefined reference to `extcon_get_property'
drivers/gpu/drm/rockchip/cdn-dp-core.o: In function `cdn_dp_check_sink_connection':
cdn-dp-core.c:(.text.cdn_dp_check_sink_connection+0x80): undefined reference to `extcon_get_state'
drivers/gpu/drm/rockchip/cdn-dp-core.o: In function `cdn_dp_enable':
cdn-dp-core.c:(.text.cdn_dp_enable+0x748): undefined reference to `extcon_get_property'
The problem is that that the sub-drivers are now all linked into the
main rockchip drm module, which breaks all the Kconfig dependencies
that are specified in the options for those sub-drivers.
This clarifies the dependency to ensure that we can only turn on the DP
driver when EXTCON is reachable. As the 'select' statements can now
cause additional options to become built-in when they should be
loadable modules, I'm moving those into the main driver config option.
The dependency on DRM_ROCKCHIP can be reduced into a single 'if'
statement here for brevity, but this has no functional effect.
Fixes: b6705157b2db ("drm/rockchip: add extcon dependency for DP")
Fixes: 8820b68bd378 ("drm/rockchip: Refactor the component match logic.")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
drivers/gpu/drm/rockchip/Kconfig | 19 +++++++++----------
1 file changed, 9 insertions(+), 10 deletions(-)
diff --git a/drivers/gpu/drm/rockchip/Kconfig b/drivers/gpu/drm/rockchip/Kconfig
index 50c41c0a50ef..dcc539ba85d6 100644
--- a/drivers/gpu/drm/rockchip/Kconfig
+++ b/drivers/gpu/drm/rockchip/Kconfig
@@ -5,6 +5,10 @@ config DRM_ROCKCHIP
select DRM_KMS_HELPER
select DRM_PANEL
select VIDEOMODE_HELPERS
+ select DRM_ANALOGIX_DP if ROCKCHIP_ANALOGIX_DP
+ select DRM_DW_HDMI if ROCKCHIP_DW_HDMI
+ select DRM_MIPI_DSI if ROCKCHIP_DW_MIPI_DSI
+ select SND_SOC_HDMI_CODEC if ROCKCHIP_CDN_DP && SND_SOC
help
Choose this option if you have a Rockchip soc chipset.
This driver provides kernel mode setting and buffer
@@ -12,10 +16,10 @@ config DRM_ROCKCHIP
2D or 3D acceleration; acceleration is performed by other
IP found on the SoC.
+if DRM_ROCKCHIP
+
config ROCKCHIP_ANALOGIX_DP
bool "Rockchip specific extensions for Analogix DP driver"
- depends on DRM_ROCKCHIP
- select DRM_ANALOGIX_DP
help
This selects support for Rockchip SoC specific extensions
for the Analogix Core DP driver. If you want to enable DP
@@ -23,9 +27,7 @@ config ROCKCHIP_ANALOGIX_DP
config ROCKCHIP_CDN_DP
bool "Rockchip cdn DP"
- depends on DRM_ROCKCHIP
- depends on EXTCON
- select SND_SOC_HDMI_CODEC if SND_SOC
+ depends on EXTCON=y || (EXTCON=m && DRM_ROCKCHIP=m)
help
This selects support for Rockchip SoC specific extensions
for the cdn DP driver. If you want to enable Dp on
@@ -34,8 +36,6 @@ config ROCKCHIP_CDN_DP
config ROCKCHIP_DW_HDMI
bool "Rockchip specific extensions for Synopsys DW HDMI"
- depends on DRM_ROCKCHIP
- select DRM_DW_HDMI
help
This selects support for Rockchip SoC specific extensions
for the Synopsys DesignWare HDMI driver. If you want to
@@ -44,8 +44,6 @@ config ROCKCHIP_DW_HDMI
config ROCKCHIP_DW_MIPI_DSI
bool "Rockchip specific extensions for Synopsys DW MIPI DSI"
- depends on DRM_ROCKCHIP
- select DRM_MIPI_DSI
help
This selects support for Rockchip SoC specific extensions
for the Synopsys DesignWare HDMI driver. If you want to
@@ -54,8 +52,9 @@ config ROCKCHIP_DW_MIPI_DSI
config ROCKCHIP_INNO_HDMI
bool "Rockchip specific extensions for Innosilicon HDMI"
- depends on DRM_ROCKCHIP
help
This selects support for Rockchip SoC specific extensions
for the Innosilicon HDMI driver. If you want to enable
HDMI on RK3036 based SoC, you should select this option.
+
+endif
--
2.9.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] drm/rockchip: fix Kconfig dependencies
[not found] ` <20170328101654.73624-1-arnd-r2nGTMty4D4@public.gmane.org>
@ 2017-03-28 16:37 ` Guenter Roeck
2017-03-29 1:03 ` jeffy
0 siblings, 1 reply; 3+ messages in thread
From: Guenter Roeck @ 2017-03-28 16:37 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Stephen Boyd, Heiko Stuebner, Tobias Jakobi, David Airlie,
Daniel Vetter, Jeffy Chen, linux-kernel,
dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW, Chris Zhong,
Sean Paul, Yakir Yang, Guenter Roeck,
open list:ARM/Rockchip SoC...,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, Mark Yao
On Tue, Mar 28, 2017 at 3:16 AM, Arnd Bergmann <arnd-r2nGTMty4D4@public.gmane.org> wrote:
> A bug that I had fixed earlier just came back, with CONFIG_EXTCON=m,
> the rockchip drm driver will fail to link:
>
> drivers/gpu/drm/rockchip/cdn-dp-core.o: In function `cdn_dp_get_port_lanes':
> cdn-dp-core.c:(.text.cdn_dp_get_port_lanes+0x30): undefined reference to `extcon_get_state'
> cdn-dp-core.c:(.text.cdn_dp_get_port_lanes+0x6c): undefined reference to `extcon_get_property'
> drivers/gpu/drm/rockchip/cdn-dp-core.o: In function `cdn_dp_check_sink_connection':
> cdn-dp-core.c:(.text.cdn_dp_check_sink_connection+0x80): undefined reference to `extcon_get_state'
> drivers/gpu/drm/rockchip/cdn-dp-core.o: In function `cdn_dp_enable':
> cdn-dp-core.c:(.text.cdn_dp_enable+0x748): undefined reference to `extcon_get_property'
>
> The problem is that that the sub-drivers are now all linked into the
> main rockchip drm module, which breaks all the Kconfig dependencies
> that are specified in the options for those sub-drivers.
>
> This clarifies the dependency to ensure that we can only turn on the DP
> driver when EXTCON is reachable. As the 'select' statements can now
> cause additional options to become built-in when they should be
> loadable modules, I'm moving those into the main driver config option.
> The dependency on DRM_ROCKCHIP can be reduced into a single 'if'
> statement here for brevity, but this has no functional effect.
>
> Fixes: b6705157b2db ("drm/rockchip: add extcon dependency for DP")
> Fixes: 8820b68bd378 ("drm/rockchip: Refactor the component match logic.")
> Signed-off-by: Arnd Bergmann <arnd-r2nGTMty4D4@public.gmane.org>
Acked-by: Guenter Roeck <groeck-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org>
> ---
> drivers/gpu/drm/rockchip/Kconfig | 19 +++++++++----------
> 1 file changed, 9 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/gpu/drm/rockchip/Kconfig b/drivers/gpu/drm/rockchip/Kconfig
> index 50c41c0a50ef..dcc539ba85d6 100644
> --- a/drivers/gpu/drm/rockchip/Kconfig
> +++ b/drivers/gpu/drm/rockchip/Kconfig
> @@ -5,6 +5,10 @@ config DRM_ROCKCHIP
> select DRM_KMS_HELPER
> select DRM_PANEL
> select VIDEOMODE_HELPERS
> + select DRM_ANALOGIX_DP if ROCKCHIP_ANALOGIX_DP
> + select DRM_DW_HDMI if ROCKCHIP_DW_HDMI
> + select DRM_MIPI_DSI if ROCKCHIP_DW_MIPI_DSI
> + select SND_SOC_HDMI_CODEC if ROCKCHIP_CDN_DP && SND_SOC
> help
> Choose this option if you have a Rockchip soc chipset.
> This driver provides kernel mode setting and buffer
> @@ -12,10 +16,10 @@ config DRM_ROCKCHIP
> 2D or 3D acceleration; acceleration is performed by other
> IP found on the SoC.
>
> +if DRM_ROCKCHIP
> +
> config ROCKCHIP_ANALOGIX_DP
> bool "Rockchip specific extensions for Analogix DP driver"
> - depends on DRM_ROCKCHIP
> - select DRM_ANALOGIX_DP
> help
> This selects support for Rockchip SoC specific extensions
> for the Analogix Core DP driver. If you want to enable DP
> @@ -23,9 +27,7 @@ config ROCKCHIP_ANALOGIX_DP
>
> config ROCKCHIP_CDN_DP
> bool "Rockchip cdn DP"
> - depends on DRM_ROCKCHIP
> - depends on EXTCON
> - select SND_SOC_HDMI_CODEC if SND_SOC
> + depends on EXTCON=y || (EXTCON=m && DRM_ROCKCHIP=m)
> help
> This selects support for Rockchip SoC specific extensions
> for the cdn DP driver. If you want to enable Dp on
> @@ -34,8 +36,6 @@ config ROCKCHIP_CDN_DP
>
> config ROCKCHIP_DW_HDMI
> bool "Rockchip specific extensions for Synopsys DW HDMI"
> - depends on DRM_ROCKCHIP
> - select DRM_DW_HDMI
> help
> This selects support for Rockchip SoC specific extensions
> for the Synopsys DesignWare HDMI driver. If you want to
> @@ -44,8 +44,6 @@ config ROCKCHIP_DW_HDMI
>
> config ROCKCHIP_DW_MIPI_DSI
> bool "Rockchip specific extensions for Synopsys DW MIPI DSI"
> - depends on DRM_ROCKCHIP
> - select DRM_MIPI_DSI
> help
> This selects support for Rockchip SoC specific extensions
> for the Synopsys DesignWare HDMI driver. If you want to
> @@ -54,8 +52,9 @@ config ROCKCHIP_DW_MIPI_DSI
>
> config ROCKCHIP_INNO_HDMI
> bool "Rockchip specific extensions for Innosilicon HDMI"
> - depends on DRM_ROCKCHIP
> help
> This selects support for Rockchip SoC specific extensions
> for the Innosilicon HDMI driver. If you want to enable
> HDMI on RK3036 based SoC, you should select this option.
> +
> +endif
> --
> 2.9.0
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] drm/rockchip: fix Kconfig dependencies
2017-03-28 16:37 ` Guenter Roeck
@ 2017-03-29 1:03 ` jeffy
0 siblings, 0 replies; 3+ messages in thread
From: jeffy @ 2017-03-29 1:03 UTC (permalink / raw)
To: Guenter Roeck, Arnd Bergmann
Cc: Heiko Stuebner, Tobias Jakobi, David Airlie, Daniel Vetter,
Stephen Boyd, linux-kernel, dri-devel, Chris Zhong, Sean Paul,
Guenter Roeck, open list:ARM/Rockchip SoC..., linux-arm-kernel,
Mark Yao
Hi Arnd,
Tested-by: Jeffy Chen <jeffy.chen@rock-chips.com>
Thanx for fixing this :)
On 03/29/2017 12:37 AM, Guenter Roeck wrote:
> On Tue, Mar 28, 2017 at 3:16 AM, Arnd Bergmann <arnd@arndb.de> wrote:
>> A bug that I had fixed earlier just came back, with CONFIG_EXTCON=m,
>> the rockchip drm driver will fail to link:
>>
>> drivers/gpu/drm/rockchip/cdn-dp-core.o: In function `cdn_dp_get_port_lanes':
>> cdn-dp-core.c:(.text.cdn_dp_get_port_lanes+0x30): undefined reference to `extcon_get_state'
>> cdn-dp-core.c:(.text.cdn_dp_get_port_lanes+0x6c): undefined reference to `extcon_get_property'
>> drivers/gpu/drm/rockchip/cdn-dp-core.o: In function `cdn_dp_check_sink_connection':
>> cdn-dp-core.c:(.text.cdn_dp_check_sink_connection+0x80): undefined reference to `extcon_get_state'
>> drivers/gpu/drm/rockchip/cdn-dp-core.o: In function `cdn_dp_enable':
>> cdn-dp-core.c:(.text.cdn_dp_enable+0x748): undefined reference to `extcon_get_property'
>>
>> The problem is that that the sub-drivers are now all linked into the
>> main rockchip drm module, which breaks all the Kconfig dependencies
>> that are specified in the options for those sub-drivers.
>>
>> This clarifies the dependency to ensure that we can only turn on the DP
>> driver when EXTCON is reachable. As the 'select' statements can now
>> cause additional options to become built-in when they should be
>> loadable modules, I'm moving those into the main driver config option.
>> The dependency on DRM_ROCKCHIP can be reduced into a single 'if'
>> statement here for brevity, but this has no functional effect.
>>
>> Fixes: b6705157b2db ("drm/rockchip: add extcon dependency for DP")
>> Fixes: 8820b68bd378 ("drm/rockchip: Refactor the component match logic.")
>> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
>
> Acked-by: Guenter Roeck <groeck@chromium.org>
>
>> ---
>> drivers/gpu/drm/rockchip/Kconfig | 19 +++++++++----------
>> 1 file changed, 9 insertions(+), 10 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/rockchip/Kconfig b/drivers/gpu/drm/rockchip/Kconfig
>> index 50c41c0a50ef..dcc539ba85d6 100644
>> --- a/drivers/gpu/drm/rockchip/Kconfig
>> +++ b/drivers/gpu/drm/rockchip/Kconfig
>> @@ -5,6 +5,10 @@ config DRM_ROCKCHIP
>> select DRM_KMS_HELPER
>> select DRM_PANEL
>> select VIDEOMODE_HELPERS
>> + select DRM_ANALOGIX_DP if ROCKCHIP_ANALOGIX_DP
>> + select DRM_DW_HDMI if ROCKCHIP_DW_HDMI
>> + select DRM_MIPI_DSI if ROCKCHIP_DW_MIPI_DSI
>> + select SND_SOC_HDMI_CODEC if ROCKCHIP_CDN_DP && SND_SOC
>> help
>> Choose this option if you have a Rockchip soc chipset.
>> This driver provides kernel mode setting and buffer
>> @@ -12,10 +16,10 @@ config DRM_ROCKCHIP
>> 2D or 3D acceleration; acceleration is performed by other
>> IP found on the SoC.
>>
>> +if DRM_ROCKCHIP
>> +
>> config ROCKCHIP_ANALOGIX_DP
>> bool "Rockchip specific extensions for Analogix DP driver"
>> - depends on DRM_ROCKCHIP
>> - select DRM_ANALOGIX_DP
>> help
>> This selects support for Rockchip SoC specific extensions
>> for the Analogix Core DP driver. If you want to enable DP
>> @@ -23,9 +27,7 @@ config ROCKCHIP_ANALOGIX_DP
>>
>> config ROCKCHIP_CDN_DP
>> bool "Rockchip cdn DP"
>> - depends on DRM_ROCKCHIP
>> - depends on EXTCON
>> - select SND_SOC_HDMI_CODEC if SND_SOC
>> + depends on EXTCON=y || (EXTCON=m && DRM_ROCKCHIP=m)
>> help
>> This selects support for Rockchip SoC specific extensions
>> for the cdn DP driver. If you want to enable Dp on
>> @@ -34,8 +36,6 @@ config ROCKCHIP_CDN_DP
>>
>> config ROCKCHIP_DW_HDMI
>> bool "Rockchip specific extensions for Synopsys DW HDMI"
>> - depends on DRM_ROCKCHIP
>> - select DRM_DW_HDMI
>> help
>> This selects support for Rockchip SoC specific extensions
>> for the Synopsys DesignWare HDMI driver. If you want to
>> @@ -44,8 +44,6 @@ config ROCKCHIP_DW_HDMI
>>
>> config ROCKCHIP_DW_MIPI_DSI
>> bool "Rockchip specific extensions for Synopsys DW MIPI DSI"
>> - depends on DRM_ROCKCHIP
>> - select DRM_MIPI_DSI
>> help
>> This selects support for Rockchip SoC specific extensions
>> for the Synopsys DesignWare HDMI driver. If you want to
>> @@ -54,8 +52,9 @@ config ROCKCHIP_DW_MIPI_DSI
>>
>> config ROCKCHIP_INNO_HDMI
>> bool "Rockchip specific extensions for Innosilicon HDMI"
>> - depends on DRM_ROCKCHIP
>> help
>> This selects support for Rockchip SoC specific extensions
>> for the Innosilicon HDMI driver. If you want to enable
>> HDMI on RK3036 based SoC, you should select this option.
>> +
>> +endif
>> --
>> 2.9.0
>>
>
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-03-29 1:03 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-03-28 10:16 [PATCH] drm/rockchip: fix Kconfig dependencies Arnd Bergmann
[not found] ` <20170328101654.73624-1-arnd-r2nGTMty4D4@public.gmane.org>
2017-03-28 16:37 ` Guenter Roeck
2017-03-29 1:03 ` jeffy
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).