All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Ville Syrjälä" <ville.syrjala@linux.intel.com>
To: "Kamble, Sagar A" <sagar.a.kamble@intel.com>
Cc: intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH 4/5] drm/i915: Use only blitter forcewake
Date: Fri, 11 Sep 2015 17:02:59 +0300	[thread overview]
Message-ID: <20150911140259.GL26517@intel.com> (raw)
In-Reply-To: <55F2DD17.3070800@intel.com>

On Fri, Sep 11, 2015 at 07:24:31PM +0530, Kamble, Sagar A wrote:
> 
> 
> On 9/11/2015 7:07 PM, Ville Syrjälä wrote:
> > On Sun, Aug 23, 2015 at 05:52:50PM +0530, Sagar Arun Kamble wrote:
> >> Coarse power gating is disabled prior to BXT B0 and till SKL E0,
> >> hence even for render and media well registers blitter forcewake request
> >> need to be used.
> >>
> >> Change-Id: Ibfa8abf02b4d27ca1fcd68fc9e98c2daade7c286
> >> Signed-off-by: Sagar Arun Kamble <sagar.a.kamble@intel.com>
> >> ---
> >>   drivers/gpu/drm/i915/i915_debugfs.c |  5 +++-
> >>   drivers/gpu/drm/i915/i915_drv.h     |  1 +
> >>   drivers/gpu/drm/i915/intel_uncore.c | 53 ++++++++++++++++++++++++++++++-------
> >>   3 files changed, 48 insertions(+), 11 deletions(-)
> >>
> >> diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
> >> index 7a28de5..8eea452 100644
> >> --- a/drivers/gpu/drm/i915/i915_debugfs.c
> >> +++ b/drivers/gpu/drm/i915/i915_debugfs.c
> >> @@ -1509,7 +1509,10 @@ static int gen6_drpc_info(struct seq_file *m)
> >>   	intel_runtime_pm_get(dev_priv);
> >>   
> >>   	spin_lock_irq(&dev_priv->uncore.lock);
> >> -	forcewake_count = dev_priv->uncore.fw_domain[FW_DOMAIN_ID_RENDER].wake_count;
> >> +	if (use_blitter_forcewake(dev))
> >> +		forcewake_count = dev_priv->uncore.fw_domain[FW_DOMAIN_ID_BLITTER].wake_count;
> >> +	else
> >> +		forcewake_count = dev_priv->uncore.fw_domain[FW_DOMAIN_ID_RENDER].wake_count;
> >>   	spin_unlock_irq(&dev_priv->uncore.lock);
> >>   
> >>   	if (forcewake_count) {
> >> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> >> index e0f3f05..c127175 100644
> >> --- a/drivers/gpu/drm/i915/i915_drv.h
> >> +++ b/drivers/gpu/drm/i915/i915_drv.h
> >> @@ -2691,6 +2691,7 @@ extern void intel_uncore_check_errors(struct drm_device *dev);
> >>   extern void intel_uncore_fini(struct drm_device *dev);
> >>   extern void intel_uncore_forcewake_reset(struct drm_device *dev, bool restore);
> >>   const char *intel_uncore_forcewake_domain_to_str(const enum forcewake_domain_id id);
> >> +bool use_blitter_forcewake(struct drm_device *dev);
> >>   void intel_uncore_forcewake_get(struct drm_i915_private *dev_priv,
> >>   				enum forcewake_domains domains);
> >>   void intel_uncore_forcewake_put(struct drm_i915_private *dev_priv,
> >> diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c
> >> index 2df03b1..b7b6612 100644
> >> --- a/drivers/gpu/drm/i915/intel_uncore.c
> >> +++ b/drivers/gpu/drm/i915/intel_uncore.c
> >> @@ -63,6 +63,19 @@ intel_uncore_forcewake_domain_to_str(const enum forcewake_domain_id id)
> >>   	return "unknown";
> >>   }
> >>   
> >> +bool use_blitter_forcewake(struct drm_device *dev)
> >> +{
> >> +	/*
> >> +	 * Due to WaRsDisableCoarsePowerGating, Only blitter forcewake need to
> >> +	 * be used on platforms previous to BXT B0 and until SKL E0.
> >> +	*/
> > You say only blitter forcewake need be used. OK, but how does that imply
> > that you need to grab the blitter forcewake for render/media wells as
> > well?
> Ok. I need to reword the commit message. Change is to grab blitter fw 
> for all register accesses in GT.

Where is that documented BTW? I couldn't find anything solid.

> >
> >> +	if ((IS_BROXTON(dev) && (INTEL_REVID(dev) < BXT_REVID_B0)) ||
> >> +		(IS_SKYLAKE(dev) && (INTEL_REVID(dev) <= SKL_REVID_E0)))
> >> +		return true;
> >> +	else
> >> +		return false;
> >> +}
> >> +
> >>   static void
> >>   assert_device_not_suspended(struct drm_i915_private *dev_priv)
> >>   {
> >> @@ -129,6 +142,9 @@ fw_domains_get(struct drm_i915_private *dev_priv, enum forcewake_domains fw_doma
> >>   	struct intel_uncore_forcewake_domain *d;
> >>   	enum forcewake_domain_id id;
> >>   
> >> +	WARN_ON(use_blitter_forcewake(dev_priv->dev) &&
> >> +			(fw_domains & ~FORCEWAKE_BLITTER));
> >> +
> >>   	for_each_fw_domain_mask(d, fw_domains, dev_priv, id) {
> >>   		fw_domain_wait_ack_clear(d);
> >>   		fw_domain_get(d);
> >> @@ -142,6 +158,9 @@ fw_domains_put(struct drm_i915_private *dev_priv, enum forcewake_domains fw_doma
> >>   	struct intel_uncore_forcewake_domain *d;
> >>   	enum forcewake_domain_id id;
> >>   
> >> +	WARN_ON(use_blitter_forcewake(dev_priv->dev) &&
> >> +			(fw_domains & ~FORCEWAKE_BLITTER));
> >> +
> >>   	for_each_fw_domain_mask(d, fw_domains, dev_priv, id) {
> >>   		fw_domain_put(d);
> >>   		fw_domain_posting_read(d);
> >> @@ -313,6 +332,11 @@ void intel_uncore_forcewake_reset(struct drm_device *dev, bool restore)
> >>   	if (fw)
> >>   		dev_priv->uncore.funcs.force_wake_put(dev_priv, fw);
> >>   
> >> +	if (use_blitter_forcewake(dev) && !restore) {
> >> +		__raw_i915_write32(dev_priv, FORCEWAKE_RENDER_GEN9, _MASKED_BIT_DISABLE(0xffff));
> >> +		__raw_i915_write32(dev_priv, FORCEWAKE_MEDIA_GEN9, _MASKED_BIT_DISABLE(0xffff));
> >> +	}
> >> +
> >>   	fw_domains_reset(dev_priv, FORCEWAKE_ALL);
> >>   
> >>   	if (restore) { /* If reset with a user forcewake, try to restore */
> >> @@ -780,8 +804,11 @@ gen9_read##x(struct drm_i915_private *dev_priv, off_t reg, bool trace) { \
> >>   		fw_engine = FORCEWAKE_RENDER | FORCEWAKE_MEDIA; \
> >>   	else \
> >>   		fw_engine = FORCEWAKE_BLITTER; \
> >> -	if (fw_engine) \
> >> +	if (fw_engine) { \
> >> +		if (use_blitter_forcewake(dev_priv->dev)) \
> >> +			fw_engine = FORCEWAKE_BLITTER; \
> >>   		__force_wake_get(dev_priv, fw_engine); \
> >> +	} \
> >>   	val = __raw_i915_read##x(dev_priv, reg); \
> >>   	GEN6_READ_FOOTER; \
> >>   }
> >> @@ -994,8 +1021,11 @@ gen9_write##x(struct drm_i915_private *dev_priv, off_t reg, u##x val, \
> >>   		fw_engine = FORCEWAKE_RENDER | FORCEWAKE_MEDIA; \
> >>   	else \
> >>   		fw_engine = FORCEWAKE_BLITTER; \
> >> -	if (fw_engine) \
> >> +	if (fw_engine) { \
> >> +		if (use_blitter_forcewake(dev_priv->dev)) \
> >> +			fw_engine = FORCEWAKE_BLITTER; \
> >>   		__force_wake_get(dev_priv, fw_engine); \
> >> +	} \
> >>   	__raw_i915_write##x(dev_priv, reg, val); \
> >>   	GEN6_WRITE_FOOTER; \
> >>   }
> >> @@ -1106,14 +1136,17 @@ static void intel_uncore_fw_domains_init(struct drm_device *dev)
> >>   	if (IS_GEN9(dev)) {
> >>   		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,
> >> -			       FORCEWAKE_RENDER_GEN9,
> >> -			       FORCEWAKE_ACK_RENDER_GEN9);
> >> -		fw_domain_init(dev_priv, FW_DOMAIN_ID_BLITTER,
> >> -			       FORCEWAKE_BLITTER_GEN9,
> >> -			       FORCEWAKE_ACK_BLITTER_GEN9);
> >> -		fw_domain_init(dev_priv, FW_DOMAIN_ID_MEDIA,
> >> -			       FORCEWAKE_MEDIA_GEN9, FORCEWAKE_ACK_MEDIA_GEN9);
> >> +		if (!use_blitter_forcewake(dev)) {
> >> +			fw_domain_init(dev_priv, FW_DOMAIN_ID_RENDER,
> >> +					FORCEWAKE_RENDER_GEN9,
> >> +					FORCEWAKE_ACK_RENDER_GEN9);
> >> +			fw_domain_init(dev_priv, FW_DOMAIN_ID_MEDIA,
> >> +					FORCEWAKE_MEDIA_GEN9,
> >> +					FORCEWAKE_ACK_MEDIA_GEN9);
> >> +		}
> >> +                fw_domain_init(dev_priv, FW_DOMAIN_ID_BLITTER,
> >> +                               FORCEWAKE_BLITTER_GEN9,
> >> +                               FORCEWAKE_ACK_BLITTER_GEN9);
> >>   	} else if (IS_VALLEYVIEW(dev)) {
> >>   		dev_priv->uncore.funcs.force_wake_get = fw_domains_get;
> >>   		if (!IS_CHERRYVIEW(dev))
> >> -- 
> >> 1.9.1
> >>
> >> _______________________________________________
> >> Intel-gfx mailing list
> >> Intel-gfx@lists.freedesktop.org
> >> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Ville Syrjälä
Intel OTC
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

  reply	other threads:[~2015-09-11 14:03 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-08-23 12:22 [PATCH 0/5] RC6/Forcewake/Turbo related changes for Gen9 Sagar Arun Kamble
2015-08-23 12:22 ` [PATCH 1/5] drm/i915: Increase maximum polling time to 50ms for forcewake request/clear ack Sagar Arun Kamble
2015-08-26  9:26   ` Daniel Vetter
2015-09-22  9:06     ` Tvrtko Ursulin
2015-09-22  9:15       ` Chris Wilson
2015-09-22  9:48         ` Tvrtko Ursulin
2015-09-21 16:43   ` Yu Dai
2015-09-23  8:04     ` Daniel Vetter
2015-08-23 12:22 ` [PATCH 2/5] drm/i915/bxt: WaGsvDisableTurbo Sagar Arun Kamble
2015-09-11  6:23   ` Kamble, Sagar A
2015-09-11 12:24     ` Kamble, Sagar A
2015-09-21 16:43   ` Yu Dai
2015-09-23  7:46     ` Daniel Vetter
2015-08-23 12:22 ` [PATCH 3/5] drm/i915: WaRsDisableCoarsePowerGating Sagar Arun Kamble
2015-09-11  6:22   ` Kamble, Sagar A
2015-09-11  9:11     ` [PATCH 1/2] drm/i915: Add IS_SKL_GT3 and IS_SKL_GT4 macro Sagar Arun Kamble
2015-09-11  9:11       ` [PATCH 2/2] drm/i915: WaRsDisableCoarsePowerGating Sagar Arun Kamble
2015-09-11 11:46         ` [PATCH v2 1/1] " Sagar Arun Kamble
2015-09-21 16:43   ` [PATCH 3/5] " Yu Dai
2015-09-23  7:47     ` Daniel Vetter
2015-08-23 12:22 ` [PATCH 4/5] drm/i915: Use only blitter forcewake Sagar Arun Kamble
2015-08-23 12:30   ` Chris Wilson
2015-09-11 13:23     ` Kamble, Sagar A
2015-09-11 13:37   ` Ville Syrjälä
2015-09-11 13:54     ` Kamble, Sagar A
2015-09-11 14:02       ` Ville Syrjälä [this message]
2015-09-12 18:15         ` Kamble, Sagar A
2015-08-23 12:22 ` [PATCH 5/5] drm/i915: Notify Coarse Power Gating changes to GuC Sagar Arun Kamble
2015-08-27 19:55   ` O'Rourke, Tom
2015-09-11  6:16     ` Kamble, Sagar A
2015-09-11 17:17       ` Yu Dai

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20150911140259.GL26517@intel.com \
    --to=ville.syrjala@linux.intel.com \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=sagar.a.kamble@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.