summaryrefslogtreecommitdiff
path: root/include/media/rc-map.h
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2021-02-26 13:37:47 +0300
committerMauro Carvalho Chehab <mchehab+huawei@kernel.org>2021-03-11 13:40:28 +0300
commitf09f9f93afad770a04b35235a0aa465fcc8d6e3d (patch)
tree8ede8f189b650e40d7a44810976a841ea69c6988 /include/media/rc-map.h
parenta38fd8748464831584a19438cbb3082b5a2dab15 (diff)
downloadlinux-f09f9f93afad770a04b35235a0aa465fcc8d6e3d.tar.xz
media: rc: compile rc-cec.c into rc-core
The rc-cec keymap is unusual in that it can't be built as a module, instead it is registered directly in rc-main.c if CONFIG_MEDIA_CEC_RC is set. This is because it can be called from drm_dp_cec_set_edid() via cec_register_adapter() in an asynchronous context, and it is not allowed to use request_module() to load rc-cec.ko in that case. Trying to do so results in a 'WARN_ON_ONCE(wait && current_is_async())'. Since this keymap is only used if CONFIG_MEDIA_CEC_RC is set, we just compile this keymap into the rc-core module and never as a separate module. Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Fixes: 2c6d1fffa1d9 (drm: add support for DisplayPort CEC-Tunneling-over-AUX) Reported-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Sean Young <sean@mess.org> Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Diffstat (limited to 'include/media/rc-map.h')
-rw-r--r--include/media/rc-map.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/include/media/rc-map.h b/include/media/rc-map.h
index 999b750bc6b8..30f138ebab6f 100644
--- a/include/media/rc-map.h
+++ b/include/media/rc-map.h
@@ -175,6 +175,13 @@ struct rc_map_list {
struct rc_map map;
};
+#ifdef CONFIG_MEDIA_CEC_RC
+/*
+ * rc_map_list from rc-cec.c
+ */
+extern struct rc_map_list cec_map;
+#endif
+
/* Routines from rc-map.c */
/**