• Dave Airlie's avatar
    Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel into drm-next · 2cc79544
    Dave Airlie authored
    A bunch of fixes, nothing truely horrible:
    - Fix PCH irq handling race which resulted in missed gmbus/dp aux irqs
      and subsequent fallout (Paulo)
    - Fixup off-by-one in our hsw id table (Kenneth)
    - Fixup ilk rc6 support (disabled by default), regression introduced in
      3.8
    - g4x plane w/a from Egbert Eich
    - gen2/3/4 dpms suspend/standy fixes for VGA outputs from Patrik Jakobsson
    - Workaround dying ivb machines with less aggressive rc6 values (Stéphane
      Marchesin)
    
    * 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel:
      drm/i915: Turn off hsync and vsync on ADPA when disabling crt
      drm/i915: Fix incorrect definition of ADPA HSYNC and VSYNC bits
      drm/i915: also disable south interrupts when handling them
      drm/i915: enable irqs earlier when resuming
      drm/i915: Increase the RC6p threshold.
      DRM/i915: On G45 enable cursor plane briefly after enabling the display plane.
      drm/i915: Fix Haswell/CRW PCI IDs.
      drm/i915: Don't clobber crtc->fb when queue_flip fails
      drm/i915: wait_event_timeout's timeout is in jiffies
      drm/i915: Fix missing variable initilization
    2cc79544
intel_display.c 251 KB