1. 16 12月, 2014 5 次提交
    • C
      drm/i915: Disable PSMI sleep messages on all rings around context switches · 2c550183
      Chris Wilson 提交于
      There exists a current workaround to prevent a hang on context switch
      should the ring go to sleep in the middle of the restore,
      WaProgramMiArbOnOffAroundMiSetContext (applicable to all gen7+). In
      spite of disabling arbitration (which prevents the ring from powering
      down during the critical section) we were still hitting hangs that had
      the hallmarks of the known erratum. That is we are still seeing hangs
      "on the last instruction in the context restore". By comparing -nightly
      (broken) with requests (working), we were able to deduce that it was the
      semaphore LRI cross-talk that reproduced the original failure. The key
      was that requests implemented deferred semaphore signalling, and
      disabling that, i.e. emitting the semaphore signal to every other ring
      after every batch restored the frequent hang.  Explicitly disabling PSMI
      sleep on the RCS ring was insufficient, all the rings had to be awake to
      prevent the hangs. Fortunately, we can reduce the wakelock to the
      MI_SET_CONTEXT operation itself, and so should be able to limit the extra
      power implications.
      
      Since the MI_ARB_ON_OFF workaround is listed for all gen7 and above
      products, we should apply this extra hammer for all of the same
      platforms despite so far that we have only been able to reproduce the
      hang on certain ivb and hsw models. The last question is whether we want
      to always use the extra hammer or only when we know semaphores are in
      operation. At the moment, we only use LRI on non-RCS rings for
      semaphores, but that may change in the future with the possibility of
      reintroducing this bug under subtle conditions.
      
      v2: Make it explicit that the PSMI LRI are an extension to the original
      workaround for the other rings.
      v3: Bikeshedding variable names and whitespacing
      
      Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=80660
      Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=83677
      Cc: Simon Farnsworth <simon@farnz.org.uk>
      Cc: Daniel Vetter <daniel@ffwll.ch>
      Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
      Signed-off-by: NChris Wilson <chris@chris-wilson.co.uk>
      Tested-by: NPeter Frühberger <fritsch@xbmc.org>
      Reviewed-by: NDaniel Vetter <daniel@ffwll.ch>
      Cc: stable@vger.kernel.org
      Signed-off-by: NJani Nikula <jani.nikula@intel.com>
      2c550183
    • C
      drm/i915: Force the CS stall for invalidate flushes · add284a3
      Chris Wilson 提交于
      In order to act as a full command barrier by itself, we need to tell the
      pipecontrol to actually stall the command streamer while the flush runs.
      We require the full command barrier before operations like
      MI_SET_CONTEXT, which currently rely on a prior invalidate flush.
      
      References: https://bugs.freedesktop.org/show_bug.cgi?id=83677
      Cc: Simon Farnsworth <simon@farnz.org.uk>
      Cc: Daniel Vetter <daniel@ffwll.ch>
      Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
      Signed-off-by: NChris Wilson <chris@chris-wilson.co.uk>
      Cc: stable@vger.kernel.org
      Signed-off-by: NJani Nikula <jani.nikula@intel.com>
      add284a3
    • C
      drm/i915: Invalidate media caches on gen7 · 148b83d0
      Chris Wilson 提交于
      In the gen7 pipe control there is an extra bit to flush the media
      caches, so let's set it during cache invalidation flushes.
      
      v2: Rename to MEDIA_STATE_CLEAR to be more inline with spec.
      
      Cc: Simon Farnsworth <simon@farnz.org.uk>
      Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
      Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
      Signed-off-by: NChris Wilson <chris@chris-wilson.co.uk>
      Reviewed-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
      Cc: stable@vger.kernel.org
      Signed-off-by: NJani Nikula <jani.nikula@intel.com>
      148b83d0
    • I
      drm/i915: sanitize RPS resetting during GPU reset · dbea3cea
      Imre Deak 提交于
      Atm, we don't disable RPS interrupts and related work items before
      resetting the GPU. This may interfere with the following GPU
      initialization and cause RPS interrupts to show up in PM_IIR too early
      before calling gen6_enable_rps_interrupts() (triggering a WARN there).
      
      Solve this by disabling RPS interrupts and flushing any related work
      items before resetting the GPU.
      
      v2:
      - split out the common parts of the gt suspend and the new gt reset
        functions (Paulo)
      v3:
      - remove the check for UMS, it's a NOP nowadays (Daniel)
      Reported-by: NHe, Shuang <shuang.he@intel.com>
      Testcase: igt/gem_reset_stats/ban-render
      Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=86644Signed-off-by: NImre Deak <imre.deak@intel.com>
      Reviewed-by: NPaulo Zanoni <paulo.r.zanoni@intel.com>
      Signed-off-by: NJani Nikula <jani.nikula@intel.com>
      dbea3cea
    • I
      drm/i915: move RPS PM_IER enabling to gen6_enable_rps_interrupts · 78e68d36
      Imre Deak 提交于
      Paulo noticed that we don't enable RPS interrupts via PM_IER in
      gen6_enable_rps_interrupts(). This wasn't a problem so far, since the
      only place we disabled RPS interrupts was during system/runtime suspend
      and after that we reenable all interrupts in the IRQ pre/postinstall
      hooks.
      
      In the next patch we'll disable/reenable RPS interrupts during GPU reset
      too, but not call IRQ uninstall, pre/postinstall hooks, so there the
      above wouldn't work. The logical place for programming PM_IER is
      gen6_enable_rps_interrupts() and this also makes the function more
      symmetric with gen6_disable_rps_interrupts(), so move the programming
      there from the postinstall hooks.
      
      Note that these changes don't affect the ILK RPS interrupt code, which
      could be sanitized in a similar way. But that can be done as a
      follow-up.
      
      Credits-to: Paulo Zanoni <paulo.r.zanoni@intel.com>
      Signed-off-by: NImre Deak <imre.deak@intel.com>
      Reviewed-by: NPaulo Zanoni <paulo.r.zanoni@intel.com>
      Signed-off-by: NJani Nikula <jani.nikula@intel.com>
      78e68d36
  2. 11 12月, 2014 2 次提交
  3. 10 12月, 2014 4 次提交
  4. 08 12月, 2014 1 次提交
  5. 05 12月, 2014 3 次提交
  6. 03 12月, 2014 20 次提交
  7. 02 12月, 2014 5 次提交
    • T
      drm/i915: Don't pin LRC in GGTT when dumping in debugfs · 064ca1d2
      Thomas Daniel 提交于
      LRC object does not need to be mapped into the GGTT when dumping. A side-effect
      of this patch is that a compiler warning goes away (not checking return value
      of i915_gem_obj_ggtt_pin).
      
      v2: Broke out individual context dumping into a new function as the indentation
      was getting a bit crazy.  Added notification of contexts with no gem object for
      debugging purposes.  Removed unnecessary pin_pages and unpin_pages, replaced
      with explicit get_pages for the context object as there may be no backing store
      allocated at this time (Comment for get_pages says "Ensure that the associated
      pages are gathered from the backing storage and pinned into our object").
      Improved error checking - get_pages and get_page are checked for failure.
      Signed-off-by: NThomas Daniel <thomas.daniel@intel.com>
      [danvet: Align paramter continuation lines properly. Also add some
      braces to the nested loops again for readability.]
      Signed-off-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
      064ca1d2
    • D
      Merge branch 'linux-3.19' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-next · 1a92b7a2
      Dave Airlie 提交于
      - Tegra K1 voltage support, and coherency improvements
      - GM204 support (modesetting, still waiting on NVIDIA for signed fw to
      proceed further), and a lot of bios/i2c/devinit adjustments needed to
      support it
      - GT21x memory reclocking work
      - Various other bits and pieces, most of which are prep-work for a
      couple of bigger projects I didn't get finished in time
      
      * 'linux-3.19' of git://anongit.freedesktop.org/git/nouveau/linux-2.6: (73 commits)
        drm/nv50/kms: drop requirement that framebuffer bos be contig up-front
        drm/nv50/kms: directly use cursor image from userspace buffer
        drm/nouveau/kms: when pinning display-related buffers, force contig vram
        drm/nouveau: teach nouveau_bo_pin() how to force a contig vram allocation
        drm/nouveau/volt: add support for GK20A
        drm/nouveau/platform: add GPU speedo information to nouveau platform
        drm/nouveau/volt: allow non-bios voltage scaling
        drm/gf100-/gr: return non-fatal error code when fw not present
        drm/nouveau/devinit: bump priv ring timeouts before executing scripts
        drm/nouveau/bios: translate ramcfg strap through M0203
        drm/nouveau/fb: make use of M0203 routines for ram type determination
        drm/nouveau/bios: add parsing of BIT M(v2) +0x03 table
        drm/nouveau/core: allow vbios parsing without knowing chipset type
        drm/nouveau/lib: add null backend
        drm/nouveau/device: store revision
        drm/nouveau/core: add some forgotten subdevs to disable mask
        drm/gk20a/clk: fix max VCO value
        drm/nouveau: we need pin_refcnt for nouveau_bo_placement_set()
        drm/nv50-/kms: add some evo tracing ability for debugging
        drm/nv50/kms: use sclass() instead of trial-and-error
        ...
      1a92b7a2
    • B
      drm/nv50/kms: drop requirement that framebuffer bos be contig up-front · 9f6d2ce3
      Ben Skeggs 提交于
      We'll move them at pin() time if necessary.
      Signed-off-by: NBen Skeggs <bskeggs@redhat.com>
      9f6d2ce3
    • B
      drm/nv50/kms: directly use cursor image from userspace buffer · 5a560252
      Ben Skeggs 提交于
      Preparation for transition to planes, which use framebuffers for the
      cursor image.  We've always done copies from the userspace buffer up
      until now for legacy reasons, there's no good reason to do so on the
      chipsets this code covers.
      Signed-off-by: NBen Skeggs <bskeggs@redhat.com>
      5a560252
    • B