summaryrefslogtreecommitdiff
path: root/linux-core/i915_buffer.c
diff options
context:
space:
mode:
Diffstat (limited to 'linux-core/i915_buffer.c')
-rw-r--r--linux-core/i915_buffer.c103
1 files changed, 43 insertions, 60 deletions
diff --git a/linux-core/i915_buffer.c b/linux-core/i915_buffer.c
index 7655902f..4fab0bef 100644
--- a/linux-core/i915_buffer.c
+++ b/linux-core/i915_buffer.c
@@ -33,7 +33,6 @@
#include "i915_drm.h"
#include "i915_drv.h"
-
drm_ttm_backend_t *i915_create_ttm_backend_entry(drm_device_t * dev)
{
return drm_agp_init_ttm(dev, NULL);
@@ -65,51 +64,49 @@ int i915_invalidate_caches(drm_device_t * dev, uint32_t flags)
return i915_emit_mi_flush(dev, flush_cmd);
}
-int i915_init_mem_type(drm_device_t *dev, uint32_t type,
- drm_mem_type_manager_t *man)
+int i915_init_mem_type(drm_device_t * dev, uint32_t type,
+ drm_mem_type_manager_t * man)
{
- switch(type) {
+ switch (type) {
case DRM_BO_MEM_LOCAL:
man->flags = _DRM_FLAG_MEMTYPE_MAPPABLE |
- _DRM_FLAG_MEMTYPE_CACHED;
+ _DRM_FLAG_MEMTYPE_CACHED;
break;
case DRM_BO_MEM_TT:
if (!(drm_core_has_AGP(dev) && dev->agp)) {
- DRM_ERROR("AGP is not enabled for memory type %u\n",
- (unsigned) type);
+ DRM_ERROR("AGP is not enabled for memory type %u\n",
+ (unsigned)type);
return -EINVAL;
}
man->io_offset = dev->agp->agp_info.aper_base;
man->io_size = dev->agp->agp_info.aper_size * 1024 * 1024;
man->io_addr = NULL;
man->flags = _DRM_FLAG_MEMTYPE_MAPPABLE |
- _DRM_FLAG_MEMTYPE_CSELECT |
- _DRM_FLAG_NEEDS_IOREMAP;
+ _DRM_FLAG_MEMTYPE_CSELECT | _DRM_FLAG_NEEDS_IOREMAP;
break;
case DRM_BO_MEM_PRIV0:
if (!(drm_core_has_AGP(dev) && dev->agp)) {
- DRM_ERROR("AGP is not enabled for memory type %u\n",
- (unsigned) type);
+ DRM_ERROR("AGP is not enabled for memory type %u\n",
+ (unsigned)type);
return -EINVAL;
}
man->io_offset = dev->agp->agp_info.aper_base;
man->io_size = dev->agp->agp_info.aper_size * 1024 * 1024;
man->io_addr = NULL;
man->flags = _DRM_FLAG_MEMTYPE_MAPPABLE |
- _DRM_FLAG_MEMTYPE_FIXED |
- _DRM_FLAG_NEEDS_IOREMAP;
+ _DRM_FLAG_MEMTYPE_FIXED | _DRM_FLAG_NEEDS_IOREMAP;
break;
default:
- DRM_ERROR("Unsupported memory type %u\n", (unsigned) type);
+ DRM_ERROR("Unsupported memory type %u\n", (unsigned)type);
return -EINVAL;
}
return 0;
}
-uint32_t i915_evict_flags(drm_device_t *dev, uint32_t type)
+uint32_t i915_evict_flags(drm_device_t * dev, uint32_t type)
{
- switch(type) {
+ switch (type) {
case DRM_BO_MEM_LOCAL:
case DRM_BO_MEM_TT:
return DRM_BO_FLAG_MEM_LOCAL;
@@ -118,11 +115,10 @@ uint32_t i915_evict_flags(drm_device_t *dev, uint32_t type)
}
}
-static void i915_emit_copy_blit(drm_device_t *dev,
- uint32_t src_offset,
- uint32_t dst_offset,
- uint32_t pages,
- int direction)
+static void i915_emit_copy_blit(drm_device_t * dev,
+ uint32_t src_offset,
+ uint32_t dst_offset,
+ uint32_t pages, int direction)
{
uint32_t cur_pages;
uint32_t stride = PAGE_SIZE;
@@ -131,9 +127,9 @@ static void i915_emit_copy_blit(drm_device_t *dev,
if (!dev_priv)
return;
-
+
i915_kernel_lost_context(dev);
- while(pages > 0) {
+ while (pages > 0) {
cur_pages = pages;
if (cur_pages > 2048)
cur_pages = 2048;
@@ -142,7 +138,7 @@ static void i915_emit_copy_blit(drm_device_t *dev,
BEGIN_LP_RING(6);
OUT_RING(SRC_COPY_BLT_CMD | XY_SRC_COPY_BLT_WRITE_ALPHA |
XY_SRC_COPY_BLT_WRITE_RGB);
- OUT_RING((stride & 0xffff) | ( 0xcc << 16) | (1 << 24) |
+ OUT_RING((stride & 0xffff) | (0xcc << 16) | (1 << 24) |
(1 << 25) | (direction ? (1 << 30) : 0));
OUT_RING((cur_pages << 16) | PAGE_SIZE);
OUT_RING(dst_offset);
@@ -153,33 +149,29 @@ static void i915_emit_copy_blit(drm_device_t *dev,
return;
}
-static int i915_move_blit(drm_buffer_object_t *bo,
- int evict,
- int no_wait,
- drm_bo_mem_reg_t *new_mem)
+static int i915_move_blit(drm_buffer_object_t * bo,
+ int evict, int no_wait, drm_bo_mem_reg_t * new_mem)
{
drm_bo_mem_reg_t *old_mem = &bo->mem;
int dir = 0;
- if ((old_mem->mem_type == new_mem->mem_type) &&
- (new_mem->mm_node->start <
- old_mem->mm_node->start + old_mem->mm_node->size)) {
+ if ((old_mem->mem_type == new_mem->mem_type) &&
+ (new_mem->mm_node->start <
+ old_mem->mm_node->start + old_mem->mm_node->size)) {
dir = 1;
}
i915_emit_copy_blit(bo->dev,
old_mem->mm_node->start << PAGE_SHIFT,
new_mem->mm_node->start << PAGE_SHIFT,
- new_mem->num_pages,
- dir);
+ new_mem->num_pages, dir);
i915_emit_mi_flush(bo->dev, MI_READ_FLUSH | MI_EXE_FLUSH);
return drm_bo_move_accel_cleanup(bo, evict, no_wait,
DRM_FENCE_TYPE_EXE |
- DRM_I915_FENCE_TYPE_RW,
- DRM_I915_FENCE_FLAG_FLUSHED,
- new_mem);
+ DRM_I915_FENCE_TYPE_RW,
+ DRM_I915_FENCE_FLAG_FLUSHED, new_mem);
}
/*
@@ -187,11 +179,8 @@ static int i915_move_blit(drm_buffer_object_t *bo,
* then blit and subsequently move out again.
*/
-
-static int i915_move_flip(drm_buffer_object_t *bo,
- int evict,
- int no_wait,
- drm_bo_mem_reg_t *new_mem)
+static int i915_move_flip(drm_buffer_object_t * bo,
+ int evict, int no_wait, drm_bo_mem_reg_t * new_mem)
{
drm_device_t *dev = bo->dev;
drm_bo_mem_reg_t tmp_mem;
@@ -200,23 +189,22 @@ static int i915_move_flip(drm_buffer_object_t *bo,
tmp_mem = *new_mem;
tmp_mem.mm_node = NULL;
tmp_mem.mask = DRM_BO_FLAG_MEM_TT |
- DRM_BO_FLAG_CACHED |
- DRM_BO_FLAG_FORCE_CACHING;
-
+ DRM_BO_FLAG_CACHED | DRM_BO_FLAG_FORCE_CACHING;
+
ret = drm_bo_mem_space(bo, &tmp_mem, no_wait);
- if (ret)
+ if (ret)
return ret;
-
+
ret = drm_bind_ttm(bo->ttm, 1, tmp_mem.mm_node->start);
- if (ret)
+ if (ret)
goto out_cleanup;
ret = i915_move_blit(bo, 1, no_wait, &tmp_mem);
- if (ret)
+ if (ret)
goto out_cleanup;
-
+
ret = drm_bo_move_ttm(bo, evict, no_wait, new_mem);
-out_cleanup:
+ out_cleanup:
if (tmp_mem.mm_node) {
mutex_lock(&dev->struct_mutex);
drm_mm_put_block(tmp_mem.mm_node);
@@ -226,24 +214,19 @@ out_cleanup:
return ret;
}
-
-int i915_move(drm_buffer_object_t *bo,
- int evict,
- int no_wait,
- drm_bo_mem_reg_t *new_mem)
+int i915_move(drm_buffer_object_t * bo,
+ int evict, int no_wait, drm_bo_mem_reg_t * new_mem)
{
drm_bo_mem_reg_t *old_mem = &bo->mem;
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 (i915_move_flip(bo, evict, no_wait, new_mem))
- return drm_bo_move_memcpy(bo, evict, no_wait,
- new_mem);
+ if (i915_move_flip(bo, evict, no_wait, new_mem))
+ return drm_bo_move_memcpy(bo, evict, no_wait, new_mem);
} else {
if (i915_move_blit(bo, evict, no_wait, new_mem))
- return drm_bo_move_memcpy(bo, evict, no_wait,
- new_mem);
+ return drm_bo_move_memcpy(bo, evict, no_wait, new_mem);
}
return 0;
}