| Message ID | 20160218150650.GR19428@n2100.arm.linux.org.uk (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi Russell, Am Donnerstag, den 18.02.2016, 15:06 +0000 schrieb Russell King - ARM Linux: > On Thu, Feb 18, 2016 at 04:02:17PM +0100, Philipp Zabel wrote: > > This is extracted from Russell's food for thought HDMI notification > > prototype [1]. I've put it into drivers/video for the time being because > > my kernels don't have drivers/cec yet. > > I see it's also the old version still - this is my latest version, only > subtly different in terms of the file naming and Kconfig option name. > Functionally the same. Thank you for the update. Have you sent (or do you intend to send) this separately somewhere? I could then reference it and drop the patch from this series. Or I could add your signoff and keep the new patch as part of this series, if you'd prefer. best regards Philipp > drivers/video/Kconfig | 3 +++ > drivers/video/Makefile | 1 + > drivers/video/hdmi-notifier.c | 61 +++++++++++++++++++++++++++++++++++++++++++ > include/linux/hdmi-notifier.h | 44 +++++++++++++++++++++++++++++++ > 4 files changed, 109 insertions(+) > > diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig > index e0606c01e8ac..193649c8a951 100644 > --- a/drivers/video/Kconfig > +++ b/drivers/video/Kconfig > @@ -40,6 +40,9 @@ config VIDEOMODE_HELPERS > config HDMI > bool > > +config HDMI_NOTIFIERS > + bool > + > if VT > source "drivers/video/console/Kconfig" > endif > diff --git a/drivers/video/Makefile b/drivers/video/Makefile > index 9ad3c17d6456..65f564906fb4 100644 > --- a/drivers/video/Makefile > +++ b/drivers/video/Makefile > @@ -1,5 +1,6 @@ > obj-$(CONFIG_VGASTATE) += vgastate.o > obj-$(CONFIG_HDMI) += hdmi.o > +obj-$(CONFIG_HDMI_NOTIFIERS) += hdmi-notifier.o > > obj-$(CONFIG_VT) += console/ > obj-$(CONFIG_LOGO) += logo/ > diff --git a/drivers/video/hdmi-notifier.c b/drivers/video/hdmi-notifier.c > new file mode 100644 > index 000000000000..a233359cacfa > --- /dev/null > +++ b/drivers/video/hdmi-notifier.c > @@ -0,0 +1,61 @@ > +#include <linux/export.h> > +#include <linux/hdmi-notifier.h> > +#include <linux/notifier.h> > +#include <linux/string.h> > + > +static BLOCKING_NOTIFIER_HEAD(hdmi_notifier); > + > +int hdmi_register_notifier(struct notifier_block *nb) > +{ > + return blocking_notifier_chain_register(&hdmi_notifier, nb); > +} > +EXPORT_SYMBOL_GPL(hdmi_register_notifier); > + > +int hdmi_unregister_notifier(struct notifier_block *nb) > +{ > + return blocking_notifier_chain_unregister(&hdmi_notifier, nb); > +} > +EXPORT_SYMBOL_GPL(hdmi_unregister_notifier); > + > +void hdmi_event_connect(struct device *dev) > +{ > + struct hdmi_event_base base; > + > + base.source = dev; > + > + blocking_notifier_call_chain(&hdmi_notifier, HDMI_CONNECTED, &base); > +} > +EXPORT_SYMBOL_GPL(hdmi_event_connect); > + > +void hdmi_event_disconnect(struct device *dev) > +{ > + struct hdmi_event_base base; > + > + base.source = dev; > + > + blocking_notifier_call_chain(&hdmi_notifier, HDMI_DISCONNECTED, &base); > +} > +EXPORT_SYMBOL_GPL(hdmi_event_disconnect); > + > +void hdmi_event_new_edid(struct device *dev, const void *edid, size_t size) > +{ > + struct hdmi_event_new_edid new_edid; > + > + new_edid.base.source = dev; > + new_edid.edid = edid; > + new_edid.size = size; > + > + blocking_notifier_call_chain(&hdmi_notifier, HDMI_NEW_EDID, &new_edid); > +} > +EXPORT_SYMBOL_GPL(hdmi_event_new_edid); > + > +void hdmi_event_new_eld(struct device *dev, const void *eld) > +{ > + struct hdmi_event_new_eld new_eld; > + > + new_eld.base.source = dev; > + memcpy(new_eld.eld, eld, sizeof(new_eld.eld)); > + > + blocking_notifier_call_chain(&hdmi_notifier, HDMI_NEW_ELD, &new_eld); > +} > +EXPORT_SYMBOL_GPL(hdmi_event_new_eld); > diff --git a/include/linux/hdmi-notifier.h b/include/linux/hdmi-notifier.h > new file mode 100644 > index 000000000000..9c5ad498f610 > --- /dev/null > +++ b/include/linux/hdmi-notifier.h > @@ -0,0 +1,44 @@ > +#ifndef LINUX_HDMI_NOTIFIER_H > +#define LINUX_HDMI_NOTIFIER_H > + > +#include <linux/types.h> > + > +enum { > + HDMI_CONNECTED, > + HDMI_DISCONNECTED, > + HDMI_NEW_EDID, > + HDMI_NEW_ELD, > +}; > + > +struct hdmi_event_base { > + struct device *source; > +}; > + > +struct hdmi_event_new_edid { > + struct hdmi_event_base base; > + const void *edid; > + size_t size; > +}; > + > +struct hdmi_event_new_eld { > + struct hdmi_event_base base; > + unsigned char eld[128]; > +}; > + > +union hdmi_event { > + struct hdmi_event_base base; > + struct hdmi_event_new_edid edid; > + struct hdmi_event_new_eld eld; > +}; > + > +struct notifier_block; > + > +int hdmi_register_notifier(struct notifier_block *nb); > +int hdmi_unregister_notifier(struct notifier_block *nb); > + > +void hdmi_event_connect(struct device *dev); > +void hdmi_event_disconnect(struct device *dev); > +void hdmi_event_new_edid(struct device *dev, const void *edid, size_t size); > +void hdmi_event_new_eld(struct device *dev, const void *eld); > + > +#endif > >
On Thu, Feb 18, 2016 at 04:18:30PM +0100, Philipp Zabel wrote: > Hi Russell, > > Am Donnerstag, den 18.02.2016, 15:06 +0000 schrieb Russell King - ARM > Linux: > > On Thu, Feb 18, 2016 at 04:02:17PM +0100, Philipp Zabel wrote: > > > This is extracted from Russell's food for thought HDMI notification > > > prototype [1]. I've put it into drivers/video for the time being because > > > my kernels don't have drivers/cec yet. > > > > I see it's also the old version still - this is my latest version, only > > subtly different in terms of the file naming and Kconfig option name. > > Functionally the same. > > Thank you for the update. Have you sent (or do you intend to send) this > separately somewhere? I could then reference it and drop the patch from > this series. > Or I could add your signoff and keep the new patch as part of this > series, if you'd prefer. I haven't yet: it's part of two branches in my tree at the moment, one with Hans Verkil's CEC work in plus TDA998x and dw-hdmi support for that, and also my imx-drm branch which contains a reworked version of FSL's CEC code: imx-drm: drm: bridge/dw_hdmi: place PHY into low power mode when disabled drm: bridge/dw_hdmi: start of support for pixel doubled modes drm: bridge/dw_hdmi: remove CEC engine register definitions drm: bridge/dw_hdmi-cec: add Designware HDMI CEC driver cec: add HDMI CEC input driver cec: add HDMI CEC core driver drm: bridge/dw_hdmi: add HDMI notifier support video: add HDMI state notifier support cec: cec: add tda9950 driver using Hans Verkil's CEC code drm: i2c/tda998x: add CEC support cec: add dw-hdmi cec driver using Hans Verkil's CEC code DocBook/media: add CEC documentation cec.txt: add CEC framework documentation cec: add compat32 ioctl support cec: add HDMI CEC framework rc: Add HDMI CEC protocol handling HID: add HDMI CEC specific keycodes input.h: add BUS_CEC type drm: bridge/dw_hdmi: add HDMI notifier support video: add HDMI state notifier support I haven't put any thought into how to get anything from these merged yet, I was rather hoping that Hans was going to push his own CEC work to be merged, and then I'd think about those logistics.
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index e0606c01e8ac..193649c8a951 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig @@ -40,6 +40,9 @@ config VIDEOMODE_HELPERS config HDMI bool +config HDMI_NOTIFIERS + bool + if VT source "drivers/video/console/Kconfig" endif diff --git a/drivers/video/Makefile b/drivers/video/Makefile index 9ad3c17d6456..65f564906fb4 100644 --- a/drivers/video/Makefile +++ b/drivers/video/Makefile @@ -1,5 +1,6 @@ obj-$(CONFIG_VGASTATE) += vgastate.o obj-$(CONFIG_HDMI) += hdmi.o +obj-$(CONFIG_HDMI_NOTIFIERS) += hdmi-notifier.o obj-$(CONFIG_VT) += console/ obj-$(CONFIG_LOGO) += logo/ diff --git a/drivers/video/hdmi-notifier.c b/drivers/video/hdmi-notifier.c new file mode 100644 index 000000000000..a233359cacfa --- /dev/null +++ b/drivers/video/hdmi-notifier.c @@ -0,0 +1,61 @@ +#include <linux/export.h> +#include <linux/hdmi-notifier.h> +#include <linux/notifier.h> +#include <linux/string.h> + +static BLOCKING_NOTIFIER_HEAD(hdmi_notifier); + +int hdmi_register_notifier(struct notifier_block *nb) +{ + return blocking_notifier_chain_register(&hdmi_notifier, nb); +} +EXPORT_SYMBOL_GPL(hdmi_register_notifier); + +int hdmi_unregister_notifier(struct notifier_block *nb) +{ + return blocking_notifier_chain_unregister(&hdmi_notifier, nb); +} +EXPORT_SYMBOL_GPL(hdmi_unregister_notifier); + +void hdmi_event_connect(struct device *dev) +{ + struct hdmi_event_base base; + + base.source = dev; + + blocking_notifier_call_chain(&hdmi_notifier, HDMI_CONNECTED, &base); +} +EXPORT_SYMBOL_GPL(hdmi_event_connect); + +void hdmi_event_disconnect(struct device *dev) +{ + struct hdmi_event_base base; + + base.source = dev; + + blocking_notifier_call_chain(&hdmi_notifier, HDMI_DISCONNECTED, &base); +} +EXPORT_SYMBOL_GPL(hdmi_event_disconnect); + +void hdmi_event_new_edid(struct device *dev, const void *edid, size_t size) +{ + struct hdmi_event_new_edid new_edid; + + new_edid.base.source = dev; + new_edid.edid = edid; + new_edid.size = size; + + blocking_notifier_call_chain(&hdmi_notifier, HDMI_NEW_EDID, &new_edid); +} +EXPORT_SYMBOL_GPL(hdmi_event_new_edid); + +void hdmi_event_new_eld(struct device *dev, const void *eld) +{ + struct hdmi_event_new_eld new_eld; + + new_eld.base.source = dev; + memcpy(new_eld.eld, eld, sizeof(new_eld.eld)); + + blocking_notifier_call_chain(&hdmi_notifier, HDMI_NEW_ELD, &new_eld); +} +EXPORT_SYMBOL_GPL(hdmi_event_new_eld); diff --git a/include/linux/hdmi-notifier.h b/include/linux/hdmi-notifier.h new file mode 100644 index 000000000000..9c5ad498f610 --- /dev/null +++ b/include/linux/hdmi-notifier.h @@ -0,0 +1,44 @@ +#ifndef LINUX_HDMI_NOTIFIER_H +#define LINUX_HDMI_NOTIFIER_H + +#include <linux/types.h> + +enum { + HDMI_CONNECTED, + HDMI_DISCONNECTED, + HDMI_NEW_EDID, + HDMI_NEW_ELD, +}; + +struct hdmi_event_base { + struct device *source; +}; + +struct hdmi_event_new_edid { + struct hdmi_event_base base; + const void *edid; + size_t size; +}; + +struct hdmi_event_new_eld { + struct hdmi_event_base base; + unsigned char eld[128]; +}; + +union hdmi_event { + struct hdmi_event_base base; + struct hdmi_event_new_edid edid; + struct hdmi_event_new_eld eld; +}; + +struct notifier_block; + +int hdmi_register_notifier(struct notifier_block *nb); +int hdmi_unregister_notifier(struct notifier_block *nb); + +void hdmi_event_connect(struct device *dev); +void hdmi_event_disconnect(struct device *dev); +void hdmi_event_new_edid(struct device *dev, const void *edid, size_t size); +void hdmi_event_new_eld(struct device *dev, const void *eld); + +#endif