Nouveau and Intel,
The two from Ben fixes regressions in since 2.6.38-rc1,
Chris has a revert + hopefully a more correct fix, along with an overflow
fix, and disabling the GPU semaphores which seemed to be causing hangs.
I'm just passing these on since I'm stuck at home today and can't do much
more than read the patches and build them.
Dave.
The following changes since commit fb62c00a6d8942775abc23d1621db1252e2d93d1:
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client (2011-03-05 10:43:22 -0800)
are available in the git repository at:
ssh://master.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6.git drm-fixes
Ben Skeggs (2):
drm/nouveau: fix regression causing ttm to not be able to evict vram
drm/nv50-nvc0: prevent multiple vm/bar flushes occuring simultanenously
Chris Wilson (4):
Revert "drm/i915: fix corruptions on i8xx due to relaxed fencing"
drm/i915: Do not overflow the MMADDR write FIFO
drm/i915: Disable GPU semaphores by default
drm/i915: Rebind the buffer if its alignment constraints changes with tiling
Dave Airlie (1):
Merge remote branch 'ickle/drm-intel-fixes' into drm-fixes
drivers/gpu/drm/i915/i915_debugfs.c | 4 +-
drivers/gpu/drm/i915/i915_drv.c | 17 +++++++++++-
drivers/gpu/drm/i915/i915_drv.h | 24 ++++++++++++++----
drivers/gpu/drm/i915/i915_gem.c | 2 +-
drivers/gpu/drm/i915/i915_gem_execbuffer.c | 4 +-
drivers/gpu/drm/i915/i915_gem_tiling.c | 37 +++++++++++++--------------
drivers/gpu/drm/i915/i915_reg.h | 2 +
drivers/gpu/drm/i915/intel_display.c | 8 +++---
drivers/gpu/drm/i915/intel_ringbuffer.h | 13 +++++----
drivers/gpu/drm/nouveau/nouveau_mem.c | 6 +++-
drivers/gpu/drm/nouveau/nouveau_mm.c | 2 +-
drivers/gpu/drm/nouveau/nv50_instmem.c | 8 ++++++
drivers/gpu/drm/nouveau/nv50_vm.c | 4 +++
13 files changed, 87 insertions(+), 44 deletions(-)
>
> Nouveau and Intel,
>
> The two from Ben fixes regressions in since 2.6.38-rc1,
>
> Chris has a revert + hopefully a more correct fix, along with an overflow
> fix, and disabling the GPU semaphores which seemed to be causing hangs.
>
> I'm just passing these on since I'm stuck at home today and can't do much
> more than read the patches and build them.
And it wouldn't be me unless one more fix came in overnight and I missed
it. Fix from Roel for a loop variable re-use that may have caused some
meomry corruption.
The following changes since commit fb62c00a6d8942775abc23d1621db1252e2d93d1:
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client (2011-03-05 10:43:22 -0800)
are available in the git repository at:
ssh://master.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6.git drm-fixes
Ben Skeggs (2):
drm/nouveau: fix regression causing ttm to not be able to evict vram
drm/nv50-nvc0: prevent multiple vm/bar flushes occuring simultanenously
Chris Wilson (4):
Revert "drm/i915: fix corruptions on i8xx due to relaxed fencing"
drm/i915: Do not overflow the MMADDR write FIFO
drm/i915: Disable GPU semaphores by default
drm/i915: Rebind the buffer if its alignment constraints changes with tiling
Dave Airlie (1):
Merge remote branch 'ickle/drm-intel-fixes' into drm-fixes
roel (1):
drm: index i shadowed in 2nd loop
drivers/gpu/drm/drm_fb_helper.c | 4 +-
drivers/gpu/drm/i915/i915_debugfs.c | 4 +-
drivers/gpu/drm/i915/i915_drv.c | 17 +++++++++++-
drivers/gpu/drm/i915/i915_drv.h | 24 ++++++++++++++----
drivers/gpu/drm/i915/i915_gem.c | 2 +-
drivers/gpu/drm/i915/i915_gem_execbuffer.c | 4 +-
drivers/gpu/drm/i915/i915_gem_tiling.c | 37 +++++++++++++--------------
drivers/gpu/drm/i915/i915_reg.h | 2 +
drivers/gpu/drm/i915/intel_display.c | 8 +++---
drivers/gpu/drm/i915/intel_ringbuffer.h | 13 +++++----
drivers/gpu/drm/nouveau/nouveau_mem.c | 6 +++-
drivers/gpu/drm/nouveau/nouveau_mm.c | 2 +-
drivers/gpu/drm/nouveau/nv50_instmem.c | 8 ++++++
drivers/gpu/drm/nouveau/nv50_vm.c | 4 +++
14 files changed, 89 insertions(+), 46 deletions(-)