1. 10 Mar, 2012 6 commits
  2. 07 Mar, 2012 1 commit
  3. 05 Mar, 2012 1 commit
  4. 29 Feb, 2012 15 commits
  5. 27 Feb, 2012 5 commits
  6. 23 Feb, 2012 2 commits
    • Dave Airlie's avatar
      Merge tag 'drm-intel-next-2012-02-16-merge-resolved' of... · e5bcf234
      Dave Airlie authored
      Merge tag 'drm-intel-next-2012-02-16-merge-resolved' of git://people.freedesktop.org/~danvet/drm-intel into drm-core-next
      
      * tag 'drm-intel-next-2012-02-16-merge-resolved' of git://people.freedesktop.org/~danvet/drm-intel: (45 commits)
        Revert "drivers/gpu/drm/i915/intel_overlay.c needs seq_file.h"
        drm/i915/lvds: Always use the presence pin for LVDS on PCH
        drm/i915: Record the position of the request upon error
        drm/i915: Record the in-flight requests at the time of a hang
        drm/i915: Record the tail at each request and use it to estimate the head
        drm/i915: add missing SDVO bits for interlaced modes on ILK
        drm/i915: Fix race condition in accessing GMBUS
        drm/i915: add a "force-dvi" HDMI audio mode
        drm/i915: Don't lock panel registers when downclocking
        drm/i915: fix up locking inconsistency around gem_do_init
        drm/i915: enable forcewake voodoo also for gen6
        drm/i915: fixup seqno allocation logic for lazy_request
        drm/i915: outstanding_lazy_request is a u32
        drm/i915: check gtfifodbg after possibly failed writes
        drm/i915: catch gtfifo errors on forcewake_put
        drm/i915: use gtfifodbg
        drm/i915: set interlaced bits for TRANSCONF
        drm/i915: fixup overlay checks for interlaced modes
        drm/i915: allow interlaced mode output on the HDMI connector
        drm/i915: allow interlaced mode output on the SDVO connector
        ...
      e5bcf234
    • Daniel Vetter's avatar
      Merge remote-tracking branch 'airlied/drm-next' into for-airlied · ff5f4b05
      Daniel Vetter authored
      Manually resolve the conflict between the new enum drm property
      helpers in drm-next and the new "force-dvi" option that the "audio" output
      property gained in drm-intel-next.
      
      While resolving this conflict, switch the new drm_prop_enum_list to
      use the newly introduced enum defines instead of magic values.
      
      Conflicts:
      	drivers/gpu/drm/i915/intel_modes.c
      Signed-Off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
      ff5f4b05
  7. 16 Feb, 2012 4 commits
  8. 15 Feb, 2012 4 commits
    • Chris Wilson's avatar
      drm/i915/lvds: Always use the presence pin for LVDS on PCH · f3cfcba6
      Chris Wilson authored
      With the introduction of the PCH, we gained an LVDS presence pin but we
      continued to use the existing logic that asserted that LVDS was only
      supported on certain mobile chipsets. However, there are desktop
      IronLake systems with LVDS attached which we fail to detect. So for PCH,
      trust the LVDS presence pin and quirk all the lying manufacturers.
      Tested-by: default avatarDaniel Woff <wolff.daniel@gmail.com>
      Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=43171Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
      Reviewed-by: default avatarEugeni Dodonov <eugeni.dodonov@intel.com>
      Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
      f3cfcba6
    • Chris Wilson's avatar
      drm/i915: Record the position of the request upon error · ee4f42b1
      Chris Wilson authored
      So that we can tally the request against the command sequence in the
      ringbuffer, or merely jump to the interesting locations.
      Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
      Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
      ee4f42b1
    • Chris Wilson's avatar
      drm/i915: Record the in-flight requests at the time of a hang · 52d39a21
      Chris Wilson authored
      Being able to tally the list of outstanding requests with the sequence
      of commands in the ringbuffer is often useful evidence with respect to
      driver corruption.
      
      Note that since this is the umpteenth per-ring data structure to be added
      to the error state, I've coallesced the nearby loops (the ringbuffer and
      batchbuffer) into a single structure along with the list of requests.  A
      later task would be to refactor the ring register state into the same
      structure.
      
      v2: Fix pretty printing of requests so that they are parsed correctly by
      intel_error_decode and use the 0x%08x format for seqno for consistency
      Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
      Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
      52d39a21
    • Chris Wilson's avatar
      drm/i915: Record the tail at each request and use it to estimate the head · a71d8d94
      Chris Wilson authored
      By recording the location of every request in the ringbuffer, we know
      that in order to retire the request the GPU must have finished reading
      it and so the GPU head is now beyond the tail of the request. We can
      therefore provide a conservative estimate of where the GPU is reading
      from in order to avoid having to read back the ring buffer registers
      when polling for space upon starting a new write into the ringbuffer.
      
      A secondary effect is that this allows us to convert
      intel_ring_buffer_wait() to use i915_wait_request() and so consolidate
      upon the single function to handle the complicated task of waiting upon
      the GPU. A necessary precaution is that we need to make that wait
      uninterruptible to match the existing conditions as all the callers of
      intel_ring_begin() have not been audited to handle ERESTARTSYS
      correctly.
      
      By using a conservative estimate for the head, and always processing all
      outstanding requests first, we prevent a race condition between using
      the estimate and direct reads of I915_RING_HEAD which could result in
      the value of the head going backwards, and the tail overflowing once
      again. We are also careful to mark any request that we skip over in
      order to free space in ring as consumed which provides a
      self-consistency check.
      
      Given sufficient abuse, such as a set of unthrottled GPU bound
      cairo-traces, avoiding the use of I915_RING_HEAD gives a 10-20% boost on
      Sandy Bridge (i5-2520m):
        firefox-paintball  18927ms -> 15646ms: 1.21x speedup
        firefox-fishtank   12563ms -> 11278ms: 1.11x speedup
      which is a mild consolation for the performance those traces achieved from
      exploiting the buggy autoreported head.
      
      v2: Add a few more comments and make request->tail a conservative
      estimate as suggested by Daniel Vetter.
      Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
      [danvet: resolve conflicts with retirement defering and the lack of
      the autoreport head removal (that will go in through -fixes).]
      Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
      a71d8d94
  9. 14 Feb, 2012 2 commits
    • Paulo Zanoni's avatar
      drm/i915: add missing SDVO bits for interlaced modes on ILK · 7c26e5c6
      Paulo Zanoni authored
      This was pointed by Jesse Barnes. The code now seems to follow the
      specification but I don't have an SDVO device to really test this.
      Signed-off-by: default avatarPaulo Zanoni <paulo.r.zanoni@intel.com>
      Reviewed-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
      Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
      7c26e5c6
    • Dave Airlie's avatar
      Merge tag 'drm-intel-next-2012-02-07' of... · cdbe8b54
      Dave Airlie authored
      Merge tag 'drm-intel-next-2012-02-07' of git://people.freedesktop.org/~danvet/drm-intel into drm-core-next
      
      * tag 'drm-intel-next-2012-02-07' of git://people.freedesktop.org/~danvet/drm-intel: (29 commits)
        drm/i915: Handle unmappable buffers during error state capture
        drm/i915: rewrite shmem_pread_slow to use copy_to_user
        drm/i915: rewrite shmem_pwrite_slow to use copy_from_user
        drm/i915: fall through pwrite_gtt_slow to the shmem slow path
        drm/i915: add debugfs file for swizzling information
        drm/i915: fix swizzle detection for gen3
        drm/i915: Remove the upper limit on the bo size for mapping into the CPU domain
        drm/i915: add per-ring fault reg to error_state
        drm/i915: reject GTT domain in relocations
        drm/i915: remove the i915_batchbuffer_info debugfs file
        drm/i915: capture error_state also for stuck rings
        drm/i915: refactor debugfs create functions
        drm/i915: refactor debugfs open function
        drm/i915: don't trash the gtt when running out of fences
        drm/i915: Separate fence pin counting from normal bind pin counting
        drm/i915/ringbuffer: kill snb blt workaround
        drm/i915: collect more per ring error state
        drm/i915: refactor ring error state capture to use arrays
        drm/i915: switch ring->id to be a real id
        drm/i915: set AUD_CONFIG N_value_index for DisplayPort
        ...
      cdbe8b54