summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Hellstrom <thomas-at-tungstengraphics-dot-com>2006-09-27 19:11:27 +0200
committerThomas Hellstrom <thomas-at-tungstengraphics-dot-com>2006-09-27 19:11:27 +0200
commit1c6f0ea43c47603c2265248ce8a91698c8982f3c (patch)
tree8545d4f2fec2212092f8845a0c57785299a91362
parentf2c03ecae627df77db25391fe85fcd8a2a4bdc0c (diff)
Activate error message that was never hit since it was masked
by drm_lock_transfer. Ifdef out drm_lock_transfer. I see no use for it currently. Should be removed.
-rw-r--r--linux-core/drm_lock.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/linux-core/drm_lock.c b/linux-core/drm_lock.c
index 97417636..86ee25cb 100644
--- a/linux-core/drm_lock.c
+++ b/linux-core/drm_lock.c
@@ -35,9 +35,12 @@
#include "drmP.h"
+#if 0
static int drm_lock_transfer(drm_device_t * dev,
__volatile__ unsigned int *lock,
unsigned int context);
+#endif
+
static int drm_notifier(void *priv);
/**
@@ -172,7 +175,7 @@ int drm_unlock(struct inode *inode, struct file *filp,
else {
if (drm_lock_free(dev, &dev->lock.hw_lock->lock,
lock.context)) {
- DRM_ERROR("\n");
+ /* FIXME: Should really bail out here. */
}
}
@@ -217,6 +220,7 @@ int drm_lock_take(__volatile__ unsigned int *lock, unsigned int context)
return 0;
}
+#if 0
/**
* This takes a lock forcibly and hands it to context. Should ONLY be used
* inside *_unlock to give lock to kernel before calling *_dma_schedule.
@@ -243,6 +247,7 @@ static int drm_lock_transfer(drm_device_t * dev,
} while (prev != old);
return 1;
}
+#endif
/**
* Free lock.
@@ -267,7 +272,7 @@ int drm_lock_free(drm_device_t * dev,
} while (prev != old);
if (_DRM_LOCK_IS_HELD(old) && _DRM_LOCKING_CONTEXT(old) != context) {
- DRM_DEBUG("%d freed heavyweight lock held by %d\n",
+ DRM_ERROR("%d freed heavyweight lock held by %d\n",
context, _DRM_LOCKING_CONTEXT(old));
return 1;
}