intel: initialize bufmgr.bo_mrb_exec unconditionally
If bufmgr.bo_mrb_exec is not set, drm_intel_bo_mrb_exec returns ENODEV even though drm_intel_gem_bo_mrb_exec2 will work fine for the RENDER ring. Fixes xf86-video-intel after commit 'add BLT ring support' (5bed685f76) with kernels without BSD or BLT ring support (2.6.34 and before). Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=31443 Signed-off-by: Albert Damen <albrt@gmx.net> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>main
parent
a52e61b5c8
commit
49447a9b95
|
@ -2184,8 +2184,7 @@ drm_intel_bufmgr_gem_init(int fd, int batch_size)
|
|||
/* Use the new one if available */
|
||||
if (exec2) {
|
||||
bufmgr_gem->bufmgr.bo_exec = drm_intel_gem_bo_exec2;
|
||||
if (bufmgr_gem->has_bsd|bufmgr_gem->has_blt)
|
||||
bufmgr_gem->bufmgr.bo_mrb_exec = drm_intel_gem_bo_mrb_exec2;
|
||||
bufmgr_gem->bufmgr.bo_mrb_exec = drm_intel_gem_bo_mrb_exec2;
|
||||
} else
|
||||
bufmgr_gem->bufmgr.bo_exec = drm_intel_gem_bo_exec;
|
||||
bufmgr_gem->bufmgr.bo_busy = drm_intel_gem_bo_busy;
|
||||
|
|
Loading…
Reference in New Issue