1. 23 7月, 2013 13 次提交
  2. 19 7月, 2013 8 次提交
    • D
      Merge tag 'drm-intel-next-2013-07-12' of... · e13af9a8
      Dave Airlie 提交于
      Merge tag 'drm-intel-next-2013-07-12' of git://people.freedesktop.org/~danvet/drm-intel into drm-next
      
       Highlights:
      - follow-up refactoring after the shared dpll rework that landed in 3.11
      - oddball prep cleanups from Ben for ppgtt
      - encoder->get_config state tracking infrastructure from Jesse
      - used by the experimental fastboot support from Jesse (disabled by
        default)
      - make the error state file official and add it to our sysfs interface
        (Mika)
      - drm_mm prep changes from Ben, prepares to embedd the drm_mm_node (which
        will be used by the vma rework later on)
      - interrupt handling rework, follow up cleanups to the VECS enabling, hpd
        storm handling and fifo underrun reporting.
      - Big pile of smaller cleanups, code improvements and related stuff.
      
      * tag 'drm-intel-next-2013-07-12' of git://people.freedesktop.org/~danvet/drm-intel: (72 commits)
        drm/i915: clear DPLL reg when disabling i9xx dplls
        drm/i915: Fix up cpt pixel multiplier enable sequence
        drm/i915: clean up vlv ->pre_pll_enable and pll enable sequence
        drm/i915: move error state to own compilation unit
        drm/i915: Don't attempt to read an unitialized stack value
        drm/i915: Use for_each_pipe() when possible
        drm/i915: don't enable PM_VEBOX_CS_ERROR_INTERRUPT
        drm/i915: unify ring irq refcounts (again)
        drm/i915: kill dev_priv->rps.lock
        drm/i915: queue work outside spinlock in hsw_pm_irq_handler
        drm/i915: streamline hsw_pm_irq_handler
        drm/i915: irq handlers don't need interrupt-safe spinlocks
        drm/i915: kill lpt pch transcoder->crtc mapping code for fifo underruns
        drm/i915: improve GEN7_ERR_INT clearing for fifo underrun reporting
        drm/i915: improve SERR_INT clearing for fifo underrun reporting
        drm/i915: extract ibx_display_interrupt_update
        drm/i915: remove unused members from drm_i915_private
        drm/i915: don't frob mm.suspended when not using ums
        drm/i915: Fix VLV DP RBR/HDMI/DAC PLL LPF coefficients
        drm/i915: WARN if the bios reserved range is bigger than stolen size
        ...
      
      Conflicts:
      	drivers/gpu/drm/i915/i915_gem.c
      e13af9a8
    • L
      Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · ee114b97
      Linus Torvalds 提交于
      Pull x86 fixes from Peter Anvin:
       "Trying again to get the fixes queue, including the fixed IDT alignment
        patch.
      
        The UEFI patch is by far the biggest issue at hand: it is currently
        causing quite a few machines to boot.  Which is sad, because the only
        reason they would is because their BIOSes touch memory that has
        already been freed.  The other major issue is that we finally have
        tracked down the root cause of a significant number of machines
        failing to suspend/resume"
      
      * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86: Make sure IDT is page aligned
        x86, suspend: Handle CPUs which fail to #GP on RDMSR
        x86/platform/ce4100: Add header file for reboot type
        Revert "UEFI: Don't pass boot services regions to SetVirtualAddressMap()"
        efivars: check for EFI_RUNTIME_SERVICES
      ee114b97
    • L
      Merge tag 'md-3.11-fixes' of git://neil.brown.name/md · 4b8b8a4a
      Linus Torvalds 提交于
      Pull md bug fixes from NeilBrown:
       "Sorry boss, back at work now boss.  Here's them nice shiny patches ya
        wanted.  All nicely tagged and justified for -stable and everyfing:
      
        Three bug fixes for md in 3.10
      
        3.10 wasn't a good release for md.  The bio changes left a couple of
        bugs, and an md "fix" created another one.
      
        These three patches appear to fix the issues and have been tagged for
        -stable"
      
      * tag 'md-3.11-fixes' of git://neil.brown.name/md:
        md/raid1: fix bio handling problems in process_checks()
        md: Remove recent change which allows devices to skip recovery.
        md/raid10: fix two problems with RAID10 resync.
      4b8b8a4a
    • L
      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux · 0a693ab6
      Linus Torvalds 提交于
      Pull drm fixes from Dave Airlie:
       "You'll be terribly disappointed in this, I'm not trying to sneak any
        features in or anything, its mostly radeon and intel fixes, a couple
        of ARM driver fixes"
      
      * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux: (34 commits)
        drm/radeon/dpm: add debugfs support for RS780/RS880 (v3)
        drm/radeon/dpm/atom: fix broken gcc harder
        drm/radeon/dpm/atom: restructure logic to work around a compiler bug
        drm/radeon/dpm: fix atom vram table parsing
        drm/radeon: fix an endian bug in atom table parsing
        drm/radeon: add a module parameter to disable aspm
        drm/rcar-du: Use the GEM PRIME helpers
        drm/shmobile: Use the GEM PRIME helpers
        uvesafb: Really allow mtrr being 0, as documented and warn()ed
        radeon kms: do not flush uninitialized hotplug work
        drm/radeon/dpm/sumo: handle boost states properly when forcing a perf level
        drm/radeon: align VM PTBs (Page Table Blocks) to 32K
        drm/radeon: allow selection of alignment in the sub-allocator
        drm/radeon: never unpin UVD bo v3
        drm/radeon: fix UVD fence emit
        drm/radeon: add fault decode function for CIK
        drm/radeon: add fault decode function for SI (v2)
        drm/radeon: add fault decode function for cayman/TN (v2)
        drm/radeon: use radeon device for request firmware
        drm/radeon: add missing ttm_eu_backoff_reservation to radeon_bo_list_validate
        ...
      0a693ab6
    • L
      Merge tag 'driver-core-3.11-rc2' of... · 7a62711a
      Linus Torvalds 提交于
      Merge tag 'driver-core-3.11-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
      
      Pull driver core patches from Greg KH:
       "Here are some driver core patches for 3.11-rc2.  They aren't really
        bugfixes, but a bunch of new helper macros for drivers to properly
        create attribute groups, which drivers and subsystems need to fix up a
        ton of race issues with incorrectly creating sysfs files (binary and
        normal) after userspace has been told that the device is present.
      
        Also here is the ability to create binary files as attribute groups,
        to solve that race condition, which was impossible to do before this,
        so that's my fault the drivers were broken.
      
        The majority of the .c changes is indenting and moving code around a
        bit.  It affects no existing code, but allows the large backlog of 70+
        patches that I already have created to start flowing into the
        different subtrees, instead of having to live in my driver-core tree,
        causing merge nightmares in linux-next for the next few months.
      
        These were finalized too late for the -rc1 merge window, which is why
        they were didn't make that pull request, testing and review from
        others didn't happen until a few weeks ago, and then there's the whole
        distraction of the past few days, which prevented these from getting
        to you sooner, sorry about that.
      
        Oh, and there's a bugfix for the documentation build warning in here
        as well.  All of these have been in linux-next this week, with no
        reported problems"
      
      * tag 'driver-core-3.11-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:
        driver-core: fix new kernel-doc warning in base/platform.c
        sysfs: use file mode defines from stat.h
        sysfs: add more helper macro's for (bin_)attribute(_groups)
        driver core: add default groups to struct class
        driver core: Introduce device_create_groups
        sysfs: prevent warning when only using binary attributes
        sysfs: add support for binary attributes in groups
        driver core: device.h: add RW and RO attribute macros
        sysfs.h: add BIN_ATTR macro
        sysfs.h: add ATTRIBUTE_GROUPS() macro
        sysfs.h: add __ATTR_RW() macro
      7a62711a
    • L
      Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging · 5d88d15e
      Linus Torvalds 提交于
      Pull hwmon fix from Guenter Roeck:
       "Single patch to staticize a local variable"
      
      * tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
        hwmon: (abx500) Staticize abx500_temp_attributes
      5d88d15e
    • L
      Merge branch 'cpuinit_phase2' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux · 3f334c20
      Linus Torvalds 提交于
      Pull phase two of __cpuinit removal from Paul Gortmaker:
       "With the __cpuinit infrastructure removed earlier, this group of
        commits only removes the function/data tagging that was done with the
        various (now no-op) __cpuinit related prefixes.
      
        Now that the dust has settled with yesterday's v3.11-rc1, there
        hopefully shouldn't be any new users leaking back in tree, but I think
        we can leave the harmless no-op stubs there for a release as a
        courtesy to those who still have out of tree stuff and weren't paying
        attention.
      
        Although the commits are against the recent tag to allow for minor
        context refreshes for things like yesterday's v3.11-rc1~ slab content,
        the patches have been largely unchanged for weeks, aside from such
        trivial updates.
      
        For detail junkies, the largely boring and mostly irrelevant history
        of the patches can be viewed at:
      
          http://git.kernel.org/cgit/linux/kernel/git/paulg/cpuinit-delete.git
      
        If nothing else, I guess it does at least demonstrate the level of
        involvement required to shepherd such a treewide change to completion.
      
        This is the same repository of patches that has been applied to the
        end of the daily linux-next branches for the past several weeks"
      
      * 'cpuinit_phase2' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux: (28 commits)
        block: delete __cpuinit usage from all block files
        drivers: delete __cpuinit usage from all remaining drivers files
        kernel: delete __cpuinit usage from all core kernel files
        rcu: delete __cpuinit usage from all rcu files
        net: delete __cpuinit usage from all net files
        acpi: delete __cpuinit usage from all acpi files
        hwmon: delete __cpuinit usage from all hwmon files
        cpufreq: delete __cpuinit usage from all cpufreq files
        clocksource+irqchip: delete __cpuinit usage from all related files
        x86: delete __cpuinit usage from all x86 files
        score: delete __cpuinit usage from all score files
        xtensa: delete __cpuinit usage from all xtensa files
        openrisc: delete __cpuinit usage from all openrisc files
        m32r: delete __cpuinit usage from all m32r files
        hexagon: delete __cpuinit usage from all hexagon files
        frv: delete __cpuinit usage from all frv files
        cris: delete __cpuinit usage from all cris files
        metag: delete __cpuinit usage from all metag files
        tile: delete __cpuinit usage from all tile files
        sh: delete __cpuinit usage from all sh files
        ...
      3f334c20
    • L
      Merge tag 'sound-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · c66bce9b
      Linus Torvalds 提交于
      Pull sound fixes from Takashi Iwai:
       "Except for a slightly big OMAP changes, all rest are small, mostly
        boring changes; all either 3.11 regression fixes or stable materials.
      
         - ASoC OMAP fixes due to non-DT OMAP4 removals
         - Other ASoC driver changes (sglt5000, wm8978, wm8948, samsung)
         - Fix missing locking for snd_pcm_stop() calls in many drivers
         - Fix the blocking request_module() in OSS sequencer
         - Fix old OSS vwsnd driver builds
         - Add a new HD-audio HDMI codec ID"
      
      * tag 'sound-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (23 commits)
        ALSA: seq-oss: Initialize MIDI clients asynchronously
        ALSA: hda - Add new GPU codec ID to snd-hda
        staging: line6: Fix unlocked snd_pcm_stop() call
        [media] saa7134: Fix unlocked snd_pcm_stop() call
        ASoC: s6000: Fix unlocked snd_pcm_stop() call
        ASoC: atmel: Fix unlocked snd_pcm_stop() call
        ALSA: pxa2xx: Fix unlocked snd_pcm_stop() call
        ALSA: usx2y: Fix unlocked snd_pcm_stop() call
        ALSA: ua101: Fix unlocked snd_pcm_stop() call
        ALSA: 6fire: Fix unlocked snd_pcm_stop() call
        ALSA: atiixp: Fix unlocked snd_pcm_stop() call
        ALSA: asihpi: Fix unlocked snd_pcm_stop() call
        sound: oss/vwsnd: Always define vwsnd_mutex
        sound: oss/vwsnd: Add missing inclusion of linux/delay.h
        ASoC: wm8978: enable symmetric rates
        ASoC: omap-mcbsp: Use different method for DMA request when booted with DT
        ASoC: omap-dmic: Do not use platform_get_resource_byname() for DMA
        ASoC: omap-mcpdm: Do not use platform_get_resource_byname() for DMA
        ASoC: omap-pcm: Request the DMA channel differently when DT is involved
        ASoC: Samsung: Set RFS and BFS in slave mode
        ...
      c66bce9b
  3. 18 7月, 2013 12 次提交
  4. 17 7月, 2013 7 次提交
    • L
      drm/rcar-du: Use the GEM PRIME helpers · ffb40400
      Laurent Pinchart 提交于
      The GEM CMA PRIME import/export helpers have been removed in favor of
      generic GEM PRIME helpers with GEM CMA low-level operations. Fix the
      driver accordingly.
      Reported-by: NMark Brown <broonie@linaro.org>
      Signed-off-by: NLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
      Tested-by: NMark Brown <broonie@linaro.org>
      ffb40400
    • L
      drm/shmobile: Use the GEM PRIME helpers · 58cbd3ac
      Laurent Pinchart 提交于
      The GEM CMA PRIME import/export helpers have been removed in favor of
      generic GEM PRIME helpers with GEM CMA low-level operations. Fix the
      driver accordingly.
      Reported-by: NMark Brown <broonie@linaro.org>
      Signed-off-by: NLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
      Tested-by: NMark Brown <broonie@linaro.org>
      58cbd3ac
    • T
      ALSA: seq-oss: Initialize MIDI clients asynchronously · 256ca9c3
      Takashi Iwai 提交于
      We've got bug reports that the module loading stuck on Debian system
      with 3.10 kernel.  The debugging session revealed that the initial
      registration of OSS sequencer clients stuck at module loading time,
      which involves again with request_module() at the init phase.  This is
      triggered only by special --install stuff Debian is using, but it's
      still not good to have such loops.
      
      As a workaround, call the registration part asynchronously.  This is a
      better approach irrespective of the hang fix, in anyway.
      Reported-and-tested-by: NPhilipp Matthias Hahn <pmhahn@pmhahn.de>
      Cc: <stable@vger.kernel.org>
      Signed-off-by: NTakashi Iwai <tiwai@suse.de>
      256ca9c3
    • R
      driver-core: fix new kernel-doc warning in base/platform.c · 08801f96
      Randy Dunlap 提交于
      Fix new kernel-doc warning in drivers/base/platform.c:
      
      Warning(drivers/base/platform.c:528): No description found for parameter 'owner'
      Signed-off-by: NRandy Dunlap <rdunlap@infradead.org>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      08801f96
    • D
      linked-list: Remove __list_for_each · c0d15cc7
      Dave Jones 提交于
      __list_for_each used to be the non prefetch() aware list walking
      primitive.  When we removed the prefetch macros from the list routines,
      it became redundant.  Given it does exactly the same thing as
      list_for_each now, we might as well remove it and call list_for_each
      directly.
      
      All users of __list_for_each have been converted to list_for_each calls
      in the current merge window.
      Signed-off-by: NDave Jones <davej@redhat.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      c0d15cc7
    • D
      Merge tag 'drm-intel-fixes-2013-07-11' of git://people.freedesktop.org/~danvet/drm-intel · 6bd2cab2
      Dave Airlie 提交于
      One feature latecomer, I've forgotten to merge the patch to reeanble the
      Haswell power well feature now that the audio interaction is fixed up.
      Since that was the only unfixed issue with it I've figured I could throw
      it in a bit late, and it's trivial to revert in case I'm wrong.
      
      Otherwise all bug/regression fixes:
      - Fix status page reinit after gpu hangs, spotted by more paranoid igt
        checks.
      - Fix object list walking fumble regression in the shrinker (only the
        counting part, the actual shrinking code was correct so no Oops
        potential), from Xiong Zhang.
      - Fix DP 1.2 bw limits (Imre).
      - Restore legacy forcewake on ivb, too many broken biosen out there. We
        dump a warn though that recent userspace might fall over with that
        config (Guenter Roeck).
      - Patch up the gen2 cs tlb w/a.
      - Improve the fence coherency w/a now that we have a better understanding
        what's going on. The removed wbinvd+ipi should make -rt folks happy. Big
        thanks to Jon Bloomfield for figuring this out, patches from Chris.
      - Fix write-read race when switching ring (Chris). Spotted with code
        inspection, but now we also have an igt for it.
      
      There's an ugly regression we're still working on introduced between
      3.10-rc7 and 3.10.0. Unfortunately we can't just revert the offender since
      that one fixes another regression :( I've asked Steven to include my
      -fixes branch into linux-next to prevent such fallout in the future,
      hopefully.
      
      * tag 'drm-intel-fixes-2013-07-11' of git://people.freedesktop.org/~danvet/drm-intel:
        Revert "drm/i915: Workaround incoherence between fences and LLC across multiple CPUs"
        drm/i915: Fix incoherence with fence updates on Sandybridge+
        drm/i915: Fix write-read race with multiple rings
        Partially revert "drm/i915: unconditionally use mt forcewake on hsw/ivb"
        drm/i915: fix lane bandwidth capping for DP 1.2 sinks
        drm/i915: fix up ring cleanup for the i830/i845 CS tlb w/a
        drm/i915: Correct obj->mm_list link to dev_priv->dev_priv->mm.inactive_list
        drm/i915: switch disable_power_well default value to 1
        drm/i915: reinit status page registers after gpu reset
      6bd2cab2
    • K
      x86: Make sure IDT is page aligned · 4df05f36
      Kees Cook 提交于
      Since the IDT is referenced from a fixmap, make sure it is page aligned.
      Merge with 32-bit one, since it was already aligned to deal with F00F
      bug. Since bss is cleared before IDT setup, it can live there. This also
      moves the other *_idt_table variables into common locations.
      
      This avoids the risk of the IDT ever being moved in the bss and having
      the mapping be offset, resulting in calling incorrect handlers. In the
      current upstream kernel this is not a manifested bug, but heavily patched
      kernels (such as those using the PaX patch series) did encounter this bug.
      
      The tables other than idt_table technically do not need to be page
      aligned, at least not at the current time, but using a common
      declaration avoids mistakes.  On 64 bits the table is exactly one page
      long, anyway.
      Signed-off-by: NKees Cook <keescook@chromium.org>
      Link: http://lkml.kernel.org/r/20130716183441.GA14232@www.outflux.netReported-by: NPaX Team <pageexec@gmail.com>
      Signed-off-by: NH. Peter Anvin <hpa@linux.intel.com>
      4df05f36