From: Dave A. <ai...@li...> - 2008-12-19 05:50:14
|
Hi Linus, Please pull the 'drm-fixes' branch from ssh://master.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6.git drm-fixes One GEM fix + a patch to disable it on PAE for now, we need to do some invasive work to AGP + set_memory_array to make it work properly. Dave. drivers/gpu/drm/i915/i915_dma.c | 10 +++++++++- drivers/gpu/drm/i915/i915_drv.h | 2 ++ drivers/gpu/drm/i915/i915_gem.c | 9 ++++++++- 3 files changed, 19 insertions(+), 2 deletions(-) commit ac5c4e76180a74c7f922f6fa71ace0cef45fa433 Author: Dave Airlie <ai...@re...> Date: Fri Dec 19 15:38:34 2008 +1000 drm/i915: GEM on PAE has problems - disable it for now. On PAE systems, GEM allocates pages using shmem, and passes these pages to be bound into AGP, however the AGP interfaces + the x86 set_memory interfaces all take unsigned long not dma_addr_t. The initial fix for this was a mess, so we need to do this correctly for 2.6.29. Signed-off-by: Dave Airlie <ai...@re...> commit c4de0a5d671e3af38dc3496538e391782aecc3a5 Author: Eric Anholt <er...@an...> Date: Sun Dec 14 19:05:04 2008 -0800 drm/i915: Don't return busy for buffers left on the flushing list. These buffers don't have active rendering still occurring to them, they just need either a flush to be emitted or a retire_requests to occur so that we notice they're done. Return unbusy so that one of the two occurs. The two expected consumers of this interface (OpenGL and libdrm_intel BO cache) both want this behavior. Signed-off-by: Eric Anholt <er...@an...> Acked-by: Keith Packard <ke...@ke...> Signed-off-by: Dave Airlie <ai...@re...> |