summaryrefslogtreecommitdiff
path: root/shared
diff options
context:
space:
mode:
authorThomas Hellstrom <unichrome@shipmail.org>2005-02-13 23:03:48 +0000
committerThomas Hellstrom <unichrome@shipmail.org>2005-02-13 23:03:48 +0000
commit650c0fe391b09479afd787e0b1db0a3e22cc4fcd (patch)
treef0bd211179886476211b3471f86d16d6931e9e0c /shared
parent0d2eb2b90c092eaef00c95a9403ed7f0c8f7b3a6 (diff)
Fixed Futex release bug. Bumped driver date and patchlevel.
Diffstat (limited to 'shared')
-rw-r--r--shared/via.h4
-rw-r--r--shared/via_mm.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/shared/via.h b/shared/via.h
index ee46b139..05ed9df3 100644
--- a/shared/via.h
+++ b/shared/via.h
@@ -30,11 +30,11 @@
#define DRIVER_NAME "via"
#define DRIVER_DESC "VIA Unichrome"
-#define DRIVER_DATE "20050127"
+#define DRIVER_DATE "20050214"
#define DRIVER_MAJOR 2
#define DRIVER_MINOR 4
-#define DRIVER_PATCHLEVEL 4
+#define DRIVER_PATCHLEVEL 6
#define DRIVER_IOCTLS \
[DRM_IOCTL_NR(DRM_IOCTL_VIA_ALLOCMEM)] = { via_mem_alloc, 1, 0 }, \
diff --git a/shared/via_mm.c b/shared/via_mm.c
index c6271367..96f3335d 100644
--- a/shared/via_mm.c
+++ b/shared/via_mm.c
@@ -178,12 +178,12 @@ int via_final_context(struct drm_device *dev, int context)
for (i=0; i < VIA_NR_XVMC_LOCKS; ++i) {
lock = XVMCLOCKPTR(sAPriv, i);
- if ( (_DRM_LOCKING_CONTEXT( *lock ) == i) &&
+ if ( (_DRM_LOCKING_CONTEXT( *lock ) == context) &&
(_DRM_LOCK_IS_HELD( *lock ))) {
if ( *lock & _DRM_LOCK_CONT) {
DRM_WAKEUP( &(dev_priv->decoder_queue[i]));
}
- *lock &= ~( _DRM_LOCK_HELD | _DRM_LOCK_CONT );
+ *lock = 0;
}
}