Attachment 112887 Details for Bug 88805 – drm/i915: Do uncore early sanitize after domain init

[patch] drm/i915: Do uncore early sanitize after domain init

0001-drm-i915-Do-uncore-early-sanitize-after-domain-init.patch (text/plain), 2.64 KB, created by Mika Kuoppala on 2015-01-27 17:01:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mika Kuoppala

Created: 2015-01-27 17:01:04 UTC

Size: 2.64 KB

patch

obsolete

>From 2114b6dbb82b69eba27df0d3d290cb0f920d831d Mon Sep 17 00:00:00 2001
>From: Mika Kuoppala <mika.kuoppala@intel.com>
>Date: Tue, 27 Jan 2015 18:03:21 +0200
>Subject: [PATCH 1/3] drm/i915: Do uncore early sanitize after domain init
>
>intel_uncore_early_sanitize() will reset the forcewake domains. However
>as we used to call this function early in the init, introduction of the
>forcewake domains accessors broke the reset functionality. This was due to
>the domains not being initialized when sanitize was called.
>
>Sanitize after all the domains have been initialized. On ivb we need
>special case as there we need early forcewake access to determine
>the final configuration for the forcewake domain.
>
>Reference: https://bugs.freedesktop.org/show_bug.cgi?id=88805
>Signed-off-by: Mika Kuoppala <mika.kuoppala@intel.com>
>---
> drivers/gpu/drm/i915/intel_uncore.c | 11 +++++++++--
> 1 file changed, 9 insertions(+), 2 deletions(-)
>
>diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c
>index b3951f2..c438ca4 100644
>--- a/drivers/gpu/drm/i915/intel_uncore.c
>+++ b/drivers/gpu/drm/i915/intel_uncore.c
>@@ -72,6 +72,7 @@ assert_device_not_suspended(struct drm_i915_private *dev_priv)
> static inline void
> fw_domain_reset(const struct intel_uncore_forcewake_domain *d)
> {
>+	WARN_ON(d->reg_set == 0);
> 	__raw_i915_write32(d->i915, d->reg_set, d->val_reset);
> }
> 
>@@ -166,6 +167,8 @@ fw_domains_reset(struct drm_i915_private *dev_priv, enum forcewake_domains fw_do
> 	struct intel_uncore_forcewake_domain *d;
> 	enum forcewake_domain_id id;
> 
>+	WARN_ON(dev_priv->uncore.fw_domains == 0);
>+
> 	for_each_fw_domain_mask(d, fw_domains, dev_priv, id)
> 		fw_domain_reset(d);
> 
>@@ -987,8 +990,7 @@ static void fw_domain_init(struct drm_i915_private *dev_priv,
> void intel_uncore_init(struct drm_device *dev)
> {
> 	struct drm_i915_private *dev_priv = dev->dev_private;
>-
>-	__intel_uncore_early_sanitize(dev, false);
>+	bool sanitize_done = false;
> 
> 	if (IS_GEN9(dev)) {
> 		dev_priv->uncore.funcs.force_wake_get = fw_domains_get;
>@@ -1037,6 +1039,8 @@ void intel_uncore_init(struct drm_device *dev)
> 
> 		fw_domain_init(dev_priv, FW_DOMAIN_ID_RENDER,
> 			       FORCEWAKE_MT, FORCEWAKE_MT_ACK);
>+		__intel_uncore_early_sanitize(dev, false);
>+		sanitize_done = true;
> 		mutex_lock(&dev->struct_mutex);
> 		fw_domains_get_with_thread_status(dev_priv, FORCEWAKE_ALL);
> 		ecobus = __raw_i915_read32(dev_priv, ECOBUS);
>@@ -1058,6 +1062,9 @@ void intel_uncore_init(struct drm_device *dev)
> 			       FORCEWAKE, FORCEWAKE_ACK);
> 	}
> 
>+	if (sanitize_done == false)
>+		__intel_uncore_early_sanitize(dev, false);
>+
> 	switch (INTEL_INFO(dev)->gen) {
> 	default:
> 		MISSING_CASE(INTEL_INFO(dev)->gen);
>-- 
>1.9.1
>

Actions: View | Splinter Review

Attachments on bug 88805: 112836 | 112887

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.