25 Apr, 2014
1 commit
-
In commit a51435a3137ad8ae75c288c39bd2d8b2696bae8f
Author: Naresh Kumar Kachhi
Date: Wed Mar 12 16:39:40 2014 +0530drm/i915: disable rings before HW status page setup
we reordered stopping the rings to do so before we set the HWS register.
However, there is an extra workaround for g45 to reset the rings twice,
and for consistency we should apply that workaround before setting the
HWS to be sure that the rings are truly stopped.Reference: http://lkml.kernel.org/r/20140423202248.GA3621@amd.pavel.ucw.cz
Tested-by: Pavel Machek
Cc: Naresh Kumar Kachhi
Signed-off-by: Chris Wilson
Reviewed-by: Jesse Barnes
Signed-off-by: Daniel Vetter
Signed-off-by: Jani Nikula
29 Mar, 2014
1 commit
-
As Broadwell has an increased virtual address size, it requires more
than 32 bits to store offsets into its address space. This includes the
debug registers to track the current HEAD of the individual rings, which
may be anywhere within the per-process address spaces. In order to find
the full location, we need to read the high bits from a second register.
We then also need to expand our storage to keep track of the larger
address.v2: Carefully read the two registers to catch wraparound between
the reads.
v3: Use a WARN_ON rather than loop indefinitely on an unstable
register read.Signed-off-by: Chris Wilson
Cc: Ben Widawsky
Cc: Timo Aaltonen
Cc: Tvrtko Ursulin
Reviewed-by: Ben Widawsky
[danvet: Drop spurious hunk which conflicted.]
Signed-off-by: Daniel Vetter
12 Mar, 2014
1 commit
-
make sure we wait for rings to become idle once they are
disabled. In case of timeout print an error messageSigned-off-by: Naresh Kumar Kachhi
[danvet: Frob patch as suggested by Chris.]
Reviewed-by: Chris Wilson
Signed-off-by: Daniel Vetter
11 Mar, 2014
1 commit
-
Linux 3.14-rc6
I need the hdmi/dvi-dual link fixes in 3.14 to avoid ugly conflicts
when merging Ville's new hdmi cloning support into my -next treeConflicts:
drivers/gpu/drm/i915/Makefile
drivers/gpu/drm/i915/intel_dp.cMakefile cleanup conflicts with an acpi build fix, intel_dp.c is
trivial.Signed-off-by: Daniel Vetter
08 Mar, 2014
1 commit
-
The command parser scans batch buffers submitted via execbuffer ioctls before
the driver submits them to hardware. At a high level, it looks for several
things:1) Commands which are explicitly defined as privileged or which should only be
used by the kernel driver. The parser generally rejects such commands, with
the provision that it may allow some from the drm master process.
2) Commands which access registers. To support correct/enhanced userspace
functionality, particularly certain OpenGL extensions, the parser provides a
whitelist of registers which userspace may safely access (for both normal and
drm master processes).
3) Commands which access privileged memory (i.e. GGTT, HWS page, etc). The
parser always rejects such commands.See the overview comment in the source for more details.
This patch only implements the logic. Subsequent patches will build the tables
that drive the parser.v2: Don't set the secure bit if the parser succeeds
Fail harder during init
Makefile cleanup
Kerneldoc cleanup
Clarify module param description
Convert ints to bools in a few places
Move client/subclient defs to i915_reg.h
Remove the bits_count fieldOTC-Tracker: AXIA-4631
Change-Id: I50b98c71c6655893291c78a2d1b8954577b37a30
Signed-off-by: Brad Volkin
Reviewed-by: Jani Nikula
[danvet: Appease checkpatch.]
Signed-off-by: Daniel Vetter
12 Feb, 2014
1 commit
-
intel_ring_cachline_align() emits MI_NOOPs until the ring tail is
aligned to a cacheline boundary.Cc: Bjoern C
Cc: Alexandru DAMIAN
Cc: Enrico Tagliavini
Suggested-by: Chris Wilson
Signed-off-by: Ville Syrjälä
Reviewed-by: Chris Wilson
Cc: stable@vger.kernel.org (prereq for the next patch)
Signed-off-by: Daniel Vetter
04 Feb, 2014
1 commit
-
With full ppgtt using acthd is not enough to find guilty
batch buffer. We get multiple false positives as acthd is
per vm.Instead of scanning which vm was running on a ring,
to find corressponding context, use a different, simpler,
strategy of finding batches that caused gpu hang:If hangcheck has declared ring to be hung, find first non complete
request on that ring and claim it was guilty.v2: Rebase
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=73652
Suggested-by: Chris Wilson
Signed-off-by: Mika Kuoppala
Reviewed-by: Ben Widawsky (v1)
Signed-off-by: Daniel Vetter
10 Sep, 2013
1 commit
-
Ignoring the legacy DRI1 code, and a couple of special cases (to be
discussed later), all access to the ring is mediated through requests.
The first write to a ring will grab a seqno and mark the ring as having
an outstanding_lazy_request. Either through explicitly adding a request
after an execbuffer or through an implicit wait (either by the CPU or by
a semaphore), that sequence of writes will be terminated with a request.
So we can ellide all the intervening writes to the tail register and
send the entire command stream to the GPU at once. This will reduce the
number of *serialising* writes to the tail register by a factor or 3-5
times (depending upon architecture and number of workarounds, context
switches, etc involved). This becomes even more noticeable when the
register write is overloaded with a number of debugging tools. The
astute reader will wonder if it is then possible to overflow the ring
with a single command. It is not. When we start a command sequence to
the ring, we check for available space and issue a wait in case we have
not. The ring wait will in this case be forced to flush the outstanding
register write and then poll the ACTHD for sufficient space to continue.The exception to the rule where everything is inside a request are a few
initialisation cases where we may want to write GPU commands via the CS
before userspace wakes up and page flips.Signed-off-by: Chris Wilson
Signed-off-by: Daniel Vetter
06 Sep, 2013
1 commit
-
Score and action reveals what all the rings were doing
and why hang was declared. Add idle state so that
we can distinguish between waiting and idle ring.v2: - add idle as a hangcheck action
- consensed hangcheck status to single line (Chris)
- mark active explicitly when we are making progress (Chris)Reviewed-by: Chris Wilson
Signed-off-by: Mika Kuoppala
Signed-off-by: Daniel Vetter
05 Sep, 2013
2 commits
-
It is possible for us to be forced to perform an allocation for the lazy
request whilst running the shrinker. This allocation may fail, leaving
us unable to reclaim any memory leading to premature OOM. A neat
solution to the problem is to preallocate the request at the same time
as acquiring the seqno for the ring transaction. This means that we can
report ENOMEM prior to touching the rings.Signed-off-by: Chris Wilson
Reviewed-by: Mika Kuoppala
Signed-off-by: Daniel Vetter -
Prior to preallocating an request for lazy emission, rename the existing
field to make way (and differentiate the seqno from the request struct).Signed-off-by: Chris Wilson
Reviewed-by: Mika Kuoppala
Signed-off-by: Daniel Vetter
04 Sep, 2013
1 commit
-
We now have more devices using ring->private than not, and they all want
the same structure. Worse, I would like to use a scratch page from
outside of intel_ringbuffer.c and so for convenience would like to reuse
ring->private. Embed the object into the struct intel_ringbuffer so that
we can keep the code clean.Signed-off-by: Chris Wilson
Signed-off-by: Daniel Vetter
23 Aug, 2013
1 commit
-
The code directly uses the registers and ring->mmio_base.
Signed-off-by: Damien Lespiau
Signed-off-by: Daniel Vetter
22 Aug, 2013
1 commit
-
The short lowercase names are bound to collide. The default warnings
don't even warn about shadowing.Signed-off-by: Jani Nikula
Reviewed-by: Chris Wilson
Signed-off-by: Daniel Vetter
11 Jul, 2013
2 commits
-
With the simplified locking there's no reason any more to keep the
refcounts seperate.v2: Readd the lost comment that ring->irq_refcount is protected by
dev_priv->irq_lock.Reviewed-by: Ben Widawsky
Signed-off-by: Daniel Vetter -
Now that the rps interrupt locking isn't clearly separated (at elast
conceptually) from all the other interrupt locking having a different
lock stopped making sense: It protects much more than just the rps
workqueue it started out with. But with the addition of VECS the
separation started to blurr and resulted in some more complex locking
for the ring interrupt refcount.With this we can (again) unifiy the ringbuffer irq refcounts without
causing a massive confusion, but that's for the next patch.v2: Explain better why the rps.lock once made sense and why no longer,
requested by Ben.Reviewed-by: Ben Widawsky
Signed-off-by: Daniel Vetter
13 Jun, 2013
1 commit
-
For guilty batchbuffer analysis later on when rings are reset,
store what state the ring was on when hang was declared.
This helps to weed out the waiting rings from the active ones.Signed-off-by: Mika Kuoppala
Reviewed-by: Chris Wilson
Acked-by: Ben Widawsky
Signed-off-by: Daniel Vetter
11 Jun, 2013
1 commit
-
If we detect a ring is in a valid wait for another, just let it be.
Eventually it will either begin to progress again, or the entire system
will come grinding to a halt and then hangcheck will fire as soon as the
deadlock is detected.This error was foretold by Ben in
commit 05407ff889ceebe383aa5907219f86582ef96b72
Author: Mika Kuoppala
Date: Thu May 30 09:04:29 2013 +0300drm/i915: detect hang using per ring hangcheck_score
"If ring B is waiting on ring A via semaphore, and ring A is making
progress, albeit slowly - the hangcheck will fire. The check will
determine that A is moving, however ring B will appear hung because
the ACTHD doesn't move. I honestly can't say if that's actually a
realistic problem to hit it probably implies the timeout value is too
low."v2: Make sure we don't even incur the KICK cost whilst waiting.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=65394
Signed-off-by: Chris Wilson
Cc: Mika Kuoppala
Cc: Ben Widawsky
Reviewed-by: Mika Kuoppala
Signed-off-by: Daniel Vetter
07 Jun, 2013
1 commit
-
This is required for tracking render damage for use with FBC and will be
used in subsequent patches.Signed-off-by: Chris Wilson
Reviewed-by: Rodrigo Vivi
Signed-off-by: Daniel Vetter
03 Jun, 2013
1 commit
-
Keep track of ring seqno progress and if there are no
progress detected, declare hang. Use actual head (acthd)
to distinguish between ring stuck and batchbuffer looping
situation. Stuck ring will be kicked to trigger progress.This commit adds a hard limit for batchbuffer completion time.
If batchbuffer completion time is more than 4.5 seconds,
the gpu will be declared hung.Review comment from Ben which nicely clarifies the semantic change:
"Maybe I'm just stating the functional changes of the patch, but in case
they were unintended here is what I see as potential issues:1. "If ring B is waiting on ring A via semaphore, and ring A is making
progress, albeit slowly - the hangcheck will fire. The check will
determine that A is moving, however ring B will appear hung because
the ACTHD doesn't move. I honestly can't say if that's actually a
realistic problem to hit it probably implies the timeout value is too
low.2. "There's also another corner case on the kick. If the seqno = 2
(though not stuck), and on the 3rd hangcheck, the ring is stuck, and
we try to kick it... we don't actually try to find out if the kick
helped"v2: use atchd to detect stuck ring from loop (Ben Widawsky)
v3: Use acthd to check when ring needs kicking.
Declare hang on third time in order to give time for
kick_ring to take effect.v4: Update commit msg
Signed-off-by: Mika Kuoppala
Reviewed-by: Ben Widawsky
[danvet: Paste in Ben's review comment.]
Signed-off-by: Daniel Vetter
01 Jun, 2013
7 commits
-
v2: Use the correct lock to protect PM interrupt regs, this was
accidentally lost from earlier (Haihao)
Fix return types (Ben)Reviewed-by: Damien Lespiau
Signed-off-by: Ben Widawsky
Signed-off-by: Daniel Vetter -
It's overkill on older gens, but it's useful for newer gens.
Reviewed-by: Damien Lespiau
Signed-off-by: Ben Widawsky
Signed-off-by: Daniel Vetter -
v2: Add set_seqno which didn't exist before rebase (Haihao)
Signed-off-by: Ben Widawsky
Reviewed-by: Damien Lespiau
Signed-off-by: Xiang, Haihao
Signed-off-by: Daniel Vetter -
The video enhancement command streamer is a new ring on HSW which does
what it sounds like it does. This patch provides the most minimal
inception of the ring.In order to support a new ring, we need to bump the number. The patch
may look trivial to the untrained eye, but bumping the number of rings
is a bit scary. As such the patch is not terribly useful by itself, but
a pretty nice place to find issues during a bisection.Reviewed-by: Damien Lespiau
Signed-off-by: Ben Widawsky
Signed-off-by: Daniel Vetter -
This replaces the existing MBOX update code with a more generalized
calculation for emitting mbox updates. We also create a sentinel for
doing the updates so we can more abstractly deal with the rings.When doing MBOX updates the code must be aware of the /other/ rings.
Until now the platforms which supported semaphores had a fixed number of
rings and so it made sense for the code to be very specialized
(hardcoded).The patch does contain a functional change, but should have no
behavioral changes.Signed-off-by: Ben Widawsky
Reviewed-by: Damien Lespiau
Signed-off-by: Daniel Vetter -
Semaphores are tied very closely to the rings in the GPU. Trivial patch
adds comments to the existing code so that when we add new rings we can
include comments there as well. It also helps distinguish the ring to
semaphore mailbox interactions by using the ringname in the semaphore
data structures.This patch should have no functional impact.
v2: The English parts (as opposed to register names) of the comments
were reversed. (Damien)Signed-off-by: Ben Widawsky
Reviewed-by: Damien Lespiau
Signed-off-by: Daniel Vetter -
Instead of relying in acthd, track ring seqno progression
to detect if ring has hung.v2: put hangcheck stuff inside struct (Chris Wilson)
v3: initialize hangcheck.seqno (Ben Widawsky)
Signed-off-by: Mika Kuoppala
Reviewed-by: Ben Widawsky
Signed-off-by: Daniel Vetter
06 May, 2013
1 commit
-
In order to be notified of when the context and all of its associated
objects is idle (for if the context maps to a ppgtt) we need a callback
from the retire handler. We can arrange this by using the kref_get/put
of the context for request tracking and by inserting a request to
demarque the switch away from the old context.[Ben: fixed minor error to patch compile, AND s/last_context/from/]
Signed-off-by: Ben Widawsky
Signed-off-by: Daniel Vetter
17 Jan, 2013
1 commit
-
…m-intel into drm-next
Daniel writes:
- seqno wrap fixes and debug infrastructure from Mika Kuoppala and Chris
Wilson
- some leftover kill-agp on gen6+ patches from Ben
- hotplug improvements from Damien
- clear fb when allocated from stolen, avoids dirt on the fbcon (Chris)
- Stolen mem support from Chris Wilson, one of the many steps to get to
real fastboot support.
- Some DDI code cleanups from Paulo.
- Some refactorings around lvds and dp code.
- some random little bits&pieces* tag 'drm-intel-next-2012-12-21' of git://people.freedesktop.org/~danvet/drm-intel: (93 commits)
drm/i915: Return the real error code from intel_set_mode()
drm/i915: Make GSM void
drm/i915: Move GSM mapping into dev_priv
drm/i915: Move even more gtt code to i915_gem_gtt
drm/i915: Make next_seqno debugs entry to use i915_gem_set_seqno
drm/i915: Introduce i915_gem_set_seqno()
drm/i915: Always clear semaphore mboxes on seqno wrap
drm/i915: Initialize hardware semaphore state on ring init
drm/i915: Introduce ring set_seqno
drm/i915: Missed conversion to gtt_pte_t
drm/i915: Bug on unsupported swizzled platforms
drm/i915: BUG() if fences are used on unsupported platform
drm/i915: fixup overlay stolen memory leak
drm/i915: clean up PIPECONF bpc #defines
drm/i915: add intel_dp_set_signal_levels
drm/i915: remove leftover display.update_wm assignment
drm/i915: check for the PCH when setting pch_transcoder
drm/i915: Clear the stolen fb before enabling
drm/i915: Access to snooped system memory through the GTT is incoherent
drm/i915: Remove stale comment about intel_dp_detect()
...Conflicts:
drivers/gpu/drm/i915/intel_display.c
19 Dec, 2012
2 commits
-
Hardware status page needs to have proper seqno set
as our initial seqno can be arbitrary. If initial seqno is close
to wrap boundary on init and i915_seqno_passed() (31bit space)
refers to hw status page which contains zero, errorneous result
will be returned.v2: clear mboxes and set hws page directly instead of going
through rings. Suggested by Chris Wilson.v3: hws needs to be updated for all gens. Noticed by Chris
Wilson.References: https://bugs.freedesktop.org/show_bug.cgi?id=58230
Signed-off-by: Mika Kuoppala
Reviewed-by: Chris Wilson
Signed-off-by: Daniel Vetter -
In preparation for setting per ring initial seqno values
add ring::set_seqno().Signed-off-by: Mika Kuoppala
Reviewed-by: Chris Wilson
Signed-off-by: Daniel Vetter
18 Dec, 2012
1 commit
-
Now that Chris Wilson demonstrated that the key for stability on early
gen 2 is to simple _never_ exchange the physical backing storage of
batch buffers I've tried a stab at a kernel solution. Doesn't look too
nefarious imho, now that I don't try to be too clever for my own good
any more.v2: After discussing the various techniques, we've decided to always blit
batches on the suspect devices, but allow userspace to opt out of the
kernel workaround assume full responsibility for providing coherent
batches. The principal reason is that avoiding the blit does improve
performance in a few key microbenchmarks and also in cairo-trace
replays.Signed-Off-by: Daniel Vetter
Signed-off-by: Chris Wilson
[danvet:
- Drop the hunk which uses HAS_BROKEN_CS_TLB to implement the ring
wrap w/a. Suggested by Chris Wilson.
- Also add the ACTHD check from Chris Wilson for the error state
dumping, so that we still catch batches when userspace opts out of
the w/a.]
Signed-off-by: Daniel Vetter
06 Dec, 2012
1 commit
-
If there are pre-wrap values in semaphore-mbox registers after wrap,
syncing against some after-wrap request will complete immediately.
Fix this by emitting ring commands to set mbox registers to zero
when the wrap happens.v2: Use __intel_ring_begin to emit ring commands, from
Chris Wilson.Signed-off-by: Mika Kuoppala
Reviewed-by: Chris Wilson
[danvet: Add a small comment to handle_seqno_wrap.]
Signed-off-by: Daniel Vetter
04 Dec, 2012
1 commit
-
From BSpec:
"If the Ring Buffer Head Pointer and the Tail Pointer are on the same
cacheline, the Head Pointer must not be greater than the Tail
Pointer."The easiest way to enforce this is to reduce the reported ring space.
References:
Gen2 BSpec "1. Programming Environment" / 1.4.4.6 "Ring Buffer Use"
Gen3 BSpec "vol1c Memory Interface Functions" / 2.3.4.5 "Ring Buffer Use"
Gen4+ BSpec "vol1c Memory Interface and Command Stream" / 5.3.4.5 "Ring Buffer Use"v2: Include the exact BSpec references in the description
v3: s/64/I915_RING_FREE_SPACE, and add the BSpec information to the code
Signed-off-by: Ville Syrjälä
Reviewed-by: Chris Wilson
Signed-off-by: Daniel Vetter
29 Nov, 2012
2 commits
-
Replace the wait for the ring to be clear with the more common wait for
the ring to be idle. The principle advantage is one less exported
intel_ring_wait function, and the removal of a hardcoded value.Signed-off-by: Chris Wilson
Reviewed-by: Mika Kuoppala
Signed-off-by: Daniel Vetter -
Based on the work by Mika Kuoppala, we realised that we need to handle
seqno wraparound prior to committing our changes to the ring. The most
obvious point then is to grab the seqno inside intel_ring_begin(), and
then to reuse that seqno for all ring operations until the next request.
As intel_ring_begin() can fail, the callers must already be prepared to
handle such failure and so we can safely add further checks.This patch looks like it should be split up into the interface
changes and the tweaks to move seqno wrapping from the execbuffer into
the core seqno increment. However, I found no easy way to break it into
incremental steps without introducing further broken behaviour.v2: Mika found a silly mistake and a subtle error in the existing code;
inside i915_gem_retire_requests() we were resetting the sync_seqno of
the target ring based on the seqno from this ring - which are only
related by the order of their allocation, not retirement. Hence we were
applying the optimisation that the rings were synchronised too early,
fortunately the only real casualty there is the handling of seqno
wrapping.v3: Do not forget to reset the sync_seqno upon module reinitialisation,
ala resume.Signed-off-by: Chris Wilson
Cc: Mika Kuoppala
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=863861
Reviewed-by: Mika Kuoppala [v2]
Signed-off-by: Daniel Vetter
12 Nov, 2012
1 commit
-
So store into the scratch space of the HWS to make sure the invalidate
occurs.v2: use GTT address space for store, clean up #defines (Chris)
v3: use correct #define in blt ring flush (Chris)Signed-off-by: Jesse Barnes
Reviewed-by: Antti Koskipää
Reviewed-by: Chris Wilson
References: https://bugs.launchpad.net/ubuntu/+source/xserver-xorg-video-intel/+bug/1063252
Signed-off-by: Daniel Vetter
18 Oct, 2012
1 commit
-
With the introduction of per-process GTT space, the hardware designers
thought it wise to also limit the ability to write to MMIO space to only
a "secure" batch buffer. The ability to rewrite registers is the only
way to program the hardware to perform certain operations like scanline
waits (required for tear-free windowed updates). So we either have a
choice of adding an interface to perform those synchronized updates
inside the kernel, or we permit certain processes the ability to write
to the "safe" registers from within its command stream. This patch
exposes the ability to submit a SECURE batch buffer to
DRM_ROOT_ONLY|DRM_MASTER processes.v2: Haswell split up bit8 into a ppgtt bit (still bit8) and a security
bit (bit 13, accidentally not set). Also add a comment explaining why
secure batches need a global gtt binding.Signed-off-by: Chris Wilson (v1)
[danvet: added hsw fixup.]
Reviewed-by: Jesse Barnes
Signed-off-by: Daniel Vetter
10 Aug, 2012
1 commit
-
Avoid the forcewake overhead when simply retiring requests, as often the
last seen seqno is good enough to satisfy the retirment process and will
be promptly re-run in any case. Only ensure that we force the coherent
seqno read when we are explicitly waiting upon a completion event to be
sure that none go missing, and also for when we are reporting seqno
values in case of error or debugging.This greatly reduces the load for userspace using the busy-ioctl to
track active buffers, for instance halving the CPU used by X in pushing
the pixels from a software render (flash). The effect will be even more
magnified with userptr and so providing a zero-copy upload path in that
instance, or in similar instances where X is simply compositing DRI
buffers.v2: Reverse the polarity of the tachyon stream. Daniel suggested that
'force' was too generic for the parameter name and that 'lazy_coherency'
better encapsulated the semantics of it being an optimization and its
purpose. Also notice that gen6_get_seqno() is only used by gen6/7
chipsets and so the test for IS_GEN6 || IS_GEN7 is redundant in that
function.Signed-off-by: Chris Wilson
Reviewed-by: Daniel Vetter
Signed-off-by: Daniel Vetter
26 Jul, 2012
1 commit
-
By moving the function to intel_ringbuffer and currying the appropriate
parameter, hopefully we make the callsites easier to read and
understand.Signed-off-by: Chris Wilson
Signed-off-by: Daniel Vetter