1. 28 Nov, 2013 6 commits
  2. 27 Nov, 2013 1 commit
    • Chris Wilson's avatar
      drm/i915: Do not attempt to re-enable an unconnected primary plane · 947fdaad
      Chris Wilson authored
      Due to user fudging (for instance using video=VGA-1:e with FBDEV=n) we can
      attempt to reset an inconsistent CRTC that is marked as active but has
      no assigned fb. It would be wise to fix this earlier, but the long
      term plan is to have primary and secondary planes associated with a
      CRTC, in which crtc->fb being NULL will be expected. So for a quick
      short term fix with pretensions of grandeur, just check for a NULL fb
      during GPU reset and ignore the plane restoration.
      
      This fixes a potential hard hang (a panic in the panic handler)
      following a GPU hang.
      Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
      Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
      [danvet: Add a corresponding fixme comment.]
      Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
      947fdaad
  3. 26 Nov, 2013 18 commits
  4. 25 Nov, 2013 2 commits
  5. 21 Nov, 2013 8 commits
  6. 18 Nov, 2013 3 commits
  7. 15 Nov, 2013 2 commits
    • Daniel Vetter's avatar
      Merge branch 'backlight-rework' into drm-intel-next-queued · c09cd6e9
      Daniel Vetter authored
      Pull in Jani's backlight rework branch. This was merged through a
      separate branch to be able to sort out the Broadwell conflicts
      properly before pulling it into the main development branch.
      
      Conflicts:
      	drivers/gpu/drm/i915/intel_display.c
      Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
      c09cd6e9
    • Daniel Vetter's avatar
      Merge branch 'bdw-fixes' into backlight-rework · 96ab4c70
      Daniel Vetter authored
      Merge the bdw changes into the backlight rework branch so that we can
      adapt the new code for bdw, too.  This is a bit a mess, but doing this
      another way would have delayed the merging of the backlight
      refactoring. Mea culpa.
      
      As discussed with Jani on irc only do bdw-specific callbacks for the
      set/get methods and bake in the only other special-case into the pch
      enable function.
      
      Conflicts:
      	drivers/gpu/drm/i915/intel_panel.c
      
      v2: Don't enable the PWM too early for bdw (Jani).
      
      v3: Create new bdw_ functions for setup and enable - the rules change
      sufficiently imo with the switch from controlling the pwm from the cpu
      to controlling it completel from the pch to warrant this.
      
      v4: Rip out unused pipe variable in bdw_enable_backlight (0-day
      builder).
      
      Tested-by: Ben Widawsky <ben@bwidawsk.net> (on bdw)
      Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
      Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
      96ab4c70