From: Jani Nikula <jani.nikula@linux.intel.com>
To: Intel GFX <intel-gfx@lists.freedesktop.org>
Cc: Ben Widawsky <ben@bwidawsk.net>,
Ben Widawsky <benjamin.widawsky@intel.com>
Subject: Re: [PATCH] [trivial] drm/i915: Convert straggling MCHBAR registers
Date: Wed, 23 Oct 2013 09:54:41 +0300 [thread overview]
Message-ID: <87vc0o79zi.fsf@intel.com> (raw)
In-Reply-To: <1382504709-1158-1-git-send-email-benjamin.widawsky@intel.com>
On Wed, 23 Oct 2013, Ben Widawsky <benjamin.widawsky@intel.com> wrote:
> All our registers which are written through the MCHBAR are defined
> descriptively as an offset to the MCHBAR. We had 3 outliers here.
> Convert these as well so all registers which are offsets are MCHBAR can
> be easily identified/found within the code.
>
> With this, convert DCLK to also follow this format.
>
> Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
> ---
> drivers/gpu/drm/i915/i915_reg.h | 8 ++++----
> drivers/gpu/drm/i915/intel_pm.c | 2 +-
> 2 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
> index 2b4f7b1..6c98238 100644
> --- a/drivers/gpu/drm/i915/i915_reg.h
> +++ b/drivers/gpu/drm/i915/i915_reg.h
> @@ -1480,7 +1480,7 @@
> #define MCHBAR_MIRROR_BASE_SNB 0x140000
>
> /* Memory controller frequency in MCHBAR for Haswell (possible SNB+) */
> -#define DCLK 0x5e04
> +#define DCLK (MCHBAR_MIRROR_BASE_SNB + 0x5e04)
>
> /** 915-945 and GM965 MCH register controlling DRAM channel access */
> #define DCC 0x10200
> @@ -1775,9 +1775,9 @@
> #define GEN6_GT_THREAD_STATUS_CORE_MASK 0x7
> #define GEN6_GT_THREAD_STATUS_CORE_MASK_HSW (0x7 | (0x07 << 16))
>
> -#define GEN6_GT_PERF_STATUS 0x145948
> -#define GEN6_RP_STATE_LIMITS 0x145994
> -#define GEN6_RP_STATE_CAP 0x145998
> +#define GEN6_GT_PERF_STATUS (MCHBAR_MIRROR_BASE_SNB + 0x5948)
> +#define GEN6_RP_STATE_LIMITS (MCHBAR_MIRROR_BASE_SNB + 0x5994)
> +#define GEN6_RP_STATE_CAP (MCHBAR_MIRROR_BASE_SNB + 0x5998)
>
> /*
> * Logical Context regs
> diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
> index 3e140ab..d4dd543 100644
> --- a/drivers/gpu/drm/i915/intel_pm.c
> +++ b/drivers/gpu/drm/i915/intel_pm.c
> @@ -3915,7 +3915,7 @@ void gen6_update_ring_freq(struct drm_device *dev)
> /* Convert from kHz to MHz */
> max_ia_freq /= 1000;
>
> - min_ring_freq = I915_READ(MCHBAR_MIRROR_BASE_SNB + DCLK) & 0xf;
> + min_ring_freq = I915_READ(DCLK) & 0xf;
> /* convert DDR frequency from units of 266.6MHz to bandwidth */
> min_ring_freq = mult_frac(min_ring_freq, 8, 3);
>
> --
> 1.8.4.1
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Jani Nikula, Intel Open Source Technology Center
next prev parent reply other threads:[~2013-10-23 6:53 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-23 5:05 [PATCH] [trivial] drm/i915: Convert straggling MCHBAR registers Ben Widawsky
2013-10-23 6:54 ` Jani Nikula [this message]
2013-10-27 13:39 ` Daniel Vetter
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=87vc0o79zi.fsf@intel.com \
--to=jani.nikula@linux.intel.com \
--cc=ben@bwidawsk.net \
--cc=benjamin.widawsky@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
/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