From patchwork Sun Nov 7 14:54:32 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Albert Damen X-Patchwork-Id: 306902 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oA7Estie015748 for ; Sun, 7 Nov 2010 14:55:16 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8A0539EB25 for ; Sun, 7 Nov 2010 06:54:55 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail.gmx.net (mailout-de.gmx.net [213.165.64.23]) by gabe.freedesktop.org (Postfix) with SMTP id 6140D9E782 for ; Sun, 7 Nov 2010 06:54:36 -0800 (PST) Received: (qmail invoked by alias); 07 Nov 2010 14:54:34 -0000 Received: from ip4daa4833.direct-adsl.nl (EHLO [192.168.1.100]) [77.170.72.51] by mail.gmx.net (mp017) with SMTP; 07 Nov 2010 15:54:34 +0100 X-Authenticated: #16733509 X-Provags-ID: V01U2FsdGVkX18jck4LERkjSlsYYbFZafQvV8dlPL5U+TPjV3KRyD v29JvXZgtjqS81 From: Albert Damen To: intel-gfx@lists.freedesktop.org Date: Sun, 07 Nov 2010 15:54:32 +0100 Message-ID: <1289141672.2487.37.camel@vaio.lan> Mime-Version: 1.0 X-Mailer: Evolution 2.28.3 X-Y-GMX-Trusted: 0 Subject: [Intel-gfx] [PATCH] intel: initialize bufmgr.bo_mrb_exec unconditionally X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Sun, 07 Nov 2010 14:55:16 +0000 (UTC) From 6e78a4c6c009a2dc2a11e2f05b58d20ca3c449df Mon Sep 17 00:00:00 2001 From: Albert Damen Date: Sun, 7 Nov 2010 12:38:12 +0100 Subject: [PATCH] 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). Signed-off-by: Albert Damen --- intel/intel_bufmgr_gem.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/intel/intel_bufmgr_gem.c b/intel/intel_bufmgr_gem.c index 2da3a8a..2b7bd47 100644 --- a/intel/intel_bufmgr_gem.c +++ b/intel/intel_bufmgr_gem.c @@ -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; -- 1.7.0.4