geemili
/
drm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug #112197 Made sis driver compile under 2.4.0-test7/pre4

main
Rik Faith 2000-08-17 20:20:33 +00:00
parent 3e42514360
commit 761ffd63f3
3 changed files with 3 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
linux-core/sis_drv.c
View File

@ -28,7 +28,6 @@
* Daryll Strauss <daryll@precisioninsight.com> * Daryll Strauss <daryll@precisioninsight.com>
* *
*/ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/sis_drv.c,v 1.2 2000/08/04 03:51:47 tsi Exp $ */
#include <linux/config.h> #include <linux/config.h>
#include "drmP.h" #include "drmP.h"
@ -643,11 +642,6 @@ int sis_lock(struct inode *inode, struct file *filp, unsigned int cmd,
} }
} }
if (lock.context != sis_res_ctx.handle) {
current->counter = 5;
current->priority = DEF_PRIORITY/4;
}
DRM_DEBUG("%d %s\n", lock.context, ret ? "interrupted" : "has lock"); DRM_DEBUG("%d %s\n", lock.context, ret ? "interrupted" : "has lock");
#if DRM_DMA_HISTOGRAM #if DRM_DMA_HISTOGRAM
@ -688,11 +682,6 @@ int sis_unlock(struct inode *inode, struct file *filp, unsigned int cmd,
} }
} }
if (lock.context != sis_res_ctx.handle) {
current->counter = 5;
current->priority = DEF_PRIORITY;
}
return 0; return 0;
} }

11
linux/sis_drv.c
View File

@ -28,7 +28,6 @@
* Daryll Strauss <daryll@precisioninsight.com> * Daryll Strauss <daryll@precisioninsight.com>
* *
*/ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/sis_drv.c,v 1.2 2000/08/04 03:51:47 tsi Exp $ */
#include <linux/config.h> #include <linux/config.h>
#include "drmP.h" #include "drmP.h"
@ -643,11 +642,6 @@ int sis_lock(struct inode *inode, struct file *filp, unsigned int cmd,
} }
} }
if (lock.context != sis_res_ctx.handle) {
current->counter = 5;
current->priority = DEF_PRIORITY/4;
}
DRM_DEBUG("%d %s\n", lock.context, ret ? "interrupted" : "has lock"); DRM_DEBUG("%d %s\n", lock.context, ret ? "interrupted" : "has lock");
#if DRM_DMA_HISTOGRAM #if DRM_DMA_HISTOGRAM
@ -688,11 +682,6 @@ int sis_unlock(struct inode *inode, struct file *filp, unsigned int cmd,
} }
} }
if (lock.context != sis_res_ctx.handle) {
current->counter = 5;
current->priority = DEF_PRIORITY;
}
return 0; return 0;
} }

7
linux/sis_mm.c
View File

@ -1,14 +1,13 @@
/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/sis_mm.c,v 1.2 2000/08/04 03:51:48 tsi Exp $ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/sis_mm.c,v 1.2 2000/08/04 03:51:48 tsi Exp $ */
#define __NO_VERSION__ #define __NO_VERSION__
#include <linux/fb.h>
#include <linux/sisfb.h>
#include <linux/interrupt.h>
#include "drmP.h" #include "drmP.h"
#include "sis_drm_public.h" #include "sis_drm_public.h"
#include "sis_ds.h" #include "sis_ds.h"
#include "sis_drv.h" #include "sis_drv.h"
#include <linux/fb.h>
#include <linux/sisfb.h>
#include <linux/interrupt.h>
#define MAX_CONTEXT 100 #define MAX_CONTEXT 100
#define VIDEO_TYPE 0 #define VIDEO_TYPE 0