From: Ben Widawsky <ben@bwidawsk.net>
To: Jani Nikula <jani.nikula@linux.intel.com>,
Mika Kuoppala <mika.kuoppala@intel.com>
Cc: Intel GFX <intel-gfx@lists.freedesktop.org>,
Eero Tamminen <eero.t.tamminen@intel.com>
Subject: Re: [PATCH] drm/i915/skl: Update eDRAM calculation
Date: Thu, 14 Apr 2016 07:50:37 -0700 [thread overview]
Message-ID: <20160414145036.GA19132@mail.bwidawsk.net> (raw)
In-Reply-To: <20160414144812.GA18872@mail.bwidawsk.net>
On Thu, Apr 14, 2016 at 07:48:13AM -0700, Ben Widawsky wrote:
> On Thu, Apr 14, 2016 at 11:14:48AM +0300, Jani Nikula wrote:
> > On Thu, 14 Apr 2016, Jani Nikula <jani.nikula@linux.intel.com> wrote:
> > > On Wed, 13 Apr 2016, Ben Widawsky <ben@bwidawsk.net> wrote:
> > >> The two behavioral changes here are the correct detection of the eDRAM size on
> > >> gen9 (SKL + KBL), and unconditional printing of the eLLC size.
> > >>
> > >> Cc: Eero Tamminen <eero.t.tamminen@intel.com>
> > >> Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
> > >
> > > Please see [1].
> > >
> > > BR,
> > > Jani.
> > >
> > >
> > > [1] http://patchwork.freedesktop.org/patch/msgid/1460557604-7126-3-git-send-email-mika.kuoppala@intel.com
> >
> > I did mean to refer to the entire series
> >
> > https://patchwork.freedesktop.org/series/5663/
> >
> >
>
> My patch is more correct as it does the proper calculation.
>
Oh. He did it as two patches with the first claiming we can't make the
calculation... that was odd.
Anyway, assuming it does the right thing patches 2, and 3 are:
Acked-by: Ben Widawsky <ben@bwidawsk.net>
> > >
> > >
> > >> ---
> > >> drivers/gpu/drm/i915/intel_uncore.c | 16 +++++++++++++---
> > >> 1 file changed, 13 insertions(+), 3 deletions(-)
> > >>
> > >> diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c
> > >> index fbc1d21..efef724 100644
> > >> --- a/drivers/gpu/drm/i915/intel_uncore.c
> > >> +++ b/drivers/gpu/drm/i915/intel_uncore.c
> > >> @@ -314,8 +314,17 @@ static void intel_uncore_ellc_detect(struct drm_device *dev)
> > >> {
> > >> struct drm_i915_private *dev_priv = dev->dev_private;
> > >>
> > >> - if ((IS_HASWELL(dev) || IS_BROADWELL(dev) ||
> > >> - INTEL_INFO(dev)->gen >= 9) &&
> > >> + if (INTEL_INFO(dev)->gen >= 9 && HAS_LLC(dev)) {
> > >> + u32 edramcap = __raw_i915_read32(dev_priv, HSW_EDRAM_PRESENT);
> > >> + if (edramcap & EDRAM_ENABLED) {
> > >> + int sets = (edramcap >> 8) & 0x3;
> > >> + int ways = (edramcap >> 5) & 0x7;
> > >> + int banks = (edramcap >> 1) & 0xf;
> > >> +
> > >> + ways = (ways + 1) * 4;
> > >> + dev_priv->ellc_size = sets * ways * banks;
> > >> + }
> > >> + } else if ((IS_HASWELL(dev) || IS_BROADWELL(dev)) &&
> > >> (__raw_i915_read32(dev_priv, HSW_EDRAM_PRESENT) & EDRAM_ENABLED)) {
> > >> /* The docs do not explain exactly how the calculation can be
> > >> * made. It is somewhat guessable, but for now, it's always
> > >> @@ -323,8 +332,9 @@ static void intel_uncore_ellc_detect(struct drm_device *dev)
> > >> * NB: We can't write IDICR yet because we do not have gt funcs
> > >> * set up */
> > >> dev_priv->ellc_size = 128;
> > >> - DRM_INFO("Found %zuMB of eLLC\n", dev_priv->ellc_size);
> > >> }
> > >> +
> > >> + DRM_INFO("Found %zuMB of eLLC\n", dev_priv->ellc_size);
> > >> }
> > >>
> > >> static bool
> >
> > --
> > Jani Nikula, Intel Open Source Technology Center
_______________________________________________
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-14 14:50 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-13 15:52 [PATCH] drm/i915/skl: Update eDRAM calculation Ben Widawsky
2016-04-14 8:13 ` Jani Nikula
2016-04-14 8:14 ` Jani Nikula
2016-04-14 14:48 ` Ben Widawsky
2016-04-14 14:50 ` Ben Widawsky [this message]
2016-04-15 7:23 ` Mika Kuoppala
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=20160414145036.GA19132@mail.bwidawsk.net \
--to=ben@bwidawsk.net \
--cc=eero.t.tamminen@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=jani.nikula@linux.intel.com \
--cc=mika.kuoppala@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.