Commit 3d16ca58 authored by Rodrigo Vivi's avatar Rodrigo Vivi
Browse files

drm/i915/cnl: Add force wake for gen10+. 



By spec there is no change on force wake registers
for Cannonlake. Let's reuse gen9 one.

v2: Adding missing case for the write part. (Tvrtko)
v3: Rebase on recent tree.
v4: Make it for gen9+ instead adding gen10 only. (by Joonas).

Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1499302831-17773-1-git-send-email-rodrigo.vivi@intel.com
parent 2e1e9d48

drivers/gpu/drm/i915/intel_uncore.c

+2 −2
Original line number Diff line number Diff line
@@ -643,7 +643,7 @@ find_fw_domain(struct drm_i915_private *dev_priv, u32 offset) 
	{ .start = (s), .end = (e), .domains = (d) }



#define HAS_FWTABLE(dev_priv) \

	(IS_GEN9(dev_priv) || \

	(INTEL_GEN(dev_priv) >= 9 || \

	 IS_CHERRYVIEW(dev_priv) || \

	 IS_VALLEYVIEW(dev_priv))
@@ -1072,7 +1072,7 @@ static void intel_uncore_fw_domains_init(struct drm_i915_private *dev_priv) 
		dev_priv->uncore.fw_clear = _MASKED_BIT_DISABLE(FORCEWAKE_KERNEL);

	}



	if (IS_GEN9(dev_priv)) {

	if (INTEL_GEN(dev_priv) >= 9) {

		dev_priv->uncore.funcs.force_wake_get = fw_domains_get;

		dev_priv->uncore.funcs.force_wake_put = fw_domains_put;

		fw_domain_init(dev_priv, FW_DOMAIN_ID_RENDER,

CRA Git | Maintained and supported by SUSTech CRA and CCSE