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

__REALLY_HAVE_MTRR, vmalloc_32 fixes from Jeff Wiedemeier.

Browse source
This commit is contained in:
Gareth Hughes 2001-03-18 23:54:41 +00:00
parent 1d32e305ef
commit f2ad4d9beb
4 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
linux-core/drm_bufs.c
View file

@ -30,6 +30,7 @@
*/
#define __NO_VERSION__
#include <linux/vmalloc.h>
#include "drmP.h"
#ifndef __HAVE_PCI_DMA
@ -109,7 +110,7 @@ int DRM(addmap)( struct inode *inode, struct file *filp,
return -EINVAL;
}
#endif
#ifdef __REALLY_HAVE_MTRR
#if __REALLY_HAVE_MTRR
if ( map->type == _DRM_FRAME_BUFFER ||
(map->flags & _DRM_WRITE_COMBINING) ) {
map->mtrr = mtrr_add( map->offset, map->size,
@ -171,7 +172,7 @@ int DRM(addmap)( struct inode *inode, struct file *filp,
* isn't in use.
*/
int DRM(rmmap)(struct inode *inode, struct file *filp,
int DRM(rmmap)(struct inode *inode, struct file *filp,
unsigned int cmd, unsigned long arg)
{
drm_file_t *priv = filp->private_data;
@ -183,7 +184,7 @@ int DRM(rmmap)(struct inode *inode, struct file *filp,
drm_map_t request;
int found_maps = 0;
if (copy_from_user(&request, (drm_map_t *)arg,
if (copy_from_user(&request, (drm_map_t *)arg,
sizeof(request))) {
return -EFAULT;
}
@ -221,7 +222,7 @@ int DRM(rmmap)(struct inode *inode, struct file *filp,
switch (map->type) {
case _DRM_REGISTERS:
case _DRM_FRAME_BUFFER:
#ifdef __REALLY_HAVE_MTRR
#if __REALLY_HAVE_MTRR
if (map->mtrr >= 0) {
int retcode;
retcode = mtrr_del(map->mtrr,

4
linux-core/drm_vm.c
View file

@ -156,7 +156,7 @@ void DRM(vm_shm_close)(struct vm_area_struct *vma)
}
}
/* We were the only map that was found */
if(found_maps == 1 &&
if(found_maps == 1 &&
map->flags & _DRM_REMOVABLE) {
/* Check to see if we are in the maplist, if we are not, then
* we delete this mappings information.
@ -172,7 +172,7 @@ void DRM(vm_shm_close)(struct vm_area_struct *vma)
switch (map->type) {
case _DRM_REGISTERS:
case _DRM_FRAME_BUFFER:
#ifdef __REALLY_HAVE_MTRR
#if __REALLY_HAVE_MTRR
if (map->mtrr >= 0) {
int retcode;
retcode = mtrr_del(map->mtrr,

9
linux/drm_bufs.h
View file

@ -30,6 +30,7 @@
*/
#define __NO_VERSION__
#include <linux/vmalloc.h>
#include "drmP.h"
#ifndef __HAVE_PCI_DMA
@ -109,7 +110,7 @@ int DRM(addmap)( struct inode *inode, struct file *filp,
return -EINVAL;
}
#endif
#ifdef __REALLY_HAVE_MTRR
#if __REALLY_HAVE_MTRR
if ( map->type == _DRM_FRAME_BUFFER ||
(map->flags & _DRM_WRITE_COMBINING) ) {
map->mtrr = mtrr_add( map->offset, map->size,
@ -171,7 +172,7 @@ int DRM(addmap)( struct inode *inode, struct file *filp,
* isn't in use.
*/
int DRM(rmmap)(struct inode *inode, struct file *filp,
int DRM(rmmap)(struct inode *inode, struct file *filp,
unsigned int cmd, unsigned long arg)
{
drm_file_t *priv = filp->private_data;
@ -183,7 +184,7 @@ int DRM(rmmap)(struct inode *inode, struct file *filp,
drm_map_t request;
int found_maps = 0;
if (copy_from_user(&request, (drm_map_t *)arg,
if (copy_from_user(&request, (drm_map_t *)arg,
sizeof(request))) {
return -EFAULT;
}
@ -221,7 +222,7 @@ int DRM(rmmap)(struct inode *inode, struct file *filp,
switch (map->type) {
case _DRM_REGISTERS:
case _DRM_FRAME_BUFFER:
#ifdef __REALLY_HAVE_MTRR
#if __REALLY_HAVE_MTRR
if (map->mtrr >= 0) {
int retcode;
retcode = mtrr_del(map->mtrr,

4
linux/drm_vm.h
View file

@ -156,7 +156,7 @@ void DRM(vm_shm_close)(struct vm_area_struct *vma)
}
}
/* We were the only map that was found */
if(found_maps == 1 &&
if(found_maps == 1 &&
map->flags & _DRM_REMOVABLE) {
/* Check to see if we are in the maplist, if we are not, then
* we delete this mappings information.
@ -172,7 +172,7 @@ void DRM(vm_shm_close)(struct vm_area_struct *vma)
switch (map->type) {
case _DRM_REGISTERS:
case _DRM_FRAME_BUFFER:
#ifdef __REALLY_HAVE_MTRR
#if __REALLY_HAVE_MTRR
if (map->mtrr >= 0) {
int retcode;
retcode = mtrr_del(map->mtrr,