2010-02-23 06:03:09

by Dave Airlie

[permalink] [raw]
Subject: [git pull] drm staging driver fixes.


Just nouveau/vmwgfx changes, the nouveau ones fix nouveau to work
on a range of IGP chipsets, mostly seen as ION or in Apple laptops,
Without these changes there is a chance of memory corruption on the low
pages since the GPU tables are setup different to every other nvidia in
history.

Dave.

The following changes since commit 635f1a31292087a2e99568bf4451c10ee287adaa:
Dave Airlie (1):
drm/radeon: bump the UMS driver version number to indicate rv740 fix

are available in the git repository at:

ssh://master.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6.git drm-linus

Ben Skeggs (5):
drm/nv50: make nv50_mem_vm_{bind,unbind} operate only on vram
drm/nv50: more efficient clearing of gpu page table entries
drm/nv50: improve vram page table construction
drm/nv50: fix instmem binding on IGPs to point at stolen system memory
drm/nv50: fix vram ptes on IGPs to point at stolen system memory

Dave Airlie (1):
Merge remote branch 'nouveau/for-airlied' of ../drm-nouveau-next into drm-linus

Francisco Jerez (1):
drm/nouveau: Fix up pre-nv17 analog load detection.

Thomas Hellstrom (1):
drm/vmwgfx: Fix queries if no dma buffer thrashing is occuring.

drivers/gpu/drm/nouveau/nouveau_drv.h | 1 +
drivers/gpu/drm/nouveau/nouveau_mem.c | 113 ++++++++++++++++++++-----------
drivers/gpu/drm/nouveau/nv04_dac.c | 6 ++-
drivers/gpu/drm/nouveau/nv50_instmem.c | 58 +++++++++++-----
drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 108 +++++++++++++++++++++++++-----
5 files changed, 210 insertions(+), 76 deletions(-)