Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

When moving an object to inactive, make sure that we first flush it from 

the GTT domain in case it belonged there. Also, fix some compilation issues
when turning on WATCH_GTT and WATCH_LISTS, although this is a lost cause;
most of the code has rotted beyond repair.
This commit is contained in:
christos 2014-11-03 16:50:20 +00:00
parent 23e96eacf2
commit 413e395095
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sys/external/bsd/drm2/dist/drm/i915/i915_gem.c vendored
View File

@ -58,6 +58,7 @@
#include <linux/time.h> #include <linux/time.h>
#include <linux/err.h> #include <linux/err.h>
#include <linux/bitops.h> #include <linux/bitops.h>
#include <linux/printk.h>
#include <asm/param.h> #include <asm/param.h>
#include <asm/page.h> #include <asm/page.h>
@ -2838,10 +2839,18 @@ void i915_vma_move_to_active(struct i915_vma *vma,
static void static void
i915_gem_object_move_to_inactive(struct drm_i915_gem_object *obj) i915_gem_object_move_to_inactive(struct drm_i915_gem_object *obj)
{ {
struct drm_i915_private *dev_priv = obj->base.dev->dev_private; struct drm_device *dev = obj->base.dev;
struct drm_i915_private *dev_priv = dev->dev_private;
struct i915_address_space *vm; struct i915_address_space *vm;
struct i915_vma *vma; struct i915_vma *vma;
if ((obj->base.write_domain & I915_GEM_DOMAIN_GTT) != 0) {
#if 0
printk(KERN_ERR "%s: %p 0x%x flushing gtt\n", __func__, obj,
obj->base.write_domain);
#endif
i915_gem_object_flush_gtt_write_domain(obj);
}
BUG_ON(obj->base.write_domain & ~I915_GEM_GPU_DOMAINS); BUG_ON(obj->base.write_domain & ~I915_GEM_GPU_DOMAINS);
BUG_ON(!obj->active); BUG_ON(!obj->active);
@ -3948,7 +3957,7 @@ static void i915_gem_verify_gtt(struct drm_device *dev)
struct drm_i915_gem_object *obj; struct drm_i915_gem_object *obj;
int err = 0; int err = 0;
list_for_each_entry(obj, &dev_priv->mm.gtt_list, global_list) { list_for_each_entry(obj, &dev_priv->mm.bound_list, global_list) {
if (obj->gtt_space == NULL) { if (obj->gtt_space == NULL) {
printk(KERN_ERR "object found on GTT list with no space reserved\n"); printk(KERN_ERR "object found on GTT list with no space reserved\n");
err++; err++;