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

Commit f0d7f98f authored by Daniele Ceraolo Spurio's avatar Daniele Ceraolo Spurio Committed by Greg Kroah-Hartman
Browse files

drm/i915: make find_fw_domain work on intel_uncore 



[ Upstream commit cb7ee69015aaba5e1091af94e73bc72483c08e37 ]

Remove unneeded usage of dev_priv from 1 extra function.

Signed-off-by: default avatarDaniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
Reviewed-by: default avatarPaulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20190319183543.13679-6-daniele.ceraolospurio@intel.com


Stable-dep-of: 0ec986ed7bab ("tcp: fix incorrect undo caused by DSACK of TLP retransmit")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent de9d81da

drivers/gpu/drm/i915/intel_uncore.c

+10 −10
Original line number Diff line number Diff line
@@ -836,13 +836,13 @@ static int fw_range_cmp(u32 offset, const struct intel_forcewake_range *entry) 
})



static enum forcewake_domains

find_fw_domain(struct drm_i915_private *dev_priv, u32 offset)

find_fw_domain(struct intel_uncore *uncore, u32 offset)

{

	const struct intel_forcewake_range *entry;



	entry = BSEARCH(offset,

			dev_priv->uncore.fw_domains_table,

			dev_priv->uncore.fw_domains_table_entries,

			uncore->fw_domains_table,

			uncore->fw_domains_table_entries,

			fw_range_cmp);



	if (!entry)
@@ -854,11 +854,11 @@ find_fw_domain(struct drm_i915_private *dev_priv, u32 offset) 
	 * translate it here to the list of available domains.

	 */

	if (entry->domains == FORCEWAKE_ALL)

		return dev_priv->uncore.fw_domains;

		return uncore->fw_domains;



	WARN(entry->domains & ~dev_priv->uncore.fw_domains,

	WARN(entry->domains & ~uncore->fw_domains,

	     "Uninitialized forcewake domain(s) 0x%x accessed at 0x%x\n",

	     entry->domains & ~dev_priv->uncore.fw_domains, offset);

	     entry->domains & ~uncore->fw_domains, offset);



	return entry->domains;

}
@@ -886,7 +886,7 @@ static const struct intel_forcewake_range __vlv_fw_ranges[] = { 
({ \

	enum forcewake_domains __fwd = 0; \

	if (NEEDS_FORCE_WAKE((offset))) \

		__fwd = find_fw_domain(dev_priv, offset); \

		__fwd = find_fw_domain(&dev_priv->uncore, offset); \

	__fwd; \

})
@@ -894,7 +894,7 @@ static const struct intel_forcewake_range __vlv_fw_ranges[] = { 
({ \

	enum forcewake_domains __fwd = 0; \

	if (GEN11_NEEDS_FORCE_WAKE((offset))) \

		__fwd = find_fw_domain(dev_priv, offset); \

		__fwd = find_fw_domain(&dev_priv->uncore, offset); \

	__fwd; \

})
@@ -980,7 +980,7 @@ static const struct intel_forcewake_range __chv_fw_ranges[] = { 
({ \

	enum forcewake_domains __fwd = 0; \

	if (NEEDS_FORCE_WAKE((offset)) && !is_gen8_shadowed(offset)) \

		__fwd = find_fw_domain(dev_priv, offset); \

		__fwd = find_fw_domain(&dev_priv->uncore, offset); \

	__fwd; \

})
@@ -988,7 +988,7 @@ static const struct intel_forcewake_range __chv_fw_ranges[] = { 
({ \

	enum forcewake_domains __fwd = 0; \

	if (GEN11_NEEDS_FORCE_WAKE((offset)) && !is_gen11_shadowed(offset)) \

		__fwd = find_fw_domain(dev_priv, offset); \

		__fwd = find_fw_domain(&dev_priv->uncore, offset); \

	__fwd; \

})