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

Commit 54cf91dc authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915: Split i915_gem_execbuffer into its own file. 



A number of dragons have been seen lurking within the execbuffer code.
The first step is then to isolate them from the rest and begin to
scrutinise them in depth. Suggested by Daniel Vetter.

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
parent 6299f992

drivers/gpu/drm/i915/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -8,8 +8,9 @@ i915-y := i915_drv.o i915_dma.o i915_irq.o i915_mem.o \ 
          i915_suspend.o \

	  i915_gem.o \

	  i915_gem_debug.o \

	  i915_gem_gtt.o \

	  i915_gem_evict.o \

	  i915_gem_execbuffer.o \

	  i915_gem_gtt.o \

	  i915_gem_tiling.o \

	  i915_trace_points.o \

	  intel_display.o \

drivers/gpu/drm/i915/i915_drv.h

+18 −0
Original line number Diff line number Diff line
@@ -1083,6 +1083,10 @@ int i915_gem_get_aperture_ioctl(struct drm_device *dev, void *data, 
				struct drm_file *file_priv);

void i915_gem_load(struct drm_device *dev);

int i915_gem_init_object(struct drm_gem_object *obj);

void i915_gem_flush_ring(struct drm_device *dev,

			 struct intel_ring_buffer *ring,

			 uint32_t invalidate_domains,

			 uint32_t flush_domains);

struct drm_i915_gem_object *i915_gem_alloc_object(struct drm_device *dev,

						  size_t size);

void i915_gem_free_object(struct drm_gem_object *obj);
@@ -1094,6 +1098,12 @@ int __must_check i915_gem_object_unbind(struct drm_i915_gem_object *obj); 
void i915_gem_release_mmap(struct drm_i915_gem_object *obj);

void i915_gem_lastclose(struct drm_device *dev);



int __must_check i915_mutex_lock_interruptible(struct drm_device *dev);

int __must_check i915_gem_object_wait_rendering(struct drm_i915_gem_object *obj,

						bool interruptible);

void i915_gem_object_move_to_active(struct drm_i915_gem_object *obj,

				    struct intel_ring_buffer *ring);



/**

 * Returns true if seq1 is later than seq2.

 */
@@ -1103,6 +1113,14 @@ i915_seqno_passed(uint32_t seq1, uint32_t seq2) 
	return (int32_t)(seq1 - seq2) >= 0;

}



static inline u32

i915_gem_next_request_seqno(struct drm_device *dev,

			    struct intel_ring_buffer *ring)

{

	drm_i915_private_t *dev_priv = dev->dev_private;

	return ring->outstanding_lazy_request = dev_priv->next_seqno;

}



int __must_check i915_gem_object_get_fence_reg(struct drm_i915_gem_object *obj,

					       bool interruptible);

int __must_check i915_gem_object_put_fence_reg(struct drm_i915_gem_object *obj,

drivers/gpu/drm/i915/i915_gem.c

+13 −1151

File changed.

Preview size limit exceeded, changes collapsed.

drivers/gpu/drm/i915/i915_gem_execbuffer.c

0 → 100644
+1155 −0

File added.

Preview size limit exceeded, changes collapsed.