Linus Torvalds
f2fde3a65e
Merge branch 'drm-core-next' of git://people.freedesktop.org/~airlied/linux ...
Pull main drm updates from Dave Airlie:
"This is the main merge window request for the drm.
It's big, but jam packed will lots of features and of course 0
regressions. (okay maybe there'll be one).
Highlights:
- new KMS drivers for server GPU chipsets: ast, mgag200 and cirrus
(qemu only). These drivers use the generic modesetting drivers.
- initial prime/dma-buf support for i915, nouveau, radeon, udl and
exynos
- switcheroo audio support: so GPUs with HDMI can turn off the sound
driver without crashing stuff.
- There are some patches drifting outside drivers/gpu into x86 and
EFI for better handling of multiple video adapters in Apple Macs,
they've got correct acks except one trivial fixup.
- Core:
edid parser has better DMT and reduced blanking support,
crtc properties,
plane properties,
- Drivers:
exynos: add 2D core accel support, prime support, hdmi features
intel: more Haswell support, initial Valleyview support, more
hdmi infoframe fixes, update MAINTAINERS for Daniel, lots of
cleanups and fixes
radeon: more HDMI audio support, improved GPU lockup recovery
support, remove nested mutexes, less memory copying on PCIE, fix
bus master enable race (kexec), improved fence handling
gma500: cleanups, 1080p support, acpi fixes
nouveau: better nva3 memory reclocking, kepler accel (needs
external firmware rip), async buffer moves on nv84+ hw.
I've some more dma-buf patches that rely on the dma-buf merge for vmap
stuff, and I've a few fixes building up, but I'd decided I'd better
get rid of the main pull sooner rather than later, so the audio guys
are also unblocked."
Fix up trivial conflict due to some duplicated changes in
drivers/gpu/drm/i915/intel_ringbuffer.c
* 'drm-core-next' of git://people.freedesktop.org/~airlied/linux: (605 commits)
drm/nouveau/nvd9: Fix GPIO initialisation sequence.
drm/nouveau: Unregister switcheroo client on exit
drm/nouveau: Check dsm on switcheroo unregister
drm/nouveau: fix a minor annoyance in an output string
drm/nouveau: turn a BUG into a WARN
drm/nv50: decode PGRAPH DATA_ERROR = 0x24
drm/nouveau/disp: fix dithering not being enabled on some eDP macbooks
drm/nvd9/copy: initialise copy engine, seems to work like nvc0
drm/nvc0/ttm: use copy engines for async buffer moves
drm/nva3/ttm: use copy engine for async buffer moves
drm/nv98/ttm: add in a (disabled) crypto engine buffer copy method
drm/nv84/ttm: use crypto engine for async buffer copies
drm/nouveau/ttm: untangle code to support accelerated buffer moves
drm/nouveau/fbcon: use fence for sync, rather than notifier
drm/nv98/crypt: non-stub implementation of the engine hooks
drm/nouveau/fifo: turn all fifo modules into engine modules
drm/nv50/graph: remove ability to do interrupt-driven context switching
drm/nv50: remove manual context unload on context destruction
drm/nv50: remove execution engine context saves on suspend
drm/nv50/fifo: use hardware channel kickoff functionality
...
2012-05-24 12:42:54 -07:00
module_param: make bool parameters really bool (drivers & misc)
2012-01-13 09:32:20 +10:30
ARM: SoC fixes for 3.4-rc2
2012-04-05 22:13:39 -07:00
parisc: move definition of PAGE0 to asm/page.h
2012-05-10 15:12:08 -07:00
video: support DP controller driver
2012-02-13 03:02:30 +00:00
gx1fb: Fix section mismatch warnings
2011-06-24 17:00:31 +09:00
module_param: make bool parameters really bool (drivers/video/i810)
2012-01-12 23:28:59 +00:00
fbdev fixes for 3.3
2012-02-07 15:54:02 -08:00
kyrofb: fix on x86_64
2012-04-08 14:27:08 +00:00
module_param: make bool parameters really bool (drivers & misc)
2012-01-13 09:32:20 +10:30
fbdev: matroxfb: Fix compilation after fb_var_screeninfo change
2011-12-21 02:26:11 +00:00
video: Add module.h to drivers/video files who really use it.
2011-10-31 19:31:33 -04:00
video: convert mbxfb to use module_platform_driver()
2011-12-19 20:21:43 +00:00
video: msm: Fix section mismatches in mddi.c
2012-04-13 10:23:17 -07:00
drivers/video/nvidia/nvidia.c: fix warning
2012-01-12 20:13:03 -08:00
ARM: board specific updates
2012-03-27 16:27:28 -07:00
OMAPDSS: DSI: implement generic DSI pin config
2012-05-09 10:53:05 +03:00
video: pnx4008: convert drivers/video/pnx4008/* to use module_platform_driver()
2011-12-19 20:21:43 +00:00
riva/fbdev: fix several -Wuninitialized
2012-02-13 02:59:14 +00:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
sisfb: use display information in info not in var for panning
2011-08-19 10:34:52 +02:00
atomic: use <linux/atomic.h>
2011-07-26 16:49:47 -07:00
Merge branch 'viafb-next' of git://github.com/schandinat/linux-2.6 into fbdev-next
2012-03-13 23:19:58 +00:00
68328fb: use display information in info not in var for panning
2011-08-19 10:28:58 +02:00
acornfb: use display information in info not in var for panning
2011-08-19 10:29:34 +02:00
fbdev: amba: Enable module alias autogeneration for AMBA drivers
2011-11-22 10:58:33 +00:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
video: Convert vmalloc/memset to vzalloc
2011-06-02 17:25:35 +09:00
arkfb: use display information in info not in var for panning
2011-08-19 10:29:44 +02:00
m68k/atari: Do not use "/" in interrupt names
2011-05-19 18:19:10 +02:00
atmel_lcdfb: support 16bit BGR:565 mode, remove unsupported 15bit modes
2012-01-28 19:54:10 +00:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2012-05-22 19:22:50 -07:00
fb: fix au1100fb bitrot.
2011-10-03 15:52:38 +00:00
fbdev: fix au1*fb builds
2012-04-08 14:27:09 +00:00
video: use gpio_request_one
2012-01-28 20:50:11 +00:00
video: use gpio_request_one
2012-01-28 20:50:11 +00:00
blackfin: fix compile error in bfin-lq035q1-fb.c
2012-04-26 14:46:51 -04:00
treewide: Fix comment and string typo 'bufer'
2011-12-06 09:53:40 +01:00
fbdev: bfin_adv7393fb: Drop needless include
2012-03-21 10:27:37 +00:00
Fix common misspellings
2011-03-31 11:26:23 -03:00
video: Convert vmalloc/memset to vzalloc
2011-06-02 17:25:35 +09:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
video: Add module.h to drivers/video files who really use it.
2011-10-31 19:31:33 -04:00
Merge branch 'fbdev-next' of git://github.com/schandinat/linux-2.6
2012-01-14 15:11:19 -08:00
ARM: clps711x: Using a single definition for the PHYS and VIRT registers offset
2012-05-11 16:18:01 +02:00
video: Add module.h to drivers/video files who really use it.
2011-10-31 19:31:33 -04:00
Drivers: video: controlfb: fixed a brace coding style issue
2011-11-22 01:00:16 +00:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
fbdev: da8xx: add support for SP10Q010 display
2012-03-19 22:59:47 +00:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
vga: fix build when fbdev is a module
2012-04-24 09:50:21 +01:00
ep93xx: Use ioremap for backlight driver
2012-03-14 11:41:10 +11:00
fbdev: unicore32: use display information in info not in var for panning
2011-08-19 10:31:01 +02:00
video: Add module.h to drivers/video files who really use it.
2011-10-31 19:31:33 -04:00
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-3.x into fbdev-next
2011-08-29 09:14:30 +00:00
video: Add export.h for THIS_MODULE/EXPORT_SYMBOL to drivers/video
2011-10-31 19:31:33 -04:00
udlfb: remove sysfs framebuffer device with USB .disconnect()
2012-03-15 13:35:22 +00:00
fbdev: fix parsing of standard timings
2011-09-01 00:31:05 +00:00
fb: avoid possible deadlock caused by fb_set_suspend
2011-09-02 17:58:29 +00:00
Fix common misspellings
2011-03-31 11:26:23 -03:00
drivers/video: compile fixes for fsl-diu-fb.c
2012-01-28 19:35:24 +00:00
g364fb: use display information in info not in var for panning
2011-08-19 10:31:09 +02:00
Fix common misspellings
2011-03-31 11:26:23 -03:00
grvga: fix section mismatch warnings
2012-01-03 16:02:55 +00:00
gxt4500: use display information in info not in var for panning
2011-08-19 10:31:17 +02:00
hecubafb: add module_put on error path in hecubafb_probe()
2011-06-24 17:00:39 +09:00
module_param: make bool parameters really bool (drivers & misc)
2012-01-13 09:32:20 +10:30
Resurrect Intel740 driver: i740fb
2012-02-15 04:31:21 +00:00
i740fb: fix compile error when CONFIG_MTRR is not selected
2012-02-19 19:11:51 +00:00
doc: fix broken references
2011-09-27 18:08:04 +02:00
imsttfb: use display information in info not in var for panning
2011-08-19 10:31:39 +02:00
drivers/video/imxfb.c: add missing clk_put
2011-06-02 17:07:41 +09:00
ARM: global cleanups
2012-03-27 16:03:32 -07:00
macfb: fix black and white modes
2012-01-22 14:50:02 +01:00
Resurrect Intel740 driver: i740fb
2012-02-15 04:31:21 +00:00
video: Convert vmalloc/memset to vzalloc
2011-06-02 17:25:35 +09:00
fbdev: fix indentation in modedb.c
2011-09-14 16:40:52 +00:00
dmaengine/dma_slave: introduce inline wrappers
2012-03-21 19:20:22 +05:30
video: mxsfb: adopt pinctrl support
2012-05-12 09:43:19 +08:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
video: convert drivers/video/* to use module_platform_driver()
2011-12-03 22:08:42 +00:00
Fix common misspellings
2011-03-31 11:26:23 -03:00
offb: Fix setting of the pseudo-palette for >8bpp
2012-01-03 12:09:25 +11:00
video: platinumfb: Add __devexit_p at necessary place
2011-10-15 00:19:58 +00:00
module_param: make bool parameters really bool (drivers & misc)
2012-01-13 09:32:20 +10:30
module_param: make bool parameters really bool (drivers & misc)
2012-01-13 09:32:20 +10:30
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
video: irq: Remove IRQF_DISABLED
2011-10-03 15:52:22 +00:00
drivers/video/pvr2fb.c: ensure arguments to request_irq and free_irq are compatible
2012-03-13 23:17:31 +00:00
video: convert drivers/video/* to use module_platform_driver()
2011-12-03 22:08:42 +00:00
drivers/video/pxa168fb.c: use devm_ functions
2012-02-24 00:49:59 +00:00
video: pxafb: add clk_prepare/clk_unprepare calls
2012-03-21 10:29:01 +00:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
video: s3c-fb: Add support EXYNOS5 FIMD
2012-03-06 11:57:14 +00:00
video: s3c2410: fix checkpatch error and warnings
2011-12-03 22:10:43 +00:00
s3fb: fix Virge/VX
2011-12-21 02:25:21 +00:00
FB: sa11x0: convert to use platform resource and ioremap()
2012-02-24 09:39:59 +00:00
FB: sa11x0: convert to use platform resource and ioremap()
2012-02-24 09:39:59 +00:00
Drivers: video: sbuslib: fixed a brace coding style issue
2011-11-22 01:00:24 +00:00
video: convert drivers/video/* to use module_platform_driver()
2011-12-03 22:08:42 +00:00
fbdev: sh_mipi_dsi: add extra phyctrl for sh_mipi_dsi_info
2012-03-21 07:24:01 +00:00
fbdev: sh_mobile_hdmi: Don't access LCDC fb_info
2012-03-12 22:40:54 +01:00
fbdev: sh_mobile_lcdc: Don't confuse line size with pitch
2012-05-21 20:59:32 -07:00
fbdev: sh_mobile_lcdc: Don't confuse line size with pitch
2012-05-21 20:59:32 -07:00
fbdev: sh_mobile_meram: Implement system suspend/resume
2012-03-12 22:41:14 +01:00
video: Fix speficied typo
2011-06-24 17:14:39 +09:00
video: convert drivers/video/* to use module_platform_driver()
2011-12-03 22:08:42 +00:00
module_param: make bool parameters really bool (drivers & misc)
2012-01-13 09:32:20 +10:30
module_param: make bool parameters really bool (drivers & misc)
2012-01-13 09:32:20 +10:30
Fix common misspellings
2011-03-31 11:26:23 -03:00
module_param: make bool parameters really bool (drivers & misc)
2012-01-13 09:32:20 +10:30
video: irq: Remove IRQF_DISABLED
2011-10-03 15:52:22 +00:00
tridentfb: use display information in info not in var for panning
2011-08-19 10:35:18 +02:00
USB: udlfb.c: remove err() usage
2012-04-25 12:37:49 -07:00
connector/userns: replace netlink uses of cap_raised() with capable()
2012-05-10 23:21:39 -04:00
video: Fix speficied typo
2011-06-24 17:14:39 +09:00
vesafb: fix memory leak
2011-07-04 16:02:48 +09:00
module_param: make bool parameters really bool (drivers & misc)
2012-01-13 09:32:20 +10:30
vga16fb: use display information in info not in var for panning
2011-08-19 10:35:34 +02:00
video: convert drivers/video/* to use module_platform_driver()
2011-12-03 22:08:42 +00:00
vt8623fb: use display information in info not in var for panning
2011-08-19 10:36:20 +02:00
video: convert drivers/video/* to use module_platform_driver()
2011-12-03 22:08:42 +00:00
video: convert drivers/video/* to use module_platform_driver()
2011-12-03 22:08:42 +00:00
video: convert drivers/video/* to use module_platform_driver()
2011-12-03 22:08:42 +00:00
drivers/video/xen-fbfront.c: add missing cleanup code
2012-05-07 06:41:56 -04:00
video: convert drivers/video/* to use module_platform_driver()
2011-12-03 22:08:42 +00:00
f2fde3a65e