diff options
| author | Christopher James Halse Rogers <christopher.halse.rogers@canonical.com> | 2011-03-04 12:32:59 +1100 |
|---|---|---|
| committer | Christopher James Halse Rogers <christopher.halse.rogers@canonical.com> | 2011-03-04 12:32:59 +1100 |
| commit | d9f77af478d9d4b9225df97632701b18588a0bab (patch) | |
| tree | 94641d8e5480ec7ccafff862bd579e30d6635931 | |
| parent | 9c79f727d7590f18e6455c99081c51a4c739f71c (diff) | |
Revert "intel: Fallback to old exec if no mrb_exec is available"
It seems git got confused by an upstream rebase and didn't merge this
cherry-pick with the original commit which causes the build to fail.
This reverts commit e4aa4696a44b2bb571bf7ba56ccdff921e562205.
| -rw-r--r-- | intel/intel_bufmgr.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/intel/intel_bufmgr.c b/intel/intel_bufmgr.c index a1d846b0..e949ff2a 100644 --- a/intel/intel_bufmgr.c +++ b/intel/intel_bufmgr.c @@ -147,10 +147,6 @@ drm_intel_bo_mrb_exec(drm_intel_bo *bo, int used, return bo->bufmgr->bo_exec(bo, used, cliprects, num_cliprects, DR4); - if (ring_flag == 0) - return bo->bufmgr->bo_exec(bo, used, - cliprects, num_cliprects, DR4); - return -ENODEV; } |