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

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

Merge tag 'drm-intel-fixes-2018-12-12-1' of... 

Merge tag 'drm-intel-fixes-2018-12-12-1' of git://anongit.freedesktop.org/drm/drm-intel

 into drm-fixes

- Two fixes to avoid GPU hangs (on Braswell and Gen3)

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20181212134010.GA18900@jlahtine-desk.ger.corp.intel.com
parents 71fb5539 5b2e3120

drivers/gpu/drm/i915/i915_drv.h

+7 −0
Original line number Diff line number Diff line
@@ -2150,6 +2150,8 @@ struct drm_i915_private { 
		struct delayed_work idle_work;



		ktime_t last_init_time;



		struct i915_vma *scratch;

	} gt;



	/* perform PHY state sanity checks? */
@@ -3872,4 +3874,9 @@ static inline int intel_hws_csb_write_index(struct drm_i915_private *i915) 
		return I915_HWS_CSB_WRITE_INDEX;

}



static inline u32 i915_scratch_offset(const struct drm_i915_private *i915)

{

	return i915_ggtt_offset(i915->gt.scratch);

}



#endif

drivers/gpu/drm/i915/i915_gem.c

+49 −1
Original line number Diff line number Diff line
@@ -5500,6 +5500,44 @@ static int __intel_engines_record_defaults(struct drm_i915_private *i915) 
	goto out_ctx;

}



static int

i915_gem_init_scratch(struct drm_i915_private *i915, unsigned int size)

{

	struct drm_i915_gem_object *obj;

	struct i915_vma *vma;

	int ret;



	obj = i915_gem_object_create_stolen(i915, size);

	if (!obj)

		obj = i915_gem_object_create_internal(i915, size);

	if (IS_ERR(obj)) {

		DRM_ERROR("Failed to allocate scratch page\n");

		return PTR_ERR(obj);

	}



	vma = i915_vma_instance(obj, &i915->ggtt.vm, NULL);

	if (IS_ERR(vma)) {

		ret = PTR_ERR(vma);

		goto err_unref;

	}



	ret = i915_vma_pin(vma, 0, 0, PIN_GLOBAL | PIN_HIGH);

	if (ret)

		goto err_unref;



	i915->gt.scratch = vma;

	return 0;



err_unref:

	i915_gem_object_put(obj);

	return ret;

}



static void i915_gem_fini_scratch(struct drm_i915_private *i915)

{

	i915_vma_unpin_and_release(&i915->gt.scratch, 0);

}



int i915_gem_init(struct drm_i915_private *dev_priv)

{

	int ret;
@@ -5546,12 +5584,19 @@ int i915_gem_init(struct drm_i915_private *dev_priv) 
		goto err_unlock;

	}



	ret = i915_gem_contexts_init(dev_priv);

	ret = i915_gem_init_scratch(dev_priv,

				    IS_GEN2(dev_priv) ? SZ_256K : PAGE_SIZE);

	if (ret) {

		GEM_BUG_ON(ret == -EIO);

		goto err_ggtt;

	}



	ret = i915_gem_contexts_init(dev_priv);

	if (ret) {

		GEM_BUG_ON(ret == -EIO);

		goto err_scratch;

	}



	ret = intel_engines_init(dev_priv);

	if (ret) {

		GEM_BUG_ON(ret == -EIO);
@@ -5624,6 +5669,8 @@ int i915_gem_init(struct drm_i915_private *dev_priv) 
err_context:

	if (ret != -EIO)

		i915_gem_contexts_fini(dev_priv);

err_scratch:

	i915_gem_fini_scratch(dev_priv);

err_ggtt:

err_unlock:

	intel_uncore_forcewake_put(dev_priv, FORCEWAKE_ALL);
@@ -5675,6 +5722,7 @@ void i915_gem_fini(struct drm_i915_private *dev_priv) 
	intel_uc_fini(dev_priv);

	i915_gem_cleanup_engines(dev_priv);

	i915_gem_contexts_fini(dev_priv);

	i915_gem_fini_scratch(dev_priv);

	mutex_unlock(&dev_priv->drm.struct_mutex);



	intel_wa_list_free(&dev_priv->gt_wa_list);

drivers/gpu/drm/i915/i915_gem_execbuffer.c

+1 −6
Original line number Diff line number Diff line
@@ -1268,7 +1268,7 @@ relocate_entry(struct i915_vma *vma, 
		else if (gen >= 4)

			len = 4;

		else

			len = 6;

			len = 3;



		batch = reloc_gpu(eb, vma, len);

		if (IS_ERR(batch))
@@ -1309,11 +1309,6 @@ relocate_entry(struct i915_vma *vma, 
			*batch++ = MI_STORE_DWORD_IMM | MI_MEM_VIRTUAL;

			*batch++ = addr;

			*batch++ = target_offset;



			/* And again for good measure (blb/pnv) */

			*batch++ = MI_STORE_DWORD_IMM | MI_MEM_VIRTUAL;

			*batch++ = addr;

			*batch++ = target_offset;

		}



		goto out;

drivers/gpu/drm/i915/i915_gpu_error.c

+1 −1
Original line number Diff line number Diff line
@@ -1495,7 +1495,7 @@ static void gem_record_rings(struct i915_gpu_state *error) 
			if (HAS_BROKEN_CS_TLB(i915))

				ee->wa_batchbuffer =

					i915_error_object_create(i915,

								 engine->scratch);

								 i915->gt.scratch);

			request_record_user_bo(request, ee);



			ee->ctx =

drivers/gpu/drm/i915/intel_engine_cs.c

+0 −42
Original line number Diff line number Diff line
@@ -490,46 +490,6 @@ void intel_engine_setup_common(struct intel_engine_cs *engine) 
	intel_engine_init_cmd_parser(engine);

}



int intel_engine_create_scratch(struct intel_engine_cs *engine,

				unsigned int size)

{

	struct drm_i915_gem_object *obj;

	struct i915_vma *vma;

	int ret;



	WARN_ON(engine->scratch);



	obj = i915_gem_object_create_stolen(engine->i915, size);

	if (!obj)

		obj = i915_gem_object_create_internal(engine->i915, size);

	if (IS_ERR(obj)) {

		DRM_ERROR("Failed to allocate scratch page\n");

		return PTR_ERR(obj);

	}



	vma = i915_vma_instance(obj, &engine->i915->ggtt.vm, NULL);

	if (IS_ERR(vma)) {

		ret = PTR_ERR(vma);

		goto err_unref;

	}



	ret = i915_vma_pin(vma, 0, 0, PIN_GLOBAL | PIN_HIGH);

	if (ret)

		goto err_unref;



	engine->scratch = vma;

	return 0;



err_unref:

	i915_gem_object_put(obj);

	return ret;

}



void intel_engine_cleanup_scratch(struct intel_engine_cs *engine)

{

	i915_vma_unpin_and_release(&engine->scratch, 0);

}



static void cleanup_status_page(struct intel_engine_cs *engine)

{

	if (HWS_NEEDS_PHYSICAL(engine->i915)) {
@@ -704,8 +664,6 @@ void intel_engine_cleanup_common(struct intel_engine_cs *engine) 
{

	struct drm_i915_private *i915 = engine->i915;



	intel_engine_cleanup_scratch(engine);



	cleanup_status_page(engine);



	intel_engine_fini_breadcrumbs(engine);