first part of 4.0.1b merge

diff --git a/libdrm/xf86drm.c b/libdrm/xf86drm.c
index e4bc53b..10c2222 100644 (file)
--- a/libdrm/xf86drm.c
+++ b/libdrm/xf86drm.c
@@ -27,7 +27,7 @@
  * Authors: Rickard E. (Rik) Faith <faith@valinux.com>
  *         Kevin E. Martin <martin@valinux.com>
  *
- * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drm.c,v 1.14 2000/06/27 16:42:07 alanh Exp $
+ * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drm.c,v 1.15 2000/08/09 14:44:27 alanh Exp $
  * 
  */
 
@@ -71,8 +71,6 @@ extern int xf86RemoveSIGIOHandler(int fd);
 #ifdef __alpha__
 extern unsigned long _bus_base(void);
 #define BUS_BASE _bus_base()
-#else
-#define BUS_BASE (0)
 #endif
 
 /* Not all systems have MAP_FAILED defined */
@@ -504,7 +502,7 @@ int drmAddMap(int fd,
 
     map.offset  = offset;
 #ifdef __alpha__
-    if (!(type & DRM_SHM))
+    if (type != DRM_SHM)
        map.offset += BUS_BASE;
 #endif
     map.size    = size;

diff --git a/linux/Makefile.linux b/linux/Makefile.linux
index c1ead32..fd136e9 100644 (file)
--- a/linux/Makefile.linux
+++ b/linux/Makefile.linux
@@ -24,6 +24,7 @@
 # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 # DEALINGS IN THE SOFTWARE.
 # 
+# $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/Makefile.linux,v 1.9 2000/08/04 03:51:47 tsi Exp $
 #
 # ***** NOTE NOTE NOTE NOTE NOTE *****
 # To override the automatic Linux source tree determination, pass the
@@ -47,7 +48,7 @@
 
 # **** End of SMP/MODVERSIONS detection
 
-MODS=           gamma.o tdfx.o r128.o
+MODS=           gamma.o tdfx.o r128.o sis.o
 LIBS=           libdrm.a
 PROGS=         drmstat
 
@@ -64,6 +65,9 @@ TDFXHEADERS=    tdfx_drv.h $(DRMHEADERS)
 R128OBJS=      r128_drv.o r128_dma.o r128_bufs.o r128_context.o
 R128HEADERS=   r128_drv.h r128_drm.h $(DRMHEADERS)
 
+SISOBJS=       sis_drv.o sis_context.o sis_ds.o sis_mm.o
+SISHEADERS=    sis_drv.h sis_ds.h sis_drm_public.h $(DRMHEADERS)
+
 PROGOBJS=       drmstat.po xf86drm.po xf86drmHash.po xf86drmRandom.po sigio.po
 PROGHEADERS=    xf86drm.h $(DRMHEADERS)
 
@@ -180,6 +184,9 @@ r128_drv.o: r128_drv.c
 r128.o: $(R128OBJS) $(LIBS)
        $(LD) -r $^ -o $@
 
+sis.o: $(SISOBJS) $(LIBS)
+       $(LD) -r $^ -o $@
+
 ifeq ($(AGP),1)
 mga_drv.o: mga_drv.c
        $(CC) $(MODCFLAGS) -DEXPORT_SYMTAB -I$(TREE) -c $< -o $@