drm: Branch 'master'

[<ickle@ke...>]

 intel/intel_bufmgr.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 550fe2ca3b29ad2191eab4fdfbed9ed21e25492d
Author: Chris Wilson <chris@...>
Date:   Wed Jan 12 15:06:25 2011 +0000

    intel: compile fix for previous commit after rebasing
    
    Signed-off-by: Chris Wilson <chris@...>

diff --git a/intel/intel_bufmgr.c b/intel/intel_bufmgr.c
index 2546222..e949ff2 100644
--- a/intel/intel_bufmgr.c
+++ b/intel/intel_bufmgr.c
@@ -143,7 +143,7 @@ drm_intel_bo_mrb_exec(drm_intel_bo *bo, int used,
 					cliprects, num_cliprects, DR4,
 					rings);
 
-	if (ring_flag == 0)
+	if (rings == 0)
 		return bo->bufmgr->bo_exec(bo, used,
 					   cliprects, num_cliprects, DR4);
 

drm: Branch 'master'

[<ickle@ke...>]

 intel/intel_bufmgr.c |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 6717b7579f84d05e45e7846d2b6e767760461709
Author: Chris Wilson <chris@...>
Date:   Wed Jan 12 10:57:46 2011 +0000

    intel: Fallback to old exec if no mrb_exec is available
    
    Reported-by: Torsten Hilbrich <torsten.hilbrich@...>
    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=33016
    Signed-off-by: Chris Wilson <chris@...>

diff --git a/intel/intel_bufmgr.c b/intel/intel_bufmgr.c
index b7c5c09..2546222 100644
--- a/intel/intel_bufmgr.c
+++ b/intel/intel_bufmgr.c
@@ -143,6 +143,10 @@ drm_intel_bo_mrb_exec(drm_intel_bo *bo, int used,
 					cliprects, num_cliprects, DR4,
 					rings);
 
+	if (ring_flag == 0)
+		return bo->bufmgr->bo_exec(bo, used,
+					   cliprects, num_cliprects, DR4);
+
 	return -ENODEV;
 }