summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Hellstrom <unichrome@shipmail.org>2006-01-12 19:08:16 +0000
committerThomas Hellstrom <unichrome@shipmail.org>2006-01-12 19:08:16 +0000
commitd394c9fa082407591586856afbaeb0833f5a7534 (patch)
tree78f64c5010964549b2e508dde2ce870ffdb98be0
parent2e0c281d1aabdf5b775a2f7de804d2f34a500124 (diff)
via: direction bug in get_user_pages call in via_dmablit.c fixed. Bumped
minor since this causes the via DDX to fail with vlc video player.
-rw-r--r--linux-core/via_dmablit.c3
-rw-r--r--shared-core/via_drv.h4
2 files changed, 4 insertions, 3 deletions
diff --git a/linux-core/via_dmablit.c b/linux-core/via_dmablit.c
index e1295cf2..9e2f1009 100644
--- a/linux-core/via_dmablit.c
+++ b/linux-core/via_dmablit.c
@@ -237,7 +237,8 @@ via_lock_all_dma_pages(drm_via_sg_info_t *vsg, drm_via_dmablit_t *xfer)
memset(vsg->pages, 0, sizeof(struct page *) * vsg->num_pages);
down_read(&current->mm->mmap_sem);
ret = get_user_pages(current, current->mm, (unsigned long) xfer->mem_addr,
- vsg->num_pages, vsg->direction, 0, vsg->pages, NULL);
+ vsg->num_pages, (vsg->direction == DMA_FROM_DEVICE),
+ 0, vsg->pages, NULL);
up_read(&current->mm->mmap_sem);
if (ret != vsg->num_pages) {
diff --git a/shared-core/via_drv.h b/shared-core/via_drv.h
index ae8b0d11..11a61167 100644
--- a/shared-core/via_drv.h
+++ b/shared-core/via_drv.h
@@ -28,10 +28,10 @@
#define DRIVER_NAME "via"
#define DRIVER_DESC "VIA Unichrome / Pro"
-#define DRIVER_DATE "20060106"
+#define DRIVER_DATE "20060111"
#define DRIVER_MAJOR 2
-#define DRIVER_MINOR 8
+#define DRIVER_MINOR 9
#define DRIVER_PATCHLEVEL 0
#include "via_verifier.h"