Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 922a2efc authored by Daniel Vetter's avatar Daniel Vetter Committed by Eric Anholt
Browse files

drm/i915: clean-up i915_gem_flush_gpu_write_domain 



Now that we have an exact gpu write domain tracking, we don't need
to move objects to the active list ourself. i915_add_request will
take care of that under all circumstances.

Idea stolen from a patch by Chris Wilson <chris@chris-wilson.co.uk>.

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarEric Anholt <eric@anholt.net>
parent 4df2faf4

drivers/gpu/drm/i915/i915_gem.c

+1 −3
Original line number Original line Diff line number Diff line
@@ -2748,7 +2748,6 @@ static void 
i915_gem_object_flush_gpu_write_domain(struct drm_gem_object *obj)

i915_gem_object_flush_gpu_write_domain(struct drm_gem_object *obj)

{

{

	struct drm_device *dev = obj->dev;

	struct drm_device *dev = obj->dev;

	uint32_t seqno;

	uint32_t old_write_domain;

	uint32_t old_write_domain;





	if ((obj->write_domain & I915_GEM_GPU_DOMAINS) == 0)

	if ((obj->write_domain & I915_GEM_GPU_DOMAINS) == 0)
@@ -2757,9 +2756,8 @@ i915_gem_object_flush_gpu_write_domain(struct drm_gem_object *obj) 
	/* Queue the GPU write cache flushing we need. */

	/* Queue the GPU write cache flushing we need. */

	old_write_domain = obj->write_domain;

	old_write_domain = obj->write_domain;

	i915_gem_flush(dev, 0, obj->write_domain);

	i915_gem_flush(dev, 0, obj->write_domain);

	seqno = i915_add_request(dev, NULL, obj->write_domain);

	(void) i915_add_request(dev, NULL, obj->write_domain);

	BUG_ON(obj->write_domain);

	BUG_ON(obj->write_domain);

	i915_gem_object_move_to_active(obj, seqno);





	trace_i915_gem_object_change_domain(obj,

	trace_i915_gem_object_change_domain(obj,

					    obj->read_domains,

					    obj->read_domains,