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
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
char
/
drm
/
savage_bci.c
diff --git
a/drivers/char/drm/savage_bci.c
b/drivers/char/drm/savage_bci.c
index
59c7520
..
b94fab5
100644
(file)
--- a/
drivers/char/drm/savage_bci.c
+++ b/
drivers/char/drm/savage_bci.c
@@
-728,6
+728,7
@@
static int savage_do_init_bci(drm_device_t * dev, drm_savage_init_t * init)
dev_priv->status = NULL;
}
if (dev_priv->dma_type == SAVAGE_DMA_AGP && init->buffers_offset) {
dev_priv->status = NULL;
}
if (dev_priv->dma_type == SAVAGE_DMA_AGP && init->buffers_offset) {
+ dev->agp_buffer_token = init->buffers_offset;
dev->agp_buffer_map = drm_core_findmap(dev,
init->buffers_offset);
if (!dev->agp_buffer_map) {
dev->agp_buffer_map = drm_core_findmap(dev,
init->buffers_offset);
if (!dev->agp_buffer_map) {
@@
-962,8
+963,8
@@
static int savage_bci_event_emit(DRM_IOCTL_ARGS)
event.count = savage_bci_emit_event(dev_priv, event.flags);
event.count |= dev_priv->event_wrap << 16;
event.count = savage_bci_emit_event(dev_priv, event.flags);
event.count |= dev_priv->event_wrap << 16;
- DRM_COPY_TO_USER_IOCTL(
&((drm_savage_event_emit_t __user *) data)->
-
count, event.count, sizeof(event.cou
nt));
+ DRM_COPY_TO_USER_IOCTL(
(drm_savage_event_emit_t __user *) data,
+
event, sizeof(eve
nt));
return 0;
}
return 0;
}