From owner-svn-src-head@FreeBSD.ORG  Mon Oct 27 21:16:07 2008
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 9564E1065670;
	Mon, 27 Oct 2008 21:16:07 +0000 (UTC)
	(envelope-from rnoland@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 842B58FC0C;
	Mon, 27 Oct 2008 21:16:07 +0000 (UTC)
	(envelope-from rnoland@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id m9RLG7vU053331;
	Mon, 27 Oct 2008 21:16:07 GMT (envelope-from rnoland@svn.freebsd.org)
Received: (from rnoland@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id m9RLG7RR053330;
	Mon, 27 Oct 2008 21:16:07 GMT (envelope-from rnoland@svn.freebsd.org)
Message-Id: <200810272116.m9RLG7RR053330@svn.freebsd.org>
From: Robert Noland <rnoland@FreeBSD.org>
Date: Mon, 27 Oct 2008 21:16:07 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r184373 - head/sys/dev/drm
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Oct 2008 21:16:07 -0000

Author: rnoland
Date: Mon Oct 27 21:16:07 2008
New Revision: 184373
URL: http://svn.freebsd.org/changeset/base/184373

Log:
  Don't report GEM capability until we actually have GEM support.
  
  This was causing the newer Intel video drivers to fail and abort X.
  
  Approved by:	jhb (mentor)

Modified:
  head/sys/dev/drm/i915_dma.c

Modified: head/sys/dev/drm/i915_dma.c
==============================================================================
--- head/sys/dev/drm/i915_dma.c	Mon Oct 27 21:06:16 2008	(r184372)
+++ head/sys/dev/drm/i915_dma.c	Mon Oct 27 21:16:07 2008	(r184373)
@@ -914,7 +914,8 @@ static int i915_getparam(struct drm_devi
 		value = dev->pci_device;
 		break;
 	case I915_PARAM_HAS_GEM:
-		value = 1;
+		/* We need to reset this to 1 once we have GEM */
+		value = 0;
 		break;
 	default:
 		DRM_ERROR("Unknown parameter %d\n", param->param);