Skip to content

L
linux
Commit b4b6051a authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

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.
parent c1dd5958
Show whitespace changes
Inline Side-by-side
Showing with 623 additions and 561 deletions
drivers/char/drm/Kconfig
View file @ b4b6051a
...@@ -75,9 +75,9 @@ config DRM_MGA ...@@ -75,9 +75,9 @@ config DRM_MGA
config DRM_SIS config DRM_SIS
tristate "SiS video cards" tristate "SiS video cards"
depends on DRM && AGP && FB_SIS depends on DRM && AGP
help help
Choose this option if you have a SiS 630 or compatibel video Choose this option if you have a SiS 630 or compatibel video
chipset. If M is selected the module will be called sis. AGP 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
View file @ b4b6051a
...@@ -33,7 +33,11 @@ ...@@ -33,7 +33,11 @@
* Name it sisdrv_##x as there's a conflict with sis_free/malloc in the kernel * Name it sisdrv_##x as there's a conflict with sis_free/malloc in the kernel
* that's used for fb devices * that's used for fb devices
*/ */
#ifdef __linux__
#define DRM(x) sisdrv_##x #define DRM(x) sisdrv_##x
#else
#define DRM(x) sis_##x
#endif
/* General customization: /* General customization:
*/ */
...@@ -45,25 +49,18 @@ ...@@ -45,25 +49,18 @@
#define DRIVER_AUTHOR "SIS" #define DRIVER_AUTHOR "SIS"
#define DRIVER_NAME "sis" #define DRIVER_NAME "sis"
#define DRIVER_DESC "SIS 300/630/540" #define DRIVER_DESC "SIS 300/630/540"
#define DRIVER_DATE "20010503" #define DRIVER_DATE "20030826"
#define DRIVER_MAJOR 1 #define DRIVER_MAJOR 1
#define DRIVER_MINOR 0 #define DRIVER_MINOR 1
#define DRIVER_PATCHLEVEL 0 #define DRIVER_PATCHLEVEL 0
#define DRIVER_IOCTLS \ #define DRIVER_IOCTLS \
[DRM_IOCTL_NR(SIS_IOCTL_FB_ALLOC)] = { sis_fb_alloc, 1, 0 }, \ [DRM_IOCTL_NR(DRM_IOCTL_SIS_FB_ALLOC)] = { sis_fb_alloc, 1, 0 }, \
[DRM_IOCTL_NR(SIS_IOCTL_FB_FREE)] = { sis_fb_free, 1, 0 }, \ [DRM_IOCTL_NR(DRM_IOCTL_SIS_FB_FREE)] = { sis_fb_free, 1, 0 }, \
/* AGP Memory Management */ \ [DRM_IOCTL_NR(DRM_IOCTL_SIS_AGP_INIT)] = { sis_ioctl_agp_init, 1, 1 }, \
[DRM_IOCTL_NR(SIS_IOCTL_AGP_INIT)] = { sisp_agp_init, 1, 0 }, \ [DRM_IOCTL_NR(DRM_IOCTL_SIS_AGP_ALLOC)] = { sis_ioctl_agp_alloc, 1, 0 }, \
[DRM_IOCTL_NR(SIS_IOCTL_AGP_ALLOC)] = { sisp_agp_alloc, 1, 0 }, \ [DRM_IOCTL_NR(DRM_IOCTL_SIS_AGP_FREE)] = { sis_ioctl_agp_free, 1, 0 }, \
[DRM_IOCTL_NR(SIS_IOCTL_AGP_FREE)] = { sisp_agp_free, 1, 0 } [DRM_IOCTL_NR(DRM_IOCTL_SIS_FB_INIT)] = { sis_fb_init, 1, 1 }
#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
#define __HAVE_COUNTERS 5 #define __HAVE_COUNTERS 5
......
drivers/char/drm/sis_drm.h
View file @ b4b6051a
#ifndef _sis_drm_public_h_ #ifndef __SIS_DRM_H__
#define _sis_drm_public_h_ #define __SIS_DRM_H__
/* SiS specific ioctls */ /* SiS specific ioctls */
#define SIS_IOCTL_FB_ALLOC DRM_IOWR(0x44, drm_sis_mem_t) #define DRM_IOCTL_SIS_FB_ALLOC DRM_IOWR(0x44, drm_sis_mem_t)
#define SIS_IOCTL_FB_FREE DRM_IOW( 0x45, drm_sis_mem_t) #define DRM_IOCTL_SIS_FB_FREE DRM_IOW( 0x45, drm_sis_mem_t)
#define SIS_IOCTL_AGP_INIT DRM_IOWR(0x53, drm_sis_agp_t) #define DRM_IOCTL_SIS_AGP_INIT DRM_IOWR(0x53, drm_sis_agp_t)
#define SIS_IOCTL_AGP_ALLOC DRM_IOWR(0x54, drm_sis_mem_t) #define DRM_IOCTL_SIS_AGP_ALLOC DRM_IOWR(0x54, drm_sis_mem_t)
#define SIS_IOCTL_AGP_FREE DRM_IOW( 0x55, drm_sis_mem_t) #define DRM_IOCTL_SIS_AGP_FREE DRM_IOW( 0x55, drm_sis_mem_t)
#define SIS_IOCTL_FLIP DRM_IOW( 0x48, drm_sis_flip_t) #define DRM_IOCTL_SIS_FB_INIT DRM_IOW( 0x56, drm_sis_fb_t)
#define SIS_IOCTL_FLIP_INIT DRM_IO( 0x49) /*
#define SIS_IOCTL_FLIP_FINAL DRM_IO( 0x50) #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 { typedef struct {
int context; int context;
unsigned int offset; unsigned int offset;
unsigned int size; unsigned int size;
unsigned int free; unsigned long free;
} drm_sis_mem_t; } drm_sis_mem_t;
typedef struct { typedef struct {
...@@ -24,23 +27,7 @@ typedef struct { ...@@ -24,23 +27,7 @@ typedef struct {
} drm_sis_agp_t; } drm_sis_agp_t;
typedef struct { typedef struct {
unsigned int left, right; unsigned int offset, size;
} drm_sis_flip_t; } drm_sis_fb_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
#endif #endif /* __SIS_DRM_H__ */
drivers/char/drm/sis_drv.h
View file @ b4b6051a
...@@ -28,18 +28,20 @@ ...@@ -28,18 +28,20 @@
#ifndef _SIS_DRV_H_ #ifndef _SIS_DRV_H_
#define _SIS_DRV_H_ #define _SIS_DRV_H_
#include "sis_ds.h"
typedef struct drm_sis_private { typedef struct drm_sis_private {
drm_map_t *buffers; 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, extern int sis_fb_alloc( DRM_IOCTL_ARGS );
unsigned long arg); extern int sis_fb_free( DRM_IOCTL_ARGS );
int sis_flip_init(struct inode *inode, struct file *filp, unsigned int cmd, extern int sis_ioctl_agp_init( DRM_IOCTL_ARGS );
unsigned long arg); extern int sis_ioctl_agp_alloc( DRM_IOCTL_ARGS );
int sis_flip_final(struct inode *inode, struct file *filp, unsigned int cmd, extern int sis_ioctl_agp_free( DRM_IOCTL_ARGS );
unsigned long arg); extern int sis_fb_init( DRM_IOCTL_ARGS );
void flip_final(void);
#endif #endif
drivers/char/drm/sis_ds.c
View file @ b4b6051a
...@@ -28,15 +28,9 @@ ...@@ -28,15 +28,9 @@
* *
*/ */
#include <linux/module.h> #include "sis.h"
#include <linux/delay.h> #include "drmP.h"
#include <linux/errno.h> #include "drm.h"
#include <linux/kernel.h>
#include <linux/slab.h>
#include <linux/poll.h>
#include <asm/io.h>
#include <linux/pci.h>
#include "sis_ds.h" #include "sis_ds.h"
/* Set Data Structure, not check repeated value /* Set Data Structure, not check repeated value
...@@ -48,10 +42,10 @@ set_t *setInit(void) ...@@ -48,10 +42,10 @@ set_t *setInit(void)
int i; int i;
set_t *set; set_t *set;
set = (set_t *)MALLOC(sizeof(set_t)); set = (set_t *)DRM(alloc)(sizeof(set_t), DRM_MEM_DRIVER);
if (set) { if (set != NULL) {
for(i = 0; i < SET_SIZE; i++){ for (i = 0; i < SET_SIZE; i++) {
set->list[i].free_next = i+1; set->list[i].free_next = i + 1;
set->list[i].alloc_next = -1; set->list[i].alloc_next = -1;
} }
set->list[SET_SIZE-1].free_next = -1; set->list[SET_SIZE-1].free_next = -1;
...@@ -66,11 +60,10 @@ int setAdd(set_t *set, ITEM_TYPE item) ...@@ -66,11 +60,10 @@ int setAdd(set_t *set, ITEM_TYPE item)
{ {
int free = set->free; int free = set->free;
if(free != -1){ if (free != -1) {
set->list[free].val = item; set->list[free].val = item;
set->free = set->list[free].free_next; set->free = set->list[free].free_next;
} } else {
else{
return 0; return 0;
} }
...@@ -86,10 +79,11 @@ int setDel(set_t *set, ITEM_TYPE item) ...@@ -86,10 +79,11 @@ int setDel(set_t *set, ITEM_TYPE item)
int alloc = set->alloc; int alloc = set->alloc;
int prev = -1; int prev = -1;
while(alloc != -1){ while (alloc != -1) {
if(set->list[alloc].val == item){ if (set->list[alloc].val == item) {
if(prev != -1) if (prev != -1)
set->list[prev].alloc_next = set->list[alloc].alloc_next; set->list[prev].alloc_next =
set->list[alloc].alloc_next;
else else
set->alloc = set->list[alloc].alloc_next; set->alloc = set->list[alloc].alloc_next;
break; break;
...@@ -98,7 +92,7 @@ int setDel(set_t *set, ITEM_TYPE item) ...@@ -98,7 +92,7 @@ int setDel(set_t *set, ITEM_TYPE item)
alloc = set->list[alloc].alloc_next; alloc = set->list[alloc].alloc_next;
} }
if(alloc == -1) if (alloc == -1)
return 0; return 0;
set->list[alloc].free_next = set->free; set->list[alloc].free_next = set->free;
...@@ -112,7 +106,7 @@ int setDel(set_t *set, ITEM_TYPE item) ...@@ -112,7 +106,7 @@ int setDel(set_t *set, ITEM_TYPE item)
int setFirst(set_t *set, ITEM_TYPE *item) int setFirst(set_t *set, ITEM_TYPE *item)
{ {
if(set->alloc == -1) if (set->alloc == -1)
return 0; return 0;
*item = set->list[set->alloc].val; *item = set->list[set->alloc].val;
...@@ -123,7 +117,7 @@ int setFirst(set_t *set, ITEM_TYPE *item) ...@@ -123,7 +117,7 @@ int setFirst(set_t *set, ITEM_TYPE *item)
int setNext(set_t *set, ITEM_TYPE *item) int setNext(set_t *set, ITEM_TYPE *item)
{ {
if(set->trace == -1) if (set->trace == -1)
return 0; return 0;
*item = set->list[set->trace].val; *item = set->list[set->trace].val;
...@@ -134,7 +128,7 @@ int setNext(set_t *set, ITEM_TYPE *item) ...@@ -134,7 +128,7 @@ int setNext(set_t *set, ITEM_TYPE *item)
int setDestroy(set_t *set) int setDestroy(set_t *set)
{ {
FREE(set); DRM(free)(set, sizeof(set_t), DRM_MEM_DRIVER);
return 1; return 1;
} }
...@@ -165,48 +159,16 @@ int setDestroy(set_t *set) ...@@ -165,48 +159,16 @@ int setDestroy(set_t *set)
#define ISFREE(bptr) ((bptr)->free) #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, memHeap_t *mmInit(int ofs,
int size) int size)
{ {
PMemBlock blocks; PMemBlock blocks;
if (size <= 0) { if (size <= 0)
return 0; return 0;
}
blocks = (TMemBlock *) calloc(1,sizeof(TMemBlock)); blocks = (TMemBlock *)DRM(calloc)(1, sizeof(TMemBlock), DRM_MEM_DRIVER);
if (blocks) { if (blocks != NULL) {
blocks->ofs = ofs; blocks->ofs = ofs;
blocks->size = size; blocks->size = size;
blocks->free = 1; blocks->free = 1;
...@@ -215,6 +177,24 @@ memHeap_t *mmInit(int ofs, ...@@ -215,6 +177,24 @@ memHeap_t *mmInit(int ofs,
return 0; 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. /* Kludgey workaround for existing i810 server. Remove soon.
*/ */
memHeap_t *mmAddRange( memHeap_t *heap, memHeap_t *mmAddRange( memHeap_t *heap,
...@@ -222,23 +202,22 @@ memHeap_t *mmAddRange( memHeap_t *heap, ...@@ -222,23 +202,22 @@ memHeap_t *mmAddRange( memHeap_t *heap,
int size ) int size )
{ {
PMemBlock blocks; PMemBlock blocks;
blocks = (TMemBlock *) calloc(2,sizeof(TMemBlock)); blocks = (TMemBlock *)DRM(calloc)(2, sizeof(TMemBlock), DRM_MEM_DRIVER);
if (blocks) { if (blocks != NULL) {
blocks[0].size = size; blocks[0].size = size;
blocks[0].free = 1; blocks[0].free = 1;
blocks[0].ofs = ofs; blocks[0].ofs = ofs;
blocks[0].next = &blocks[1]; blocks[0].next = &blocks[1];
/* Discontinuity - stops JoinBlock from trying to join non-adjacent /* Discontinuity - stops JoinBlock from trying to join
* ranges. * non-adjacent ranges.
*/ */
blocks[1].size = 0; blocks[1].size = 0;
blocks[1].free = 0; blocks[1].free = 0;
blocks[1].ofs = ofs+size; blocks[1].ofs = ofs+size;
blocks[1].next = (PMemBlock) heap; blocks[1].next = (PMemBlock)heap;
return (memHeap_t *)blocks; return (memHeap_t *)blocks;
} } else
else
return heap; return heap;
} }
...@@ -250,7 +229,8 @@ static TMemBlock* SliceBlock(TMemBlock *p, ...@@ -250,7 +229,8 @@ static TMemBlock* SliceBlock(TMemBlock *p,
/* break left */ /* break left */
if (startofs > p->ofs) { if (startofs > p->ofs) {
newblock = (TMemBlock*) calloc(1,sizeof(TMemBlock)); newblock = (TMemBlock*) DRM(calloc)(1, sizeof(TMemBlock),
DRM_MEM_DRIVER);
newblock->ofs = startofs; newblock->ofs = startofs;
newblock->size = p->size - (startofs - p->ofs); newblock->size = p->size - (startofs - p->ofs);
newblock->free = 1; newblock->free = 1;
...@@ -262,7 +242,8 @@ static TMemBlock* SliceBlock(TMemBlock *p, ...@@ -262,7 +242,8 @@ static TMemBlock* SliceBlock(TMemBlock *p,
/* break right */ /* break right */
if (size < p->size) { 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->ofs = startofs + size;
newblock->size = p->size - size; newblock->size = p->size - size;
newblock->free = 1; newblock->free = 1;
...@@ -280,15 +261,16 @@ static TMemBlock* SliceBlock(TMemBlock *p, ...@@ -280,15 +261,16 @@ static TMemBlock* SliceBlock(TMemBlock *p,
PMemBlock mmAllocMem( memHeap_t *heap, int size, int align2, int startSearch) PMemBlock mmAllocMem( memHeap_t *heap, int size, int align2, int startSearch)
{ {
int mask,startofs,endofs; int mask,startofs, endofs;
TMemBlock *p; TMemBlock *p;
if (!heap || align2 < 0 || size <= 0) if (heap == NULL || align2 < 0 || size <= 0)
return NULL; return NULL;
mask = (1 << align2)-1; mask = (1 << align2)-1;
startofs = 0; startofs = 0;
p = (TMemBlock *)heap; p = (TMemBlock *)heap;
while (p) { while (p != NULL) {
if (ISFREE(p)) { if (ISFREE(p)) {
startofs = (p->ofs + mask) & ~mask; startofs = (p->ofs + mask) & ~mask;
if ( startofs < startSearch ) { if ( startofs < startSearch ) {
...@@ -300,7 +282,7 @@ PMemBlock mmAllocMem( memHeap_t *heap, int size, int align2, int startSearch) ...@@ -300,7 +282,7 @@ PMemBlock mmAllocMem( memHeap_t *heap, int size, int align2, int startSearch)
} }
p = p->next; p = p->next;
} }
if (!p) if (p == NULL)
return NULL; return NULL;
p = SliceBlock(p,startofs,size,0,mask+1); p = SliceBlock(p,startofs,size,0,mask+1);
p->heap = heap; p->heap = heap;
...@@ -313,7 +295,7 @@ static __inline__ int Join2Blocks(TMemBlock *p) ...@@ -313,7 +295,7 @@ static __inline__ int Join2Blocks(TMemBlock *p)
TMemBlock *q = p->next; TMemBlock *q = p->next;
p->size += q->size; p->size += q->size;
p->next = q->next; p->next = q->next;
free(q); DRM(free)(q, sizeof(TMemBlock), DRM_MEM_DRIVER);
return 1; return 1;
} }
return 0; return 0;
...@@ -321,29 +303,22 @@ static __inline__ int Join2Blocks(TMemBlock *p) ...@@ -321,29 +303,22 @@ static __inline__ int Join2Blocks(TMemBlock *p)
int mmFreeMem(PMemBlock b) int mmFreeMem(PMemBlock b)
{ {
TMemBlock *p,*prev; TMemBlock *p, *prev;
if (!b) if (b == NULL)
return 0; return 0;
if (!b->heap) { if (b->heap == NULL)
fprintf(stderr, "no heap\n");
return -1; return -1;
}
p = b->heap; p = b->heap;
prev = NULL; prev = NULL;
while (p && p != b) { while (p != NULL && p != b) {
prev = p; prev = p;
p = p->next; p = p->next;
} }
if (!p || p->free || p->reserved) { if (p == NULL || 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");
return -1; return -1;
}
p->free = 1; p->free = 1;
Join2Blocks(p); Join2Blocks(p);
if (prev) if (prev)
...@@ -356,9 +331,10 @@ int mmReserveMem(memHeap_t *heap, int offset,int size) ...@@ -356,9 +331,10 @@ int mmReserveMem(memHeap_t *heap, int offset,int size)
int endofs; int endofs;
TMemBlock *p; TMemBlock *p;
if (!heap || size <= 0) if (heap == NULL || size <= 0)
return -1; return -1;
endofs = offset+size;
endofs = offset + size;
p = (TMemBlock *)heap; p = (TMemBlock *)heap;
while (p && p->ofs <= offset) { while (p && p->ofs <= offset) {
if (ISFREE(p) && endofs <= (p->ofs+p->size)) { if (ISFREE(p) && endofs <= (p->ofs+p->size)) {
...@@ -374,20 +350,22 @@ int mmFreeReserved(memHeap_t *heap, int offset) ...@@ -374,20 +350,22 @@ int mmFreeReserved(memHeap_t *heap, int offset)
{ {
TMemBlock *p,*prev; TMemBlock *p,*prev;
if (!heap) if (heap == NULL)
return -1; return -1;
p = (TMemBlock *)heap; p = (TMemBlock *)heap;
prev = NULL; prev = NULL;
while (p && p->ofs != offset) { while (p != NULL && p->ofs != offset) {
prev = p; prev = p;
p = p->next; p = p->next;
} }
if (!p || !p->reserved) if (p == NULL || !p->reserved)
return -1; return -1;
p->free = 1; p->free = 1;
p->reserved = 0; p->reserved = 0;
Join2Blocks(p); Join2Blocks(p);
if (prev) if (prev != NULL)
Join2Blocks(prev); Join2Blocks(prev);
return 0; return 0;
} }
...@@ -396,12 +374,13 @@ void mmDestroy(memHeap_t *heap) ...@@ -396,12 +374,13 @@ void mmDestroy(memHeap_t *heap)
{ {
TMemBlock *p,*q; TMemBlock *p,*q;
if (!heap) if (heap == NULL)
return; return;
p = (TMemBlock *)heap; p = (TMemBlock *)heap;
while (p) { while (p != NULL) {
q = p->next; q = p->next;
free(p); DRM(free)(p, sizeof(TMemBlock), DRM_MEM_DRIVER);
p = q; p = q;
} }
} }
drivers/char/drm/sis_ds.h
View file @ b4b6051a
...@@ -28,14 +28,12 @@ ...@@ -28,14 +28,12 @@
* *
*/ */
#ifndef _sis_ds_h_ #ifndef __SIS_DS_H__
#define _sis_ds_h_ #define __SIS_DS_H__
/* Set Data Structure */ /* Set Data Structure */
#define SET_SIZE 5000 #define SET_SIZE 5000
#define MALLOC(s) kmalloc(s, GFP_KERNEL)
#define FREE(s) kfree(s)
typedef unsigned int ITEM_TYPE; typedef unsigned int ITEM_TYPE;
...@@ -58,8 +56,6 @@ int setFirst(set_t *set, ITEM_TYPE *item); ...@@ -58,8 +56,6 @@ int setFirst(set_t *set, ITEM_TYPE *item);
int setNext(set_t *set, ITEM_TYPE *item); int setNext(set_t *set, ITEM_TYPE *item);
int setDestroy(set_t *set); int setDestroy(set_t *set);
#endif
/* /*
* GLX Hardware Device Driver common code * GLX Hardware Device Driver common code
* Copyright (C) 1999 Keith Whitwell * Copyright (C) 1999 Keith Whitwell
...@@ -84,9 +80,6 @@ int setDestroy(set_t *set); ...@@ -84,9 +80,6 @@ int setDestroy(set_t *set);
* *
*/ */
#ifndef MM_INC
#define MM_INC
struct mem_block_t { struct mem_block_t {
struct mem_block_t *next; struct mem_block_t *next;
struct mem_block_t *heap; struct mem_block_t *heap;
...@@ -102,13 +95,19 @@ typedef struct mem_block_t *PMemBlock; ...@@ -102,13 +95,19 @@ typedef struct mem_block_t *PMemBlock;
typedef struct mem_block_t memHeap_t; typedef struct mem_block_t memHeap_t;
static __inline__ int mmBlockSize(PMemBlock b) static __inline__ int mmBlockSize(PMemBlock b)
{ return b->size; } {
return b->size;
}
static __inline__ int mmOffset(PMemBlock b) static __inline__ int mmOffset(PMemBlock b)
{ return b->ofs; } {
return b->ofs;
}
static __inline__ void mmMarkReserved(PMemBlock b) static __inline__ void mmMarkReserved(PMemBlock b)
{ b->reserved = 1; } {
b->reserved = 1;
}
/* /*
* input: total size in bytes * input: total size in bytes
...@@ -116,13 +115,10 @@ static __inline__ void mmMarkReserved(PMemBlock b) ...@@ -116,13 +115,10 @@ static __inline__ void mmMarkReserved(PMemBlock b)
*/ */
memHeap_t *mmInit( int ofs, int size ); memHeap_t *mmInit( int ofs, int size );
memHeap_t *mmAddRange( memHeap_t *heap, memHeap_t *mmAddRange( memHeap_t *heap,
int ofs, int ofs,
int size ); int size );
/* /*
* Allocate 'size' bytes with 2^align2 bytes alignment, * Allocate 'size' bytes with 2^align2 bytes alignment,
* restrict the search to free memory after 'startSearch' * restrict the search to free memory after 'startSearch'
...@@ -135,6 +131,11 @@ memHeap_t *mmAddRange( memHeap_t *heap, ...@@ -135,6 +131,11 @@ memHeap_t *mmAddRange( memHeap_t *heap,
*/ */
PMemBlock mmAllocMem( memHeap_t *heap, int size, int align2, int startSearch ); 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 * Free block starts at offset
* input: pointer to a block * input: pointer to a block
...@@ -160,4 +161,4 @@ void mmDestroy( memHeap_t *mmInit ); ...@@ -160,4 +161,4 @@ void mmDestroy( memHeap_t *mmInit );
/* For debuging purpose. */ /* For debuging purpose. */
void mmDumpMemInfo( memHeap_t *mmInit ); void mmDumpMemInfo( memHeap_t *mmInit );
#endif #endif /* __SIS_DS_H__ */
drivers/char/drm/sis_mm.c
View file @ b4b6051a
...@@ -28,13 +28,14 @@ ...@@ -28,13 +28,14 @@
* *
*/ */
#include <linux/config.h>
#include "sis.h" #include "sis.h"
#include "video/sisfb.h"
#include "drmP.h" #include "drmP.h"
#include "sis_drm.h" #include "sis_drm.h"
#include "sis_drv.h" #include "sis_drv.h"
#include "sis_ds.h" #include "sis_ds.h"
#if defined(__linux__) && defined(CONFIG_FB_SIS)
#include <linux/sisfb.h>
#endif
#define MAX_CONTEXT 100 #define MAX_CONTEXT 100
#define VIDEO_TYPE 0 #define VIDEO_TYPE 0
...@@ -48,82 +49,88 @@ typedef struct { ...@@ -48,82 +49,88 @@ typedef struct {
static sis_context_t global_ppriv[MAX_CONTEXT]; static sis_context_t global_ppriv[MAX_CONTEXT];
static int add_alloc_set(int context, int type, unsigned int val) static int add_alloc_set(int context, int type, unsigned int val)
{ {
int i, retval = 0; int i, retval = 0;
for(i = 0; i < MAX_CONTEXT; i++) for (i = 0; i < MAX_CONTEXT; i++) {
if(global_ppriv[i].used && global_ppriv[i].context == context){ if (global_ppriv[i].used && global_ppriv[i].context == context)
{
retval = setAdd(global_ppriv[i].sets[type], val); retval = setAdd(global_ppriv[i].sets[type], val);
break; break;
} }
}
return retval; return retval;
} }
static int del_alloc_set(int context, int type, unsigned int val) static int del_alloc_set(int context, int type, unsigned int val)
{ {
int i, retval = 0; int i, retval = 0;
for(i = 0; i < MAX_CONTEXT; i++)
if(global_ppriv[i].used && global_ppriv[i].context == context){ for (i = 0; i < MAX_CONTEXT; i++) {
if (global_ppriv[i].used && global_ppriv[i].context == context)
{
retval = setDel(global_ppriv[i].sets[type], val); retval = setDel(global_ppriv[i].sets[type], val);
break; break;
} }
}
return retval; return retval;
} }
/* fb management via fb device */ /* fb management via fb device */
#if 1 #if defined(__linux__) && defined(CONFIG_FB_SIS)
int sis_fb_alloc(struct inode *inode, struct file *filp, unsigned int cmd,
unsigned long arg) int sis_fb_init( DRM_IOCTL_ARGS )
{
return 0;
}
int sis_fb_alloc( DRM_IOCTL_ARGS )
{ {
drm_sis_mem_t fb; drm_sis_mem_t fb;
struct sis_memreq req; struct sis_memreq req;
int retval = 0; int retval = 0;
if (copy_from_user(&fb, (drm_sis_mem_t *)arg, sizeof(fb))) DRM_COPY_FROM_USER_IOCTL(fb, (drm_sis_mem_t *)data, sizeof(fb));
return -EFAULT;
req.size = fb.size; req.size = fb.size;
sis_malloc(&req); sis_malloc(&req);
if(req.offset){ if (req.offset) {
/* TODO */ /* TODO */
fb.offset = req.offset; fb.offset = req.offset;
fb.free = req.offset; fb.free = req.offset;
if(!add_alloc_set(fb.context, VIDEO_TYPE, fb.free)){ if (!add_alloc_set(fb.context, VIDEO_TYPE, fb.free)) {
DRM_DEBUG("adding to allocation set fails\n"); DRM_DEBUG("adding to allocation set fails\n");
sis_free(req.offset); sis_free(req.offset);
retval = -1; retval = DRM_ERR(EINVAL);
}
} }
else{ } else {
fb.offset = 0; fb.offset = 0;
fb.size = 0; fb.size = 0;
fb.free = 0; fb.free = 0;
} }
if (copy_to_user((drm_sis_mem_t *)arg, &fb, sizeof(fb))) return -EFAULT; DRM_COPY_TO_USER_IOCTL((drm_sis_mem_t *)data, fb, sizeof(fb));
DRM_DEBUG("alloc fb, size = %d, offset = %ld\n", fb.size, req.offset); DRM_DEBUG("alloc fb, size = %d, offset = %ld\n", fb.size, req.offset);
return retval; return retval;
} }
int sis_fb_free(struct inode *inode, struct file *filp, unsigned int cmd, int sis_fb_free( DRM_IOCTL_ARGS )
unsigned long arg)
{ {
drm_sis_mem_t fb; drm_sis_mem_t fb;
int retval = 0; int retval = 0;
if (copy_from_user(&fb, (drm_sis_mem_t *)arg, sizeof(fb))) DRM_COPY_FROM_USER_IOCTL(fb, (drm_sis_mem_t *)data, sizeof(fb));
return -EFAULT;
if(!fb.free){ if (!fb.free)
return -1; return DRM_ERR(EINVAL);
}
if (!del_alloc_set(fb.context, VIDEO_TYPE, fb.free))
retval = DRM_ERR(EINVAL);
sis_free(fb.free); sis_free(fb.free);
if(!del_alloc_set(fb.context, VIDEO_TYPE, fb.free))
retval = -1;
DRM_DEBUG("free fb, offset = %d\n", fb.free); DRM_DEBUG("free fb, offset = %d\n", fb.free);
...@@ -132,126 +139,215 @@ int sis_fb_free(struct inode *inode, struct file *filp, unsigned int cmd, ...@@ -132,126 +139,215 @@ int sis_fb_free(struct inode *inode, struct file *filp, unsigned int cmd,
#else #else
int sis_fb_alloc(struct inode *inode, struct file *filp, unsigned int cmd, /* Called by the X Server to initialize the FB heap. Allocations will fail
unsigned long arg) * unless this is called. Offset is the beginning of the heap from the
* framebuffer offset (MaxXFBMem in XFree86).
*
* Memory layout according to Thomas Winischofer:
* |------------------|DDDDDDDDDDDDDDDDDDDDDDDDDDDDD|HHHH|CCCCCCCCCCC|
*
* X driver/sisfb HW- Command-
* framebuffer memory DRI heap Cursor queue
*/
int sis_fb_init( DRM_IOCTL_ARGS )
{ {
return -1; DRM_DEVICE;
drm_sis_private_t *dev_priv = dev->dev_private;
drm_sis_fb_t fb;
DRM_COPY_FROM_USER_IOCTL(fb, (drm_sis_fb_t *)data, sizeof(fb));
if (dev_priv == NULL) {
dev->dev_private = DRM(calloc)(1, sizeof(drm_sis_private_t),
DRM_MEM_DRIVER);
dev_priv = dev->dev_private;
if (dev_priv == NULL)
return ENOMEM;
}
if (dev_priv->FBHeap != NULL)
return DRM_ERR(EINVAL);
dev_priv->FBHeap = mmInit(fb.offset, fb.size);
DRM_DEBUG("offset = %u, size = %u", fb.offset, fb.size);
return 0;
} }
int sis_fb_free(struct inode *inode, struct file *filp, unsigned int cmd, int sis_fb_alloc( DRM_IOCTL_ARGS )
unsigned long arg)
{ {
DRM_DEVICE;
drm_sis_private_t *dev_priv = dev->dev_private;
drm_sis_mem_t fb;
PMemBlock block;
int retval = 0;
if (dev_priv == NULL || dev_priv->FBHeap == NULL)
return DRM_ERR(EINVAL);
DRM_COPY_FROM_USER_IOCTL(fb, (drm_sis_mem_t *)data, sizeof(fb));
block = mmAllocMem(dev_priv->FBHeap, fb.size, 0, 0);
if (block) {
/* TODO */
fb.offset = block->ofs;
fb.free = (unsigned long)block;
if (!add_alloc_set(fb.context, VIDEO_TYPE, fb.free)) {
DRM_DEBUG("adding to allocation set fails\n");
mmFreeMem((PMemBlock)fb.free);
retval = DRM_ERR(EINVAL);
}
} else {
fb.offset = 0;
fb.size = 0;
fb.free = 0;
}
DRM_COPY_TO_USER_IOCTL((drm_sis_mem_t *)data, fb, sizeof(fb));
DRM_DEBUG("alloc fb, size = %d, offset = %d\n", fb.size, fb.offset);
return retval;
}
int sis_fb_free( DRM_IOCTL_ARGS )
{
DRM_DEVICE;
drm_sis_private_t *dev_priv = dev->dev_private;
drm_sis_mem_t fb;
if (dev_priv == NULL || dev_priv->FBHeap == NULL)
return DRM_ERR(EINVAL);
DRM_COPY_FROM_USER_IOCTL(fb, (drm_sis_mem_t *)data, sizeof(fb));
if (!mmBlockInHeap(dev_priv->FBHeap, (PMemBlock)fb.free))
return DRM_ERR(EINVAL);
if (!del_alloc_set(fb.context, VIDEO_TYPE, fb.free))
return DRM_ERR(EINVAL);
mmFreeMem((PMemBlock)fb.free);
DRM_DEBUG("free fb, free = 0x%lx\n", fb.free);
return 0; return 0;
} }
#endif #endif
/* agp memory management */ /* agp memory management */
#if 1
static memHeap_t *AgpHeap = NULL; int sis_ioctl_agp_init( DRM_IOCTL_ARGS )
int sisp_agp_init(struct inode *inode, struct file *filp, unsigned int cmd,
unsigned long arg)
{ {
DRM_DEVICE;
drm_sis_private_t *dev_priv = dev->dev_private;
drm_sis_agp_t agp; drm_sis_agp_t agp;
if (copy_from_user(&agp, (drm_sis_agp_t *)arg, sizeof(agp))) if (dev_priv == NULL) {
return -EFAULT; dev->dev_private = DRM(calloc)(1, sizeof(drm_sis_private_t),
DRM_MEM_DRIVER);
dev_priv = dev->dev_private;
if (dev_priv == NULL)
return ENOMEM;
}
if (dev_priv->AGPHeap != NULL)
return DRM_ERR(EINVAL);
DRM_COPY_FROM_USER_IOCTL(agp, (drm_sis_agp_t *)data, sizeof(agp));
AgpHeap = mmInit(agp.offset, agp.size); dev_priv->AGPHeap = mmInit(agp.offset, agp.size);
DRM_DEBUG("offset = %u, size = %u", agp.offset, agp.size); DRM_DEBUG("offset = %u, size = %u", agp.offset, agp.size);
return 0; return 0;
} }
int sisp_agp_alloc(struct inode *inode, struct file *filp, unsigned int cmd, int sis_ioctl_agp_alloc( DRM_IOCTL_ARGS )
unsigned long arg)
{ {
DRM_DEVICE;
drm_sis_private_t *dev_priv = dev->dev_private;
drm_sis_mem_t agp; drm_sis_mem_t agp;
PMemBlock block; PMemBlock block;
int retval = 0; int retval = 0;
if(!AgpHeap) if (dev_priv == NULL || dev_priv->AGPHeap == NULL)
return -1; return DRM_ERR(EINVAL);
if (copy_from_user(&agp, (drm_sis_mem_t *)arg, sizeof(agp))) DRM_COPY_FROM_USER_IOCTL(agp, (drm_sis_mem_t *)data, sizeof(agp));
return -EFAULT;
block = mmAllocMem(AgpHeap, agp.size, 0, 0); block = mmAllocMem(dev_priv->AGPHeap, agp.size, 0, 0);
if(block){ if (block) {
/* TODO */ /* TODO */
agp.offset = block->ofs; agp.offset = block->ofs;
agp.free = (unsigned long)block; agp.free = (unsigned long)block;
if(!add_alloc_set(agp.context, AGP_TYPE, agp.free)){ if (!add_alloc_set(agp.context, AGP_TYPE, agp.free)) {
DRM_DEBUG("adding to allocation set fails\n"); DRM_DEBUG("adding to allocation set fails\n");
mmFreeMem((PMemBlock)(unsigned long)agp.free); mmFreeMem((PMemBlock)agp.free);
retval = -1; retval = -1;
} }
} } else {
else{
agp.offset = 0; agp.offset = 0;
agp.size = 0; agp.size = 0;
agp.free = 0; agp.free = 0;
} }
if (copy_to_user((drm_sis_mem_t *)arg, &agp, sizeof(agp))) return -EFAULT; DRM_COPY_TO_USER_IOCTL((drm_sis_mem_t *)data, agp, sizeof(agp));
DRM_DEBUG("alloc agp, size = %d, offset = %d\n", agp.size, agp.offset); DRM_DEBUG("alloc agp, size = %d, offset = %d\n", agp.size, agp.offset);
return retval; return retval;
} }
int sisp_agp_free(struct inode *inode, struct file *filp, unsigned int cmd, int sis_ioctl_agp_free( DRM_IOCTL_ARGS )
unsigned long arg)
{ {
DRM_DEVICE;
drm_sis_private_t *dev_priv = dev->dev_private;
drm_sis_mem_t agp; drm_sis_mem_t agp;
int retval = 0;
if(!AgpHeap) if (dev_priv == NULL || dev_priv->AGPHeap == NULL)
return -1; return DRM_ERR(EINVAL);
if (copy_from_user(&agp, (drm_sis_mem_t *)arg, sizeof(agp))) DRM_COPY_FROM_USER_IOCTL(agp, (drm_sis_mem_t *)data, sizeof(agp));
return -EFAULT;
if(!agp.free){ if (!mmBlockInHeap(dev_priv->AGPHeap, (PMemBlock)agp.free))
return -1; return DRM_ERR(EINVAL);
}
mmFreeMem((PMemBlock)(unsigned long)agp.free); mmFreeMem((PMemBlock)agp.free);
if(!del_alloc_set(agp.context, AGP_TYPE, agp.free)) if (!del_alloc_set(agp.context, AGP_TYPE, agp.free))
retval = -1; return DRM_ERR(EINVAL);
DRM_DEBUG("free agp, free = %d\n", agp.free); DRM_DEBUG("free agp, free = 0x%lx\n", agp.free);
return retval; return 0;
} }
#endif
int sis_init_context(int context) int sis_init_context(int context)
{ {
int i; int i;
for(i = 0; i < MAX_CONTEXT ; i++) for (i = 0; i < MAX_CONTEXT ; i++) {
if(global_ppriv[i].used && (global_ppriv[i].context == context)) if (global_ppriv[i].used &&
(global_ppriv[i].context == context))
break; break;
}
if(i >= MAX_CONTEXT){ if (i >= MAX_CONTEXT) {
for(i = 0; i < MAX_CONTEXT ; i++){ for (i = 0; i < MAX_CONTEXT ; i++) {
if(!global_ppriv[i].used){ if (!global_ppriv[i].used) {
global_ppriv[i].context = context; global_ppriv[i].context = context;
global_ppriv[i].used = 1; global_ppriv[i].used = 1;
global_ppriv[i].sets[0] = setInit(); global_ppriv[i].sets[0] = setInit();
global_ppriv[i].sets[1] = setInit(); global_ppriv[i].sets[1] = setInit();
DRM_DEBUG("init allocation set, socket=%d, context = %d\n", DRM_DEBUG("init allocation set, socket=%d, "
i, context); "context = %d\n", i, context);
break; break;
} }
} }
if((i >= MAX_CONTEXT) || (global_ppriv[i].sets[0] == NULL) || if ((i >= MAX_CONTEXT) || (global_ppriv[i].sets[0] == NULL) ||
(global_ppriv[i].sets[1] == NULL)){ (global_ppriv[i].sets[1] == NULL))
{
return 0; return 0;
} }
} }
...@@ -263,11 +359,13 @@ int sis_final_context(int context) ...@@ -263,11 +359,13 @@ int sis_final_context(int context)
{ {
int i; int i;
for(i=0; i<MAX_CONTEXT; i++) for (i=0; i<MAX_CONTEXT; i++) {
if(global_ppriv[i].used && (global_ppriv[i].context == context)) if (global_ppriv[i].used &&
(global_ppriv[i].context == context))
break; break;
}
if(i < MAX_CONTEXT){ if (i < MAX_CONTEXT) {
set_t *set; set_t *set;
unsigned int item; unsigned int item;
int retval; int retval;
...@@ -277,9 +375,13 @@ int sis_final_context(int context) ...@@ -277,9 +375,13 @@ int sis_final_context(int context)
/* Video Memory */ /* Video Memory */
set = global_ppriv[i].sets[0]; set = global_ppriv[i].sets[0];
retval = setFirst(set, &item); retval = setFirst(set, &item);
while(retval){ while (retval) {
DRM_DEBUG("free video memory 0x%x\n", item); DRM_DEBUG("free video memory 0x%x\n", item);
#if defined(__linux__) && defined(CONFIG_FB_SIS)
sis_free(item); sis_free(item);
#else
mmFreeMem((PMemBlock)item);
#endif
retval = setNext(set, &item); retval = setNext(set, &item);
} }
setDestroy(set); setDestroy(set);
...@@ -287,9 +389,9 @@ int sis_final_context(int context) ...@@ -287,9 +389,9 @@ int sis_final_context(int context)
/* AGP Memory */ /* AGP Memory */
set = global_ppriv[i].sets[1]; set = global_ppriv[i].sets[1];
retval = setFirst(set, &item); retval = setFirst(set, &item);
while(retval){ while (retval) {
DRM_DEBUG("free agp memory 0x%x\n", item); DRM_DEBUG("free agp memory 0x%x\n", item);
mmFreeMem((PMemBlock)(unsigned long)item); mmFreeMem((PMemBlock)item);
retval = setNext(set, &item); retval = setNext(set, &item);
} }
setDestroy(set); setDestroy(set);
...@@ -297,11 +399,5 @@ int sis_final_context(int context) ...@@ -297,11 +399,5 @@ int sis_final_context(int context)
global_ppriv[i].used = 0; global_ppriv[i].used = 0;
} }
/* turn-off auto-flip */
/* TODO */
#if defined(SIS_STEREO)
flip_final();
#endif
return 1; return 1;
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7