1. 25 Apr, 2012 12 commits
  2. 23 Apr, 2012 22 commits
  3. 19 Apr, 2012 6 commits
    • Linus Torvalds's avatar
      Merge branch 'for-3.4' of git://linux-nfs.org/~bfields/linux · c6f5c930
      Linus Torvalds authored
      Pull nfsd bugfixes from J. Bruce Fields:
       "One bugfix, and one minor header fix from Jeff Layton while we're
        here"
      
      * 'for-3.4' of git://linux-nfs.org/~bfields/linux:
        nfsd: include cld.h in the headers_install target
        nfsd: don't fail unchecked creates of non-special files
      c6f5c930
    • Linus Torvalds's avatar
      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux · 19853301
      Linus Torvalds authored
      Pull drm fixes from Dave Airlie:
       "It's like a grab bag of one liners:
      
        - core: fix page flip error path, reorder object teardown.
        - usb: fix the drm_usb module license.
        - i915: VT switch on SNB with non-native modes fix, and a regression
          fix from 3.3.
        - radeon: missing unreserve on SI, AGP/VRAM setup fix (fixes radeon on
          IA64, but its a generic bug), an rn50 regression from 3.3, turn off
          MSIs on rv515 (it loses rearms every so often)."
      
      * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
        nouveau: Set special lane map for the right chipset
        drm/radeon: fix load detect on rn50 with hardcoded EDIDs.
        drm: Releasing FBs before releasing GEM objects during drm_release
        drm/nouveau/pm: don't read/write beyond end of stack buffer
        drivers: gpu: drm: gma500: mdfld_dsi_output.h: Remove not unneeded include of version.h
        radeon: fix r600/agp when vram is after AGP (v3)
        drm: fix page_flip error handling
        drm/radeon/kms: fix the regression of DVI connector check
        drm/usb: fix module license on drm/usb layer.
        drm/i915: Do not set "Enable Panel Fitter" on SNB pageflips
        drm/i915: Hold mode_config lock whilst changing mode for lastclose()
        drm/radeon/si: add missing radeon_bo_unreserve in si_rlc_init() v2
        drm/radeon: disable MSI on RV515
        drm/i915: don't clobber the special upscaling lvds timings
      19853301
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/virt/kvm/kvm · 9e01297e
      Linus Torvalds authored
      Pull KVM updates from Marcelo Tosatti.
      
      * git://git.kernel.org/pub/scm/virt/kvm/kvm:
        KVM: lock slots_lock around device assignment
        KVM: VMX: Fix kvm_set_shared_msr() called in preemptible context
        KVM: unmap pages from the iommu when slots are removed
        KVM: PMU emulation: GLOBAL_CTRL MSR should be enabled on reset
      9e01297e
    • Henrik Rydberg's avatar
      nouveau: Set special lane map for the right chipset · 273a50fb
      Henrik Rydberg authored
      The refactoring of the nv50 logic, introduced in 8663bc7c, modified the
      test for the special lane map used on some Apple computers with Nvidia
      chipsets. The tested MBA3,1 would still boot, but resume from suspend
      stopped working. This patch restores the old test, which fixes the problem.
      Signed-off-by: default avatarHenrik Rydberg <rydberg@euromail.se>
      Acked-by: default avatarBen Skeggs <bskeggs@redhat.com>
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      273a50fb
    • Dave Airlie's avatar
      drm/radeon: fix load detect on rn50 with hardcoded EDIDs. · a09d431f
      Dave Airlie authored
      When the force changes went in back in 3.3.0, we ended up returning
      disconnected in the !force case, and the connected in when forced,
      as it hit the hardcoded check.
      
      Fix it so all exits go via the hardcoded check and stop spurious
      modesets on platforms with hardcoded EDIDs.
      
      Reported-by: Evan McNabb (Red Hat)
      Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      a09d431f
    • Prathyush's avatar
      drm: Releasing FBs before releasing GEM objects during drm_release · 4e47e02d
      Prathyush authored
      During DRM release, all the FBs and gem objects are released. If
      a gem object is being used as a FB and set to a crtc, it must not
      be freed before releasing the framebuffer first.
      
      If FBs are released first, the crtc using the FB is disabled first
      so now the GEM object can be freed safely. The CRTC will be enabled
      again when the driver restores fbdev mode.
      Signed-off-by: default avatarPrathyush K <prathyush.k@samsung.com>
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      4e47e02d