NV50: basic fbcon + misc fixes

[platform/upstream/libdrm.git] / linux-core / i915_buffer.c

diff --git a/linux-core/i915_buffer.c b/linux-core/i915_buffer.c
index 54aa75a..4224b73 100644 (file)
--- a/linux-core/i915_buffer.c
+++ b/linux-core/i915_buffer.c
@@ -252,10 +252,10 @@ int i915_move(struct drm_buffer_object *bo,
        if (old_mem->mem_type == DRM_BO_MEM_LOCAL) {
                return drm_bo_move_memcpy(bo, evict, no_wait, new_mem);
        } else if (new_mem->mem_type == DRM_BO_MEM_LOCAL) {
-               if (0) /*i915_move_flip(bo, evict, no_wait, new_mem)*/
+               if (1) /*i915_move_flip(bo, evict, no_wait, new_mem)*/
                        return drm_bo_move_memcpy(bo, evict, no_wait, new_mem);
        } else {
-               if (0) /*i915_move_blit(bo, evict, no_wait, new_mem)*/
+               if (1) /*i915_move_blit(bo, evict, no_wait, new_mem)*/
                        return drm_bo_move_memcpy(bo, evict, no_wait, new_mem);
        }
        return 0;
@@ -270,10 +270,12 @@ static inline void clflush(volatile void *__p)
 
 static inline void drm_cache_flush_addr(void *virt)
 {
+#ifdef cpu_has_clflush
        int i;
 
        for (i = 0; i < PAGE_SIZE; i += boot_cpu_data.x86_clflush_size)
                clflush(virt+i);
+#endif
 }
 
 static inline void drm_cache_flush_page(struct page *p)
@@ -291,6 +293,9 @@ void i915_flush_ttm(struct drm_ttm *ttm)
        DRM_MEMORYBARRIER();
 
 #ifdef CONFIG_X86_32
+#ifndef cpu_has_clflush
+#define cpu_has_clflush 0
+#endif
        /* Hopefully nobody has built an x86-64 processor without clflush */
        if (!cpu_has_clflush) {
                wbinvd();