Dave Airlie 38f1cff086 Merge commit '5359533801e3dd3abca5b7d3d985b0b33fd9fe8b' into drm-core-next ...

This commit changed an internal radeon structure, that meant a new driver
in -next had to be fixed up, merge in the commit and fix up the driver.

Also fixes a trivial nouveau merge.

Conflicts:
	drivers/gpu/drm/nouveau/nouveau_mem.c

2011-03-16 11:34:41 +10:00

..

Kconfig

kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT

2011-01-20 17:02:05 -08:00

Makefile

drm/nvc0: implement fbcon acceleration

2010-12-21 17:18:39 +10:00

nouveau_acpi.c

nouveau/acpi: improve detection of what is IGD and what is DIS.

2011-01-05 13:43:32 +10:00

nouveau_backlight.c

Merge branch 'master' into for-next

2010-12-22 18:57:02 +01:00

nouveau_bios.c

drm/nouveau/vbios: parse more gpio tag bits from connector table

2011-02-25 06:45:28 +10:00

nouveau_bios.h

drm/nouveau: make vbios parser runnable from an atomic context

2011-02-25 06:44:56 +10:00

nouveau_bo.c

Merge remote branch 'intel/drm-intel-next' of ../drm-next into drm-core-next

2011-03-14 14:15:13 +10:00

nouveau_calc.c

drm/nouveau: make the behaviour of get_pll_limits() consistent

2010-09-24 16:26:49 +10:00

nouveau_channel.c

drm/nouveau: remove no_vm/mappable flags from nouveau_bo

2011-02-25 06:45:34 +10:00

nouveau_connector.c

drm/nouveau: fix non-EDIDful native mode selection

2011-02-17 09:40:03 +10:00

nouveau_connector.h

drm/nouveau: Use "force" to decide if analog load detection is ok or not.

2010-11-18 14:38:41 +10:00

nouveau_crtc.h

drm/nouveau: allow cursor image and position to survive suspend

2010-05-28 16:06:17 +10:00

nouveau_debugfs.c

drm/nouveau: add debugfs file to forcibly evict everything from vram

2010-09-24 16:28:33 +10:00

nouveau_display.c

drm/nouveau: Fix pageflip event

2011-02-25 06:45:31 +10:00

nouveau_dma.c

Merge commit '5359533801e3dd3abca5b7d3d985b0b33fd9fe8b' into drm-core-next

2011-03-16 11:34:41 +10:00

nouveau_dma.h

drm/nouveau: remove no_vm/mappable flags from nouveau_bo

2011-02-25 06:45:34 +10:00

nouveau_dp.c

drm/nouveau: silence some compiler warnings

2011-02-25 06:44:22 +10:00

nouveau_drv.c

drm: rework PCI/platform driver interface.

2011-02-07 13:09:36 +10:00

nouveau_drv.h

Merge commit '5359533801e3dd3abca5b7d3d985b0b33fd9fe8b' into drm-core-next

2011-03-16 11:34:41 +10:00

nouveau_encoder.h

drm/nouveau: enable enhanced framing only if DP display supports it

2010-10-05 09:57:35 +10:00

nouveau_fb.h

drm/nv50-nvc0: precalculate some fb state when creating them

2011-02-25 06:45:08 +10:00

nouveau_fbcon.c

drm/nouveau: pass domain rather than ttm flags to gem_new()

2011-02-25 06:45:40 +10:00

nouveau_fbcon.h

drm/nvc0: implement fbcon acceleration

2010-12-21 17:18:39 +10:00

nouveau_fence.c

drm/nouveau: fix __nouveau_fence_wait performance

2011-03-14 16:35:16 +10:00

nouveau_gem.c

drm/nouveau: properly handle pushbuffer check failures

2011-03-14 16:31:45 +10:00

nouveau_grctx.h

drm/nouveau: modify object accessors, offset in bytes rather than dwords

2010-09-24 16:20:00 +10:00

nouveau_hw.c

drm/nouveau: introduce a util function to wait on reg != val

2010-12-08 03:00:36 +01:00

nouveau_hw.h

drm/nv04: Fix scanout over the 16MB mark.

2010-11-18 14:38:38 +10:00

nouveau_i2c.c

drm/nouveau: Fix a few confusions between "chipset" and "card_type".

2010-11-18 14:39:04 +10:00

nouveau_i2c.h

Merge branch 'drm-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6

2010-10-26 18:57:59 -07:00

nouveau_ioc32.c

drm: convert drm_ioctl to unlocked_ioctl

2009-12-18 11:22:31 +10:00

nouveau_irq.c

drm/nouveau: tidy+move PGRAPH ISRs to their respective *_graph.c files

2010-12-03 15:11:41 +10:00

nouveau_mem.c

Merge commit '5359533801e3dd3abca5b7d3d985b0b33fd9fe8b' into drm-core-next

2011-03-16 11:34:41 +10:00

nouveau_mm.c

drm/nouveau: fix regression causing ttm to not be able to evict vram

2011-03-08 07:03:01 +10:00

nouveau_mm.h

drm/nouveau: rename nouveau_vram to nouveau_mem

2011-02-25 06:45:55 +10:00

nouveau_notifier.c

Merge commit '5359533801e3dd3abca5b7d3d985b0b33fd9fe8b' into drm-core-next

2011-03-16 11:34:41 +10:00

nouveau_object.c

drm/nv50-nvc0: initialise display sync channels

2011-02-25 06:45:11 +10:00

nouveau_perf.c

drm/nouveau: parse voltage from perf 0x40 entires

2010-10-05 09:59:39 +10:00

nouveau_pm.c

drm/nouveau: fix suspend/resume on GPUs that don't have PM support

2011-02-17 12:02:22 +10:00

nouveau_pm.h

drm/nva3: split pm backend out from nv50

2010-10-05 09:57:54 +10:00

nouveau_ramht.c

drm/nv50-nvc0: fix ramht entries for multiple evo channels

2011-02-25 06:44:48 +10:00

nouveau_ramht.h

drm/nouveau: return error from nouveau_ramht_remove() if not found

2010-12-03 15:05:27 +10:00

nouveau_reg.h

drm/nouveau: tidy up and extend dma object creation interfaces

2010-12-03 15:11:59 +10:00

nouveau_sgdma.c

drm/nv40: attempt to reserve just enough vram for all 32 channels

2011-03-14 16:35:16 +10:00

nouveau_state.c

drm/nouveau: remove no_vm/mappable flags from nouveau_bo

2011-02-25 06:45:34 +10:00

nouveau_temp.c

drm/nouveau: use I2C_MODULE_PREFIX kernel define

2011-02-25 06:44:33 +10:00

nouveau_ttm.c

drm: move ttm global code to core drm

2010-08-04 09:46:06 +10:00

nouveau_util.c

drm/nouveau: add nouveau_enum_find() util function

2011-03-14 16:31:50 +10:00

nouveau_util.h

drm/nouveau: add nouveau_enum_find() util function

2011-03-14 16:31:50 +10:00

nouveau_vm.c

drm/nvc0: remove vm hack forcing large/small pages to not share a PDE

2011-03-14 16:31:38 +10:00

nouveau_vm.h

drm/nv50: support for compression

2011-02-25 06:46:07 +10:00

nouveau_volt.c

drm/nouveau: fix thinko in volt 0x1x parsing

2010-09-24 16:27:58 +10:00

nv04_crtc.c

drm/nouveau: remove no_vm/mappable flags from nouveau_bo

2011-02-25 06:45:34 +10:00

nv04_cursor.c

drm/nouveau: allow cursor image and position to survive suspend

2010-05-28 16:06:17 +10:00

nv04_dac.c

drm/nouveau: introduce a util function to wait on reg != val

2010-12-08 03:00:36 +01:00

nv04_dfp.c

drm/nv04-nv40: Fix NULL dereference when we fail to find an LVDS native mode.

2011-02-17 09:39:49 +10:00

nv04_display.c

drm/nv04-nv40: unregister irq handler on destroy

2010-12-03 15:11:43 +10:00

nv04_fb.c

drm/nouveau: Add DRM driver for NVIDIA GPUs

2009-12-11 21:29:34 +10:00

nv04_fbcon.c

drm/nouveau: implicitly insert non-DMA objects into RAMHT

2010-12-08 03:00:35 +01:00

nv04_fifo.c

drm/nv50: check for vm traps on every gr irq

2011-03-14 16:32:30 +10:00

nv04_graph.c

drm/nv04-nv10: Don't re-enable FIFO access multiple times after IRQ dispatch.

2010-12-08 03:00:20 +01:00

nv04_instmem.c

drm/nouveau: rework gpu-specific instmem interfaces

2010-12-03 15:11:48 +10:00

nv04_mc.c

drm/nouveau: Disable PROM access on init.

2010-07-13 10:13:58 +10:00

nv04_pm.c

drm/nv10-nv20: Fix instability after MPLL changes.

2010-11-18 14:38:47 +10:00

nv04_timer.c

drm/nouveau: Add DRM driver for NVIDIA GPUs

2009-12-11 21:29:34 +10:00

nv04_tv.c

drm/nv0x-nv4x: Leave the 0x40 bit untouched when changing CRE_LCD.

2010-10-05 09:58:43 +10:00

nv10_fb.c

drm/nv20: Add Z compression support.

2010-12-03 15:11:21 +10:00

nv10_fifo.c

drm/nouveau: make fifo.create_context() responsible for mapping control regs

2010-12-08 03:00:34 +01:00

nv10_gpio.c

drm/nouveau: introduce gpio engine

2010-07-26 11:43:57 +10:00

nv10_graph.c

drm/nv04-nv10: Don't re-enable FIFO access multiple times after IRQ dispatch.

2010-12-08 03:00:20 +01:00

nv17_tv_modes.c

drm: Mark constant arrays of drm_display_mode const

2011-02-23 11:13:11 +10:00

nv17_tv.c

drm: Mark constant arrays of drm_display_mode const

2011-02-23 11:13:11 +10:00

nv17_tv.h

drm: Mark constant arrays of drm_display_mode const

2011-02-23 11:13:11 +10:00

nv20_graph.c

drm/nouveau: tidy+move PGRAPH ISRs to their respective *_graph.c files

2010-12-03 15:11:41 +10:00

nv30_fb.c

drm/nouveau: Rework tile region handling.

2010-12-03 15:11:20 +10:00

nv40_fb.c

drm/nv40: implement support for on-chip PCIEGART

2011-02-25 06:44:04 +10:00

nv40_fifo.c

drm/nouveau: create grctx on the fly on all chipsets

2011-01-07 14:03:58 +10:00

nv40_graph.c

drm/nv40: fix tiling-related setup for a number of chipsets

2011-02-17 09:40:34 +10:00

nv40_grctx.c

drm/nv40: make detection of 0x4097-ful chipsets available everywhere

2011-01-17 11:28:31 +10:00

nv40_mc.c

drm/nv40: initialise 0x17xx on all chipsets that have it

2011-01-17 11:28:43 +10:00

nv50_calc.c

drm/nva3: fix overflow in fixed point math used for pll calculation

2010-11-18 14:38:34 +10:00

nv50_crtc.c

drm/nouveau: remove no_vm/mappable flags from nouveau_bo

2011-02-25 06:45:34 +10:00

nv50_cursor.c

drm/nv50-nvc0: rename disp->evo to disp->master

2011-02-25 06:44:42 +10:00

nv50_dac.c

drm/nv50-nvc0: rename disp->evo to disp->master

2011-02-25 06:44:42 +10:00

nv50_display.c

drm/nv50-nvc0: initialise display sync channels

2011-02-25 06:45:11 +10:00

nv50_display.h

drm/nv50-nvc0: initialise display sync channels

2011-02-25 06:45:11 +10:00

nv50_evo.c

drm/nouveau: remove no_vm/mappable flags from nouveau_bo

2011-02-25 06:45:34 +10:00

nv50_evo.h

drm/nv50-nvc0: initialise display sync channels

2011-02-25 06:45:11 +10:00

nv50_fb.c

drm/nv50: check for vm traps on every gr irq

2011-03-14 16:32:30 +10:00

nv50_fbcon.c

drm/nv50: add missing license header to nv50_fbcon.c

2010-12-21 06:14:37 +10:00

nv50_fifo.c

drm/nv50: drop explicit yields in favour of smaller PFIFO timeslice

2011-02-25 06:44:30 +10:00

nv50_gpio.c

drm/nouveau: use system_wq instead of dev_priv->wq

2011-02-25 06:44:36 +10:00

nv50_graph.c

drm/nv50: check for vm traps on every gr irq

2011-03-14 16:32:30 +10:00

nv50_grctx.c

drm/nv50: demagic grctx, and add NVAF support

2010-09-24 16:24:00 +10:00

nv50_instmem.c

Merge commit '5359533801e3dd3abca5b7d3d985b0b33fd9fe8b' into drm-core-next

2011-03-16 11:34:41 +10:00

nv50_mc.c

drm/nouveau: introduce gpio engine

2010-07-26 11:43:57 +10:00

nv50_pm.c

drm/nva3: split pm backend out from nv50

2010-10-05 09:57:54 +10:00

nv50_sor.c

drm/nv50-nvc0: rename disp->evo to disp->master

2011-02-25 06:44:42 +10:00

nv50_vm.c

Merge commit '5359533801e3dd3abca5b7d3d985b0b33fd9fe8b' into drm-core-next

2011-03-16 11:34:41 +10:00

nv50_vram.c

drm/nv50: support for compression

2011-02-25 06:46:07 +10:00

nv84_crypt.c

drm/nv50: check for vm traps on every gr irq

2011-03-14 16:32:30 +10:00

nva3_pm.c

drm/nva3: split pm backend out from nv50

2010-10-05 09:57:54 +10:00

nvc0_fb.c

drm/nvc0: starting point for GF100 support, everything stubbed

2010-08-06 08:35:17 +10:00

nvc0_fbcon.c

drm/nvc0: nuke left-over debug messages

2010-12-29 10:51:34 +10:00

nvc0_fifo.c

drm/nouveau: remove no_vm/mappable flags from nouveau_bo

2011-02-25 06:45:34 +10:00

nvc0_graph.c

drm/nvc0: support for sw methods + enable page flipping

2011-02-25 06:45:20 +10:00

nvc0_graph.h

drm/nvc0: kill off a couple more magics

2010-12-29 10:51:27 +10:00

nvc0_grctx.c

drm/nvc0/grctx: correct an off-by-one

2011-01-25 11:05:01 +10:00

nvc0_instmem.c

drm/nouveau: don't munge in drm_mm internals

2011-02-23 10:18:20 +10:00

nvc0_vm.c

drm/nv50: support for compression

2011-02-25 06:46:07 +10:00

nvc0_vram.c

drm/nv50: support for compression

2011-02-25 06:46:07 +10:00

nvreg.h

drm/nv04: Make CRTC base changes effective in the next hsync.

2010-12-03 15:11:09 +10:00