• Dave Airlie's avatar
    Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel into drm-next · 41494cba
    Dave Airlie authored
    Daniel writes:
    
    "- Regression fixer for an OOPS at boot when i915.ko is built-in and
      CONFIG_PM=n, introduce in 3.5 (patch from Hunt Xu)
    - Regression fixer for occlusion query failures, the required w/a wasn't
      applied in all cases (thanks to Eric for tracking this on down).
    - dmar vs. dma_buf imprt fix (Dave Airlie)
    - 2 patches to fight down forcewake issues on snb. This is the stuff I've
      talked about 2 weeks ago already, it's a minefield. Investigation still
      going on, but afaict this is the best we have for now.
    - a few minor things to keep coverty&compiler happy (Alan, Davendra,
      Stéphane)
    - tons of hsw pci ids - this one is a bit late because internal approval
      sometimes takes a while, but ppl in charge finally agreed that world+dog
      already knows about ult and crw haswell variants ;-)
    
    Wrt regressions I'm aware of:
    - the power regression due to semaphores=1. Ben is running around with a
      killawatt, unfortunately we have a hard time reproducing this one. And
      this /shouldn't/ increase power usage. Ben has turned up a few odds bits
      though already.
    - the lvds fix in 3.6-rc1 broke a backlight after lid close/open (but can
      be resurrected with a modeset cycle). I guess we anger the bios - I'm
      still looking into this one.
    - gmbus broke edid reading on an odd-ball monitor, we need to fall-back.
      Due to vacation (both mine&the reporter's) this is stalling for a final
      patch and a tested-by on it. But issue is fully diagnosed."
    
    * 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel:
      drm/i915: correctly order the ring init sequence
      drm/i915: add more Haswell PCI IDs
      drm/i915: make rc6 in sysfs functions conditional
      drm/i915: Workaround hang with BSD and forcewake on SandyBridge
      drm/i915: Make intel_panel_get_backlight static.
      i915: don't map imported dma-bufs for dmar.
      drm/i915: remove unused variable
      drm/i915: Don't forget to apply SNB PIPE_CONTROL GTT workaround.
      drm/i915: fix forcewake related hangs on snb
      i915: Remove silly test
      i915: fix error path leak in intel_sdvo_write_cmd
      vlv: it might be wise if we initialised the flag value...
    41494cba
intel_display.c 197 KB