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

Commit 4f47c99a authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Jani Nikula
Browse files

drm/i915: Move WaBarrierPerformanceFixDisable:skl to skl code from chv code 



 commit 65ca7514
 Author: Damien Lespiau <damien.lespiau@intel.com>
 Date:   Mon Feb 9 19:33:22 2015 +0000

    drm/i915/skl: Implement WaBarrierPerformanceFixDisable

got misapplied and the code landed in chv_init_workarounds() instead of
the intended skl_init_workarounds(). Move it over to the right place.

Cc: Damien Lespiau <damien.lespiau@intel.com>
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarDamien Lespiau <damien.lespiau@intel.com>
Reviewed-by: default avatarBen Widawsky <ben@bwidawsk.net>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parent 77b64555

drivers/gpu/drm/i915/intel_ringbuffer.c

+7 −7
Original line number Diff line number Diff line
@@ -901,13 +901,6 @@ static int chv_init_workarounds(struct intel_engine_cs *ring) 
			    GEN6_WIZ_HASHING_MASK,

			    GEN6_WIZ_HASHING_16x4);



	if (INTEL_REVID(dev) == SKL_REVID_C0 ||

	    INTEL_REVID(dev) == SKL_REVID_D0)

		/* WaBarrierPerformanceFixDisable:skl */

		WA_SET_BIT_MASKED(HDC_CHICKEN0,

				  HDC_FENCE_DEST_SLM_DISABLE |

				  HDC_BARRIER_PERFORMANCE_DISABLE);



	return 0;

}
@@ -1024,6 +1017,13 @@ static int skl_init_workarounds(struct intel_engine_cs *ring) 
		WA_SET_BIT_MASKED(HIZ_CHICKEN,

				  BDW_HIZ_POWER_COMPILER_CLOCK_GATING_DISABLE);



	if (INTEL_REVID(dev) == SKL_REVID_C0 ||

	    INTEL_REVID(dev) == SKL_REVID_D0)

		/* WaBarrierPerformanceFixDisable:skl */

		WA_SET_BIT_MASKED(HDC_CHICKEN0,

				  HDC_FENCE_DEST_SLM_DISABLE |

				  HDC_BARRIER_PERFORMANCE_DISABLE);



	return skl_tune_iz_hashing(ring);

}