diff options
Diffstat (limited to 'drivers/gpu/drm')
-rw-r--r-- | drivers/gpu/drm/i915/i915_gem_execbuffer.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c index 6b34e98a1270..8db88e34ef7b 100644 --- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c +++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c | |||
@@ -464,8 +464,6 @@ i915_gem_execbuffer_relocate(struct drm_device *dev, | |||
464 | int ret; | 464 | int ret; |
465 | 465 | ||
466 | list_for_each_entry(obj, objects, exec_list) { | 466 | list_for_each_entry(obj, objects, exec_list) { |
467 | obj->base.pending_read_domains = 0; | ||
468 | obj->base.pending_write_domain = 0; | ||
469 | ret = i915_gem_execbuffer_relocate_object(obj, eb); | 467 | ret = i915_gem_execbuffer_relocate_object(obj, eb); |
470 | if (ret) | 468 | if (ret) |
471 | return ret; | 469 | return ret; |
@@ -505,6 +503,9 @@ i915_gem_execbuffer_reserve(struct intel_ring_buffer *ring, | |||
505 | list_move(&obj->exec_list, &ordered_objects); | 503 | list_move(&obj->exec_list, &ordered_objects); |
506 | else | 504 | else |
507 | list_move_tail(&obj->exec_list, &ordered_objects); | 505 | list_move_tail(&obj->exec_list, &ordered_objects); |
506 | |||
507 | obj->base.pending_read_domains = 0; | ||
508 | obj->base.pending_write_domain = 0; | ||
508 | } | 509 | } |
509 | list_splice(&ordered_objects, objects); | 510 | list_splice(&ordered_objects, objects); |
510 | 511 | ||
@@ -712,8 +713,6 @@ i915_gem_execbuffer_relocate_slow(struct drm_device *dev, | |||
712 | 713 | ||
713 | list_for_each_entry(obj, objects, exec_list) { | 714 | list_for_each_entry(obj, objects, exec_list) { |
714 | int offset = obj->exec_entry - exec; | 715 | int offset = obj->exec_entry - exec; |
715 | obj->base.pending_read_domains = 0; | ||
716 | obj->base.pending_write_domain = 0; | ||
717 | ret = i915_gem_execbuffer_relocate_object_slow(obj, eb, | 716 | ret = i915_gem_execbuffer_relocate_object_slow(obj, eb, |
718 | reloc + reloc_offset[offset]); | 717 | reloc + reloc_offset[offset]); |
719 | if (ret) | 718 | if (ret) |