Commit a979bb70 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-fixes-2020-04-30' of... 

Merge tag 'drm-intel-fixes-2020-04-30' of git://anongit.freedesktop.org/drm/drm-intel

 into drm-fixes

- Fix selftest refcnt leak (Xiyu)
- Fix gem vma lock (Chris)
- Fix gt's i915_request.timeline acquire by checking if cacheline is valid (Chris)
- Fix IRQ postinistall fault masks (Matt)

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200430140042.GA270140@intel.com
parents c62098c9 8598eb78

drivers/gpu/drm/i915/gem/i915_gem_tiling.c

+18 −2
Original line number Diff line number Diff line
@@ -182,21 +182,35 @@ i915_gem_object_fence_prepare(struct drm_i915_gem_object *obj, 
			      int tiling_mode, unsigned int stride)

{

	struct i915_ggtt *ggtt = &to_i915(obj->base.dev)->ggtt;

	struct i915_vma *vma;

	struct i915_vma *vma, *vn;

	LIST_HEAD(unbind);

	int ret = 0;



	if (tiling_mode == I915_TILING_NONE)

		return 0;



	mutex_lock(&ggtt->vm.mutex);



	spin_lock(&obj->vma.lock);

	for_each_ggtt_vma(vma, obj) {

		GEM_BUG_ON(vma->vm != &ggtt->vm);



		if (i915_vma_fence_prepare(vma, tiling_mode, stride))

			continue;



		list_move(&vma->vm_link, &unbind);

	}

	spin_unlock(&obj->vma.lock);



	list_for_each_entry_safe(vma, vn, &unbind, vm_link) {

		ret = __i915_vma_unbind(vma);

		if (ret)

		if (ret) {

			/* Restore the remaining vma on an error */

			list_splice(&unbind, &ggtt->vm.bound_list);

			break;

		}

	}



	mutex_unlock(&ggtt->vm.mutex);



	return ret;
@@ -268,6 +282,7 @@ i915_gem_object_set_tiling(struct drm_i915_gem_object *obj, 
	}

	mutex_unlock(&obj->mm.lock);



	spin_lock(&obj->vma.lock);

	for_each_ggtt_vma(vma, obj) {

		vma->fence_size =

			i915_gem_fence_size(i915, vma->size, tiling, stride);
@@ -278,6 +293,7 @@ i915_gem_object_set_tiling(struct drm_i915_gem_object *obj, 
		if (vma->fence)

			vma->fence->dirty = true;

	}

	spin_unlock(&obj->vma.lock);



	obj->tiling_and_stride = tiling | stride;

	i915_gem_object_unlock(obj);

drivers/gpu/drm/i915/gem/selftests/huge_pages.c

+8 −4
Original line number Diff line number Diff line
@@ -1477,8 +1477,10 @@ static int igt_ppgtt_pin_update(void *arg) 
		unsigned int page_size = BIT(first);



		obj = i915_gem_object_create_internal(dev_priv, page_size);

		if (IS_ERR(obj))

			return PTR_ERR(obj);

		if (IS_ERR(obj)) {

			err = PTR_ERR(obj);

			goto out_vm;

		}



		vma = i915_vma_instance(obj, vm, NULL);

		if (IS_ERR(vma)) {
@@ -1531,8 +1533,10 @@ static int igt_ppgtt_pin_update(void *arg) 
	}



	obj = i915_gem_object_create_internal(dev_priv, PAGE_SIZE);

	if (IS_ERR(obj))

		return PTR_ERR(obj);

	if (IS_ERR(obj)) {

		err = PTR_ERR(obj);

		goto out_vm;

	}



	vma = i915_vma_instance(obj, vm, NULL);

	if (IS_ERR(vma)) {

drivers/gpu/drm/i915/gt/intel_timeline.c

+2 −0
Original line number Diff line number Diff line
@@ -521,6 +521,8 @@ int intel_timeline_read_hwsp(struct i915_request *from, 


	rcu_read_lock();

	cl = rcu_dereference(from->hwsp_cacheline);

	if (i915_request_completed(from)) /* confirm cacheline is valid */

		goto unlock;

	if (unlikely(!i915_active_acquire_if_busy(&cl->active)))

		goto unlock; /* seqno wrapped and completed! */

	if (unlikely(i915_request_completed(from)))

drivers/gpu/drm/i915/i915_irq.c

+2 −4
Original line number Diff line number Diff line
@@ -3358,7 +3358,8 @@ static void gen8_de_irq_postinstall(struct drm_i915_private *dev_priv) 
{

	struct intel_uncore *uncore = &dev_priv->uncore;



	u32 de_pipe_masked = GEN8_PIPE_CDCLK_CRC_DONE;

	u32 de_pipe_masked = gen8_de_pipe_fault_mask(dev_priv) |

		GEN8_PIPE_CDCLK_CRC_DONE;

	u32 de_pipe_enables;

	u32 de_port_masked = GEN8_AUX_CHANNEL_A;

	u32 de_port_enables;
@@ -3369,13 +3370,10 @@ static void gen8_de_irq_postinstall(struct drm_i915_private *dev_priv) 
		de_misc_masked |= GEN8_DE_MISC_GSE;



	if (INTEL_GEN(dev_priv) >= 9) {

		de_pipe_masked |= GEN9_DE_PIPE_IRQ_FAULT_ERRORS;

		de_port_masked |= GEN9_AUX_CHANNEL_B | GEN9_AUX_CHANNEL_C |

				  GEN9_AUX_CHANNEL_D;

		if (IS_GEN9_LP(dev_priv))

			de_port_masked |= BXT_DE_PORT_GMBUS;

	} else {

		de_pipe_masked |= GEN8_DE_PIPE_IRQ_FAULT_ERRORS;

	}



	if (INTEL_GEN(dev_priv) >= 11)

drivers/gpu/drm/i915/i915_vma.c

+6 −4
Original line number Diff line number Diff line
@@ -158,16 +158,18 @@ vma_create(struct drm_i915_gem_object *obj, 


	GEM_BUG_ON(!IS_ALIGNED(vma->size, I915_GTT_PAGE_SIZE));



	spin_lock(&obj->vma.lock);



	if (i915_is_ggtt(vm)) {

		if (unlikely(overflows_type(vma->size, u32)))

			goto err_vma;

			goto err_unlock;



		vma->fence_size = i915_gem_fence_size(vm->i915, vma->size,

						      i915_gem_object_get_tiling(obj),

						      i915_gem_object_get_stride(obj));

		if (unlikely(vma->fence_size < vma->size || /* overflow */

			     vma->fence_size > vm->total))

			goto err_vma;

			goto err_unlock;



		GEM_BUG_ON(!IS_ALIGNED(vma->fence_size, I915_GTT_MIN_ALIGNMENT));
@@ -179,8 +181,6 @@ vma_create(struct drm_i915_gem_object *obj, 
		__set_bit(I915_VMA_GGTT_BIT, __i915_vma_flags(vma));

	}



	spin_lock(&obj->vma.lock);



	rb = NULL;

	p = &obj->vma.tree.rb_node;

	while (*p) {
@@ -225,6 +225,8 @@ vma_create(struct drm_i915_gem_object *obj, 


	return vma;



err_unlock:

	spin_unlock(&obj->vma.lock);

err_vma:

	i915_vma_free(vma);

	return ERR_PTR(-E2BIG);

CRA Git | Maintained and supported by SUSTech CRA and CCSE