Linus Torvalds 007b703b3e Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux ... Pull DRM fixes from Dave Airlie: "This is just a set of nouveau and radeon fixes, the nouveau ones fix some suspend/resume regressions since use of copy engines and some fixes for Z compression on some newer chipsets." * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux: drm/radeon/dce2: use 10khz units for audio dto calculation drm/radeon: Fix VRAM size calculation for VRAM >= 4GB drm/radeon: Remove superfluous variable drm/nouveau: ensure channels are stopped before saving fences for suspend drm/nv50/fifo: prevent races between clients updating playlists drm/nvc0/fifo: prevent CHAN_TABLE_ERROR:CHANNEL_PENDING on fifo fini drm/nvc0/fifo: prevent races between clients updating playlists drm/nve0/fifo: prevent races between clients updating playlists drm/nve0/ltcg: poke the partition count into yet another register drm/nvc0/ltcg: fix handling of disabled partitions drm/nvc0/ce: disable ce1 on a number of chipsets drm/nouveau/bios: fix thinko in ZM_MASK_ADD opcode drm/nouveau: fix build with nv50->nvc0		2013-05-21 08:50:09 -07:00
..
core	Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux	2013-05-21 08:50:09 -07:00
dispnv04	drm/nv04/disp: hide all the cruft away in its own little hole	2013-04-26 15:37:51 +10:00
Kconfig	Merge branch 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-next	2013-02-20 17:54:13 +10:00
Makefile	drm/nvf0/disp: expose display class 2.2	2013-05-02 16:23:13 +10:00
nouveau_abi16.c	drm/nvc0-: support NOUVEAU_GETPARAM_GRAPH_UNITS	2013-04-26 15:37:41 +10:00
nouveau_abi16.h	drm/nouveau: port all engines to new engine module format	2012-10-03 13:12:56 +10:00
nouveau_acpi.c	drm/nouveau: Add interface to detect optimus and v1 support	2012-11-29 09:57:59 +10:00
nouveau_acpi.h	nouveau: ACPI support depends on X86 and X86_PLATFORM_DEVICES	2013-02-20 16:05:16 +10:00
nouveau_agp.c	drm/nouveau: Disable AGP on PowerPC again.	2013-03-04 11:46:12 +10:00
nouveau_agp.h	drm/nouveau: implement devinit subdev, and new init table parser	2012-10-03 13:12:47 +10:00
nouveau_backlight.c	drm/nouveau/drm: adding support for backlight control of GT525M (NVC0)	2013-04-26 15:37:45 +10:00
nouveau_bios.c	drm/nv04/disp: hide all the cruft away in its own little hole	2013-04-26 15:37:51 +10:00
nouveau_bios.h	drm/nv04/disp: hide all the cruft away in its own little hole	2013-04-26 15:37:51 +10:00
nouveau_bo.c	drm/nv50: use correct tiling methods for m2mf buffer moves	2013-03-11 08:43:09 +10:00
nouveau_bo.h	drm/nouveau: use prime helpers	2013-02-08 13:39:09 +10:00
nouveau_chan.c	drm/nv84-/fence: prepare for emit/sync support of sysram sequences	2013-02-20 16:00:53 +10:00
nouveau_chan.h	drm/nve0: use async copy engine for ttm buffer moves if available	2012-10-03 13:13:02 +10:00
nouveau_connector.c	drm/nv04/disp: hide all the cruft away in its own little hole	2013-04-26 15:37:51 +10:00
nouveau_connector.h	drm/nouveau/gpio: use event interfaces for interrupt signalling	2013-02-20 16:00:50 +10:00
nouveau_crtc.h	drm/nouveau: rename nvd0_display to nv50_display to reflect reality since merge	2012-11-29 09:57:58 +10:00
nouveau_debugfs.c	drm/nouveau: restore debugfs/vbios.rom support	2013-02-20 20:46:34 +10:00
nouveau_debugfs.h	drm/nouveau: restore debugfs/vbios.rom support	2013-02-20 20:46:34 +10:00
nouveau_display.c	drm/nv04/disp: hide all the cruft away in its own little hole	2013-04-26 15:37:51 +10:00
nouveau_display.h	drm/nouveau/disp: port vblank handling to event interface	2013-02-20 16:00:46 +10:00
nouveau_dma.c	drm/nouveau: port all engines to new engine module format	2012-10-03 13:12:56 +10:00
nouveau_dma.h	drm/nouveau/fence/nv84-: put processes to sleep while waiting on fences	2013-02-20 16:00:48 +10:00
nouveau_dp.c	drm/nv50-/disp: move DP link training to core and train from supervisor	2013-02-20 16:01:02 +10:00
nouveau_drm.c	drm/nouveau: ensure channels are stopped before saving fences for suspend	2013-05-20 13:24:09 +10:00
nouveau_drm.h	drm/nouveau/drm: bump the driver version to 1.1.1 to report new features	2013-04-26 15:37:43 +10:00
nouveau_encoder.h	drm/nv04/disp: hide all the cruft away in its own little hole	2013-04-26 15:37:51 +10:00
nouveau_fbcon.c	drm/<drivers>: simplify ->fb_probe callback	2013-02-14 00:07:58 +01:00
nouveau_fbcon.h	Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux	2012-10-03 23:29:23 -07:00
nouveau_fence.c	drm/nv84-/fence: prepare for emit/sync support of sysram sequences	2013-02-20 16:00:53 +10:00
nouveau_fence.h	drm/nv84-/fence: prepare for emit/sync support of sysram sequences	2013-02-20 16:00:53 +10:00
nouveau_gem.c	Merge branch 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-next	2013-02-20 17:54:13 +10:00
nouveau_gem.h	drm/nouveau: use prime helpers	2013-02-08 13:39:09 +10:00
nouveau_hwsq.h
nouveau_ioc32.c	Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux	2012-10-03 23:29:23 -07:00
nouveau_ioctl.h	drm/nouveau: move compat ioctl out of nouveau_drv.h	2012-10-03 13:12:58 +10:00
nouveau_mem.c	drm/nouveau: quiet some static-related sparse noise	2012-10-03 13:13:07 +10:00
nouveau_perf.c	Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux	2012-10-03 23:29:23 -07:00
nouveau_pm.c	drm/nouveau/hwmon: do not expose a buggy temperature if it is unavailable	2013-03-18 11:15:27 +10:00
nouveau_pm.h	drm/nouveau/therm: move thermal-related functions to the therm subdev	2012-10-03 13:13:14 +10:00
nouveau_prime.c	drm/nouveau: use prime helpers	2013-02-08 13:39:09 +10:00
nouveau_reg.h
nouveau_sgdma.c	drm/nouveau: port all engines to new engine module format	2012-10-03 13:12:56 +10:00
nouveau_ttm.c	drm/nouveau/ttm: allow tiled memtype on system memory buffer objects	2013-04-26 15:37:38 +10:00
nouveau_ttm.h	drm/nouveau: port remainder of drm code, and rip out compat layer	2012-10-03 13:12:59 +10:00
nouveau_vga.c	drm/nouveau: convert to dev_pm_ops	2012-11-29 09:58:00 +10:00
nouveau_vga.h	drm/nouveau: port remainder of drm code, and rip out compat layer	2012-10-03 13:12:59 +10:00
nouveau_volt.c	Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux	2012-10-03 23:29:23 -07:00
nv04_fbcon.c	drm/nouveau: port remainder of drm code, and rip out compat layer	2012-10-03 13:12:59 +10:00
nv04_fence.c	drm/nouveau/fence: make internal hooks part of the context	2013-02-20 16:00:53 +10:00
nv04_pm.c	drm/nv04/disp: hide all the cruft away in its own little hole	2013-04-26 15:37:51 +10:00
nv10_fence.c	drm/nouveau/fence: make internal hooks part of the context	2013-02-20 16:00:53 +10:00
nv10_fence.h	drm/nouveau: share fence structures between nv10+ and nv50 implementations	2013-02-20 16:00:34 +10:00
nv17_fence.c	drm/nouveau/fence: make internal hooks part of the context	2013-02-20 16:00:53 +10:00
nv40_pm.c	drm/nv04/disp: hide all the cruft away in its own little hole	2013-04-26 15:37:51 +10:00
nv50_display.c	Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux	2013-05-02 19:40:34 -07:00
nv50_display.h	drm/nouveau: rename nvd0_display to nv50_display to reflect reality since merge	2012-11-29 09:57:58 +10:00
nv50_fbcon.c	drm/nouveau: port remainder of drm code, and rip out compat layer	2012-10-03 13:12:59 +10:00
nv50_fence.c	drm/nouveau/fence: make internal hooks part of the context	2013-02-20 16:00:53 +10:00
nv50_pm.c	drm/nv04/disp: hide all the cruft away in its own little hole	2013-04-26 15:37:51 +10:00
nv84_fence.c	drm/nv84-/fence: prepare for emit/sync support of sysram sequences	2013-02-20 16:00:53 +10:00
nva3_pm.c	Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux	2012-10-03 23:29:23 -07:00
nvc0_fbcon.c	drm/nouveau: port remainder of drm code, and rip out compat layer	2012-10-03 13:12:59 +10:00
nvc0_fence.c	drm/nv84-/fence: prepare for emit/sync support of sysram sequences	2013-02-20 16:00:53 +10:00
nvc0_pm.c	drm/nouveau: port remainder of drm code, and rip out compat layer	2012-10-03 13:12:59 +10:00