summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Hellstrom <thomas-at-tungstengraphics-dot-com>2007-06-12 12:30:33 +0200
committerThomas Hellstrom <thomas-at-tungstengraphics-dot-com>2007-06-12 12:30:33 +0200
commitf984b1b8d17f285dfacb593702178f1eb2fdb4ac (patch)
tree391472b76f73e84a24d896b15663b51511775f10
parentb6b5df24b962c94433afe4d8665b5f145bfa1ad3 (diff)
Fix some obvious bugs.
-rw-r--r--linux-core/drm_bo.c6
-rw-r--r--shared-core/drm.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/linux-core/drm_bo.c b/linux-core/drm_bo.c
index b6a31943..a1a27d1e 100644
--- a/linux-core/drm_bo.c
+++ b/linux-core/drm_bo.c
@@ -1716,13 +1716,13 @@ int drm_bo_op_ioctl(DRM_IOCTL_ARGS)
&rep);
break;
case drm_bo_fence:
- ret = drm_bo_lock_test(dev, filp);
- if (ret)
- break;
+ ret = -EINVAL;
+ DRM_ERROR("Function is not implemented yet.\n");
break;
case drm_bo_ref_fence:
ret = -EINVAL;
DRM_ERROR("Function is not implemented yet.\n");
+ break;
default:
ret = -EINVAL;
}
diff --git a/shared-core/drm.h b/shared-core/drm.h
index bc2e718c..1b0e54e3 100644
--- a/shared-core/drm.h
+++ b/shared-core/drm.h
@@ -733,7 +733,7 @@ typedef struct drm_fence_arg {
/* Mask: Make sure the buffer is in cached memory when mapped for reading.
* Flags: Acknowledge.
*/
-#define DRM_BO_FLAG_READ_CACHED (1ULL << 16)
+#define DRM_BO_FLAG_READ_CACHED (1ULL << 19)
/* Mask: Force DRM_BO_FLAG_CACHED flag strictly also if it is set.
* Flags: Acknowledge.