Merge tag 'drm-intel-next-fixes-2019-05-02' of... (9f17847d) · Commits · 戴 / test

Merge tag 'drm-intel-next-fixes-2019-05-02' of git://anongit.freedesktop.org/drm/drm-intel into drm-next - Whitelist a register to avoid media driver from hanging Signed-off-by:

Dave Airlie <airlied@redhat.com> From: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20190502134015.GA22891@jlahtine-desk.ger.corp.intel.com

drivers/gpu/drm/i915/intel_workarounds.c

+3 −4

Original line number	Diff line number	Diff line
		@@ -541,10 +541,6 @@ static void icl_ctx_workarounds_init(struct intel_engine_cs *engine)
		WA_SET_BIT_MASKED(GEN7_ROW_CHICKEN2,
		GEN11_TDL_CLOCK_GATING_FIX_DISABLE);

		/* WaEnableStateCacheRedirectToCS:icl */
		WA_SET_BIT_MASKED(GEN9_SLICE_COMMON_ECO_CHICKEN1,
		GEN11_STATE_CACHE_REDIRECT_TO_CS);

		/* Wa_2006665173:icl (pre-prod) */
		if (IS_ICL_REVID(i915, ICL_REVID_A0, ICL_REVID_A0))
		WA_SET_BIT_MASKED(GEN11_COMMON_SLICE_CHICKEN3,
		@@ -1050,6 +1046,9 @@ static void icl_whitelist_build(struct i915_wa_list *w)

		/* WaAllowUMDToModifySamplerMode:icl */
		whitelist_reg(w, GEN10_SAMPLER_MODE);

		/* WaEnableStateCacheRedirectToCS:icl */
		whitelist_reg(w, GEN9_SLICE_COMMON_ECO_CHICKEN1);
		}

		void intel_engine_init_whitelist(struct intel_engine_cs *engine)

Admin message