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

Commit 852835f3 authored by Zou Nan hai's avatar Zou Nan hai Committed by Eric Anholt
Browse files

drm/i915: convert some gem structures to per-ring V2 



The active list and request list move into the ringbuffer structure,
so each can track its active objects in the order they are in that
ring.  The flushing list does not, as it doesn't matter which ring
caused data to end up in the render cache.  Objects gain a pointer to
the ring they are active on (if any).

Signed-off-by: default avatarZou Nan hai <nanhai.zou@intel.com>
Signed-off-by: default avatarXiang Hai hao <haihao.xiang@intel.com>
Signed-off-by: default avatarEric Anholt <eric@anholt.net>
parent 8187a2b7

drivers/gpu/drm/i915/i915_debugfs.c

+7 −5
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ static int i915_gem_object_list_info(struct seq_file *m, void *data) 
	case ACTIVE_LIST:

		seq_printf(m, "Active:\n");

		lock = &dev_priv->mm.active_list_lock;

		head = &dev_priv->mm.active_list;

		head = &dev_priv->render_ring.active_list;

		break;

	case INACTIVE_LIST:

		seq_printf(m, "Inactive:\n");
@@ -129,7 +129,8 @@ static int i915_gem_request_info(struct seq_file *m, void *data) 
	struct drm_i915_gem_request *gem_request;



	seq_printf(m, "Request:\n");

	list_for_each_entry(gem_request, &dev_priv->mm.request_list, list) {

	list_for_each_entry(gem_request, &dev_priv->render_ring.request_list,

			list) {

		seq_printf(m, "    %d @ %d\n",

			   gem_request->seqno,

			   (int) (jiffies - gem_request->emitted_jiffies));
@@ -145,7 +146,7 @@ static int i915_gem_seqno_info(struct seq_file *m, void *data) 


	if (dev_priv->hw_status_page != NULL) {

		seq_printf(m, "Current sequence: %d\n",

			   i915_get_gem_seqno(dev));

			   i915_get_gem_seqno(dev,  &dev_priv->render_ring));

	} else {

		seq_printf(m, "Current sequence: hws uninitialized\n");

	}
@@ -197,7 +198,7 @@ static int i915_interrupt_info(struct seq_file *m, void *data) 
		   atomic_read(&dev_priv->irq_received));

	if (dev_priv->hw_status_page != NULL) {

		seq_printf(m, "Current sequence:    %d\n",

			   i915_get_gem_seqno(dev));

			   i915_get_gem_seqno(dev,  &dev_priv->render_ring));

	} else {

		seq_printf(m, "Current sequence:    hws uninitialized\n");

	}
@@ -287,7 +288,8 @@ static int i915_batchbuffer_info(struct seq_file *m, void *data) 


	spin_lock(&dev_priv->mm.active_list_lock);



	list_for_each_entry(obj_priv, &dev_priv->mm.active_list, list) {

	list_for_each_entry(obj_priv, &dev_priv->render_ring.active_list,

			list) {

		obj = &obj_priv->base;

		if (obj->read_domains & I915_GEM_DOMAIN_COMMAND) {

		    ret = i915_gem_object_get_pages(obj, 0);

drivers/gpu/drm/i915/i915_dma.c

+4 −4
Original line number Diff line number Diff line
@@ -82,7 +82,8 @@ static void i915_free_hws(struct drm_device *dev) 
		dev_priv->status_page_dmah = NULL;

	}



	if (dev_priv->status_gfx_addr) {

	if (dev_priv->render_ring.status_page.gfx_addr) {

		dev_priv->render_ring.status_page.gfx_addr = 0;

		dev_priv->status_gfx_addr = 0;

		drm_core_ioremapfree(&dev_priv->hws_map, dev);

	}
@@ -1510,7 +1511,6 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) 
	resource_size_t base, size;

	int ret = 0, mmio_bar;

	uint32_t agp_size, prealloc_size, prealloc_start;



	/* i915 has 4 more counters */

	dev->counters += 4;

	dev->types[6] = _DRM_STAT_IRQ;

drivers/gpu/drm/i915/i915_drv.c

+1 −1
Original line number Diff line number Diff line
@@ -340,7 +340,7 @@ int i965_reset(struct drm_device *dev, u8 flags) 
	/*

	 * Clear request list

	 */

	i915_gem_retire_requests(dev);

	i915_gem_retire_requests(dev, &dev_priv->render_ring);



	if (need_display)

		i915_save_display(dev);

drivers/gpu/drm/i915/i915_drv.h

+17 −22
Original line number Diff line number Diff line
@@ -505,18 +505,7 @@ typedef struct drm_i915_private { 
		 */

		struct list_head shrink_list;



		/**

		 * List of objects currently involved in rendering from the

		 * ringbuffer.

		 *

		 * Includes buffers having the contents of their GPU caches

		 * flushed, not necessarily primitives.  last_rendering_seqno

		 * represents when the rendering involved will be completed.

		 *

		 * A reference is held on the buffer while on this list.

		 */

		spinlock_t active_list_lock;

		struct list_head active_list;



		/**

		 * List of objects which are not in the ringbuffer but which
@@ -553,12 +542,6 @@ typedef struct drm_i915_private { 
		/** LRU list of objects with fence regs on them. */

		struct list_head fence_list;



		/**

		 * List of breadcrumbs associated with GPU requests currently

		 * outstanding.

		 */

		struct list_head request_list;



		/**

		 * We leave the user IRQ off as much as possible,

		 * but this means that requests will finish and never
@@ -683,6 +666,9 @@ struct drm_i915_gem_object { 
	 */

	uint32_t gtt_offset;



	/* Which ring is refering to is this object */

	struct intel_ring_buffer *ring;



	/**

	 * Fake offset for use by mmap(2)

	 */
@@ -756,6 +742,9 @@ struct drm_i915_gem_object { 
 * an emission time with seqnos for tracking how far ahead of the GPU we are.

 */

struct drm_i915_gem_request {

	/** On Which ring this request was generated */

	struct intel_ring_buffer *ring;



	/** GEM sequence number associated with this request. */

	uint32_t seqno;
@@ -916,11 +905,13 @@ void i915_gem_object_unpin(struct drm_gem_object *obj); 
int i915_gem_object_unbind(struct drm_gem_object *obj);

void i915_gem_release_mmap(struct drm_gem_object *obj);

void i915_gem_lastclose(struct drm_device *dev);

uint32_t i915_get_gem_seqno(struct drm_device *dev);

uint32_t i915_get_gem_seqno(struct drm_device *dev,

		struct intel_ring_buffer *ring);

bool i915_seqno_passed(uint32_t seq1, uint32_t seq2);

int i915_gem_object_get_fence_reg(struct drm_gem_object *obj);

int i915_gem_object_put_fence_reg(struct drm_gem_object *obj);

void i915_gem_retire_requests(struct drm_device *dev);

void i915_gem_retire_requests(struct drm_device *dev,

		 struct intel_ring_buffer *ring);

void i915_gem_retire_work_handler(struct work_struct *work);

void i915_gem_clflush_object(struct drm_gem_object *obj);

int i915_gem_object_set_domain(struct drm_gem_object *obj,
@@ -931,9 +922,13 @@ void i915_gem_cleanup_ringbuffer(struct drm_device *dev); 
int i915_gem_do_init(struct drm_device *dev, unsigned long start,

		     unsigned long end);

int i915_gem_idle(struct drm_device *dev);

uint32_t i915_add_request(struct drm_device *dev, struct drm_file *file_priv,

			  uint32_t flush_domains);

int i915_do_wait_request(struct drm_device *dev, uint32_t seqno, int interruptible);

uint32_t i915_add_request(struct drm_device *dev,

		struct drm_file *file_priv,

		uint32_t flush_domains,

		struct intel_ring_buffer *ring);

int i915_do_wait_request(struct drm_device *dev,

		uint32_t seqno, int interruptible,

		struct intel_ring_buffer *ring);

int i915_gem_fault(struct vm_area_struct *vma, struct vm_fault *vmf);

int i915_gem_object_set_to_gtt_domain(struct drm_gem_object *obj,

				      int write);

drivers/gpu/drm/i915/i915_gem.c

+120 −90

File changed.

Preview size limit exceeded, changes collapsed.