Hi, On Tue, Jul 11, 2017 at 11:06:52PM +0200, Hans Verkuil wrote: > On 11/07/17 22:39, Maxime Ripard wrote: > > On Tue, Jul 11, 2017 at 08:30:33AM +0200, Hans Verkuil wrote: > >> From: Hans Verkuil <hans.verkuil@xxxxxxxxx> > >> > >> This patch series adds CEC support for the sun4i HDMI controller. > >> > >> The CEC hardware support for the A10 is very low-level as it just > >> controls the CEC pin. Since I also wanted to support GPIO-based CEC > >> hardware most of this patch series is in the CEC framework to > >> add a generic low-level CEC pin framework. It is only the final patch > >> that adds the sun4i support. > >> > >> This patch series first makes some small changes in the CEC framework > >> (patches 1-4) to prepare for this CEC pin support. > >> > >> Patch 5-7 adds the new API elements and documents it. Patch 6 reworks > >> the CEC core event handling. > >> > >> Patch 8 adds pin monitoring support (allows userspace to see all > >> CEC pin transitions as they happen). > >> > >> Patch 9 adds the core cec-pin implementation that translates low-level > >> pin transitions into valid CEC messages. Basically this does what any > >> SoC with a proper CEC hardware implementation does. > >> > >> Patch 10 documents the cec-pin kAPI (and also the cec-notifier kAPI > >> which was missing). > >> > >> Finally patch 11 adds the actual sun4i_hdmi CEC implementation. > >> > >> I tested this on my cubieboard. There were no errors at all > >> after 126264 calls of 'cec-ctl --give-device-vendor-id' while at the > >> same time running a 'make -j4' of the v4l-utils git repository and > >> doing a continuous scp to create network traffic. > >> > >> This patch series is based on top of the mainline kernel as of > >> yesterday (so with all the sun4i and cec patches for 4.13 merged). > > > > For the whole serie: > > Reviewed-by: Maxime Ripard <maxime.ripard@xxxxxxxxxxxxxxxxxx> > > > >> Maxime, patches 1-10 will go through the media subsystem. How do you > >> want to handle the final patch? It can either go through the media > >> subsystem as well, or you can sit on it and handle this yourself during > >> the 4.14 merge window. Another option is to separate the Kconfig change > >> into its own patch. That way you can merge the code changes and only > >> have to handle the Kconfig patch as a final change during the merge > >> window. > > > > We'll probably have a number of reworks for 4.14, so it would be > > better if I merged it. > > > > However, I guess if we just switch to a depends on CEC_PIN instead of > > a select, everything would just work even if we merge your patches in > > a separate tree, right? > > This small patch will do it: > > diff --git a/drivers/gpu/drm/sun4i/Kconfig b/drivers/gpu/drm/sun4i/Kconfig > index e884d265c0b3..ebad80aefc87 100644 > --- a/drivers/gpu/drm/sun4i/Kconfig > +++ b/drivers/gpu/drm/sun4i/Kconfig > @@ -25,7 +25,7 @@ config DRM_SUN4I_HDMI_CEC > bool "Allwinner A10 HDMI CEC Support" > depends on DRM_SUN4I_HDMI > select CEC_CORE > - select CEC_PIN > + depends on CEC_PIN > help > Choose this option if you have an Allwinner SoC with an HDMI > controller and want to use CEC. > diff --git a/drivers/gpu/drm/sun4i/sun4i_hdmi.h b/drivers/gpu/drm/sun4i/sun4i_hdmi.h > index 8263de225b36..82bc6923b90f 100644 > --- a/drivers/gpu/drm/sun4i/sun4i_hdmi.h > +++ b/drivers/gpu/drm/sun4i/sun4i_hdmi.h > @@ -15,7 +15,7 @@ > #include <drm/drm_connector.h> > #include <drm/drm_encoder.h> > > -#include <media/cec-pin.h> > +#include <media/cec.h> > > #define SUN4I_HDMI_CTRL_REG 0x004 > #define SUN4I_HDMI_CTRL_ENABLE BIT(31) > > > Unfortunately you need to change the header as well since cec-pin.h doesn't > exist without the cec patches. It might be better to > > And once the cec patch series and the sun4i_hdmi patch is merged the patch above > can be applied with -R and all will work fine. > > This seems a sensible way forward. I just tested this serie, it works just fine. I've applied the patch 11 with my Tested-by and that small patch above. Thanks a lot! Maxime -- Maxime Ripard, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com
Attachment:
signature.asc
Description: PGP signature
