1. 24 Oct, 2014 23 commits
  2. 21 Oct, 2014 1 commit
    • Daniel Vetter's avatar
      Merge branch 'drm-intel-next-fixes' into drm-intel-next · a8cbd459
      Daniel Vetter authored
      So I've sent the first pull request to Dave and I expect his request
      for a merge tree any second now ;-)
      
      More seriously I have some pending patches for 3.19 that depend upon
      both trees, hence backmerge. Conflicts are all trivial.
      
      Conflicts:
      	drivers/gpu/drm/i915/i915_irq.c
      	drivers/gpu/drm/i915/intel_display.c
      
      v2: Of course I've forgotten the fixup script for the silent conflict.
      Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
      a8cbd459
  3. 16 Oct, 2014 2 commits
  4. 08 Oct, 2014 1 commit
  5. 06 Oct, 2014 2 commits
  6. 03 Oct, 2014 7 commits
  7. 02 Oct, 2014 3 commits
  8. 01 Oct, 2014 1 commit
    • Daniel Vetter's avatar
      drm/i915: Reinstate error level message for non-simulated gpu hangs · d8f2716a
      Daniel Vetter authored
      This seems to have been accidentally lost in
      
      commit be62acb4
      Author: Mika Kuoppala <mika.kuoppala@linux.intel.com>
      Date:   Fri Aug 30 16:19:28 2013 +0300
      
          drm/i915: ban badly behaving contexts
      
      Without this real gpu hangs only log output at info level, which gets
      filtered away by piglit's testrunner.
      
      v2: Tune down to notice level. Note that we need to add drm/i915 so
      that at least the automatic igt dmesg filtering still picks it up.
      
      v3: git add and lack of coffee don't mix well.
      
      v4: Message is in between hw and sw reset, so switch verb to
      continuous form.
      
      v5: Use i915_stop_rings_allow_warn for consistency. For Chris' case of
      injecting lots of hangs I guess we need to revamp this all anyway when
      merging. For now this should plug the regression for piglit testing
      mesa.
      
      v6: Make it compile (Mika).
      
      Cc: Mika Kuoppala <mika.kuoppala@intel.com>
      Cc: Chris Wilson <chris@chris-wilson.co.uk>
      Cc: Kenneth Graunke <kenneth@whitecape.org>
      Reported-by: default avatarKenneth Graunke <kenneth@whitecape.org>
      Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
      Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
      d8f2716a