summaryrefslogtreecommitdiff
path: root/linux-core
diff options
context:
space:
mode:
Diffstat (limited to 'linux-core')
-rw-r--r--linux-core/drmP.h3
-rw-r--r--linux-core/drm_bo.c30
-rw-r--r--linux-core/drm_ttm.c5
-rw-r--r--linux-core/i915_drv.c3
-rw-r--r--linux-core/i915_fence.c2
5 files changed, 36 insertions, 7 deletions
diff --git a/linux-core/drmP.h b/linux-core/drmP.h
index 81b7a1b6..4d490abe 100644
--- a/linux-core/drmP.h
+++ b/linux-core/drmP.h
@@ -652,7 +652,8 @@ typedef struct drm_ref_object {
*/
typedef struct drm_bo_driver{
- int cached_pages;
+ int cached_tt;
+ int cached_vram;
drm_ttm_backend_t *(*create_ttm_backend_entry)
(struct drm_device *dev, int cached);
} drm_bo_driver_t;
diff --git a/linux-core/drm_bo.c b/linux-core/drm_bo.c
index 30656060..55901660 100644
--- a/linux-core/drm_bo.c
+++ b/linux-core/drm_bo.c
@@ -214,7 +214,8 @@ static void drm_bo_base_deref_locked(drm_file_t *priv, drm_user_object_t *uo)
}
-static int drm_bo_new_flags(uint32_t flags, uint32_t new_mask, uint32_t hint,
+static int drm_bo_new_flags(drm_bo_driver_t *driver,
+ uint32_t flags, uint32_t new_mask, uint32_t hint,
int init, uint32_t *n_flags)
{
uint32_t new_flags;
@@ -263,6 +264,24 @@ static int drm_bo_new_flags(uint32_t flags, uint32_t new_mask, uint32_t hint,
}
new_flags |= new_mask & ~DRM_BO_MASK_MEM;
+
+ if (hint & DRM_BO_HINT_BIND_CACHED) {
+ new_flags |= DRM_BO_FLAG_CACHED;
+ if (((new_flags & DRM_BO_FLAG_MEM_TT) && !driver->cached_tt) ||
+ ((new_flags & DRM_BO_FLAG_MEM_VRAM) && !driver->cached_vram))
+ new_flags &= ~DRM_BO_FLAG_CACHED;
+ }
+
+ if ((new_flags & DRM_BO_FLAG_NO_EVICT) &&
+ ((flags ^ new_flags) & DRM_BO_FLAG_CACHED)) {
+ if (flags & DRM_BO_FLAG_CACHED) {
+ DRM_ERROR("Cannot change caching policy of pinned buffer\n");
+ return -EINVAL;
+ } else {
+ new_flags &= ~DRM_BO_FLAG_CACHED;
+ }
+ }
+
*n_flags = new_flags;
return 0;
}
@@ -531,11 +550,12 @@ static int drm_buffer_object_validate(drm_device_t *dev, drm_buffer_object_t *bo
return 0;
}
+
/*
* Call bo->mutex locked.
*/
-static int drm_bo_add_ttm(drm_file_t *priv, drm_buffer_object_t *bo, uint32_t new_flags,
+static int drm_bo_add_ttm(drm_file_t *priv, drm_buffer_object_t *bo, uint32_t hint,
uint32_t ttm_handle)
{
@@ -578,7 +598,7 @@ static int drm_bo_add_ttm(drm_file_t *priv, drm_buffer_object_t *bo, uint32_t ne
ttm = drm_ttm_from_object(to);
ret = drm_create_ttm_region(ttm, bo->buffer_start >> PAGE_SHIFT,
bo->num_pages,
- new_flags & DRM_BO_FLAG_CACHED,
+ hint & DRM_BO_HINT_BIND_CACHED,
&bo->ttm_region);
if (ret) {
drm_ttm_object_deref_unlocked(dev, to);
@@ -631,6 +651,10 @@ int drm_buffer_object_create(drm_file_t *priv,
bo->num_pages = num_pages;
bo->buffer_start = buffer_start;
+ ret = drm_bo_new_flags(dev->driver->bo_driver, bo->flags, mask, hint,
+ 1, &new_flags);
+ if (ret)
+ goto out_err;
ret = drm_bo_add_ttm(priv, bo, new_flags, ttm_handle);
if (ret)
goto out_err;
diff --git a/linux-core/drm_ttm.c b/linux-core/drm_ttm.c
index e111070e..65d40344 100644
--- a/linux-core/drm_ttm.c
+++ b/linux-core/drm_ttm.c
@@ -202,10 +202,11 @@ int drm_destroy_ttm(drm_ttm_t * ttm)
if (atomic_read(&ttm->vma_count) > 0) {
ttm->destroy = 1;
- DRM_DEBUG("VMAs are still alive. Skipping destruction.\n");
+ DRM_ERROR("VMAs are still alive. Skipping destruction.\n");
return -EBUSY;
}
+ DRM_ERROR("Destroying a ttm\n");
if (ttm->be_list) {
list_for_each_safe(list, next, &ttm->be_list->head) {
drm_ttm_backend_list_t *entry =
@@ -479,6 +480,7 @@ void drm_destroy_ttm_region(drm_ttm_backend_list_t * entry)
uint32_t *cur_page_flags;
int i;
+ DRM_ERROR("Destroying a TTM region\n");
list_del_init(&entry->head);
drm_unbind_ttm_region(entry);
@@ -800,7 +802,6 @@ void drm_ttm_object_deref_unlocked(drm_device_t *dev, drm_ttm_object_t *to)
*/
static void drm_ttm_user_deref_locked(drm_file_t *priv, drm_user_object_t *base)
{
- DRM_ERROR("User deref ttm\n");
drm_ttm_object_deref_locked(priv->head->dev,
drm_user_object_entry(base, drm_ttm_object_t,
base));
diff --git a/linux-core/i915_drv.c b/linux-core/i915_drv.c
index 64ab3f50..bc78dc2e 100644
--- a/linux-core/i915_drv.c
+++ b/linux-core/i915_drv.c
@@ -49,7 +49,8 @@ static drm_fence_driver_t i915_fence_driver = {
};
static drm_bo_driver_t i915_bo_driver = {
- .cached_pages = 1,
+ .cached_vram = 0,
+ .cached_tt = 1,
.create_ttm_backend_entry = i915_create_ttm_backend_entry
};
diff --git a/linux-core/i915_fence.c b/linux-core/i915_fence.c
index 46a2a728..452d4ee8 100644
--- a/linux-core/i915_fence.c
+++ b/linux-core/i915_fence.c
@@ -86,6 +86,8 @@ static void i915_perform_flush(drm_device_t * dev)
dev_priv->flush_sequence = (uint32_t) READ_BREADCRUMB(dev_priv);
dev_priv->flush_flags = fm->pending_flush;
dev_priv->saved_flush_status = READ_HWSP(dev_priv, 0);
+ DRM_ERROR("Saved flush status is 0x%08x\n",
+ dev_priv->saved_flush_status);
I915_WRITE(I915REG_INSTPM, (1 << 5) | (1 << 21));
dev_priv->flush_pending = 1;
fm->pending_flush = 0;