diff options
| -rw-r--r-- | shared-core/via_drv.h | 4 | ||||
| -rw-r--r-- | shared-core/via_mm.c | 4 | ||||
| -rw-r--r-- | shared/via.h | 4 | ||||
| -rw-r--r-- | shared/via_mm.c | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/shared-core/via_drv.h b/shared-core/via_drv.h index 588f6e14..399474bf 100644 --- a/shared-core/via_drv.h +++ b/shared-core/via_drv.h @@ -28,11 +28,11 @@ #define DRIVER_NAME "via" #define DRIVER_DESC "VIA Unichrome" -#define DRIVER_DATE "20050203" +#define DRIVER_DATE "20050214" #define DRIVER_MAJOR 2 #define DRIVER_MINOR 4 -#define DRIVER_PATCHLEVEL 5 +#define DRIVER_PATCHLEVEL 6 #include "via_verifier.h" diff --git a/shared-core/via_mm.c b/shared-core/via_mm.c index 88de7493..7477db1e 100644 --- a/shared-core/via_mm.c +++ b/shared-core/via_mm.c @@ -180,12 +180,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; } } 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; } } |