fdo-mirrors/mesa-drm
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/drm.git synced 2025-12-25 06:00:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

oops. missed the important changes for the mga.

Browse source
This commit is contained in:
Alan Hourihane 2001-05-10 19:28:14 +00:00
parent f9d0e7462a
commit 332862f088
5 changed files with 75 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libdrm/xf86drm.c
View file

@ -611,8 +611,11 @@ int drmMap(int fd,
pagesize_mask = getpagesize() - 1;
size = (size + pagesize_mask) & ~pagesize_mask;
ErrorF("fd 0x%x, handle 0x%x, size 0x%x, address 0x%x\n",
fd,handle,size,address);
*address = mmap(0, size, PROT_READ|PROT_WRITE, MAP_SHARED, fd, handle);
ErrorF("FAILED 0x%x\n",*address);
if (*address == MAP_FAILED) return -errno;
return 0;
}

5
linux-core/drm_drv.c
View file

@ -501,7 +501,12 @@ static int DRM(takedown)( drm_device_t *dev )
}
dev->agp->memory = NULL;
#ifdef __linux__
if ( dev->agp->acquired ) DRM(agp_do_release)();
#endif
#ifdef __FreeBSD__
if ( dev->agp->acquired ) agp_release(dev->agp->agpdev);
#endif
dev->agp->acquired = 0;
dev->agp->enabled = 0;

43
linux-core/drm_memory.h
View file

@ -486,7 +486,12 @@ agp_memory *DRM(alloc_agp)(int pages, u32 type)
return NULL;
}
#ifdef __linux__
if ((handle = DRM(agp_allocate_memory)(pages, type))) {
#endif
#ifdef __FreeBSD__
if ((handle = agp_alloc_memory(dev, type, pages << AGP_PAGE_SHIFT))) {
#endif
DRM_OS_SPINLOCK(&DRM(mem_lock));
++DRM(mem_stats)[DRM_MEM_TOTALAGP].succeed_count;
DRM(mem_stats)[DRM_MEM_TOTALAGP].bytes_allocated
@ -518,7 +523,13 @@ int DRM(free_agp)(agp_memory *handle, int pages)
return retval;
}
#ifdef __FreeBSD__
agp_free_memory(dev, handle);
#endif
#ifdef __linux__
if (DRM(agp_free_memory)(handle)) {
#endif
DRM_OS_SPINLOCK(&DRM(mem_lock));
free_count = ++DRM(mem_stats)[DRM_MEM_TOTALAGP].free_count;
alloc_count = DRM(mem_stats)[DRM_MEM_TOTALAGP].succeed_count;
@ -531,28 +542,35 @@ int DRM(free_agp)(agp_memory *handle, int pages)
free_count, alloc_count);
}
return 0;
#ifdef __linux__
}
#endif
return retval;
}
int DRM(bind_agp)(agp_memory *handle, unsigned int start)
{
int retcode = -EINVAL;
int retcode = EINVAL;
#ifdef __FreeBSD__
device_t dev = agp_find_device();
struct agp_memory_info info;
if (!dev)
return NULL;
return EINVAL;
#endif
if (!handle) {
DRM_MEM_ERROR(DRM_MEM_BOUNDAGP,
"Attempt to bind NULL AGP handle\n");
return retcode;
DRM_OS_RETURN(retcode);
}
#ifdef __linux__
if (!(retcode = DRM(agp_bind_memory)(handle, start))) {
#endif
#ifdef __FreeBSD__
if (!(retcode = agp_bind_memory(dev, handle,start << AGP_PAGE_SHIFT))) {
#endif
DRM_OS_SPINLOCK(&DRM(mem_lock));
++DRM(mem_stats)[DRM_MEM_BOUNDAGP].succeed_count;
#ifdef __linux__
@ -565,40 +583,41 @@ int DRM(bind_agp)(agp_memory *handle, unsigned int start)
+= info.ami_size;
#endif
DRM_OS_SPINUNLOCK(&DRM(mem_lock));
return retcode;
DRM_OS_RETURN(retcode);
}
DRM_OS_SPINLOCK(&DRM(mem_lock));
++DRM(mem_stats)[DRM_MEM_BOUNDAGP].fail_count;
DRM_OS_SPINUNLOCK(&DRM(mem_lock));
return retcode;
DRM_OS_RETURN(retcode);
}
int DRM(unbind_agp)(agp_memory *handle)
{
int alloc_count;
int free_count;
int retcode = -EINVAL;
int retcode = EINVAL;
#ifdef __FreeBSD__
device_t dev = agp_find_device();
struct agp_memory_info info;
if (!dev)
return NULL;
return EINVAL;
#endif
if (!handle) {
DRM_MEM_ERROR(DRM_MEM_BOUNDAGP,
"Attempt to unbind NULL AGP handle\n");
return retcode;
DRM_OS_RETURN(retcode);
}
#ifdef __linux__
if ((retcode = DRM(agp_unbind_memory)(handle)))
#endif
#ifdef __FreeBSD__
agp_memory_info(dev, handle, &info);
if ((retcode = agp_unbind_memory(dev, handle)))
return retcode;
#endif
if ((retcode = DRM(agp_unbind_memory)(handle))) return retcode;
DRM_OS_RETURN(retcode);
DRM_OS_SPINLOCK(&DRM(mem_lock));
free_count = ++DRM(mem_stats)[DRM_MEM_BOUNDAGP].free_count;
alloc_count = DRM(mem_stats)[DRM_MEM_BOUNDAGP].succeed_count;
@ -615,6 +634,6 @@ int DRM(unbind_agp)(agp_memory *handle)
"Excess frees: %d frees, %d allocs\n",
free_count, alloc_count);
}
return retcode;
DRM_OS_RETURN(retcode);
}
#endif

5
linux/drm_drv.h
View file

@ -501,7 +501,12 @@ static int DRM(takedown)( drm_device_t *dev )
}
dev->agp->memory = NULL;
#ifdef __linux__
if ( dev->agp->acquired ) DRM(agp_do_release)();
#endif
#ifdef __FreeBSD__
if ( dev->agp->acquired ) agp_release(dev->agp->agpdev);
#endif
dev->agp->acquired = 0;
dev->agp->enabled = 0;

43
linux/drm_memory.h
View file

@ -486,7 +486,12 @@ agp_memory *DRM(alloc_agp)(int pages, u32 type)
return NULL;
}
#ifdef __linux__
if ((handle = DRM(agp_allocate_memory)(pages, type))) {
#endif
#ifdef __FreeBSD__
if ((handle = agp_alloc_memory(dev, type, pages << AGP_PAGE_SHIFT))) {
#endif
DRM_OS_SPINLOCK(&DRM(mem_lock));
++DRM(mem_stats)[DRM_MEM_TOTALAGP].succeed_count;
DRM(mem_stats)[DRM_MEM_TOTALAGP].bytes_allocated
@ -518,7 +523,13 @@ int DRM(free_agp)(agp_memory *handle, int pages)
return retval;
}
#ifdef __FreeBSD__
agp_free_memory(dev, handle);
#endif
#ifdef __linux__
if (DRM(agp_free_memory)(handle)) {
#endif
DRM_OS_SPINLOCK(&DRM(mem_lock));
free_count = ++DRM(mem_stats)[DRM_MEM_TOTALAGP].free_count;
alloc_count = DRM(mem_stats)[DRM_MEM_TOTALAGP].succeed_count;
@ -531,28 +542,35 @@ int DRM(free_agp)(agp_memory *handle, int pages)
free_count, alloc_count);
}
return 0;
#ifdef __linux__
}
#endif
return retval;
}
int DRM(bind_agp)(agp_memory *handle, unsigned int start)
{
int retcode = -EINVAL;
int retcode = EINVAL;
#ifdef __FreeBSD__
device_t dev = agp_find_device();
struct agp_memory_info info;
if (!dev)
return NULL;
return EINVAL;
#endif
if (!handle) {
DRM_MEM_ERROR(DRM_MEM_BOUNDAGP,
"Attempt to bind NULL AGP handle\n");
return retcode;
DRM_OS_RETURN(retcode);
}
#ifdef __linux__
if (!(retcode = DRM(agp_bind_memory)(handle, start))) {
#endif
#ifdef __FreeBSD__
if (!(retcode = agp_bind_memory(dev, handle,start << AGP_PAGE_SHIFT))) {
#endif
DRM_OS_SPINLOCK(&DRM(mem_lock));
++DRM(mem_stats)[DRM_MEM_BOUNDAGP].succeed_count;
#ifdef __linux__
@ -565,40 +583,41 @@ int DRM(bind_agp)(agp_memory *handle, unsigned int start)
+= info.ami_size;
#endif
DRM_OS_SPINUNLOCK(&DRM(mem_lock));
return retcode;
DRM_OS_RETURN(retcode);
}
DRM_OS_SPINLOCK(&DRM(mem_lock));
++DRM(mem_stats)[DRM_MEM_BOUNDAGP].fail_count;
DRM_OS_SPINUNLOCK(&DRM(mem_lock));
return retcode;
DRM_OS_RETURN(retcode);
}
int DRM(unbind_agp)(agp_memory *handle)
{
int alloc_count;
int free_count;
int retcode = -EINVAL;
int retcode = EINVAL;
#ifdef __FreeBSD__
device_t dev = agp_find_device();
struct agp_memory_info info;
if (!dev)
return NULL;
return EINVAL;
#endif
if (!handle) {
DRM_MEM_ERROR(DRM_MEM_BOUNDAGP,
"Attempt to unbind NULL AGP handle\n");
return retcode;
DRM_OS_RETURN(retcode);
}
#ifdef __linux__
if ((retcode = DRM(agp_unbind_memory)(handle)))
#endif
#ifdef __FreeBSD__
agp_memory_info(dev, handle, &info);
if ((retcode = agp_unbind_memory(dev, handle)))
return retcode;
#endif
if ((retcode = DRM(agp_unbind_memory)(handle))) return retcode;
DRM_OS_RETURN(retcode);
DRM_OS_SPINLOCK(&DRM(mem_lock));
free_count = ++DRM(mem_stats)[DRM_MEM_BOUNDAGP].free_count;
alloc_count = DRM(mem_stats)[DRM_MEM_BOUNDAGP].succeed_count;
@ -615,6 +634,6 @@ int DRM(unbind_agp)(agp_memory *handle)
"Excess frees: %d frees, %d allocs\n",
free_count, alloc_count);
}
return retcode;
DRM_OS_RETURN(retcode);
}
#endif