1. 27 Nov, 2012 1 commit
    • Dave Airlie's avatar
      Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel · efc15e04
      Dave Airlie authored
      Daniel writes:
      - Unbreak mbp retina, this time with a much more fine-grained approach
         (since the previous "completely ignore edp vbt bpp value" regressed some
         machines even after fixing a bug in our dp bw code).
      - Disable cloning on sdvo. It just doesn't work (yeah took us a while to
         figure out), leading to jittery outputs in the best case.
      - Revert rc6 for ilk again. It seems to help a few of the gpu hang
        reporters at least, and it's definitely the best we've got.
        Head-against-the-wall-banging is still ongoing for what really breaks
        (and how we can reproduce the non-rc6 hangs and how to reproduce on
        gen4).
      * 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel:
        Revert "drm/i915: enable rc6 on ilk again"
        drm/i915: do not default to 18 bpp for eDP if missing from VBT
        drm/i915: disable cloning on sdvo
      efc15e04
  2. 26 Nov, 2012 3 commits
  3. 25 Nov, 2012 2 commits
    • Gavin Shan's avatar
      powerpc/eeh: Do not invalidate PE properly · e716e014
      Gavin Shan authored
      While the EEH does recovery on the specific PE that has PCI errors,
      the PCI devices belonging to the PE will be removed and the PE will
      be marked as invalid since we still need the information stored in
      the PE. We only invalidate the PE when it doesn't have associated
      EEH devices and valid child PEs. However, the code used to check
      that is wrong. The patch fixes that.
      Signed-off-by: default avatarGavin Shan <shangw@linux.vnet.ibm.com>
      Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
      e716e014
    • Chris Wilson's avatar
      Revert "drm/i915: enable rc6 on ilk again" · 6567d748
      Chris Wilson authored
      Even with the cumulative set of ilk w/a, rc6 is demonstrably still
      failing and causing GPU hangs as found by Peter Wu. So we need to disable
      it again until it is stable.
      
      This reverts
      
      commit 456470eb
      Author: Daniel Vetter <daniel.vetter@ffwll.ch>
      Date:   Wed Aug 8 23:35:40 2012 +0200
      
          drm/i915: enable rc6 on ilk again
      
      and the follow-on
      
      commit cd7988ee
      Author: Daniel Vetter <daniel.vetter@ffwll.ch>
      Date:   Sun Aug 26 20:33:18 2012 +0200
      
          drm/i915: disable rc6 on ilk when vt-d is enabled
      
      Note: The situation around the gen4/5 gpu hangs that cropped up in 3.7
      is rather strange. Most useful bisects have lead to
      
      commit 6c085a72
      Author: Chris Wilson <chris@chris-wilson.co.uk>
      Date:   Mon Aug 20 11:40:46 2012 +0200
      
          drm/i915: Track unbound pages
      
      or even later commits that affect the gem bo recycling, which all is
      way past the point where we re-enabled rc6. But somehow
      reverting/disabling those commits doesn't help, but disabling rc6 at
      least helps for many hangs on ilk. Obviously it doesn't change
      anything at all on gen4, and there are still strange issues left on
      gen5 (which we unfortunately can't readily reproduce).
      
      Also, the error_state signature of the hangs which can be fixed with
      this patch look remarkably different to those which seem to be
      unaffected by the rc6 settings: The rc6 hangs are in the ring,
      somewhere in the MI_FLUSH/PIPE_CONTROL sequence to make ilk coherent,
      wheras all the other hangs tend to be at a random point in the middle
      of the user batch. So it could also be that we have different issues.
      
      Until we grow more clue, this at least helps some users.
      Reported-by: default avatarPeter Wu <lekensteyn@gmail.com>
      References: https://bugs.freedesktop.org/show_bug.cgi?id=55984Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
      [danvet: Added note with some more details about the gen4/5 3.7
      gpu hang regression.]
      Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
      6567d748
  4. 24 Nov, 2012 4 commits
    • Linus Torvalds's avatar
      Merge tag 'sound-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · 194d9831
      Linus Torvalds authored
      Pull sound build error fix from Takashi Iwai:
       "Only a single commit for fixing the build error without CONFIG_PM in
        hda driver."
      
      * tag 'sound-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
        ALSA: hda - Fix build without CONFIG_PM
      194d9831
    • Takashi Iwai's avatar
      ALSA: hda - Fix build without CONFIG_PM · d846b174
      Takashi Iwai authored
      I forgot this again...  codec->in_pm is in #ifdef CONFIG_PM
      Reported-by: default avatarMarkus Trippelsdorf <markus@trippelsdorf.de>
      Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
      d846b174
    • Linus Torvalds's avatar
      Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 2654ad44
      Linus Torvalds authored
      Pull x86 arch fixes from Peter Anvin:
       "Here is a collection of fixes for 3.7-rc7.  This is a superset of
        tglx' earlier pull request."
      
      * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86-64: Fix ordering of CFI directives and recent ASM_CLAC additions
        x86, microcode, AMD: Add support for family 16h processors
        x86-32: Export kernel_stack_pointer() for modules
        x86-32: Fix invalid stack address while in softirq
        x86, efi: Fix processor-specific memcpy() build error
        x86: remove dummy long from EFI stub
        x86, mm: Correct vmflag test for checking VM_HUGETLB
        x86, amd: Disable way access filter on Piledriver CPUs
        x86/mce: Do not change worker's running cpu in cmci_rediscover().
        x86/ce4100: Fix PCI configuration register access for devices without interrupts
        x86/ce4100: Fix reboot by forcing the reboot method to be KBD
        x86/ce4100: Fix pm_poweroff
        MAINTAINERS: Update email address for Robert Richter
        x86, microcode_amd: Change email addresses, MAINTAINERS entry
        MAINTAINERS: Change Boris' email address
        EDAC: Change Boris' email address
        x86, AMD: Change Boris' email address
      2654ad44
    • Linus Torvalds's avatar
      Merge tag 'for-linus-20121123' of git://git.infradead.org/mtd-2.6 · 35f95d22
      Linus Torvalds authored
      Pull MTD fixes from David Woodhouse:
       "The most important part of this is that it fixes a regression in
        Samsung NAND chip detection, introduced by some rework which went into
        3.7.  The initial fix wasn't quite complete, so it's in two parts.  In
        fact the first part is committed twice (Artem committed his own copy
        of the same patch) and I've merged Artem's tree into mine which
        already had that fix.
      
        I'd have recommitted that to make it somewhat cleaner, but figured by
        this point in the release cycle it was better to merge *exactly* the
        commits which have been in linux-next.
      
        If I'd recommitted, I'd also omit the sparse warning fix.  But it's
        there, and it's harmless — just marking one function as 'static' in
        onenand code.
      
        This also includes a couple more fixes for stable: an AB-BA deadlock
        in JFFS2, and an invalid range check in slram."
      
      * tag 'for-linus-20121123' of git://git.infradead.org/mtd-2.6:
        mtd: nand: fix Samsung SLC detection regression
        mtd: nand: fix Samsung SLC NAND identification regression
        jffs2: Fix lock acquisition order bug in jffs2_write_begin
        mtd: onenand: Make flexonenand_set_boundary static
        mtd: slram: invalid checking of absolute end address
        mtd: ofpart: Fix incorrect NULL check in parse_ofoldpart_partitions()
        mtd: nand: fix Samsung SLC NAND identification regression
      35f95d22
  5. 23 Nov, 2012 30 commits