From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: [PATCH 08/22] drm/i915 disallow physical batchbuffers for KMS Date: Mon, 23 Apr 2012 16:50:55 +0200 Message-ID: <1335192669-10805-9-git-send-email-daniel.vetter@ffwll.ch> References: <1335192669-10805-1-git-send-email-daniel.vetter@ffwll.ch> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-ey0-f177.google.com (mail-ey0-f177.google.com [209.85.215.177]) by gabe.freedesktop.org (Postfix) with ESMTP id CC28D9E7F4 for ; Mon, 23 Apr 2012 08:55:44 -0700 (PDT) Received: by mail-ey0-f177.google.com with SMTP id k13so3145545eaa.36 for ; Mon, 23 Apr 2012 08:55:44 -0700 (PDT) In-Reply-To: <1335192669-10805-1-git-send-email-daniel.vetter@ffwll.ch> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org To: Intel Graphics Development Cc: Daniel Vetter List-Id: intel-gfx@lists.freedesktop.org Even the horrible gen3 XvMC code has learned to do this right by the time xf86-video-intel releases learned to do kernel modesetting. So we can just disallow this. Signed-off-by: Daniel Vetter --- drivers/gpu/drm/i915/i915_dma.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c index 1fa122e..68fc81b 100644 --- a/drivers/gpu/drm/i915/i915_dma.c +++ b/drivers/gpu/drm/i915/i915_dma.c @@ -1326,8 +1326,10 @@ static int i915_load_gem_init(struct drm_device *dev) i915_setup_compression(dev, cfb_size); } - /* Allow hardware batchbuffers unless told otherwise. */ - dev_priv->dri1.allow_batchbuffer = 1; + /* Allow hardware batchbuffers unless told otherwise, but not for KMS. */ + if (!drm_core_check_feature(dev, DRIVER_MODESET)) + dev_priv->dri1.allow_batchbuffer = 1; + return 0; } -- 1.7.7.6