drm/i915: make find_fw_domain work on intel_uncore (cb7ee690) · Commits · 戴 / test

drivers/gpu/drm/i915/intel_uncore.c

+10 −10

Original line number	Diff line number	Diff line
		@@ -835,13 +835,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)
		@@ -853,11 +853,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;
		}
		@@ -885,7 +885,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; \
		})

		@@ -893,7 +893,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; \
		})

		@@ -979,7 +979,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; \
		})

		@@ -987,7 +987,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; \
		})

Admin message