| Message ID | 20190718134240.2265724-1-arnd@arndb.de |
|---|---|
| State | New |
| Headers | show |
| Series | drm/bridge: fix RC_CORE dependency | expand |
On 18.07.2019 16:21, Arnd Bergmann wrote: > On Thu, Jul 18, 2019 at 4:16 PM Andrzej Hajda <a.hajda@samsung.com> wrote: >> Hi Arnd, >> >> On 18.07.2019 15:42, Arnd Bergmann wrote: >>> Using 'imply' causes a new problem, as it allows the case of >>> CONFIG_INPUT=m with RC_CORE=y, which fails to link: >>> >>> drivers/media/rc/rc-main.o: In function `ir_do_keyup': >>> rc-main.c:(.text+0x2b4): undefined reference to `input_event' >>> drivers/media/rc/rc-main.o: In function `rc_repeat': >>> rc-main.c:(.text+0x350): undefined reference to `input_event' >>> drivers/media/rc/rc-main.o: In function `rc_allocate_device': >>> rc-main.c:(.text+0x90c): undefined reference to `input_allocate_device' >>> >>> Add a 'depends on' that allows building both with and without >>> CONFIG_RC_CORE, but disallows combinations that don't link. >>> >>> Fixes: 5023cf32210d ("drm/bridge: make remote control optional") >>> Signed-off-by: Arnd Bergmann <arnd@arndb.de> >> >> Proper solution has been already merged via input tree[1]. >> >> >> [1]: >> https://lore.kernel.org/lkml/CAKdAkRTGXNbUsuKASNGLfwUwC7Asod9K5baYLPWPU7EX-42-yA@mail.gmail.com/ > At that link, I only see the patch that caused the regression, not > the solution. Are you sure it's fixed? Ups, you are right, I though you are fixing what this patch attempted to fix :) Anyway, we want to avoid dependency on RC_CORE - this driver does not require it, but with RC_CORE it has additional features. Maybe "imply INPUT" would help? Regards Andrzej > > Arnd >
On 18.07.2019 15:42, Arnd Bergmann wrote: > Using 'imply' causes a new problem, as it allows the case of > CONFIG_INPUT=m with RC_CORE=y, which fails to link: I have reviewed dependencies and I wonder how such configuration is possible at all. RC_CORE depends on INPUT (at least on today's next branch) so if INPUT=m then RC_CORE should be either n either m, am I right? Arnd, are there unknown to me changes in RC/INPUT dependencies? Regards Andrzej > > drivers/media/rc/rc-main.o: In function `ir_do_keyup': > rc-main.c:(.text+0x2b4): undefined reference to `input_event' > drivers/media/rc/rc-main.o: In function `rc_repeat': > rc-main.c:(.text+0x350): undefined reference to `input_event' > drivers/media/rc/rc-main.o: In function `rc_allocate_device': > rc-main.c:(.text+0x90c): undefined reference to `input_allocate_device' > > Add a 'depends on' that allows building both with and without > CONFIG_RC_CORE, but disallows combinations that don't link. > > Fixes: 5023cf32210d ("drm/bridge: make remote control optional") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > --- > drivers/gpu/drm/bridge/Kconfig | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/bridge/Kconfig b/drivers/gpu/drm/bridge/Kconfig > index f64c91defdc3..70a8ed2505aa 100644 > --- a/drivers/gpu/drm/bridge/Kconfig > +++ b/drivers/gpu/drm/bridge/Kconfig > @@ -85,8 +85,8 @@ config DRM_SIL_SII8620 > tristate "Silicon Image SII8620 HDMI/MHL bridge" > depends on OF > select DRM_KMS_HELPER > + depends on RC_CORE || !RC_CORE > imply EXTCON > - imply RC_CORE > help > Silicon Image SII8620 HDMI/MHL bridge chip driver. >
diff --git a/drivers/gpu/drm/bridge/Kconfig b/drivers/gpu/drm/bridge/Kconfig index f64c91defdc3..70a8ed2505aa 100644 --- a/drivers/gpu/drm/bridge/Kconfig +++ b/drivers/gpu/drm/bridge/Kconfig @@ -85,8 +85,8 @@ config DRM_SIL_SII8620 tristate "Silicon Image SII8620 HDMI/MHL bridge" depends on OF select DRM_KMS_HELPER + depends on RC_CORE || !RC_CORE imply EXTCON - imply RC_CORE help Silicon Image SII8620 HDMI/MHL bridge chip driver.
Using 'imply' causes a new problem, as it allows the case of CONFIG_INPUT=m with RC_CORE=y, which fails to link: drivers/media/rc/rc-main.o: In function `ir_do_keyup': rc-main.c:(.text+0x2b4): undefined reference to `input_event' drivers/media/rc/rc-main.o: In function `rc_repeat': rc-main.c:(.text+0x350): undefined reference to `input_event' drivers/media/rc/rc-main.o: In function `rc_allocate_device': rc-main.c:(.text+0x90c): undefined reference to `input_allocate_device' Add a 'depends on' that allows building both with and without CONFIG_RC_CORE, but disallows combinations that don't link. Fixes: 5023cf32210d ("drm/bridge: make remote control optional") Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- drivers/gpu/drm/bridge/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)