1. 13 Jul, 2011 5 commits
  2. 12 Jul, 2011 4 commits
    • Keith Packard's avatar
      9aa73a51
    • 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
  3. 08 Jul, 2011 9 commits
  4. 07 Jul, 2011 20 commits
  5. 04 Jul, 2011 2 commits
    • Linus Torvalds's avatar
      Linux 3.0-rc6 · fe0d4220
      Linus Torvalds authored
      fe0d4220
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6 · 532df6f3
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6: (277 commits)
        [SCSI] isci: fix checkpatch errors
        isci: Device reset should request sas_phy_reset(phy, true)
        isci: pare back error messsages
        isci: cleanup silicon revision detection
        isci: merge scu_unsolicited_frame.h into unsolicited_frame_control.h
        isci: merge sata.[ch] into request.c
        isci: kill 'get/set' macros
        isci: retire scic_sds_ and scic_ prefixes
        isci: unify isci_host and scic_sds_controller
        isci: unify isci_remote_device and scic_sds_remote_device
        isci: unify isci_port and scic_sds_port
        isci: fix scic_sds_remote_device_terminate_requests
        isci: unify isci_phy and scic_sds_phy
        isci: unify isci_request and scic_sds_request
        isci: rename / clean up scic_sds_stp_request
        isci: preallocate requests
        isci: combine request flags
        isci: unify can_queue tracking on the tci_pool, uplevel tag assignment
        isci: Terminate dev requests on FIS err bit rx in NCQ
        isci: fix frame received locking
        ...
      532df6f3