From: "Ville Syrjälä" <ville.syrjala@linux.intel.com>
To: "Siluvery, Arun" <arun.siluvery@linux.intel.com>
Cc: intel-gfx@lists.freedesktop.org, Rodrigo Vivi <rodrigo.vivi@intel.com>
Subject: Re: [PATCH] drm/i915: Skip Stolen Memory first page.
Date: Tue, 3 Feb 2015 19:40:21 +0200 [thread overview]
Message-ID: <20150203174021.GQ19354@intel.com> (raw)
In-Reply-To: <54D0F319.2070509@linux.intel.com>
On Tue, Feb 03, 2015 at 04:11:05PM +0000, Siluvery, Arun wrote:
> On 01/08/2014 17:34, Jesse Barnes wrote:
> > On Thu, 31 Jul 2014 12:08:20 -0700
> > Rodrigo Vivi <rodrigo.vivi@intel.com> wrote:
> >
> >> WA to skip the first page of stolen memory due to sporadic HW write on *CS Idle
> >>
> >> v2: Improve variable names and fix allocated size.
> >>
> >> Reviewed-by: Ben Widawsky <ben@bwidawsk.net>
> >> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> >> ---
> >> drivers/gpu/drm/i915/i915_gem_stolen.c | 15 ++++++++++-----
> >> 1 file changed, 10 insertions(+), 5 deletions(-)
> >>
> >> diff --git a/drivers/gpu/drm/i915/i915_gem_stolen.c b/drivers/gpu/drm/i915/i915_gem_stolen.c
> >> index 21c025a..82035b0 100644
> >> --- a/drivers/gpu/drm/i915/i915_gem_stolen.c
> >> +++ b/drivers/gpu/drm/i915/i915_gem_stolen.c
> >> @@ -289,7 +289,8 @@ void i915_gem_cleanup_stolen(struct drm_device *dev)
> >> int i915_gem_init_stolen(struct drm_device *dev)
> >> {
> >> struct drm_i915_private *dev_priv = dev->dev_private;
> >> - int bios_reserved = 0;
> >> + int start_rsvd = 0;
> >> + int end_rsvd = 0;
> >>
> >> #ifdef CONFIG_INTEL_IOMMU
> >> if (intel_iommu_gfx_mapped && INTEL_INFO(dev)->gen < 8) {
> >> @@ -308,15 +309,19 @@ int i915_gem_init_stolen(struct drm_device *dev)
> >> DRM_DEBUG_KMS("found %zd bytes of stolen memory at %08lx\n",
> >> dev_priv->gtt.stolen_size, dev_priv->mm.stolen_base);
> >>
> >> + /* WaSkipStolenMemoryFirstPage */
> >> + if (INTEL_INFO(dev)->gen >= 8)
> >> + start_rsvd = 4096;
> >> +
> >> if (IS_VALLEYVIEW(dev))
> >> - bios_reserved = 1024*1024; /* top 1M on VLV/BYT */
> >> + end_rsvd = 1024*1024; /* top 1M on VLV/BYT */
> >>
> >> - if (WARN_ON(bios_reserved > dev_priv->gtt.stolen_size))
> >> + if (WARN_ON((start_rsvd + end_rsvd) > dev_priv->gtt.stolen_size))
> >> return 0;
> >>
> >> /* Basic memrange allocator for stolen space */
> >> - drm_mm_init(&dev_priv->mm.stolen, 0, dev_priv->gtt.stolen_size -
> >> - bios_reserved);
> >> + drm_mm_init(&dev_priv->mm.stolen, start_rsvd,
> >> + dev_priv->gtt.stolen_size - start_rsvd - end_rsvd);
> >>
> >> return 0;
> >> }
> >
> > Beyond the fastboot stuff Ville has already mentioned, the early
> > allocation of the existing fb from stolen will prevent us from
> > clobbering the currently displayed buffer with the contents of the
> > ringbuffers and whatever else we allocate out of stolen at early boot.
> >
> > We might be able to avoid that by doing stolen allocations top down, or
> > by reserving the displayed fb even if we can't allocate an obj for it,
> > only freeing it after our first mode set.
> >
> > Can you file a bug or JIRA for that to make sure we don't lose track of
> > the fastboot & boot corruption issues after this fix lands?
>
> Reviving an old thread,
> Any particular reason why this patch is not merged to nightly?
> Is it known to cause any other regressions?
It breaks the BIOS fb takeover like I said several times.
If no one is willing to fix it properly I was thinking we might just
try to do the BIOS fb takeover, and if it succeeded we do nothing else,
otherwise we allocate an unused 1 page object to keep the rings/fbc
buffer/etc. away from the first page.
The first page corruption supposedly happens only when the CS is doing
stuff, so if the CS corrupts the fbcon a bit it's no big deal. And
since we don't accelerate the fbconf hooks the corruption shouldn't
really happen under normal conditions anyway. You could see it while
running some igts or something, but that's not a huge problem.
--
Ville Syrjälä
Intel OTC
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2015-02-03 17:40 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-30 17:47 [PATCH] drm/i915: Skip Stolen Memory first page Rodrigo Vivi
2014-07-31 3:57 ` Ben Widawsky
2014-07-31 5:57 ` Chris Wilson
2014-07-31 13:39 ` Ville Syrjälä
2014-07-31 19:08 ` Rodrigo Vivi
2014-08-01 16:34 ` Jesse Barnes
2015-02-03 16:11 ` Siluvery, Arun
2015-02-03 17:40 ` Ville Syrjälä [this message]
2015-02-03 19:24 ` 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=20150203174021.GQ19354@intel.com \
--to=ville.syrjala@linux.intel.com \
--cc=arun.siluvery@linux.intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=rodrigo.vivi@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