linux.git/drivers/gpu, branch v2.6.33

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

2010-02-24T02:13:34+00:00

* 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
  drm/vmwgfx: Fix queries if no dma buffer thrashing is occuring.
  drm/nv50: fix vram ptes on IGPs to point at stolen system memory
  drm/nv50: fix instmem binding on IGPs to point at stolen system memory
  drm/nv50: improve vram page table construction
  drm/nv50: more efficient clearing of gpu page table entries
  drm/nv50: make nv50_mem_vm_{bind,unbind} operate only on vram
  drm/nouveau: Fix up pre-nv17 analog load detection.

drm/vmwgfx: Fix queries if no dma buffer thrashing is occuring.

2010-02-23T05:42:36+00:00

Intercept query commands and apply relocations to their guest pointers.

Signed-off-by: Thomas Hellstrom 
Signed-off-by: Dave Airlie

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

2010-02-23T05:42:18+00:00

* 'nouveau/for-airlied' of ../drm-nouveau-next:
  drm/nv50: fix vram ptes on IGPs to point at stolen system memory
  drm/nv50: fix instmem binding on IGPs to point at stolen system memory
  drm/nv50: improve vram page table construction
  drm/nv50: more efficient clearing of gpu page table entries
  drm/nv50: make nv50_mem_vm_{bind,unbind} operate only on vram
  drm/nouveau: Fix up pre-nv17 analog load detection.

drm/nv50: fix vram ptes on IGPs to point at stolen system memory

2010-02-23T03:50:24+00:00

Signed-off-by: Ben Skeggs

drm/nv50: fix instmem binding on IGPs to point at stolen system memory

2010-02-23T03:50:21+00:00

This also modifies the unused PRAMIN PT entries to be all zeroes, can't
really recall why I used 9/0 initially, just that it didn't work for
some reason.  It was likely masking a bug elsewhere that's since been
fixed.

Signed-off-by: Ben Skeggs

drm/nv50: improve vram page table construction

2010-02-23T03:50:03+00:00

This commit changes nouveau to construct PTEs which look very much like
the ones the binary driver creates.

I presume that filling multiple PTEs identically with length flags and
the physical address of the start of a block of VRAM is a hint to the
memory controller that it need not perform additional page table lookups
for that range of addresses.

Signed-off-by: Ben Skeggs

drm/nv50: more efficient clearing of gpu page table entries

2010-02-23T03:49:58+00:00

Signed-off-by: Ben Skeggs

drm/nv50: make nv50_mem_vm_{bind,unbind} operate only on vram

2010-02-23T03:41:16+00:00

GART is handled elsewhere, no reason to have the code for it here too.

Signed-off-by: Ben Skeggs

drm/nouveau: Fix up pre-nv17 analog load detection.

2010-02-23T03:41:05+00:00

Signed-off-by: Francisco Jerez 
Signed-off-by: Ben Skeggs

i915 / PM: Fix hibernate regression caused by suspend/resume splitting

2010-02-22T16:47:14+00:00

Commit 84b79f8d2882b0a84330c04839ed4d3cefd2ff77 (drm/i915: Fix crash
while aborting hibernation) attempted to fix a regression introduced
by commit cbda12d77ea590082edb6d30bd342a67ebc459e0 (drm/i915:
implement new pm ops for i915), but it went too far trying to split
the freeze/suspend and resume/thaw parts of the code.  As a result,
it introduced another regression, which only is visible on some systems.

Fix the problem by merging i915_drm_suspend() with
i915_drm_freeze() and moving some code from i915_resume()
into i915_drm_thaw(), so that intel_opregion_free() and
intel_opregion_init() are also executed in the freeze and thaw code
paths, respectively.

Signed-off-by: Rafael J. Wysocki 
Reported-and-tested-by: Pedro Ribeiro 
Tested-by: Tino Keitel 
Acked-by: Eric Anholt 
Signed-off-by: Linus Torvalds