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

Remove workaround for PR kern/49195. 

Problem seems to have been properly fixed in rev. 1.25.
This commit is contained in:
riastradh 2015-05-13 23:57:02 +00:00
parent bcb8c68de1
commit ce18844b86
1 changed files with 1 additions and 12 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

@ -2806,21 +2806,10 @@ void i915_vma_move_to_active(struct i915_vma *vma,
static void
i915_gem_object_move_to_inactive(struct drm_i915_gem_object *obj)
{
struct drm_device *dev = obj->base.dev;
struct drm_i915_private *dev_priv = dev->dev_private;
struct drm_i915_private *dev_priv = obj->base.dev->dev_private;
struct i915_address_space *vm;
struct i915_vma *vma;
if ((obj->base.write_domain & I915_GEM_DOMAIN_GTT) != 0) {
printk(KERN_ERR "%s: %p 0x%x flushing gtt\n", __func__, obj,
obj->base.write_domain);
i915_gem_object_flush_gtt_write_domain(obj);
}
if ((obj->base.write_domain & I915_GEM_DOMAIN_CPU) != 0) {
printk(KERN_ERR "%s: %p 0x%x flushing cpu\n", __func__, obj,
obj->base.write_domain);
i915_gem_object_flush_cpu_write_domain(obj, false);
}
BUG_ON(obj->base.write_domain & ~I915_GEM_GPU_DOMAINS);
BUG_ON(!obj->active);