linux/drivers/video
Dave Airlie 9c725e5bcd Merge branch 'drm-next-3.12' of git://people.freedesktop.org/~agd5f/linux into drm-next
Alex writes:
This is the radeon drm-next request.  Big changes include:
- support for dpm on CIK parts
- support for ASPM on CIK parts
- support for berlin GPUs
- major ring handling cleanup
- remove the old 3D blit code for bo moves in favor of CP DMA or sDMA
- lots of bug fixes

[airlied: fix up a bunch of conflicts from drm_order removal]

* 'drm-next-3.12' of git://people.freedesktop.org/~agd5f/linux: (898 commits)
  drm/radeon/dpm: make sure dc performance level limits are valid (CI)
  drm/radeon/dpm: make sure dc performance level limits are valid (BTC-SI) (v2)
  drm/radeon: gcc fixes for extended dpm tables
  drm/radeon: gcc fixes for kb/kv dpm
  drm/radeon: gcc fixes for ci dpm
  drm/radeon: gcc fixes for si dpm
  drm/radeon: gcc fixes for ni dpm
  drm/radeon: gcc fixes for trinity dpm
  drm/radeon: gcc fixes for sumo dpm
  drm/radeonn: gcc fixes for rv7xx/eg/btc dpm
  drm/radeon: gcc fixes for rv6xx dpm
  drm/radeon: gcc fixes for radeon_atombios.c
  drm/radeon: enable UVD interrupts on CIK
  drm/radeon: fix init ordering for r600+
  drm/radeon/dpm: only need to reprogram uvd if uvd pg is enabled
  drm/radeon: check the return value of uvd_v1_0_start in uvd_v1_0_init
  drm/radeon: split out radeon_uvd_resume from uvd_v4_2_resume
  radeon kms: fix uninitialised hotplug work usage in r100_irq_process()
  drm/radeon/audio: set up the sads on DCE3.2 asics
  drm/radeon: fix handling of variable sized arrays for router objects
  ...

Conflicts:
	drivers/gpu/drm/i915/i915_dma.c
	drivers/gpu/drm/i915/i915_gem_dmabuf.c
	drivers/gpu/drm/i915/intel_pm.c
	drivers/gpu/drm/radeon/cik.c
	drivers/gpu/drm/radeon/ni.c
	drivers/gpu/drm/radeon/r600.c
2013-09-02 09:31:40 +10:00
..
aty fbdev/atyfb: fix recent breakage in correct_chipset() 2013-07-29 11:24:41 +03:00
backlight mfd: max8925: fix dt code for backlight 2013-07-25 16:57:00 -07:00
console Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux 2013-07-09 16:04:31 -07:00
exynos Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2013-04-30 09:36:50 -07:00
geode build some drivers only when compile-testing 2013-06-24 16:41:32 -07:00
i810
intelfb
kyro
logo Linux 3.11-rc1 2013-07-14 15:18:27 -07:00
matrox matroxfb: convert struct i2c_msg initialization to C99 format 2013-04-29 15:54:26 -07:00
mb862xx
mbx
mmp Various fbdev changes for 3.11 2013-06-28 18:01:28 +08:00
msm new helper: file_inode(file) 2013-02-22 23:31:31 -05:00
nvidia
omap ARM: OMAP: remove "config FB_OMAP_CONSISTENT_DMA_SIZE" 2013-04-10 15:03:31 +03:00
omap2 OMAPDSS: analog-tv-connector: compile fix 2013-08-02 13:03:21 +03:00
riva
savage
sis
vermilion fbdev/vermillion: use vm_iomap_memory() 2013-04-24 08:41:42 +03:00
via
68328fb.c
acornfb.c
acornfb.h
amba-clcd.c
amifb.c Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2013-04-30 09:36:50 -07:00
arcfb.c
arkfb.c
asiliantfb.c
atafb_iplan2p2.c
atafb_iplan2p4.c
atafb_iplan2p8.c
atafb_mfb.c
atafb_utils.h
atafb.c
atafb.h
atmel_lcdfb.c atmel_lcdfb: blank the backlight on remove 2013-06-01 03:18:55 +08:00
au1100fb.c Various fbdev changes for 3.11 2013-07-09 15:51:32 -07:00
au1100fb.h
au1200fb.c au1200fb: io_remap_pfn_range() sets VM_IO 2013-06-29 12:46:42 +04:00
au1200fb.h
auo_k190x.c Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2013-04-30 09:36:50 -07:00
auo_k190x.h
auo_k1900fb.c AUO-K190x: add runtime-pm calls to controller init functions 2013-04-04 13:08:06 +03:00
auo_k1901fb.c AUO-K190x: add runtime-pm calls to controller init functions 2013-04-04 13:08:06 +03:00
bf54x-lq043fb.c video: remove unnecessary platform_set_drvdata() 2013-06-26 14:44:40 +03:00
bf537-lq035.c
bfin_adv7393fb.c procfs: new helper - PDE_DATA(inode) 2013-04-09 14:13:32 -04:00
bfin_adv7393fb.h
bfin-lq035q1-fb.c fbdev: bfin-lq035q1-fb: Use dev_pm_ops 2013-06-26 16:16:26 +03:00
bfin-t350mcqb-fb.c video: remove unnecessary platform_set_drvdata() 2013-06-26 14:44:40 +03:00
broadsheetfb.c
bt431.h
bt455.h
bw2.c
c2p_core.h
c2p_iplan2.c
c2p_planar.c
c2p.h
carminefb_regs.h
carminefb.c
carminefb.h
cfbcopyarea.c
cfbfillrect.c
cfbimgblt.c
cg3.c
cg6.c
cg14.c
chipsfb.c
cirrusfb.c powerpc: remove PReP platform 2013-04-18 13:03:53 +10:00
clps711xfb.c
cobalt_lcdfb.c
controlfb.c fbdev/controlfb: use vm_iomap_memory() 2013-04-24 08:41:41 +03:00
controlfb.h
cyber2000fb.c
cyber2000fb.h
da8xx-fb.c
display_timing.c
dnfb.c
edid.h
efifb.c
ep93xx-fb.c video: remove unnecessary platform_set_drvdata() 2013-06-26 14:44:40 +03:00
fb_ddc.c
fb_defio.c new helper: file_inode(file) 2013-02-22 23:31:31 -05:00
fb_draw.h
fb_notify.c
fb_sys_fops.c
fb-puv3.c fbdev/fb-puv3: use vm_iomap_memory() 2013-04-24 08:41:41 +03:00
fbcmap.c
fbcvt.c
fbmem.c Various fbdev changes for 3.11 2013-06-28 18:01:28 +08:00
fbmon.c Merge branch '3.10/fb-mmap' into for-next 2013-04-26 09:14:47 +03:00
fbsysfs.c
ffb.c
fm2fb.c
fsl-diu-fb.c video: replace strict_strtoul() with kstrtoul() 2013-06-26 15:19:48 +03:00
g364fb.c
gbefb.c fbdev: improve fb_mmap bounds checks 2013-04-26 08:28:56 +03:00
goldfishfb.c treewide: Fix typos in printk 2013-03-20 16:26:32 +01:00
grvga.c
gxt4500.c
hdmi.c video/hdmi: Rename HDMI_IDENTIFIER to HDMI_IEEE_OUI 2013-08-30 08:42:01 +10:00
hecubafb.c
hgafb.c
hitfb.c
hpfb.c
hyperv_fb.c drivers/video: add Hyper-V Synthetic Video Frame Buffer Driver 2013-04-29 15:54:26 -07:00
i740_reg.h
i740fb.c video: i740fb: Make i740fb_init static 2013-06-27 11:57:30 +03:00
igafb.c
imsttfb.c
imxfb.c video: imxfb: Add DT support 2013-07-08 16:36:49 +08:00
jz4740_fb.c video: remove unnecessary platform_set_drvdata() 2013-06-26 14:44:40 +03:00
Kconfig video: imxfb: Add DT support 2013-07-08 16:36:49 +08:00
leo.c
macfb.c
macmodes.c
macmodes.h
Makefile lib: Move fonts from drivers/video/console/ to lib/fonts/ 2013-06-28 10:28:22 +02:00
maxinefb.c
metronomefb.c
modedb.c
mx3fb.c drivers/video/mx3fb.c: use NULL for pointer 2013-02-21 17:22:19 -08:00
mxsfb.c video: mxsfb: fix color settings for 18bit data bus and 32bpp 2013-08-02 13:13:33 +03:00
n411.c
neofb.c
nuc900fb.c video: nuc900fb: fix to pass correct device identity to request_irq() 2013-07-26 10:55:39 +03:00
nuc900fb.h
of_display_timing.c Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux 2013-07-09 16:04:31 -07:00
of_videomode.c videomode: videomode_from_timing work 2013-03-21 14:34:33 +02:00
offb.c
output.c drivers: avoid format string in dev_set_name 2013-07-03 16:07:41 -07:00
p9100.c
platinumfb.c
platinumfb.h
pm2fb.c
pm3fb.c
pmag-aa-fb.c
pmag-ba-fb.c
pmagb-b-fb.c
ps3fb.c fbdev/ps3fb: fix compile warning 2013-05-02 14:59:21 +03:00
pvr2fb.c
pxa3xx-gcu.c Various fbdev changes for 3.11 2013-07-09 15:51:32 -07:00
pxa3xx-gcu.h
pxa168fb.c
pxa168fb.h
pxafb.c video: remove unnecessary platform_set_drvdata() 2013-06-26 14:44:40 +03:00
pxafb.h
q40fb.c
s1d13xxxfb.c treewide: Fix typo in printks 2013-04-12 15:21:36 +02:00
s3c2410fb.c video: remove unnecessary platform_set_drvdata() 2013-06-26 14:44:40 +03:00
s3c2410fb.h
s3c-fb.c video/s3c: move platform_data out of arch/arm 2013-04-11 14:49:20 +03:00
s3fb.c
sa1100fb.c video: remove unnecessary platform_set_drvdata() 2013-06-26 14:44:40 +03:00
sa1100fb.h
sbuslib.c
sbuslib.h
sgivwfb.c fbdev/sgivwfb: fix compilation error in sgivwfb_mmap() 2013-07-26 11:27:53 +03:00
sh7760fb.c video: sh7760fb: fix to pass correct device identity to free_irq() 2013-07-29 11:25:03 +03:00
sh_mipi_dsi.c video: remove unnecessary platform_set_drvdata() 2013-06-26 14:44:40 +03:00
sh_mobile_hdmi.c drivers: video: use module_platform_driver_probe() 2013-04-10 15:03:31 +03:00
sh_mobile_lcdcfb.c fbdev: sh_mobile_lcdc: fixup B side hsync adjust settings 2013-03-27 22:47:24 +09:00
sh_mobile_lcdcfb.h
sh_mobile_meram.c
simplefb.c drivers/video: implement a simple framebuffer driver 2013-05-24 16:22:51 -07:00
skeletonfb.c
sm501fb.c
smscufx.c video: smscufx: Use NULL instead of 0 2013-06-26 14:50:53 +03:00
ssd1307fb.c video: ssd1307fb: Make use of horizontal addressing mode 2013-05-28 14:41:58 +03:00
sstfb.c
sticore.h
stifb.c
sunxvr500.c
sunxvr1000.c
sunxvr2500.c
svgalib.c
syscopyarea.c
sysfillrect.c
sysimgblt.c
tcx.c
tdfxfb.c
tgafb.c
tmiofb.c video: remove unnecessary platform_set_drvdata() 2013-06-26 14:44:40 +03:00
tridentfb.c
udlfb.c video: udlfb: Make local symbol static 2013-06-26 14:51:18 +03:00
uvesafb.c uvesafb: Really allow mtrr being 0, as documented and warn()ed 2013-07-16 10:24:28 +10:00
valkyriefb.c
valkyriefb.h
vesafb.c
vfb.c fbdev: improve fb_mmap bounds checks 2013-04-26 08:28:56 +03:00
vga16fb.c vga16fb: Remove unused variable 2013-07-26 10:28:50 +03:00
vgastate.c
videomode.c videomode: videomode_from_timing work 2013-03-21 14:34:33 +02:00
vt8500lcdfb.c video: remove unnecessary platform_set_drvdata() 2013-06-26 14:44:40 +03:00
vt8500lcdfb.h
vt8623fb.c
w100fb.c
w100fb.h
wm8505fb_regs.h
wm8505fb.c video: replace strict_strtoul() with kstrtoul() 2013-06-26 15:19:48 +03:00
wmt_ge_rops.c
wmt_ge_rops.h video: vt8500: Make wmt_ge_rops optional 2013-04-04 13:07:33 +03:00
xen-fbfront.c
xilinxfb.c video: xilinxfb: Fix compilation warning 2013-07-26 10:24:53 +03:00