• Dave Airlie's avatar
    Merge tag 'drm-intel-next-2012-05-20' of... · f15b4ca2
    Dave Airlie authored
    Merge tag 'drm-intel-next-2012-05-20' of git://people.freedesktop.org/~danvet/drm-intel into drm-core-next
    
    Daniel wrote:
    
    The last pull I'd like to squeeze into 3.5, safe for the hsw stuff mostly
    bugfixes:
    - last few patches for basic hsw enabling (Eugeni, infoframe support by
     Paulo)
    - Fix up infoframe support, we've hopefully squashed all the cargo-culting
     in there (Paulo). Among all the issues, this finally fixes some of the
     infoframe regressions seen on g4x and snb systems.
    - Fixup sdvo infoframe support, this fixes a regression from 2.6.37.
    - Correctly enable semaphores on snb, we've enabled it already for 3.5,
     but the dmar check was slightly wrong.
    - gen6 irq fixlets from Chris.
    - disable gmbus on i830, the hw seems to be simply broken.
    - fix up the pch pll fallout (Chris & me).
    - for_each_ring macro from Chris - I've figured I'll merge this now to
     avoid backport pain.
    - complain when the rps state isn't what we expect (Chris). Note that this
     is shockingly easy to hit and hence pretty much will cause a regression
     report. But it only tells us that the gpu turbo state got out of whack,
     a problem we know off since a long time (it cause the gpu to get stuck a
     a fixed frequency, usually the lowest one). Chris is working on a fix,
     but we haven't yet found a magic formula that works perfectly (only
     patches that massively reduce the frequency of this happening).
    - MAINTAINERS patch, I'm now officially the guy to beat up."
    
    * tag 'drm-intel-next-2012-05-20' of git://people.freedesktop.org/~danvet/drm-intel: (57 commits)
      drm/i915: IBX has a fixed pch pll to pch pipe mapping
      drm/i915: implement hsw_write_infoframe
      drm/i915: small hdmi coding style cleanups
      drm/i915: fixup infoframe support for sdvo
      drm/i915: Enable the PCH PLL for all generations after link training
      drm/i915: Convert BUG_ON(!pll->active) and friends to a WARN
      drm/i915: don't clobber the pipe param in sanitize_modesetting
      drm/i915: disable gmbus on i830
      drm/i915: Replace the feature tests for BLT/BSD with ring init checks
      drm/i915: Check whether the ring is initialised prior to dispatch
      drm/i915: Introduce for_each_ring() macro
      drm/i915: Assert that the transcoder is indeed off before modifying it
      drm/i915: hook Haswell devices in place
      drm/i915: prepare HDMI link for Haswell
      drm/i915: move HDMI structs to shared location
      drm/i915: add WR PLL programming table
      drm/i915: add support for DDI-controlled digital outputs
      drm/i915: detect digital outputs on Haswell
      drm/i915: program iCLKIP on Lynx Point
      drm/i915: program WM_LINETIME on Haswell
      ...
    f15b4ca2
i915_dma.c 47.9 KB