Dave Airlie 36d1701c50 Merge remote branch 'nouveau/for-airlied' of ../drm-nouveau-next into drm-testing ...

* 'nouveau/for-airlied' of ../drm-nouveau-next:
  drm/nv50: cast IGP memory location to u64 before shifting
  drm/nv50: use alternate source of SOR_MODE_CTRL for DP hack
  drm/nouveau: fix dual-link displays when plugged into single-link outputs
  drm/nv50: obey dcb->duallink_possible
  drm/nv50: fix duallink_possible calculation for DCB 4.0 cards
  drm/nouveau: don't execute INIT_GPIO unless we're really running the table
  drm/nv40: allow cold-booting of nv4x chipsets
  drm/nouveau: fix POST detection for certain chipsets
  drm/nouveau: Add getparam for current PTIMER time.
  drm/nouveau: allow cursor image and position to survive suspend

2010-06-01 11:32:29 +10:00

..

Kconfig

drm/i2c/ch7006: Drop build time dependency to nouveau.

2010-01-11 09:06:30 +10:00

Makefile

drm/nv50: support fractional feedback divider on newer chips

2010-05-19 16:21:59 +10:00

nouveau_acpi.c

drm/nouveau: fixup confusion over which handle the DSM is hanging off.

2010-06-01 10:24:30 +10:00

nouveau_backlight.c

backlight: Allow properties to be passed at registration

2010-03-16 19:47:54 +00:00

nouveau_bios.c

Merge remote branch 'nouveau/for-airlied' of ../drm-nouveau-next into drm-testing

2010-06-01 11:32:29 +10:00

nouveau_bios.h

drm/nv50: store full dcb i2c entry from vbios

2010-05-19 13:15:16 +10:00

nouveau_bo.c

drm/nouveau: fix a nouveau_bo dereference after it's been destroyed

2010-05-19 13:15:14 +10:00

nouveau_calc.c

drm/nouveau: merge nvbios and nouveau_bios_info

2010-02-25 15:09:21 +10:00

nouveau_channel.c

drm/nouveau: remove some unused members from drm_nouveau_private

2010-04-09 10:11:57 +10:00

nouveau_connector.c

Merge remote branch 'nouveau/for-airlied' of ../drm-nouveau-next into drm-testing

2010-06-01 11:32:29 +10:00

nouveau_connector.h

drm/nouveau: use dcb connector table for creating drm connectors

2010-02-25 15:09:32 +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

Merge branch 'drm-ttm-pool' into drm-core-next

2010-04-20 13:12:28 +10:00

nouveau_display.c

drm/fbdev: rework output polling to be back in the core. (v4)

2010-05-18 17:40:11 +10:00

nouveau_dma.c

drm/nv50: add a memory barrier to pushbuf submission

2010-03-10 16:07:35 +10:00

nouveau_dma.h

drm/nouveau: new gem pushbuf interface, bump to 0.0.16

2010-02-25 15:08:44 +10:00

nouveau_dp.c

drm/nouveau: bail out of auxch transaction if we repeatedly recieve defers

2010-04-09 10:20:15 +10:00

nouveau_drv.c

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

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

nouveau_drv.h

drm/nouveau: attempt to get bios from ACPI v3

2010-06-01 10:24:21 +10:00

nouveau_encoder.h

drm/nv50: fix suspend/resume with DP outputs

2010-05-19 13:15:16 +10:00

nouveau_fb.h

drm/fb: fix fbdev object model + cleanup properly.

2010-04-07 10:21:03 +10:00

nouveau_fbcon.c

drm/fbdev: rework output polling to be back in the core. (v4)

2010-05-18 17:40:11 +10:00

nouveau_fbcon.h

drm/fbdev: rework output polling to be back in the core. (v4)

2010-05-18 17:40:11 +10:00

nouveau_fence.c

drm/nouveau: Use the software object for fencing.

2010-01-11 09:06:38 +10:00

nouveau_gem.c

Merge branch 'drm-ttm-unmappable' into drm-core-next

2010-04-20 14:15:09 +10:00

nouveau_grctx.c

drivers/gpu/drm: Use kmemdup

2010-05-18 15:55:55 +10:00

nouveau_grctx.h

drm/nv40: implement ctxprog/state generation

2009-12-16 17:05:39 +10:00

nouveau_hw.c

drm/nouveau: merge nvbios and nouveau_bios_info

2010-02-25 15:09:21 +10:00

nouveau_hw.h

drm/nouveau: Add DRM driver for NVIDIA GPUs

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

nouveau_i2c.c

drm/nv50: fix monitor detection on certain chipsets

2010-05-19 13:15:16 +10:00

nouveau_i2c.h

drm/nouveau: Add DRM driver for NVIDIA GPUs

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

nouveau_ioc32.c

drm: convert drm_ioctl to unlocked_ioctl

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

nouveau_irq.c

Merge branch 'drm-fbdev-cleanup' into drm-core-next

2010-04-20 13:16:04 +10:00

nouveau_mem.c

drm/nv50: cast IGP memory location to u64 before shifting

2010-06-01 09:49:12 +10:00

nouveau_notifier.c

Use drm_gem_object_[handle_]unreference_unlocked where possible

2010-02-11 14:22:34 +10:00

nouveau_object.c

drm/nouveau: move dereferences after null checks

2010-02-11 09:52:00 +10:00

nouveau_reg.h

drm/nv50: fix suspend/resume with DP outputs

2010-05-19 13:15:16 +10:00

nouveau_sgdma.c

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

2010-04-09 11:50:01 -07:00

nouveau_state.c

Merge remote branch 'nouveau/for-airlied' of ../drm-nouveau-next into drm-testing

2010-06-01 11:32:29 +10:00

nouveau_ttm.c

drm/nouveau: have ttm's fault handler called directly

2010-01-11 09:06:42 +10:00

nv04_crtc.c

Merge remote branch 'nouveau/for-airlied' into drm-linus

2010-03-15 11:07:33 +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: merge nvbios and nouveau_bios_info

2010-02-25 15:09:21 +10:00

nv04_dfp.c

drm/nouveau: merge nvbios and nouveau_bios_info

2010-02-25 15:09:21 +10:00

nv04_display.c

drm/nouveau: use dcb connector table for creating drm connectors

2010-02-25 15:09:32 +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: Use 0x5f instead of 0x9f as imageblit on original NV10.

2010-05-19 13:15:14 +10:00

nv04_fifo.c

drm/nouveau: protect channel create/destroy and irq handler with a spinlock

2010-02-25 15:07:53 +10:00

nv04_graph.c

drm/nv04: Implement missing nv04 PGRAPH methods in software.

2010-05-19 13:15:14 +10:00

nv04_instmem.c

drm/nouveau: fix thinko in nv04_instmem.c

2010-01-18 09:55:54 +10:00

nv04_mc.c

drm/nouveau: Add DRM driver for NVIDIA GPUs

2009-12-11 21:29:34 +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/nouveau: merge nvbios and nouveau_bios_info

2010-02-25 15:09:21 +10:00

nv10_fb.c

drm/nouveau: Pre-G80 tiling support.

2010-01-11 08:47:56 +10:00

nv10_fifo.c

drm/nouveau: Add DRM driver for NVIDIA GPUs

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

nv10_graph.c

drm/nouveau: Pre-G80 tiling support.

2010-01-11 08:47:56 +10:00

nv17_gpio.c

drm/nouveau: Add DRM driver for NVIDIA GPUs

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

nv17_tv_modes.c

drm/nouveau: Add DRM driver for NVIDIA GPUs

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

nv17_tv.c

drm/nouveau: merge nvbios and nouveau_bios_info

2010-02-25 15:09:21 +10:00

nv17_tv.h

drm/nouveau: Add DRM driver for NVIDIA GPUs

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

nv20_graph.c

drm/nouveau: Pre-G80 tiling support.

2010-01-11 08:47:56 +10:00

nv40_fb.c

drm/nouveau: Pre-G80 tiling support.

2010-01-11 08:47:56 +10:00

nv40_fifo.c

drm/nouveau: detect vram amount once, and save the value

2010-04-09 10:12:02 +10:00

nv40_graph.c

drm: Fixes linux-next & linux-2.6 checkstack warnings:

2010-05-24 10:24:07 +10:00

nv40_grctx.c

drm/nv40: remove some completed ctxprog TODOs

2010-05-19 13:15:14 +10:00

nv40_mc.c

drm/nouveau: Add DRM driver for NVIDIA GPUs

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

nv50_calc.c

drm/nv50: support fractional feedback divider on newer chips

2010-05-19 16:21:59 +10:00

nv50_crtc.c

drm/nv50: support fractional feedback divider on newer chips

2010-05-19 16:21:59 +10:00

nv50_cursor.c

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

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

nv50_dac.c

drm/nouveau: merge nvbios and nouveau_bios_info

2010-02-25 15:09:21 +10:00

nv50_display.c

drm/nv50: fix suspend/resume with DP outputs

2010-05-19 13:15:16 +10:00

nv50_display.h

drm/nv50: punt hotplug irq handling out to workqueue

2010-04-09 10:15:40 +10:00

nv50_evo.h

drm/nouveau: Add DRM driver for NVIDIA GPUs

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

nv50_fb.c

drm/nv50: Improve PGRAPH interrupt handling.

2010-03-10 16:07:02 +10:00

nv50_fbcon.c

Merge branch 'drm-fbdev-cleanup' into drm-core-next

2010-04-20 13:16:04 +10:00

nv50_fifo.c

drm/nv50: switch to indirect push buffer controls

2010-02-25 15:08:29 +10:00

nv50_gpio.c

drm/nv50: implement gpio set/get routines

2010-04-09 10:15:46 +10:00

nv50_graph.c

drm/nv50: Allow using the NVA3 new compute class.

2010-04-09 10:15:37 +10:00

nv50_grctx.c

drm/nv50: Add NVA3 support in ctxprog/ctxvals generator.

2010-04-09 10:15:42 +10:00

nv50_instmem.c

drm/nv50: fix instmem init on IGPs if stolen mem crosses 4GiB mark

2010-04-09 10:12:19 +10:00

nv50_mc.c

drm/nouveau: Add DRM driver for NVIDIA GPUs

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

nv50_sor.c

drm/nv50: use alternate source of SOR_MODE_CTRL for DP hack

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

nvreg.h

drm/nouveau: Add DRM driver for NVIDIA GPUs

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