1. 12 Jul, 2011 5 commits
    • Linus Torvalds's avatar
      Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc · d93a881d
      Linus Torvalds authored
      * 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc:
        pcmcia: pxa2xx/vpac270: free gpios on exist rather than requesting
        ARM: pxa/raumfeld: fix device name for codec ak4104
        ARM: pxa/raumfeld: display initialisation fixes
        ARM: pxa/raumfeld: adapt to upcoming hardware change
        ARM: pxa: fix gpio_to_chip() clash with gpiolib namespace
        genirq: replace irq_gc_ack() with {set,clr}_bit variants (fwd)
        arm: mach-vt8500: add forgotten irq_data conversion
        ARM: pxa168: correct nand pmu setting
        ARM: pxa910: correct nand pmu setting
        ARM: pxa: fix PGSR register address calculation
      d93a881d
    • Linus Torvalds's avatar
      Merge branch 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/keithp/linux-2.6 · d1ca1a00
      Linus Torvalds authored
      * 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/keithp/linux-2.6:
        drm/i915/ringbuffer: Idling requires waiting for the ring to be empty
        Revert "drm/i915: enable rc6 by default"
        drm/i915: Clean up i915_driver_load failure path
        drm/i915: Enable GPU reset on Ivybridge.
        drm/i915/dp: manage sink power state if possible
        drm/i915/dp: consolidate AUX retry code
        drm/i915/dp: remove DPMS mode tracking from DP
        drm/i915/dp: try to read receiver capabilities 3 times when detecting
        drm/i915/dp: read more receiver capability bits on hotplug
        drm/i915/dp: use DP DPCD defines when looking at DPCD values
        drm/i915/dp: retry link status read 3 times on failure
      d1ca1a00
    • Chris Wilson's avatar
      drm/i915/ringbuffer: Idling requires waiting for the ring to be empty · a94919ea
      Chris Wilson authored
      ...which is measured by the size and not the amount of space remaining.
      
      Waiting upon size-8, did one of two things. In the common case with more
      than 8 bytes available to write into the ring, it would return
      immediately. Otherwise, it would timeout given the impossible condition
      of waiting for more space than is available in the ring, leading to
      warnings such as:
      
      [drm:intel_cleanup_ring_buffer] *ERROR* failed to quiesce render ring
      whilst cleaning up: -16
      Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
      Reviewed-by: default avatarEric Anholt <eric@anholt.net>
      Signed-off-by: default avatarKeith Packard <keithp@keithp.com>
      a94919ea
    • Keith Packard's avatar
      Revert "drm/i915: enable rc6 by default" · 05bd4268
      Keith Packard authored
      This reverts commit a51f7a66.
      
      We still have a few Ironlake and Sandybridge machines which fail when
      RC6 is enabled. Better luck next release?
      Signed-off-by: default avatarKeith Packard <keithp@keithp.com>
      05bd4268
    • Keith Packard's avatar
      drm/i915: Clean up i915_driver_load failure path · a7b85d2a
      Keith Packard authored
      i915_driver_load adds a write-combining MTRR region for the GTT
      aperture to improve memory speeds through the aperture. If
      i915_driver_load fails after this, it would not have cleaned up the
      MTRR. This shouldn't cause any problems, except for consuming an MTRR
      register. Still, it's best to clean up completely in the failure path,
      which is easily done by calling mtrr_del if the mtrr was successfully
      allocated.
      
      i915_driver_load calls i915_gem_load which register
      i915_gem_inactive_shrink. If i915_driver_load fails after calling
      i915_gem_load, the shrinker will be left registered. When called, it
      will access freed memory and crash. The fix is to unregister the shrinker in the
      failure path using code duplicated from i915_driver_unload.
      
      i915_driver_load also has some incorrect gotos in the error cleanup
      paths:
      
       * After failing to initialize the GTT (which cannot happen, btw,
         intel_gtt_get returns a fixed (non-NULL) value), it tries to
         free the uninitialized WC IO mapping. Fixed this by changing the
         target from out_iomapfree to out_rmmap
      Signed-off-by: default avatarKeith Packard <keithp@keithp.com>
      Tested-by: default avatarLin Ming <ming.m.lin@intel.com>
      a7b85d2a
  2. 11 Jul, 2011 21 commits
  3. 10 Jul, 2011 9 commits
  4. 09 Jul, 2011 5 commits