git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.3
[linux-2.6.git]
/
drivers
/
char
/
drm
/
sis_mm.c
diff --git
a/drivers/char/drm/sis_mm.c
b/drivers/char/drm/sis_mm.c
index
5d29b40
..
2444716
100644
(file)
--- a/
drivers/char/drm/sis_mm.c
+++ b/
drivers/char/drm/sis_mm.c
@@
-90,9
+90,10
@@
int sis_fb_alloc( DRM_IOCTL_ARGS )
{
drm_sis_mem_t fb;
struct sis_memreq req;
{
drm_sis_mem_t fb;
struct sis_memreq req;
+ drm_sis_mem_t __user *argp = (void __user *)data;
int retval = 0;
int retval = 0;
- DRM_COPY_FROM_USER_IOCTL(fb,
(drm_sis_mem_t *)data
, sizeof(fb));
+ DRM_COPY_FROM_USER_IOCTL(fb,
argp
, sizeof(fb));
req.size = fb.size;
sis_malloc(&req);
req.size = fb.size;
sis_malloc(&req);
@@
-111,7
+112,7
@@
int sis_fb_alloc( DRM_IOCTL_ARGS )
fb.free = 0;
}
fb.free = 0;
}
- DRM_COPY_TO_USER_IOCTL(
(drm_sis_mem_t *)data
, fb, sizeof(fb));
+ DRM_COPY_TO_USER_IOCTL(
argp
, fb, sizeof(fb));
DRM_DEBUG("alloc fb, size = %d, offset = %d\n", fb.size, req.offset);
DRM_DEBUG("alloc fb, size = %d, offset = %d\n", fb.size, req.offset);
@@
-123,7
+124,7
@@
int sis_fb_free( DRM_IOCTL_ARGS )
drm_sis_mem_t fb;
int retval = 0;
drm_sis_mem_t fb;
int retval = 0;
- DRM_COPY_FROM_USER_IOCTL(fb, (drm_sis_mem_t *)data, sizeof(fb));
+ DRM_COPY_FROM_USER_IOCTL(fb, (drm_sis_mem_t
__user
*)data, sizeof(fb));
if (!fb.free)
return DRM_ERR(EINVAL);
if (!fb.free)
return DRM_ERR(EINVAL);
@@
-325,7
+326,7
@@
int sis_ioctl_agp_free( DRM_IOCTL_ARGS )
return 0;
}
return 0;
}
-int sis_init_context(int context)
+int sis_init_context(
struct drm_device *dev,
int context)
{
int i;
{
int i;
@@
-357,7
+358,7
@@
int sis_init_context(int context)
return 1;
}
return 1;
}
-int sis_final_context(int context)
+int sis_final_context(
struct drm_device *dev,
int context)
{
int i;
{
int i;
@@
-403,3
+404,10
@@
int sis_final_context(int context)
return 1;
}
return 1;
}
+
+void DRM(driver_register_fns)(drm_device_t *dev)
+{
+ dev->driver_features = DRIVER_USE_AGP | DRIVER_USE_MTRR;
+ dev->fn_tbl.context_ctor = sis_init_context;
+ dev->fn_tbl.context_dtor = sis_final_context;
+}