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

Commit 06d98131 authored by Chris Wilson's avatar Chris Wilson Committed by Daniel Vetter
Browse files

drm/i915: Remove the pipelined parameter from get_fence() 



We never succeeded in getting pipelined fencing to work (unresolved
spurious GPU hangs), so begin the process of dismantling and removal
the broken code.

Step 1 is the removal of the pipeline parameter to get_fence().

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 0f91128d

drivers/gpu/drm/i915/i915_drv.h

+1 −2
Original line number Diff line number Diff line
@@ -1257,8 +1257,7 @@ i915_seqno_passed(uint32_t seq1, uint32_t seq2) 


u32 i915_gem_next_request_seqno(struct intel_ring_buffer *ring);



int __must_check i915_gem_object_get_fence(struct drm_i915_gem_object *obj,

					   struct intel_ring_buffer *pipelined);

int __must_check i915_gem_object_get_fence(struct drm_i915_gem_object *obj);

int __must_check i915_gem_object_put_fence(struct drm_i915_gem_object *obj);



static inline bool

drivers/gpu/drm/i915/i915_gem.c

+3 −4
Original line number Diff line number Diff line
@@ -1079,7 +1079,7 @@ int i915_gem_fault(struct vm_area_struct *vma, struct vm_fault *vmf) 
	if (!obj->has_global_gtt_mapping)

		i915_gem_gtt_bind_object(obj, obj->cache_level);



	ret = i915_gem_object_get_fence(obj, NULL);

	ret = i915_gem_object_get_fence(obj);

	if (ret)

		goto unlock;
@@ -2453,7 +2453,6 @@ i915_find_fence_reg(struct drm_device *dev, 
/**

 * i915_gem_object_get_fence - set up fencing for an object

 * @obj: object to map through a fence reg

 * @pipelined: ring on which to queue the change, or NULL for CPU access

 *

 * When mapping objects through the GTT, userspace wants to be able to write

 * to them without having to worry about swizzling if the object is tiled.
@@ -2466,11 +2465,11 @@ i915_find_fence_reg(struct drm_device *dev, 
 * For an untiled surface, this removes any existing fence.

 */

int

i915_gem_object_get_fence(struct drm_i915_gem_object *obj,

			  struct intel_ring_buffer *pipelined)

i915_gem_object_get_fence(struct drm_i915_gem_object *obj)

{

	struct drm_device *dev = obj->base.dev;

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct intel_ring_buffer *pipelined;

	struct drm_i915_fence_reg *reg;

	int ret;

drivers/gpu/drm/i915/i915_gem_execbuffer.c

+1 −1
Original line number Diff line number Diff line
@@ -534,7 +534,7 @@ pin_and_fence_object(struct drm_i915_gem_object *obj, 


	if (has_fenced_gpu_access) {

		if (entry->flags & EXEC_OBJECT_NEEDS_FENCE) {

			ret = i915_gem_object_get_fence(obj, ring);

			ret = i915_gem_object_get_fence(obj);

			if (ret)

				goto err_unpin;

drivers/gpu/drm/i915/intel_display.c

+1 −1
Original line number Diff line number Diff line
@@ -2151,7 +2151,7 @@ intel_pin_and_fence_fb_obj(struct drm_device *dev, 
	 * framebuffer compression.  For simplicity, we always install

	 * a fence as the cost is not that onerous.

	 */

	ret = i915_gem_object_get_fence(obj, pipelined);

	ret = i915_gem_object_get_fence(obj);

	if (ret)

		goto err_unpin;