Hi Linus,
Please pull the 'drm-next' branch from
ssh://master.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6.git drm-next
Intel: One build fix and a new API needed to make GEM work properly.
radeon: fix a regression is the bus mastering patches on rs480.
Dave.
drivers/gpu/drm/i915/Makefile | 3 ++-
drivers/gpu/drm/i915/i915_dma.c | 1 +
drivers/gpu/drm/i915/i915_drv.h | 9 +++++++++
drivers/gpu/drm/i915/i915_gem.c | 22 ++++++++++++++++++++++
drivers/gpu/drm/radeon/radeon_cp.c | 15 ++++++++-------
drivers/gpu/drm/radeon/radeon_drv.h | 12 ++++++------
include/drm/i915_drm.h | 13 +++++++++++++
7 files changed, 61 insertions(+), 14 deletions(-)
commit 5a125c3c79167e78ba44efef03af7090ef28eeaf
Author: Eric Anholt <[email protected]>
Date: Wed Oct 22 21:40:13 2008 -0700
i915: Add GEM ioctl to get available aperture size.
This will let userland know when to submit its batchbuffers, before they get
too big to fit in the aperture.
Signed-off-by: Eric Anholt <[email protected]>
Signed-off-by: Dave Airlie <[email protected]>
commit 4e270e9b8a9d246290f3901f1fb6c5efdb734ddf
Author: Alex Deucher <[email protected]>
Date: Tue Oct 28 07:48:34 2008 +1000
drm/radeon: fixup further bus mastering confusion.
rs400/480 are like previous chips not like rs6xx chips.
Signed-off-by: Dave Airlie <[email protected]>
commit 65e082c9a33a6e9f24e9a713a7d38d11206d3c3d
Author: Len Brown <[email protected]>
Date: Fri Oct 24 17:18:10 2008 -0400
build fix: CONFIG_DRM_I915=y && CONFIG_ACPI=n
drivers/gpu/drm/i915/i915_opregion.c:340: error: implicit declaration of function ‘register_acpi_notifier’
drivers/gpu/drm/i915/i915_opregion.c:361: error: implicit declaration of function ‘unregister_acpi_notifier’
Signed-off-by: Len Brown <[email protected]>
Signed-off-by: Eric Anholt <[email protected]>
Signed-off-by: Dave Airlie <[email protected]>