Commit 84c6c303 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'media/v4.12-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media 

Pull media fixes from Mauro Carvalho Chehab:
 "Some bug fixes:

   - Don't fail build if atomisp has warnings

   - Some CEC Kconfig changes to allow it to be used by DRM without
     media dependencies

   - A race fix at RC initialization code

   - A driver fix at rainshadow-cec

  IMHO, the one that affects most people in this series is a build fix:
  if you try to build the Kernel with W=1 or using gcc7 and
  all[yes|mod]config, build will fail due to -Werror at atomisp
  makefiles"

* tag 'media/v4.12-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
  [media] rc-core: race condition during ir_raw_event_register()
  [media] cec: drop MEDIA_CEC_DEBUG
  [media] cec: rename MEDIA_CEC_NOTIFIER to CEC_NOTIFIER
  [media] cec: select CEC_CORE instead of depend on it
  [media] rainshadow-cec: ensure exit_loop is intialized
  [media] atomisp: don't treat warnings as errors
parents ba7b2387 963761a0

drivers/media/Kconfig

+6 −0
Original line number Diff line number Diff line
@@ -2,6 +2,12 @@ 
# Multimedia device configuration

#



config CEC_CORE

	tristate



config CEC_NOTIFIER

	bool



menuconfig MEDIA_SUPPORT

	tristate "Multimedia support"

	depends on HAS_IOMEM

drivers/media/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -4,8 +4,6 @@ 


media-objs	:= media-device.o media-devnode.o media-entity.o



obj-$(CONFIG_CEC_CORE) += cec/



#

# I2C drivers should come before other drivers, otherwise they'll fail

# when compiled as builtin drivers
@@ -26,6 +24,8 @@ obj-$(CONFIG_DVB_CORE) += dvb-core/ 
# There are both core and drivers at RC subtree - merge before drivers

obj-y += rc/



obj-$(CONFIG_CEC_CORE) += cec/



#

# Finally, merge the drivers that require the core

#

drivers/media/cec/Kconfig

+0 −14
Original line number Diff line number Diff line 
config CEC_CORE

	tristate

	depends on MEDIA_CEC_SUPPORT

	default y



config MEDIA_CEC_NOTIFIER

	bool



config MEDIA_CEC_RC

	bool "HDMI CEC RC integration"

	depends on CEC_CORE && RC_CORE

	---help---

	  Pass on CEC remote control messages to the RC framework.
 


config MEDIA_CEC_DEBUG

	bool "HDMI CEC debugfs interface"

	depends on CEC_CORE && DEBUG_FS

	---help---

	  Turns on the DebugFS interface for CEC devices.

drivers/media/cec/Makefile

+1 −1
Original line number Diff line number Diff line 
cec-objs := cec-core.o cec-adap.o cec-api.o cec-edid.o



ifeq ($(CONFIG_MEDIA_CEC_NOTIFIER),y)

ifeq ($(CONFIG_CEC_NOTIFIER),y)

  cec-objs += cec-notifier.o

endif

drivers/media/cec/cec-adap.c

+1 −1
Original line number Diff line number Diff line
@@ -1864,7 +1864,7 @@ void cec_monitor_all_cnt_dec(struct cec_adapter *adap) 
		WARN_ON(call_op(adap, adap_monitor_all_enable, 0));

}



#ifdef CONFIG_MEDIA_CEC_DEBUG

#ifdef CONFIG_DEBUG_FS

/*

 * Log the current state of the CEC adapter.

 * Very useful for debugging.

CRA Git | Maintained and supported by SUSTech CRA and CCSE