DRI CVS merge: SiS driver updates from Eric Anholt.

Major whitespace cleanups and fix a potential oops.

The driver can now run with or without FB support.

drivers/char/drm/Kconfig

@@ -75,9 +75,9 @@ config DRM_MGA
 
 config DRM_SIS
 	tristate "SiS video cards"
-	depends on DRM && AGP && FB_SIS
+	depends on DRM && AGP
 	help
 	  Choose this option if you have a SiS 630 or compatibel video 
           chipset. If M is selected the module will be called sis. AGP
-          and SiS FB support is required for this driver to work.
+          support is required for this driver to work.
 

drivers/char/drm/sis.h

@@ -33,7 +33,11 @@
  * Name it sisdrv_##x as there's a conflict with sis_free/malloc in the kernel
  * that's used for fb devices 
  */
+#ifdef __linux__
 #define DRM(x) sisdrv_##x
+#else
+#define DRM(x) sis_##x
+#endif
 
 /* General customization:
  */
@@ -45,25 +49,18 @@
 #define DRIVER_AUTHOR		"SIS"
 #define DRIVER_NAME		"sis"
 #define DRIVER_DESC		"SIS 300/630/540"
-#define DRIVER_DATE	 "20010503"
+#define DRIVER_DATE		"20030826"
 #define DRIVER_MAJOR		1
-#define DRIVER_MINOR	 0
+#define DRIVER_MINOR		1
 #define DRIVER_PATCHLEVEL	0
 
 #define DRIVER_IOCTLS \
-        [DRM_IOCTL_NR(SIS_IOCTL_FB_ALLOC)]   = { sis_fb_alloc,	  1, 0 }, \
-        [DRM_IOCTL_NR(SIS_IOCTL_FB_FREE)]    = { sis_fb_free,	  1, 0 }, \
-        /* AGP Memory Management */					  \
-        [DRM_IOCTL_NR(SIS_IOCTL_AGP_INIT)]   = { sisp_agp_init,	  1, 0 }, \
-        [DRM_IOCTL_NR(SIS_IOCTL_AGP_ALLOC)]  = { sisp_agp_alloc,  1, 0 }, \
-        [DRM_IOCTL_NR(SIS_IOCTL_AGP_FREE)]   = { sisp_agp_free,	  1, 0 }
-#if 0 /* these don't appear to be defined */
-	/* SIS Stereo */						 
-	[DRM_IOCTL_NR(DRM_IOCTL_CONTROL)]    = { sis_control,	  1, 1 }, 
-        [DRM_IOCTL_NR(SIS_IOCTL_FLIP)]       = { sis_flip,	  1, 1 }, 
-        [DRM_IOCTL_NR(SIS_IOCTL_FLIP_INIT)]  = { sis_flip_init,	  1, 1 }, 
-        [DRM_IOCTL_NR(SIS_IOCTL_FLIP_FINAL)] = { sis_flip_final,  1, 1 }
-#endif
+	[DRM_IOCTL_NR(DRM_IOCTL_SIS_FB_ALLOC)]  = { sis_fb_alloc,	1, 0 }, \
+	[DRM_IOCTL_NR(DRM_IOCTL_SIS_FB_FREE)]   = { sis_fb_free,	1, 0 }, \
+	[DRM_IOCTL_NR(DRM_IOCTL_SIS_AGP_INIT)]  = { sis_ioctl_agp_init,	1, 1 }, \
+	[DRM_IOCTL_NR(DRM_IOCTL_SIS_AGP_ALLOC)] = { sis_ioctl_agp_alloc, 1, 0 }, \
+	[DRM_IOCTL_NR(DRM_IOCTL_SIS_AGP_FREE)]	= { sis_ioctl_agp_free,	1, 0 }, \
+	[DRM_IOCTL_NR(DRM_IOCTL_SIS_FB_INIT)]	= { sis_fb_init,	1, 1 }
 
 #define __HAVE_COUNTERS		5
 

drivers/char/drm/sis_drm.h

 
-#ifndef _sis_drm_public_h_
-#define _sis_drm_public_h_
+#ifndef __SIS_DRM_H__
+#define __SIS_DRM_H__
 
 /* SiS specific ioctls */
-#define SIS_IOCTL_FB_ALLOC		DRM_IOWR(0x44, drm_sis_mem_t)
-#define SIS_IOCTL_FB_FREE		DRM_IOW( 0x45, drm_sis_mem_t)
-#define SIS_IOCTL_AGP_INIT		DRM_IOWR(0x53, drm_sis_agp_t)
-#define SIS_IOCTL_AGP_ALLOC		DRM_IOWR(0x54, drm_sis_mem_t)
-#define SIS_IOCTL_AGP_FREE		DRM_IOW( 0x55, drm_sis_mem_t)
-#define SIS_IOCTL_FLIP			DRM_IOW( 0x48, drm_sis_flip_t)
-#define SIS_IOCTL_FLIP_INIT		DRM_IO(  0x49)
-#define SIS_IOCTL_FLIP_FINAL		DRM_IO(  0x50)
+#define DRM_IOCTL_SIS_FB_ALLOC		DRM_IOWR(0x44, drm_sis_mem_t)
+#define DRM_IOCTL_SIS_FB_FREE		DRM_IOW( 0x45, drm_sis_mem_t)
+#define DRM_IOCTL_SIS_AGP_INIT		DRM_IOWR(0x53, drm_sis_agp_t)
+#define DRM_IOCTL_SIS_AGP_ALLOC		DRM_IOWR(0x54, drm_sis_mem_t)
+#define DRM_IOCTL_SIS_AGP_FREE		DRM_IOW( 0x55, drm_sis_mem_t)
+#define DRM_IOCTL_SIS_FB_INIT		DRM_IOW( 0x56, drm_sis_fb_t)
+/*
+#define DRM_IOCTL_SIS_FLIP		DRM_IOW( 0x48, drm_sis_flip_t)
+#define DRM_IOCTL_SIS_FLIP_INIT		DRM_IO(  0x49)
+#define DRM_IOCTL_SIS_FLIP_FINAL	DRM_IO(  0x50)
+*/
 
 typedef struct {
 	int context;
 	unsigned int offset;
 	unsigned int size;
-  unsigned int free;
+	unsigned long free;
 } drm_sis_mem_t;
 
 typedef struct {
@@ -24,23 +27,7 @@ typedef struct {
 } drm_sis_agp_t;
 
 typedef struct {
-  unsigned int left, right;
-} drm_sis_flip_t;
-
-#ifdef __KERNEL__
-
-int sis_fb_alloc(struct inode *inode, struct file *filp, unsigned int cmd,
-		  unsigned long arg);
-int sis_fb_free(struct inode *inode, struct file *filp, unsigned int cmd,
-		  unsigned long arg);
-
-int sisp_agp_init(struct inode *inode, struct file *filp, unsigned int cmd,
-		  unsigned long arg);
-int sisp_agp_alloc(struct inode *inode, struct file *filp, unsigned int cmd,
-		  unsigned long arg);
-int sisp_agp_free(struct inode *inode, struct file *filp, unsigned int cmd,
-		  unsigned long arg);
-
-#endif
+	unsigned int offset, size;
+} drm_sis_fb_t;
 
-#endif
+#endif /* __SIS_DRM_H__ */

drivers/char/drm/sis_drv.h

@@ -28,18 +28,20 @@
 #ifndef _SIS_DRV_H_
 #define _SIS_DRV_H_
 
+#include "sis_ds.h"
+
 typedef struct drm_sis_private {
 	drm_map_t *buffers;
-} drm_sis_private_t;
 
-/* Stereo ? - this was never committed */
+	memHeap_t *AGPHeap;
+	memHeap_t *FBHeap;
+} drm_sis_private_t;
 
-int sis_flip(struct inode *inode, struct file *filp, unsigned int cmd,
-		  unsigned long arg);
-int sis_flip_init(struct inode *inode, struct file *filp, unsigned int cmd,
-		  unsigned long arg);
-int sis_flip_final(struct inode *inode, struct file *filp, unsigned int cmd,
-		  unsigned long arg);
-void flip_final(void);
+extern int sis_fb_alloc( DRM_IOCTL_ARGS );
+extern int sis_fb_free( DRM_IOCTL_ARGS );
+extern int sis_ioctl_agp_init( DRM_IOCTL_ARGS );
+extern int sis_ioctl_agp_alloc( DRM_IOCTL_ARGS );
+extern int sis_ioctl_agp_free( DRM_IOCTL_ARGS );
+extern int sis_fb_init( DRM_IOCTL_ARGS );
 
 #endif

drivers/char/drm/sis_ds.c

@@ -28,15 +28,9 @@
  * 
  */
 
-#include <linux/module.h>
-#include <linux/delay.h>
-#include <linux/errno.h>
-#include <linux/kernel.h>
-#include <linux/slab.h>
-#include <linux/poll.h>
-#include <asm/io.h>
-#include <linux/pci.h>
-
+#include "sis.h"
+#include "drmP.h"
+#include "drm.h"
 #include "sis_ds.h"
 
 /* Set Data Structure, not check repeated value
@@ -48,10 +42,10 @@ set_t *setInit(void)
 	int i;
 	set_t *set;
 
-  set = (set_t *)MALLOC(sizeof(set_t));
-  if (set) {
-    for(i = 0; i < SET_SIZE; i++){
-      set->list[i].free_next = i+1;    
+	set = (set_t *)DRM(alloc)(sizeof(set_t), DRM_MEM_DRIVER);
+	if (set != NULL) {
+		for (i = 0; i < SET_SIZE; i++) {
+			set->list[i].free_next = i + 1;    
 			set->list[i].alloc_next = -1;
 		}
 		set->list[SET_SIZE-1].free_next = -1;
@@ -66,11 +60,10 @@ int setAdd(set_t *set, ITEM_TYPE item)
 {
 	int free = set->free;
   
-  if(free != -1){
+	if (free != -1) {
 		set->list[free].val = item;
 		set->free = set->list[free].free_next;
-  }
-  else{
+	} else {
 		return 0;
 	}
 
@@ -86,10 +79,11 @@ int setDel(set_t *set, ITEM_TYPE item)
 	int alloc = set->alloc;
 	int prev = -1;  
 
-  while(alloc != -1){
-    if(set->list[alloc].val == item){
-      if(prev != -1)      
-        set->list[prev].alloc_next = set->list[alloc].alloc_next; 
+	while (alloc != -1) {
+		if (set->list[alloc].val == item) {
+			if (prev != -1)
+				set->list[prev].alloc_next =
+				    set->list[alloc].alloc_next;
 			else
 				set->alloc = set->list[alloc].alloc_next;
 			break;
@@ -98,7 +92,7 @@ int setDel(set_t *set, ITEM_TYPE item)
 		alloc = set->list[alloc].alloc_next;
 	}
 
-  if(alloc == -1)
+	if (alloc == -1)
 		return 0;
 
 	set->list[alloc].free_next = set->free;
@@ -112,7 +106,7 @@ int setDel(set_t *set, ITEM_TYPE item)
 
 int setFirst(set_t *set, ITEM_TYPE *item)
 {
-  if(set->alloc == -1)
+	if (set->alloc == -1)
 		return 0;
 
 	*item = set->list[set->alloc].val;
@@ -123,7 +117,7 @@ int setFirst(set_t *set, ITEM_TYPE *item)
 
 int setNext(set_t *set, ITEM_TYPE *item)
 {
-  if(set->trace == -1)
+	if (set->trace == -1)
 		return 0;
 
 	*item = set->list[set->trace].val;
@@ -134,7 +128,7 @@ int setNext(set_t *set, ITEM_TYPE *item)
 
 int setDestroy(set_t *set)
 {
-  FREE(set);
+	DRM(free)(set, sizeof(set_t), DRM_MEM_DRIVER);
 
 	return 1;
 }
@@ -165,48 +159,16 @@ int setDestroy(set_t *set)
 
 #define ISFREE(bptr) ((bptr)->free)
 
-#define PRINTF(fmt, arg...) do{}while(0)
-#define fprintf(fmt, arg...) do{}while(0)
-
-static void *calloc(size_t nmemb, size_t size)
-{
-  void *addr;
-  addr = kmalloc(nmemb*size, GFP_KERNEL);
-  if (addr)
-    memset(addr, 0, nmemb*size);
-  return addr;
-}
-#define free(n) kfree(n)
-           
-void mmDumpMemInfo( memHeap_t *heap )
-{
-  TMemBlock *p;
-
-  PRINTF ("Memory heap %p:\n", heap);
-  if (heap == 0) {
-    PRINTF ("  heap == 0\n");
-  } else {
-    p = (TMemBlock *)heap;
-    while (p) {
-      PRINTF ("  Offset:%08x, Size:%08x, %c%c\n",p->ofs,p->size,
-	     p->free ? '.':'U',
-	     p->reserved ? 'R':'.');
-      p = p->next;
-    }
-  }
-  PRINTF ("End of memory blocks\n");
-}
-
 memHeap_t *mmInit(int ofs,
 		  int size)
 {
 	PMemBlock blocks;
 
-   if (size <= 0) {
+	if (size <= 0)
 		return 0;
-   }
-   blocks = (TMemBlock *) calloc(1,sizeof(TMemBlock));
-   if (blocks) {
+
+	blocks = (TMemBlock *)DRM(calloc)(1, sizeof(TMemBlock), DRM_MEM_DRIVER);
+	if (blocks != NULL) {
 		blocks->ofs = ofs;
 		blocks->size = size;
 		blocks->free = 1;
@@ -215,6 +177,24 @@ memHeap_t *mmInit(int ofs,
 		return 0;
 }
 
+/* Checks if a pointer 'b' is part of the heap 'heap' */
+int mmBlockInHeap(memHeap_t *heap, PMemBlock b)
+{
+	TMemBlock *p;
+
+	if (heap == NULL || b == NULL)
+		return 0;
+
+	p = heap;
+	while (p != NULL && p != b) {
+		p = p->next;
+	}
+	if (p == b)
+		return 1;
+	else
+		return 0;
+}
+
 /* Kludgey workaround for existing i810 server.  Remove soon.
  */
 memHeap_t *mmAddRange( memHeap_t *heap,
@@ -222,23 +202,22 @@ memHeap_t *mmAddRange( memHeap_t *heap,
 		       int size )
 {
 	PMemBlock blocks;
-   blocks = (TMemBlock *) calloc(2,sizeof(TMemBlock));
-   if (blocks) {
+	blocks = (TMemBlock *)DRM(calloc)(2, sizeof(TMemBlock), DRM_MEM_DRIVER);
+	if (blocks != NULL) {
 		blocks[0].size = size;
 		blocks[0].free = 1;
 		blocks[0].ofs = ofs;
 		blocks[0].next = &blocks[1];
 
-      /* Discontinuity - stops JoinBlock from trying to join non-adjacent
-       * ranges.
+		/* Discontinuity - stops JoinBlock from trying to join
+		 * non-adjacent ranges.
 		 */
 		blocks[1].size = 0;
 		blocks[1].free = 0;
 		blocks[1].ofs = ofs+size;
-      blocks[1].next = (PMemBlock) heap;      
+		blocks[1].next = (PMemBlock)heap;
 		return (memHeap_t *)blocks;
-   } 
-   else
+	} else
 		return heap;
 }
 
@@ -250,7 +229,8 @@ static TMemBlock* SliceBlock(TMemBlock *p,
 
 	/* break left */
 	if (startofs > p->ofs) {
-    newblock = (TMemBlock*) calloc(1,sizeof(TMemBlock));
+		newblock = (TMemBlock*) DRM(calloc)(1, sizeof(TMemBlock),
+		    DRM_MEM_DRIVER);
 		newblock->ofs = startofs;
 		newblock->size = p->size - (startofs - p->ofs);
 		newblock->free = 1;
@@ -262,7 +242,8 @@ static TMemBlock* SliceBlock(TMemBlock *p,
 
 	/* break right */
 	if (size < p->size) {
-    newblock = (TMemBlock*) calloc(1,sizeof(TMemBlock));
+		newblock = (TMemBlock*) DRM(calloc)(1, sizeof(TMemBlock),
+		    DRM_MEM_DRIVER);
 		newblock->ofs = startofs + size;
 		newblock->size = p->size - size;
 		newblock->free = 1;
@@ -280,15 +261,16 @@ static TMemBlock* SliceBlock(TMemBlock *p,
 
 PMemBlock mmAllocMem( memHeap_t *heap, int size, int align2, int startSearch)
 {
-  int mask,startofs,endofs;
+	int mask,startofs, endofs;
 	TMemBlock *p;
 	
-  if (!heap || align2 < 0 || size <= 0)
+	if (heap == NULL || align2 < 0 || size <= 0)
 		return NULL;
+
 	mask = (1 << align2)-1;
 	startofs = 0;
 	p = (TMemBlock *)heap;
-  while (p) {
+	while (p != NULL) {
 		if (ISFREE(p)) {
 			startofs = (p->ofs + mask) & ~mask;
 			if ( startofs < startSearch ) {
@@ -300,7 +282,7 @@ PMemBlock mmAllocMem( memHeap_t *heap, int size, int align2, int startSearch)
 		}
 		p = p->next;
 	}
-  if (!p)
+	if (p == NULL)
 		return NULL;
 	p = SliceBlock(p,startofs,size,0,mask+1);
 	p->heap = heap;
@@ -313,7 +295,7 @@ static __inline__ int Join2Blocks(TMemBlock *p)
 		TMemBlock *q = p->next;
 		p->size += q->size;
 		p->next = q->next;
-    free(q);
+		DRM(free)(q, sizeof(TMemBlock), DRM_MEM_DRIVER);
 		return 1;
 	}
 	return 0;
@@ -321,29 +303,22 @@ static __inline__ int Join2Blocks(TMemBlock *p)
 
 int mmFreeMem(PMemBlock b)
 {
-  TMemBlock *p,*prev;
+	TMemBlock *p, *prev;
 
-  if (!b)
+	if (b == NULL)
 		return 0;
-  if (!b->heap) {
-     fprintf(stderr, "no heap\n");
+	if (b->heap == NULL)
 		return -1;
-  }
+
 	p = b->heap;
 	prev = NULL;
-  while (p && p != b) {
+	while (p != NULL && p != b) {
 		prev = p;
 		p = p->next;
 	}
-  if (!p || p->free || p->reserved) {
-     if (!p)
-	fprintf(stderr, "block not found in heap\n");
-     else if (p->free)
-	fprintf(stderr, "block already free\n");
-     else
-	fprintf(stderr, "block is reserved\n");
+	if (p == NULL || p->free || p->reserved)
 		return -1;
-  }
+
 	p->free = 1;
 	Join2Blocks(p);
 	if (prev)
@@ -356,9 +331,10 @@ int mmReserveMem(memHeap_t *heap, int offset,int size)
 	int endofs;
 	TMemBlock *p;
 
-  if (!heap || size <= 0)
+	if (heap == NULL || size <= 0)
 		return -1;
-  endofs = offset+size;
+
+	endofs = offset + size;
 	p = (TMemBlock *)heap;
 	while (p && p->ofs <= offset) {
 		if (ISFREE(p) && endofs <= (p->ofs+p->size)) {
@@ -374,20 +350,22 @@ int mmFreeReserved(memHeap_t *heap, int offset)
 {
 	TMemBlock *p,*prev;
 
-  if (!heap)
+	if (heap == NULL)
 		return -1;
+
 	p = (TMemBlock *)heap;
 	prev = NULL;
-  while (p && p->ofs != offset) {
+	while (p != NULL && p->ofs != offset) {
 		prev = p;
 		p = p->next;
 	}
-  if (!p || !p->reserved)
+	if (p == NULL || !p->reserved)
 		return -1;
+
 	p->free = 1;
 	p->reserved = 0;
 	Join2Blocks(p);
-  if (prev)
+	if (prev != NULL)
 		Join2Blocks(prev);
 	return 0;
 }
@@ -396,12 +374,13 @@ void mmDestroy(memHeap_t *heap)
 {
 	TMemBlock *p,*q;
 
-  if (!heap)
+	if (heap == NULL)
 		return;
+
 	p = (TMemBlock *)heap;
-  while (p) {
+	while (p != NULL) {
 		q = p->next;
-    free(p);
+		DRM(free)(p, sizeof(TMemBlock), DRM_MEM_DRIVER);
 		p = q;
 	}
 }

drivers/char/drm/sis_ds.h

@@ -28,14 +28,12 @@
  * 
  */
 
-#ifndef _sis_ds_h_
-#define _sis_ds_h_
+#ifndef __SIS_DS_H__
+#define __SIS_DS_H__
 
 /* Set Data Structure */
 
 #define SET_SIZE 5000
-#define MALLOC(s) kmalloc(s, GFP_KERNEL)
-#define FREE(s) kfree(s)
 
 typedef unsigned int ITEM_TYPE;
 
@@ -58,8 +56,6 @@ int setFirst(set_t *set, ITEM_TYPE *item);
 int setNext(set_t *set, ITEM_TYPE *item);
 int setDestroy(set_t *set);
 
-#endif
-
 /*
  * GLX Hardware Device Driver common code
  * Copyright (C) 1999 Keith Whitwell
@@ -84,9 +80,6 @@ int setDestroy(set_t *set);
  *
  */
 
-#ifndef MM_INC
-#define MM_INC
-
 struct mem_block_t {
 	struct mem_block_t *next;
 	struct mem_block_t *heap;
@@ -102,13 +95,19 @@ typedef struct mem_block_t *PMemBlock;
 typedef struct mem_block_t memHeap_t;
 
 static __inline__ int mmBlockSize(PMemBlock b)
-{ return b->size; }
+{
+	return b->size;
+}
 
 static __inline__ int mmOffset(PMemBlock b)
-{ return b->ofs; }
+{
+	return b->ofs;
+}
 
 static __inline__ void mmMarkReserved(PMemBlock b)
-{ b->reserved = 1; }
+{
+	b->reserved = 1;
+}
 
 /* 
  * input: total size in bytes
@@ -116,13 +115,10 @@ static __inline__ void mmMarkReserved(PMemBlock b)
  */
 memHeap_t *mmInit( int ofs, int size );
 
-
-
 memHeap_t *mmAddRange( memHeap_t *heap,
 		       int ofs,
 		       int size );
 
-
 /*
  * Allocate 'size' bytes with 2^align2 bytes alignment,
  * restrict the search to free memory after 'startSearch'
@@ -135,6 +131,11 @@ memHeap_t *mmAddRange( memHeap_t *heap,
  */
 PMemBlock mmAllocMem( memHeap_t *heap, int size, int align2, int startSearch );
 
+/*
+ * Returns 1 if the block 'b' is part of the heap 'heap'
+ */
+int mmBlockInHeap( PMemBlock heap, PMemBlock b );
+
 /*
  * Free block starts at offset
  * input: pointer to a block
@@ -160,4 +161,4 @@ void mmDestroy( memHeap_t *mmInit );
 /* For debuging purpose. */
 void mmDumpMemInfo( memHeap_t *mmInit );
 
-#endif
+#endif /* __SIS_DS_H__ */