[xserver-commit] xserver/hw/kdrive/src kdrive.h,1.43,1.44

Eric Anholt xserver-commit@pdx.freedesktop.org
Wed, 19 Nov 2003 00:32:40 -0800


Committed by: anholt

Update of /cvs/xserver/xserver/hw/kdrive/src
In directory pdx:/home/anholt/xserver/hw/kdrive/src

Modified Files:
	kdrive.h 
Log Message:
- Add PCI information (device/vendor id, bus location) to KdCardAttr
  to help with ati, and future DRM drivers.
- Add new "ati" kdrive driver.  It has ancestry in the r128 driver
  from andersca, but took a detour through being the WIP SiS 300
  driver on the way.  It supports Radeons (tested on QD VIVO and 7500)
  and Rage 128.  Current limitations include that it requires depth 16
  and that the other Rage 128 PCI IDs aren't included yet.


Index: kdrive.h
===================================================================
RCS file: /cvs/xserver/xserver/hw/kdrive/src/kdrive.h,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- kdrive.h	18 Nov 2003 04:53:16 -0000	1.43
+++ kdrive.h	19 Nov 2003 08:32:38 -0000	1.44
@@ -68,7 +68,14 @@
     CARD32  io;
     CARD32  address[KD_MAX_CARD_ADDRESS];
     int	    naddr;
-    int     bus;
+
+    /* PCI bus info */
+    CARD16  vendorID;
+    CARD16  deviceID;
+    CARD8   domain;
+    CARD8   bus;
+    CARD8   slot;
+    CARD8   func;
 } KdCardAttr;
 
 typedef struct _KdCardInfo {