From 550dff98b0cf08687cdde697fc6909aeb9cef30f Mon Sep 17 00:00:00 2001 From: Jeff Hartmann Date: Wed, 27 Sep 2000 21:32:19 +0000 Subject: Merged the mga-lock-debug-0-2-0-branch with the trunk. This includes several fixes including: (Jeff) Really disable multitexture (Broken since Mesa 3.4 integration.) (Jeff) Various changes in mga_state.c in the kernel module, which includes a fix to the bug where the first OGL application hangs the machine w/out rendering anything. This also includes defines for the warp registers so they are easily human readable. (Rik and Jeff) Fixed all the schedule loops in the kernel to look like they are supposed too. (Jeff) Configurable agp modes: Add the option "AGPMode2x" or "AGPMode4x" to your XF86Config file. (Rik) Various cleanups to the mga kernel driver to make it easier to read and debug. (Rik) Removed alot of DRM_DEBUG statements from the kernel driver. --- linux/r128_drv.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'linux/r128_drv.h') diff --git a/linux/r128_drv.h b/linux/r128_drv.h index dbb9ddcb..860dbf9c 100644 --- a/linux/r128_drv.h +++ b/linux/r128_drv.h @@ -198,7 +198,7 @@ extern int r128_context_switch_complete(drm_device_t *dev, int new); #define R128_MAX_USEC_TIMEOUT 100000 /* 100 ms */ -#define R128_BASE(reg) ((unsigned long)(dev_priv->mmio->handle)) +#define R128_BASE(reg) ((u32)(dev_priv->mmio->handle)) #define R128_ADDR(reg) (R128_BASE(reg) + reg) #define R128_DEREF(reg) *(__volatile__ int *)R128_ADDR(reg) -- cgit v1.2.3