fdo-mirrors/mesa-drm
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/drm.git synced 2026-05-06 04:48:22 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

VIA:

Browse source 
64-bit fixes. Bumped driver date and patchlevel.
This commit is contained in:
Thomas Hellstrom 2005-05-23 20:56:54 +00:00
parent 955791f064
commit e1fd79b31e
9 changed files with 26 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
shared-core/via_drv.h
View file

@ -28,7 +28,7 @@
#define DRIVER_NAME "via"
#define DRIVER_DESC "VIA Unichrome / Pro"
#define DRIVER_DATE "20050508"
#define DRIVER_DATE "20050523"
#define DRIVER_MAJOR 2
#define DRIVER_MINOR 6
@ -36,8 +36,8 @@
#include "via_verifier.h"
#define VIA_PCI_BUF_SIZE 120000
#define VIA_FIRE_BUF_SIZE 2048
#define VIA_PCI_BUF_SIZE 60000
#define VIA_FIRE_BUF_SIZE 1024
#define VIA_NUM_IRQS 2

2
shared-core/via_ds.h
View file

@ -30,7 +30,7 @@
/* Set Data Structure */
#define SET_SIZE 5000
typedef unsigned int ITEM_TYPE;
typedef unsigned long ITEM_TYPE;
typedef struct {
ITEM_TYPE val;

14
shared-core/via_mm.c
View file

@ -144,7 +144,7 @@ int via_final_context(struct drm_device *dev, int context)
if (i < MAX_CONTEXT) {
set_t *set;
unsigned int item;
ITEM_TYPE item;
int retval;
DRM_DEBUG("find socket %d, context = %d\n", i, context);
@ -153,7 +153,7 @@ int via_final_context(struct drm_device *dev, int context)
set = global_ppriv[i].sets[0];
retval = via_setFirst(set, &item);
while (retval) {
DRM_DEBUG("free video memory 0x%x\n", item);
DRM_DEBUG("free video memory 0x%lx\n", item);
via_mmFreeMem((PMemBlock) item);
retval = via_setNext(set, &item);
}
@ -163,7 +163,7 @@ int via_final_context(struct drm_device *dev, int context)
set = global_ppriv[i].sets[1];
retval = via_setFirst(set, &item);
while (retval) {
DRM_DEBUG("free agp memory 0x%x\n", item);
DRM_DEBUG("free agp memory 0x%lx\n", item);
via_mmFreeMem((PMemBlock) item);
retval = via_setNext(set, &item);
}
@ -228,7 +228,7 @@ static int via_fb_alloc(drm_via_mem_t * mem)
block = via_mmAllocMem(FBHeap, fb.size, 5, 0);
if (block) {
fb.offset = block->ofs;
fb.free = (unsigned int)block;
fb.free = (unsigned long)block;
if (!add_alloc_set(fb.context, VIDEO, fb.free)) {
DRM_DEBUG("adding to allocation set fails\n");
via_mmFreeMem((PMemBlock) fb.free);
@ -265,7 +265,7 @@ static int via_agp_alloc(drm_via_mem_t * mem)
block = via_mmAllocMem(AgpHeap, agp.size, 5, 0);
if (block) {
agp.offset = block->ofs;
agp.free = (unsigned int)block;
agp.free = (unsigned long)block;
if (!add_alloc_set(agp.context, AGP, agp.free)) {
DRM_DEBUG("adding to allocation set fails\n");
via_mmFreeMem((PMemBlock) agp.free);
@ -329,7 +329,7 @@ static int via_fb_free(drm_via_mem_t * mem)
retval = -1;
}
DRM_DEBUG("free fb, free = %d\n", fb.free);
DRM_DEBUG("free fb, free = %ld\n", fb.free);
return retval;
}
@ -352,7 +352,7 @@ static int via_agp_free(drm_via_mem_t * mem)
retval = -1;
}
DRM_DEBUG("free agp, free = %d\n", agp.free);
DRM_DEBUG("free agp, free = %ld\n", agp.free);
return retval;
}

2
shared-core/via_mm.h
View file

@ -28,7 +28,7 @@ typedef struct {
unsigned int context;
unsigned int size;
unsigned long offset;
unsigned int free;
unsigned long free;
} drm_via_mm_t;
typedef struct {

2
shared/via.h
View file

@ -30,7 +30,7 @@
#define DRIVER_NAME "via"
#define DRIVER_DESC "VIA Unichrome / Pro"
#define DRIVER_DATE "20050508"
#define DRIVER_DATE "20050523"
#define DRIVER_MAJOR 2
#define DRIVER_MINOR 6

4
shared/via_drv.h
View file

@ -27,8 +27,8 @@
#include "via_drm.h"
#include "via_verifier.h"
#define VIA_PCI_BUF_SIZE 120000
#define VIA_FIRE_BUF_SIZE 2048
#define VIA_PCI_BUF_SIZE 60000
#define VIA_FIRE_BUF_SIZE 1024
#define VIA_NUM_IRQS 2

2
shared/via_ds.h
View file

@ -31,7 +31,7 @@
/* Set Data Structure */
#define SET_SIZE 5000
typedef unsigned int ITEM_TYPE;
typedef unsigned long ITEM_TYPE;
typedef struct {
ITEM_TYPE val;

16
shared/via_mm.c
View file

@ -142,7 +142,7 @@ int via_final_context(struct drm_device *dev, int context)
if (i < MAX_CONTEXT) {
set_t *set;
unsigned int item;
ITEM_TYPE item;
int retval;
DRM_DEBUG("find socket %d, context = %d\n", i, context);
@ -151,7 +151,7 @@ int via_final_context(struct drm_device *dev, int context)
set = global_ppriv[i].sets[0];
retval = via_setFirst(set, &item);
while (retval) {
DRM_DEBUG("free video memory 0x%x\n", item);
DRM_DEBUG("free video memory 0x%lx\n", item);
via_mmFreeMem((PMemBlock) item);
retval = via_setNext(set, &item);
}
@ -161,7 +161,7 @@ int via_final_context(struct drm_device *dev, int context)
set = global_ppriv[i].sets[1];
retval = via_setFirst(set, &item);
while (retval) {
DRM_DEBUG("free agp memory 0x%x\n", item);
DRM_DEBUG("free agp memory 0x%lx\n", item);
via_mmFreeMem((PMemBlock) item);
retval = via_setNext(set, &item);
}
@ -169,6 +169,8 @@ int via_final_context(struct drm_device *dev, int context)
global_ppriv[i].used = 0;
}
via_release_futex(dev_priv, context);
#if defined(__linux__)
/* Linux specific until context tracking code gets ported to BSD */
@ -223,7 +225,7 @@ int via_fb_alloc(drm_via_mem_t * mem)
block = via_mmAllocMem(FBHeap, fb.size, 5, 0);
if (block) {
fb.offset = block->ofs;
fb.free = (unsigned int)block;
fb.free = (unsigned long)block;
if (!add_alloc_set(fb.context, VIDEO, fb.free)) {
DRM_DEBUG("adding to allocation set fails\n");
via_mmFreeMem((PMemBlock) fb.free);
@ -260,7 +262,7 @@ int via_agp_alloc(drm_via_mem_t * mem)
block = via_mmAllocMem(AgpHeap, agp.size, 5, 0);
if (block) {
agp.offset = block->ofs;
agp.free = (unsigned int)block;
agp.free = (unsigned long)block;
if (!add_alloc_set(agp.context, AGP, agp.free)) {
DRM_DEBUG("adding to allocation set fails\n");
via_mmFreeMem((PMemBlock) agp.free);
@ -324,7 +326,7 @@ int via_fb_free(drm_via_mem_t * mem)
retval = -1;
}
DRM_DEBUG("free fb, free = %d\n", fb.free);
DRM_DEBUG("free fb, free = %ld\n", fb.free);
return retval;
}
@ -347,7 +349,7 @@ int via_agp_free(drm_via_mem_t * mem)
retval = -1;
}
DRM_DEBUG("free agp, free = %d\n", agp.free);
DRM_DEBUG("free agp, free = %ld\n", agp.free);
return retval;
}

2
shared/via_mm.h
View file

@ -28,7 +28,7 @@ typedef struct {
unsigned int context;
unsigned int size;
unsigned long offset;
unsigned int free;
unsigned long free;
} drm_via_mm_t;
typedef struct {