diff options
| author | Thomas Hellstrom <unichrome@shipmail.org> | 2005-03-14 22:50:21 +0000 |
|---|---|---|
| committer | Thomas Hellstrom <unichrome@shipmail.org> | 2005-03-14 22:50:21 +0000 |
| commit | d2fd9200956a94cfd91a39e76994f326bdfc6ac0 (patch) | |
| tree | 9151ee4ea20c3ea53be1370b058afec101858b54 /shared-core/via_mm.c | |
| parent | a396617dbc15abafdc172b972a02c04007ad579f (diff) | |
via changes:
1. Initialize futex locks to zero on device init.
2. Remove some stray defines from via_drm.h
3. Prepare via_drm.h for drm client inclusion. The goal is to share a
common file with common definitions.
4. Sync shared / shared-core via_drm.h
5. Bump minor, because of the futex lock initialization.
Diffstat (limited to 'shared-core/via_mm.c')
| -rw-r--r-- | shared-core/via_mm.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/shared-core/via_mm.c b/shared-core/via_mm.c index 7477db1e..5cead8c4 100644 --- a/shared-core/via_mm.c +++ b/shared-core/via_mm.c @@ -179,10 +179,9 @@ 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 ) == context) && - (_DRM_LOCK_IS_HELD( *lock ))) { - if ( *lock & _DRM_LOCK_CONT) { + lock = (int *) XVMCLOCKPTR(sAPriv, i); + if ( (_DRM_LOCKING_CONTEXT( *lock ) == context)) { + if (_DRM_LOCK_IS_HELD( *lock ) && (*lock & _DRM_LOCK_CONT)) { DRM_WAKEUP( &(dev_priv->decoder_queue[i])); } *lock = 0; |