Dave Airlie
a5a0fc6743
Merge branch 'exynos-drm-next' of git://git.infradead.org/users/kmpark/linux-samsung into drm-next
...
Inki writes:
"this patch set updates exynos drm framework and includes minor fixups.
and this pull request except hdmi device tree support patch set posted
by Rahul Sharma because that includes media side patch so for this
patch set, we may have git pull one more time in addition, if we get
an agreement with media guys. for this patch, you can refer to below link,
http://comments.gmane.org/gmane.comp.video.dri.devel/74504
this pull request adds hdmi device tree support
and includes related patch set such as disabling of hdmi internal
interrupt, suppport for platform variants for hdmi and mixer,
support to disable video processor based on platform type and
removal of drm common platform data. as you know, this patch
set was delayed because it included an media side patch. so for this,
we got an ack from v4l2-based hdmi driver author, Tomasz Stanislawski."
* 'exynos-drm-next' of git://git.infradead.org/users/kmpark/linux-samsung: (34 commits)
drm: exynos: hdmi: remove drm common hdmi platform data struct
drm: exynos: hdmi: add support for exynos5 hdmi
drm: exynos: hdmi: replace is_v13 with version check in hdmi
drm: exynos: hdmi: add support for exynos5 mixer
drm: exynos: hdmi: add support to disable video processor in mixer
drm: exynos: hdmi: add support for platform variants for mixer
drm: exynos: hdmi: add support for exynos5 hdmiphy
drm: exynos: hdmi: add support for exynos5 ddc
drm: exynos: remove drm hdmi platform data struct
drm: exynos: hdmi: turn off HPD interrupt in HDMI chip
drm: exynos: hdmi: use s5p-hdmi platform data
drm: exynos: hdmi: fix interrupt handling
drm: exynos: hdmi: support for platform variants
media: s5p-hdmi: add HPD GPIO to platform data
drm/exynos: fix kcalloc size of g2d cmdlist node
drm/exynos: fix to calculate CRTC shown via screen
drm/exynos: fix display power call issue.
drm/exynos: add platform_device_id table and driver data for drm fimd
drm/exynos: Fix potential NULL pointer dereference
drm/exynos: support drm_wait_vblank feature for VIDI
...
Conflicts:
include/drm/exynos_drm.h
2012-10-07 21:06:33 +10:00
..
blackfin
[media] add blackfin capture bridge driver
2012-03-19 15:08:20 -03:00
davinci
[media] davinci: vpif: add support for clipping on output data
2012-07-30 19:06:55 -03:00
ad9389b.h
[media] ad9389b: driver for the Analog Devices AD9389B video encoder
2012-09-13 16:15:36 -03:00
adp1653.h
[media] adp1653: Add driver for LED flash controller
2011-07-27 17:55:39 -03:00
adv7183.h
[media] adv7183: add adv7183 decoder driver
2012-03-19 15:04:10 -03:00
adv7343.h
adv7393.h
[PATCH] media: add Analog Devices ADV7393 video encoder driver
2012-07-06 15:46:17 -03:00
adv7604.h
[media] adv7604: driver for the Analog Devices ADV7604 video decoder
2012-09-13 16:13:47 -03:00
ak881x.h
as3645a.h
[media] as3645a: Add driver for LED flash controller
2011-12-20 09:36:18 -02:00
atmel-isi.h
[media] atmel-isi: add code to enable/disable ISI_MCK clock
2012-01-06 11:01:11 -02:00
bt819.h
[media] bt819: the ioctls in the header are internal to the kernel
2010-12-29 08:17:19 -02:00
cs53l32a.h
cs5345.h
cx2341x.h
[media] v4l2-ctrls: use const char * const * for the menu arrays
2010-12-30 08:02:14 -02:00
cx25840.h
[media] cx25840: Add a flag to enable the CX23888 DIF to be enabled or not
2012-01-05 06:49:38 -02:00
gpio-ir-recv.h
[media] media: gpio-ir-recv: add allowed_protos for platform data
2012-07-06 18:21:53 -03:00
i2c-addr.h
ir-kbd-i2c.h
[media] rc: Rename remote controller type to rc_type instead of ir_type
2010-12-29 08:16:50 -02:00
ir-rx51.h
[media] media: rc: Introduce RX51 IR transmitter driver
2012-08-13 16:53:45 -03:00
lirc.h
Fix common misspellings
2011-03-31 11:26:23 -03:00
lirc_dev.h
[media] lirc_dev: store cdev in irctl, up maxdevs
2011-06-11 09:03:20 -03:00
m5mols.h
[media] m5mols: Remove superfluous irq field from the platform data struct
2011-09-24 00:23:03 -03:00
m52790.h
media-device.h
device.h: audit and cleanup users in main include dir
2012-03-16 10:38:24 -04:00
media-devnode.h
[media] media: Media device node support
2011-03-22 04:52:22 -03:00
media-entity.h
[media] media: Add link_validate() op to check links to the sink pad
2012-05-14 08:44:11 -03:00
mmp-camera.h
[media] marvell-cam: Basic working MMP camera driver
2011-07-27 17:53:01 -03:00
msp3400.h
mt9m032.h
[media] v4l: Add driver for Micron MT9M032 camera sensor
2012-03-19 18:56:33 -03:00
mt9p031.h
[media] mt9p031: Replace the reset board callback by a GPIO number
2012-05-14 13:33:44 -03:00
mt9t001.h
[media] mt9t001: Implement V4L2_CID_PIXEL_RATE control
2012-05-24 09:25:15 -03:00
mt9t112.h
mt9v011.h
[media] v4l2-subdev: remove core.s_config and v4l2_i2c_new_subdev_cfg()
2011-01-19 11:45:30 -02:00
mt9v032.h
[media] mt9v032: Provide link frequency control
2012-09-13 16:29:07 -03:00
noon010pc30.h
[media] Add v4l2 subdev driver for NOON010PC30L image sensor
2011-03-21 20:31:40 -03:00
omap1_camera.h
[media] SoC Camera: add driver for OMAP1 camera interface
2010-10-21 07:55:37 -02:00
omap3isp.h
[media] omap3isp: ccdc: Add YUV input formats support
2012-08-11 16:02:56 -03:00
ov772x.h
[media] V4L: ov772x: remove superfluous soc-camera client operations
2011-11-03 18:28:05 -02:00
ov7670.h
[media] marvell-cam: Move cafe-ccic into its own directory
2011-07-27 17:53:00 -03:00
radio-si4713.h
rc-core.h
[media] rc-core.h: Surround macro with do {} while (0)
2011-09-03 20:56:22 -03:00
rc-map.h
[media] patch for Asus My Cinema PS3-100 (1043:48cd)
2012-05-20 16:05:02 -03:00
rj54n1cb0c.h
s5k4ecgx.h
[media] Add v4l2 subdev driver for S5K4ECGX sensor
2012-09-26 17:32:54 -03:00
s5k6aa.h
[media] v4l: Add v4l2 subdev driver for S5K6AAFX sensor
2011-11-03 18:29:11 -02:00
s5p_fimc.h
[media] s5p-fimc: Add pipeline ops to separate FIMC-LITE module
2012-10-01 20:25:32 -03:00
s5p_hdmi.h
media: s5p-hdmi: add HPD GPIO to platform data
2012-10-05 19:14:48 +09:00
saa6588.h
[media] saa6588: rename rds.h to saa6588.h
2010-12-29 08:17:18 -02:00
saa6752hs.h
saa7115.h
saa7127.h
saa7146.h
[media] saa7146: remove V4L2_FL_LOCK_ALL_FOPS
2012-08-09 19:43:28 -03:00
saa7146_vv.h
[media] saa7146: fix querycap, vbi/video separation and g/s_register
2012-05-14 15:00:49 -03:00
sh_mobile_ceu.h
[media] V4L2: sh_mobile_ceu: manage lower 8bit bus
2012-05-15 16:15:14 -03:00
sh_mobile_csi2.h
[media] V4L: sh_mobile_csi2: switch away from using the soc-camera bus notifier
2011-07-27 17:56:08 -03:00
sh_vou.h
[media] sh_vou: Don't use module names to load I2C modules
2010-10-22 21:53:33 -02:00
si4713.h
[media] radio-si4713: Add regulator framework support
2010-12-29 08:16:35 -02:00
sii9234.h
[media] v4l: s5p-tv: add sii9234 driver
2012-02-28 18:25:46 -03:00
smiapp.h
[media] smiapp: Allow using external clock from the clock framework
2012-05-20 12:44:24 -03:00
soc_camera.h
[media] v4l2: make vidioc_s_crop const
2012-09-26 11:02:25 -03:00
soc_camera_platform.h
[media] V4L: soc_camera_platform: remove superfluous soc-camera client operations
2011-11-03 18:28:12 -02:00
soc_mediabus.h
[media] soc-camera: Add soc_mbus_image_size
2012-05-15 16:10:20 -03:00
sr030pc30.h
[media] Add driver for Siliconfile SR030PC30 VGA camera
2010-10-21 07:55:49 -02:00
timb_radio.h
[media] radio-timb: Simplified platform data
2011-07-27 17:53:07 -03:00
timb_video.h
[media] media: Add timberdale video-in driver
2010-12-29 08:16:46 -02:00
tuner-types.h
tuner.h
[media] tuner: add support for Xceive XC5000C
2012-02-14 17:20:46 -02:00
tvaudio.h
tveeprom.h
tvp514x.h
tvp5150.h
tvp7002.h
tw9910.h
upd64031a.h
upd64083.h
v4l2-chip-ident.h
[media] ad9389b: driver for the Analog Devices AD9389B video encoder
2012-09-13 16:15:36 -03:00
v4l2-common.h
[media] v4l2-common: add CVT and GTF detection functions
2012-09-13 16:09:59 -03:00
v4l2-ctrls.h
[media] v4l2-ctrls: add a filter function to v4l2_ctrl_add_handler
2012-10-01 17:07:07 -03:00
v4l2-dev.h
[media] v4l2-dev: add new VFL_DIR_ defines
2012-09-26 11:03:53 -03:00
v4l2-device.h
[media] v4l2-device: fix a macro definition
2011-04-13 09:53:29 -03:00
v4l2-event.h
[media] v4l2: make vidioc_(un)subscribe_event const
2012-09-26 10:48:52 -03:00
v4l2-fh.h
[media] v4l2-event/ctrls/fh: allocate events per fh and per type instead of just per-fh
2011-07-27 17:53:31 -03:00
v4l2-int-device.h
include: replace linux/module.h with "struct module" wherever possible
2011-10-31 19:32:32 -04:00
v4l2-ioctl.h
[media] v4l2: make vidioc_s_crop const
2012-09-26 11:02:25 -03:00
v4l2-mediabus.h
[media] v4l2: Add polarity flag definitions for the parallel bus FIELD signal
2011-09-24 00:21:31 -03:00
v4l2-mem2mem.h
[media] media v4l2-mem2mem: fix src/out and dst/cap num_rdy
2012-09-18 12:13:34 -03:00
v4l2-subdev.h
[media] v4l2: make vidioc_s_crop const
2012-09-26 11:02:25 -03:00
videobuf-core.h
[media] videobuf-core.h: remove input fields
2012-07-05 18:03:20 -03:00
videobuf-dma-contig.h
[media] videobuf-dma-contig: add cache support
2012-05-20 12:01:58 -03:00
videobuf-dma-sg.h
doc: fix broken references
2011-09-27 18:08:04 +02:00
videobuf-dvb.h
[media] dvb: get rid of fe_ioctl_override callback
2012-08-13 16:34:03 -03:00
videobuf-vmalloc.h
videobuf2-core.h
[media] videobuf2-core: Replace BUG_ON and return an error at vb2_queue_init()
2012-09-27 06:09:10 -03:00
videobuf2-dma-contig.h
[media] videobuf2: correct the #ifndef text mistake in videobuf2-dma-contig.h
2012-06-18 19:54:42 -03:00
videobuf2-dma-sg.h
[media] v4l: videobuf2: add DMA scatter/gather allocator
2011-03-21 20:31:34 -03:00
videobuf2-memops.h
[media] Update Pawel Osciak's e-mail address
2011-03-22 04:55:05 -03:00
videobuf2-vmalloc.h
[media] Update Pawel Osciak's e-mail address
2011-03-22 04:55:05 -03:00
wm8775.h
[media] Add proper audio support for Nova-S Plus with wm8775 ADC
2011-03-21 20:32:19 -03:00