| Message ID | 20230802124947.1355415-1-arnd@kernel.org (mailing list archive) |
|---|---|
| State | New |
| Delegated to: | Jiri Kosina |
| Headers | show |
| Series | HID: i2c-hid: add more DRM dependencies | expand |
Hi, On Wed, Aug 2, 2023 at 5:49 AM Arnd Bergmann <arnd@kernel.org> wrote: > > From: Arnd Bergmann <arnd@arndb.de> > > When a symbol is selected that has extra dependencies, > anything that selects it must have the same dependencies. > With the added CONFIG_DRM reference from I2C_HID_CORE, > this broke a couple of drivers that now also depend > on DRM: > > WARNING: unmet direct dependencies detected for I2C_HID_CORE > Depends on [m]: HID_SUPPORT [=y] && I2C_HID [=y] && (DRM [=m] || !DRM [=m]) > Selected by [y]: > - I2C_HID_OF [=y] && HID_SUPPORT [=y] && I2C_HID [=y] > - I2C_HID_ACPI [=y] && HID_SUPPORT [=y] && I2C_HID [=y] && ACPI [=y] > - I2C_HID_OF_GOODIX [=y] && HID_SUPPORT [=y] && I2C_HID [=y] && OF [=y] > x86_64-linux-ld: vmlinux.o: in function `i2c_hid_core_remove': > (.text+0xfc8826): undefined reference to `drm_panel_remove_follower' > x86_64-linux-ld: vmlinux.o: in function `i2c_hid_core_probe': > (.text+0xfc8da0): undefined reference to `drm_is_panel_follower' > > Add the corresponding DRM||!DRM dependencies on each one that > is affected. > > Fixes: 96a37bfd232ae ("HID: i2c-hid: Support being a panel follower") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > --- > drivers/hid/i2c-hid/Kconfig | 4 ++++ > 1 file changed, 4 insertions(+) This makes sense. Thanks for the fix! I'm happy to land this in drm-misc-next (where the original patch landed), but I'd prefer an Ack from Benjamin first, if possible. If this is still outstanding tomorrow I'll land it anyway since it's a small fix and he Acked the commit that this is fixing. Reviewed-by: Douglas Anderson <dianders@chromium.org> -Doug
Hi, On Wed, Aug 2, 2023 at 7:16 AM Doug Anderson <dianders@chromium.org> wrote: > > Hi, > > On Wed, Aug 2, 2023 at 5:49 AM Arnd Bergmann <arnd@kernel.org> wrote: > > > > From: Arnd Bergmann <arnd@arndb.de> > > > > When a symbol is selected that has extra dependencies, > > anything that selects it must have the same dependencies. > > With the added CONFIG_DRM reference from I2C_HID_CORE, > > this broke a couple of drivers that now also depend > > on DRM: > > > > WARNING: unmet direct dependencies detected for I2C_HID_CORE > > Depends on [m]: HID_SUPPORT [=y] && I2C_HID [=y] && (DRM [=m] || !DRM [=m]) > > Selected by [y]: > > - I2C_HID_OF [=y] && HID_SUPPORT [=y] && I2C_HID [=y] > > - I2C_HID_ACPI [=y] && HID_SUPPORT [=y] && I2C_HID [=y] && ACPI [=y] > > - I2C_HID_OF_GOODIX [=y] && HID_SUPPORT [=y] && I2C_HID [=y] && OF [=y] > > x86_64-linux-ld: vmlinux.o: in function `i2c_hid_core_remove': > > (.text+0xfc8826): undefined reference to `drm_panel_remove_follower' > > x86_64-linux-ld: vmlinux.o: in function `i2c_hid_core_probe': > > (.text+0xfc8da0): undefined reference to `drm_is_panel_follower' > > > > Add the corresponding DRM||!DRM dependencies on each one that > > is affected. > > > > Fixes: 96a37bfd232ae ("HID: i2c-hid: Support being a panel follower") > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > > --- > > drivers/hid/i2c-hid/Kconfig | 4 ++++ > > 1 file changed, 4 insertions(+) > > This makes sense. Thanks for the fix! > > I'm happy to land this in drm-misc-next (where the original patch > landed), but I'd prefer an Ack from Benjamin first, if possible. If > this is still outstanding tomorrow I'll land it anyway since it's a > small fix and he Acked the commit that this is fixing. > > Reviewed-by: Douglas Anderson <dianders@chromium.org> It's tomorrow, so I've landed this in drm-misc-next. a0769f25a3a6 HID: i2c-hid: add more DRM dependencies -Doug
diff --git a/drivers/hid/i2c-hid/Kconfig b/drivers/hid/i2c-hid/Kconfig index 2bdb55203104b..ef7c595c9403c 100644 --- a/drivers/hid/i2c-hid/Kconfig +++ b/drivers/hid/i2c-hid/Kconfig @@ -9,6 +9,7 @@ if I2C_HID config I2C_HID_ACPI tristate "HID over I2C transport layer ACPI driver" depends on ACPI + depends on DRM || !DRM select I2C_HID_CORE help Say Y here if you use a keyboard, a touchpad, a touchscreen, or any @@ -25,6 +26,7 @@ config I2C_HID_OF tristate "HID over I2C transport layer Open Firmware driver" # No "depends on OF" because this can also be used for manually # (board-file) instantiated "hid-over-i2c" type i2c-clients. + depends on DRM || !DRM select I2C_HID_CORE help Say Y here if you use a keyboard, a touchpad, a touchscreen, or any @@ -41,6 +43,7 @@ config I2C_HID_OF config I2C_HID_OF_ELAN tristate "Driver for Elan hid-i2c based devices on OF systems" depends on OF + depends on DRM || !DRM select I2C_HID_CORE help Say Y here if you want support for Elan i2c devices that use @@ -56,6 +59,7 @@ config I2C_HID_OF_ELAN config I2C_HID_OF_GOODIX tristate "Driver for Goodix hid-i2c based devices on OF systems" depends on OF + depends on DRM || !DRM select I2C_HID_CORE help Say Y here if you want support for Goodix i2c devices that use