From: Peter Antoine <peter.antoine@intel.com>
To: tom.orourke@intel.com
Cc: paulo.r.zanoni@intel.com, intel-gfx@lists.freedesktop.org,
jbarnes@virtuousgeek.org
Subject: Re: [PATCH 23/25] DO NOT MERGE: drm/i915: resize the GuC WOPCM for rc6
Date: Thu, 7 Apr 2016 07:33:26 +0100 (BST) [thread overview]
Message-ID: <alpine.DEB.2.10.1604070732510.8501@peterant-linux2> (raw)
In-Reply-To: <1459970683-97940-24-git-send-email-tom.orourke@intel.com>
Tom,
Might be worth taking the "Do Not Merge" message out.
Peter.
On Wed, 6 Apr 2016, tom.orourke@intel.com wrote:
> From: Peter Antoine <peter.antoine@intel.com>
>
> This patch resizes the GuC WOPCM to so that the GuC and the RC6 memory
> spaces do not overlap.
>
> DO NOT MERGE: This patch is expected as part of another
> series and is included for convenience in testing this
> series.
>
> Issue: https://jira01.devtools.intel.com/browse/VIZ-6638
> Signed-off-by: Peter Antoine <peter.antoine@intel.com>
> Signed-off-by: Jeff McGee <jeff.mcgee@intel.com>
> Acked-by: Tom O'Rourke <Tom.O'Rourke@intel.com>
> ---
> drivers/gpu/drm/i915/i915_guc_reg.h | 3 ++-
> drivers/gpu/drm/i915/intel_guc_loader.c | 6 +++++-
> 2 files changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_guc_reg.h b/drivers/gpu/drm/i915/i915_guc_reg.h
> index 80786d9..0a86599 100644
> --- a/drivers/gpu/drm/i915/i915_guc_reg.h
> +++ b/drivers/gpu/drm/i915/i915_guc_reg.h
> @@ -68,7 +68,8 @@
> #define GUC_MAX_IDLE_COUNT _MMIO(0xC3E4)
>
> #define GUC_WOPCM_SIZE _MMIO(0xc050)
> -#define GUC_WOPCM_SIZE_VALUE (0x80 << 12) /* 512KB */
> +#define GUC_WOPCM_SIZE_VALUE (0x80 << 12) /* 512KB */
> +#define BXT_GUC_WOPCM_SIZE_VALUE (0x70 << 12) /* 448KB */
>
> /* GuC addresses below GUC_WOPCM_TOP don't map through the GTT */
> #define GUC_WOPCM_TOP (GUC_WOPCM_SIZE_VALUE)
> diff --git a/drivers/gpu/drm/i915/intel_guc_loader.c b/drivers/gpu/drm/i915/intel_guc_loader.c
> index a46dd93..a9429d9 100644
> --- a/drivers/gpu/drm/i915/intel_guc_loader.c
> +++ b/drivers/gpu/drm/i915/intel_guc_loader.c
> @@ -343,7 +343,11 @@ static int guc_ucode_xfer(struct drm_i915_private *dev_priv)
> intel_uncore_forcewake_get(dev_priv, FORCEWAKE_ALL);
>
> /* init WOPCM */
> - I915_WRITE(GUC_WOPCM_SIZE, GUC_WOPCM_SIZE_VALUE);
> + if (IS_BROXTON(dev))
> + I915_WRITE(GUC_WOPCM_SIZE, BXT_GUC_WOPCM_SIZE_VALUE);
> + else
> + I915_WRITE(GUC_WOPCM_SIZE, GUC_WOPCM_SIZE_VALUE);
> +
> I915_WRITE(DMA_GUC_WOPCM_OFFSET, GUC_WOPCM_OFFSET_VALUE);
>
> /* Enable MIA caching. GuC clock gating is disabled. */
>
--
Peter Antoine (Android Graphics Driver Software Engineer)
---------------------------------------------------------------------
Intel Corporation (UK) Limited
Registered No. 1134945 (England)
Registered Office: Pipers Way, Swindon SN3 1RJ
VAT No: 860 2173 47
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2016-04-07 6:33 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-06 19:24 [PATCH v3 00/25] Add support for GuC-based SLPC tom.orourke
2016-04-06 19:24 ` [PATCH 01/25] drm/i915/slpc: Expose guc functions for use with SLPC tom.orourke
2016-04-06 19:24 ` [PATCH 02/25] drm/i915/slpc: Add has_slpc capability flag tom.orourke
2016-04-06 19:24 ` [PATCH 03/25] drm/i915/slpc: Add slpc_version_check tom.orourke
2016-04-06 19:24 ` [PATCH 04/25] drm/i915/slpc: Add enable_slpc module parameter tom.orourke
2016-04-06 19:24 ` [PATCH 05/25] drm/i915/slpc: Use intel_slpc_* functions if supported tom.orourke
2016-04-06 19:24 ` [PATCH 06/25] drm/i915/slpc: Enable SLPC in guc " tom.orourke
2016-04-06 19:24 ` [PATCH 07/25] drm/i915/slpc: If using SLPC, do not set frequency tom.orourke
2016-04-06 19:24 ` [PATCH 08/25] drm/i915/slpc: Allocate/Release/Initialize SLPC shared data tom.orourke
2016-04-06 19:24 ` [PATCH 09/25] drm/i915/slpc: Setup rps frequency values during SLPC init tom.orourke
2016-04-06 19:24 ` [PATCH 10/25] drm/i915/slpc: Update current requested frequency tom.orourke
2016-04-06 19:24 ` [PATCH 11/25] drm/i915/slpc: Send reset event tom.orourke
2016-04-06 19:24 ` [PATCH 12/25] drm/i915/slpc: Send shutdown event tom.orourke
2016-04-06 19:24 ` [PATCH 13/25] drm/i915/slpc: Add Display mode event related data structures tom.orourke
2016-04-06 19:24 ` [PATCH 14/25] drm/i915/slpc: Notification of Display mode change tom.orourke
2016-04-06 19:24 ` [PATCH 15/25] drm/i915/slpc: Notification of Refresh Rate change tom.orourke
2016-04-06 19:24 ` [PATCH 16/25] drm/i915/slpc: Add slpc_status enum values tom.orourke
2016-04-06 19:24 ` [PATCH 17/25] drm/i915/slpc: Add parameter unset/set/get functions tom.orourke
2016-04-06 19:24 ` [PATCH 18/25] drm/i915/slpc: Add slpc support for max/min freq tom.orourke
2016-04-06 19:37 ` Martin Peres
2016-04-06 19:24 ` [PATCH 19/25] drm/i915/slpc: Add enable/disable debugfs for slpc tom.orourke
2016-04-06 19:24 ` [PATCH 20/25] drm/i915/slpc: Add broxton support tom.orourke
2016-04-06 19:24 ` [PATCH 21/25] drm/i915/slpc: Add i915_slpc_info to debugfs tom.orourke
2016-04-06 19:24 ` [PATCH 22/25] DO NOT MERGE: drm/i915/bxt: Add Broxton to guc loader tom.orourke
2016-04-06 19:24 ` [PATCH 23/25] DO NOT MERGE: drm/i915: resize the GuC WOPCM for rc6 tom.orourke
2016-04-07 6:33 ` Peter Antoine [this message]
2016-04-06 19:24 ` [PATCH 24/25] DO NOT MERGE: drm/i915: Enable GuC submission, where supported tom.orourke
2016-04-06 19:24 ` [PATCH 25/25] DO NOT MERGE: drm/i915: Enable SLPC, " tom.orourke
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=alpine.DEB.2.10.1604070732510.8501@peterant-linux2 \
--to=peter.antoine@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=jbarnes@virtuousgeek.org \
--cc=paulo.r.zanoni@intel.com \
--cc=tom.orourke@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox