Commit 27173f1f authored Aug 14, 2013 by Ben Widawsky Committed by Daniel Vetter Sep 04, 2013

drm/i915: Convert execbuf code to use vmas



In order to transition more of our code over to using a VMA instead of
an <OBJ, VM> pair - we must have the vma accessible at execbuf time. Up
until now, we've only had a VMA when actually binding an object.

The previous patch helped handle the distinction on bound vs. unbound.
This patch will help us catch leaks, and other issues before we actually
shuffle a bunch of stuff around.

This attempts to convert all the execbuf code to speak in vmas. Since
the execbuf code is very self contained it was a nice isolated
conversion.

The meat of the code is about turning eb_objects into eb_vma, and then
wiring up the rest of the code to use vmas instead of obj, vm pairs.

Unfortunately, to do this, we must move the exec_list link from the obj
structure. This list is reused in the eviction code, so we must also
modify the eviction code to make this work.

WARNING: This patch makes an already hotly profiled path slower. The cost is
unavoidable. In reply to this mail, I will attach the extra data.

v2: Release table lock early, and two a 2 phase vma lookup to avoid
having to use a GFP_ATOMIC. (Chris)

v3: s/obj_exec_list/obj_exec_link/
Updates to address
commit 6d2b8885
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date:   Wed Aug 7 18:30:54 2013 +0100

    drm/i915: List objects allocated from stolen memory in debugfs

v4: Use obj = vma->obj for neatness in some places (Chris)
need_reloc_mappable() should return false if ppgtt (Chris)

Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
[danvet: Split out prep patches. Also remove a FIXME comment which is
now taken care of.]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

parent a2dc53e7

drivers/gpu/drm/i915/i915_drv.h

+7 −9

Original line number	Diff line number	Diff line
		@@ -568,6 +568,13 @@ struct i915_vma {
		/** This vma's place in the batchbuffer or on the eviction list */
		struct list_head exec_list;

		/**
		* Used for performing relocations during execbuffer insertion.
		*/
		struct hlist_node exec_node;
		unsigned long exec_handle;
		struct drm_i915_gem_exec_object2 *exec_entry;

		};

		struct i915_ctx_hang_stats {
		@@ -1398,8 +1405,6 @@ struct drm_i915_gem_object {
		struct list_head ring_list;
		/** Used in execbuf to temporarily hold a ref */
		struct list_head obj_exec_link;
		/** This object's place in the batchbuffer or on the eviction list */
		struct list_head exec_list;

		/**
		* This is set if the object is on the active lists (has pending
		@@ -1485,13 +1490,6 @@ struct drm_i915_gem_object {
		void *dma_buf_vmapping;
		int vmapping_count;

		/**
		* Used for performing relocations during execbuffer insertion.
		*/
		struct hlist_node exec_node;
		unsigned long exec_handle;
		struct drm_i915_gem_exec_object2 *exec_entry;

		struct intel_ring_buffer *ring;

		/** Breadcrumb of last rendering to the buffer. */

drivers/gpu/drm/i915/i915_gem.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -3978,7 +3978,6 @@ void i915_gem_object_init(struct drm_i915_gem_object *obj,
		{
		INIT_LIST_HEAD(&obj->global_list);
		INIT_LIST_HEAD(&obj->ring_list);
		INIT_LIST_HEAD(&obj->exec_list);
		INIT_LIST_HEAD(&obj->obj_exec_link);
		INIT_LIST_HEAD(&obj->vma_list);

drivers/gpu/drm/i915/i915_gem_execbuffer.c

+176 −144

File changed.

Preview size limit exceeded, changes collapsed.

Admin message