summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGareth Hughes <gareth@users.sourceforge.net>2001-02-20 23:15:25 +0000
committerGareth Hughes <gareth@users.sourceforge.net>2001-02-20 23:15:25 +0000
commit165c21d23ac526958e90807376c444de25c71d86 (patch)
tree5506d47fe95bcb082f104bd041c2ec5d9e143137
parent0eb46599e42311a6f08230f00e0f2ac4adc6685a (diff)
Initial CCE 2D acceleration code for the Rage 128 driver. Managedati-5-0-1-branch
completely within the X server, zero ioctls required for the actual rendering commands. Need to move Sync() routine into X server as it still uses an ioctl, but this should be trivial.
-rw-r--r--linux/Makefile.linux18
-rw-r--r--linux/r128_cce.c3
2 files changed, 15 insertions, 6 deletions
diff --git a/linux/Makefile.linux b/linux/Makefile.linux
index 7c1269c6..e83066c9 100644
--- a/linux/Makefile.linux
+++ b/linux/Makefile.linux
@@ -206,12 +206,14 @@ dristat: dristat.c
$(CC) $(PRGCFLAGS) $< -o $@
gamma_drv.o: gamma_drv.c
- $(CC) $(MODCFLAGS) -DEXPORT_SYMTAB -I$(TREE) -c $< -o $@
+ $(CC) $(MODCFLAGS) -I$(TREE) -c $< -o $@
+# $(CC) $(MODCFLAGS) -DEXPORT_SYMTAB -I$(TREE) -c $< -o $@
gamma.o: $(GAMMAOBJS)
$(LD) -r $^ -o $@
tdfx_drv.o: tdfx_drv.c
- $(CC) $(MODCFLAGS) -DEXPORT_SYMTAB -I$(TREE) -c $< -o $@
+ $(CC) $(MODCFLAGS) -I$(TREE) -c $< -o $@
+# $(CC) $(MODCFLAGS) -DEXPORT_SYMTAB -I$(TREE) -c $< -o $@
tdfx.o: $(TDFXOBJS) $(LIBS)
$(LD) -r $^ -o $@
@@ -220,22 +222,26 @@ sis.o: $(SISOBJS) $(LIBS)
ifeq ($(AGP),1)
mga_drv.o: mga_drv.c
- $(CC) $(MODCFLAGS) -DEXPORT_SYMTAB -I$(TREE) -c $< -o $@
+ $(CC) $(MODCFLAGS) -I$(TREE) -c $< -o $@
+# $(CC) $(MODCFLAGS) -DEXPORT_SYMTAB -I$(TREE) -c $< -o $@
mga.o: $(MGAOBJS)
$(LD) -r $^ -o $@
i810_drv.o: i810_drv.c
- $(CC) $(MODCFLAGS) -DEXPORT_SYMTAB -I$(TREE) -c $< -o $@
+ $(CC) $(MODCFLAGS) -I$(TREE) -c $< -o $@
+# $(CC) $(MODCFLAGS) -DEXPORT_SYMTAB -I$(TREE) -c $< -o $@
i810.o: $(I810OBJS) $(LIBS)
$(LD) -r $^ -o $@
r128_drv.o: r128_drv.c
- $(CC) $(MODCFLAGS) -DEXPORT_SYMTAB -I$(TREE) -c $< -o $@
+ $(CC) $(MODCFLAGS) -I$(TREE) -c $< -o $@
+# $(CC) $(MODCFLAGS) -DEXPORT_SYMTAB -I$(TREE) -c $< -o $@
r128.o: $(R128OBJS) $(LIBS)
$(LD) -r $^ -o $@
radeon_drv.o: radeon_drv.c
- $(CC) $(MODCFLAGS) -DEXPORT_SYMTAB -I$(TREE) -c $< -o $@
+ $(CC) $(MODCFLAGS) -I$(TREE) -c $< -o $@
+# $(CC) $(MODCFLAGS) -DEXPORT_SYMTAB -I$(TREE) -c $< -o $@
radeon.o: $(RADEONOBJS) $(LIBS)
$(LD) -r $^ -o $@
endif
diff --git a/linux/r128_cce.c b/linux/r128_cce.c
index 40d81938..9e10bb42 100644
--- a/linux/r128_cce.c
+++ b/linux/r128_cce.c
@@ -484,6 +484,9 @@ static int r128_do_init_cce( drm_device_t *dev, drm_r128_init_t *init )
dev_priv->ring.status = ((drm_r128_ring_status_t *)
dev_priv->status->handle);
+ dev_priv->ring.status->head = 0;
+ dev_priv->ring.status->tail = 0;
+ dev_priv->ring.status->space = init->ring_size;
dev_priv->ring.start = (u32 *)dev_priv->cce_ring->handle;
dev_priv->ring.size = init->ring_size;