user/sven/linux.git/include/video, branch v3.18.84

Merge tag 'fbdev-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux

2014-10-19T01:03:02Z

Pull fbdev updates from Tomi Valkeinen: - new 6x10 font - various small fixes and cleanups * tag 'fbdev-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux: (30 commits) fonts: Add 6x10 font videomode: provide dummy inline functions for !CONFIG_OF video/atmel_lcdfb: Introduce regulator support fbdev: sh_mobile_hdmi: Re-init regs before irq re-enable on resume framebuffer: fix screen corruption when copying framebuffer: fix border color arm, fbdev, omap2, LLVMLinux: Remove nested function from omapfb arm, fbdev, omap2, LLVMLinux: Remove nested function from omap2 dss video: fbdev: valkyriefb.c: use container_of to resolve fb_info_valkyrie from fb_info video: fbdev: pxafb.c: use container_of to resolve pxafb_info/layer from fb_info video: fbdev: cyber2000fb.c: use container_of to resolve cfb_info from fb_info video: fbdev: controlfb.c: use container_of to resolve fb_info_control from fb_info video: fbdev: sa1100fb.c: use container_of to resolve sa1100fb_info from fb_info video: fbdev: stifb.c: use container_of to resolve stifb_info from fb_info video: fbdev: sis: sis_main.c: Cleaning up missing null-terminate in conjunction with strncpy video: valkyriefb: Fix unused variable warning in set_valkyrie_clock() video: fbdev: use %*ph specifier to dump small buffers video: mx3fb: always enable BACKLIGHT_LCD_SUPPORT video: fbdev: au1200fb: delete double assignment video: fbdev: sis: delete double assignment ...

videomode: provide dummy inline functions for !CONFIG_OF

2014-10-07T06:31:45Z

If CONFIG_OF is disabled but we build any driver that tries to use of_get_display_timing, we get this link error: ERROR: "of_get_display_timing" [drivers/gpu/drm/rcar-du/rcar-du-drm.ko] undefined! This adds an empty inline function as an alternative, to avoid changing each driver using this function when we want to build them without CONFIG_OF. Reported-by: Arnd Bergmann Signed-off-by: Tomi Valkeinen

gpu: ipu-v3: Add ipu_dump()

2014-09-02T12:55:56Z

Adds ipu_dump() which dumps IPU register state to debug. Signed-off-by: Steve Longerbeam Signed-off-by: Philipp Zabel

gpu: ipu-cpmem: Add ipu_cpmem_dump()

2014-09-02T12:55:55Z

Adds ipu_cpmem_dump() which dumps a channel's cpmem to debug. Signed-off-by: Steve Longerbeam Signed-off-by: Philipp Zabel

gpu: ipu-cpmem: Add second buffer support to ipu_cpmem_set_image()

2014-09-02T12:55:54Z

Add a second buffer physaddr to struct ipu_image, for double-buffering support. Signed-off-by: Steve Longerbeam Signed-off-by: Philipp Zabel

gpu: ipu-cpmem: Add ipu_cpmem_set_rotation()

2014-09-02T12:55:54Z

Adds ipu_cpmem_set_rotation(). Signed-off-by: Steve Longerbeam Signed-off-by: Philipp Zabel

gpu: ipu-cpmem: Add ipu_cpmem_set_axi_id()

2014-09-02T12:55:53Z

Adds ipu_cpmem_set_axi_id() to set which AXI bus master the channel will use to transfer data onto AXI bus. Signed-off-by: Steve Longerbeam Signed-off-by: Philipp Zabel

gpu: ipu-cpmem: Add ipu_cpmem_set_block_mode()

2014-09-02T12:55:52Z

Adds ipu_cpmem_set_block_mode(). Signed-off-by: Steve Longerbeam Signed-off-by: Philipp Zabel

gpu: ipu-v3: Add ipu_idmac_lock_enable()

2014-09-02T12:55:51Z

Adds ipu_idmac_lock_enable(), which enables or disables channel burst locking. Signed-off-by: Steve Longerbeam Signed-off-by: Philipp Zabel

gpu: ipu-v3: Add ipu_idmac_enable_watermark()

2014-09-02T12:55:50Z

Adds the function ipu_idmac_enable_watermark(), which enables or disables watermarking in the IDMAC channel. Enabling watermarking can increase a channel's AXI bus arbitration priority. Signed-off-by: Steve Longerbeam Signed-off-by: Philipp Zabel