From owner-freebsd-x11@FreeBSD.ORG  Thu Oct  2 13:56:28 2008
Return-Path: <owner-freebsd-x11@FreeBSD.ORG>
Delivered-To: freebsd-x11@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 50637106564A;
	Thu,  2 Oct 2008 13:56:28 +0000 (UTC)
	(envelope-from mailinglist@ahhyes.net)
Received: from mail.netregistry.net (mail.netregistry.net [202.124.241.18])
	by mx1.freebsd.org (Postfix) with ESMTP id 14A568FC1A;
	Thu,  2 Oct 2008 13:56:28 +0000 (UTC)
	(envelope-from mailinglist@ahhyes.net)
Received: from [218.185.51.132] (helo=[10.1.1.88])
	by mail.netregistry.net protocol: esmtp (Exim 4.63 #1 (Debian))
	id 1KlO8V-0002sv-96; Thu, 02 Oct 2008 23:22:31 +1000
Message-ID: <48E4CC06.1070802@ahhyes.net>
Date: Thu, 02 Oct 2008 23:26:30 +1000
From: Alex <mailinglist@ahhyes.net>
User-Agent: Thunderbird 2.0.0.16 (Windows/20080708)
MIME-Version: 1.0
To: freebsd-x11@freebsd.org
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Cc: Robert Noland <rnoland@FreeBSD.org>
Subject: Re: DRI not working
X-BeenThere: freebsd-x11@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: X11 on FreeBSD -- maintaining and support <freebsd-x11.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-x11>,
	<mailto:freebsd-x11-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-x11>
List-Post: <mailto:freebsd-x11@freebsd.org>
List-Help: <mailto:freebsd-x11-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-x11>,
	<mailto:freebsd-x11-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 02 Oct 2008 13:56:28 -0000

Robert Noland wrote:

> Ok, can you guys give this patch a try?  I think the memory failures are
> un-related and we probably need to try and figure that out separately.
> This patch should be rejecting the second head during the probe phase,
> so drm should not report *anything* about it.
>
> One of you said something about X also reporting both heads?  If that is
> true and remains so with this patch, could you send me X logs?  I'll try
> and get someone to look into the Intel 2d driver and see what is going
> on with it.
>
> This patch is against -CURRENT.  If I need one for STABLE, let me know
> and I'll work out the difference.
>
> robert.
>  
> 
  
Hi Robert,

The patch did not apply cleanly. I cvsup'd my entire source tree to 
RELENG_7 and the patch still wouldn't apply, so had to resort to 
inserting the code myself (perhaps I need a patch for STABLE)

* Added

#include <dev/pci/pcireg.h>

to drmP.h

* Added the following code to drm_probe() in drm_drv.c

	if (pci_get_class(dev) != PCIC_DISPLAY
	    || pci_get_subclass(dev) != PCIS_DISPLAY_VGA)
		return ENXIO;


Kernel build is now broken, code in drm_drv.c throws undefined references to 
PCIC_DISPLAY


Any ideas?