Date: Fri, 4 Jun 2004 21:39:07 +0200
From: Colin Leroy <colin@colino.net>
To: akpm@asdl.org
Cc: Michel D_nzer <michel@daenzer.net>, Benjamin <benh@kernel.crashing.org>,
       linux-kernel@vger.kernel.org, dri-devel@lists.sf.net
Subject: [PATCH] 2.6.7-rc2: fix agpgart
Message-Id: <20040604213907.395b01aa@jack.colino.net>
In-Reply-To: <1086366108.4243.117.camel@localhost>
References: <20040604174818.03a4f795@jack.colino.net>
	<1086366108.4243.117.camel@localhost>
Organization: 
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-15
Content-Transfer-Encoding: 8BIT
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 1240
Lines: 36

On 04 Jun 2004 at 18h06, Michel D?nzer wrote:

Hi, 

> Paulus brought this up on IRC, it seems to be a bad DRM merge: The
> code
> 
> #ifndef VMAP_4_ARGS
>        if ( dev->agp->cant_use_aperture )
>                return -EINVAL;
> #endif
> 
> in DRM(agp_acquire) should be removed altogether in a 2.6 kernel
> because its vmap() takes 4 arguments; however, only the guards seem to
> have been removed, which causes this function to erroneously fail if
> the AGP aperture can't be directly accessed by the CPU.

Looks like. Removing it fixes the problem. Here's the patch...
Signed-off-by: Colin Leroy <colin@colino.net>

--- a/drivers/char/drm/drm_agpsupport.h	2004-06-04 17:44:23.000000000 +0200
+++ b/drivers/char/drm/drm_agpsupport.h	2004-06-04 21:01:03.000000000 +0200
@@ -109,8 +109,6 @@
 		return -EBUSY;
 	if (!drm_agp->acquire)
 		return -EINVAL;
-	if ( dev->agp->cant_use_aperture )
-		return -EINVAL;
 	if ((retcode = drm_agp->acquire()))
 		return retcode;
 	dev->agp->acquired = 1;
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/