diff options
author | Eric Anholt <anholt@FreeBSD.org> | 2005-11-28 23:13:57 +0000 |
---|---|---|
committer | Eric Anholt <anholt@FreeBSD.org> | 2005-11-28 23:13:57 +0000 |
commit | 9fb0767374acc0c89f0462bda9128825a4b663a3 (patch) | |
tree | 1cdf797deb33b0b51180c1ae0a987558664b1077 /sys/dev/drm/sis_drv.h | |
parent | 7c7e96f58cef463dfafd12d8f439c5cb70eced27 (diff) | |
download | src-9fb0767374acc0c89f0462bda9128825a4b663a3.tar.gz src-9fb0767374acc0c89f0462bda9128825a4b663a3.zip |
Update DRM to CVS snapshot as of 2005-11-28. Notable changes:
- S3 Savage driver ported.
- Added support for ATI_fragment_shader registers for r200.
- Improved r300 support, needed for latest r300 DRI driver.
- (possibly) r300 PCIE support, needs X.Org server from CVS.
- Added support for PCI Matrox cards.
- Software fallbacks fixed for Rage 128, which used to render badly or hang.
- Some issues reported by WITNESS are fixed.
- i915 module Makefile added, as the driver may now be working, but is untested.
- Added scripts for copying and preprocessing DRM CVS for inclusion in the
kernel. Thanks to Daniel Stone for getting me started on that.
Notes
Notes:
svn path=/head/; revision=152909
Diffstat (limited to 'sys/dev/drm/sis_drv.h')
-rw-r--r-- | sys/dev/drm/sis_drv.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sys/dev/drm/sis_drv.h b/sys/dev/drm/sis_drv.h index 4e06e005c4f5..7fc37716fa23 100644 --- a/sys/dev/drm/sis_drv.h +++ b/sys/dev/drm/sis_drv.h @@ -23,9 +23,11 @@ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. * - * $FreeBSD$ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #ifndef _SIS_DRV_H_ #define _SIS_DRV_H_ @@ -50,4 +52,7 @@ typedef struct drm_sis_private { extern int sis_init_context(drm_device_t * dev, int context); extern int sis_final_context(drm_device_t * dev, int context); +extern drm_ioctl_desc_t sis_ioctls[]; +extern int sis_max_ioctl; + #endif |