summaryrefslogtreecommitdiff
path: root/linux-core/i915_buffer.c
diff options
context:
space:
mode:
authorThomas Hellstrom <thomas-at-tungstengraphics-dot-com>2007-02-10 12:06:36 +0100
committerThomas Hellstrom <thomas-at-tungstengraphics-dot-com>2007-02-10 12:06:36 +0100
commit85ee2a8d044cd4d8de4894a794151af9471648e3 (patch)
treea5d8feb968026c059aafebc356cab7ed55624eb8 /linux-core/i915_buffer.c
parent53aee3122a1821b8ca24ed2bc5c1940cb0f2ff8e (diff)
Various bugfixes.
Diffstat (limited to 'linux-core/i915_buffer.c')
-rw-r--r--linux-core/i915_buffer.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/linux-core/i915_buffer.c b/linux-core/i915_buffer.c
index 70ba9a67..a357a53e 100644
--- a/linux-core/i915_buffer.c
+++ b/linux-core/i915_buffer.c
@@ -234,9 +234,9 @@ int i915_move(drm_buffer_object_t *bo,
{
drm_bo_mem_reg_t *old_mem = &bo->mem;
- if (old_mem->mem_type == DRM_BO_MEM_LOCAL)
+ if (old_mem->mem_type == DRM_BO_MEM_LOCAL) {
return drm_bo_move_memcpy(bo, evict, no_wait, new_mem);
- if (new_mem->mem_type == DRM_BO_MEM_LOCAL) {
+ } else if (new_mem->mem_type == DRM_BO_MEM_LOCAL) {
if (i915_move_flip(bo, evict, no_wait, new_mem))
return drm_bo_move_memcpy(bo, evict, no_wait, new_mem);
} else {