1. 03 5月, 2013 3 次提交
  2. 02 5月, 2013 1 次提交
  3. 17 4月, 2013 7 次提交
  4. 29 3月, 2013 1 次提交
  5. 27 3月, 2013 4 次提交
  6. 26 3月, 2013 4 次提交
  7. 25 3月, 2013 5 次提交
    • L
      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux · c4052ba9
      Linus Torvalds 提交于
      Pull drm fixes from Dave Airlie:
       "Exynos and Intel fixes.
      
        The intel fixes are fairly straightforward, mostly reverts due to bugs
        found.  The exynos one is a big larger since they found some issues
        with the G2D engine and iommu interaction, and needed to verify the
        operations a lot better than they were previously, otherwise a user
        app can just crash the kernel with an iommu fault."
      
      * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
        Revert "drm/i915: write backlight harder"
        drm/i915: don't disable the power well yet
        Revert "drm/i915: set TRANSCODER_EDP even earlier"
        drm/exynos: Check g2d cmd list for g2d restrictions
        drm/exynos: Add a new function to get gem buffer size
        drm/exynos: Deal with g2d buffer info more efficiently
        drm/exynos: Clean up some G2D codes for readability
        drm/exynos: Fix G2D core malfunctioning issue
        drm/exynos: clear node object type at gem unmap
        drm/exynos: Fix error routine to getting dma addr.
        drm/exynos: Replaced kzalloc & memcpy with kmemdup
        drm/exynos: fimd: calculate the correct address offset
        drm/exynos: Make mixer_check_timing static
        drm/exynos: modify the compatible string for exynos fimd
      c4052ba9
    • D
      Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel into HEAD · 7ac8833f
      Dave Airlie 提交于
      Daniel writes:
      "Just three revert/disable by default patches, one of them cc: stable
      (since the offending commit was cc: stable, too)."
      
      * 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel:
        Revert "drm/i915: write backlight harder"
        drm/i915: don't disable the power well yet
        Revert "drm/i915: set TRANSCODER_EDP even earlier"
      7ac8833f
    • D
      Merge branch 'exynos-drm-fixes' of... · ac165b00
      Dave Airlie 提交于
      Merge branch 'exynos-drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos into HEAD
      
      Inki writes:
      Includes bug fixes and code cleanups.
      And it considers some restrictions to G2D hardware.
      With this, the malfunction and page fault issues to g2d driver
      would be fixed.
      
      * 'exynos-drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos:
        drm/exynos: Check g2d cmd list for g2d restrictions
        drm/exynos: Add a new function to get gem buffer size
        drm/exynos: Deal with g2d buffer info more efficiently
        drm/exynos: Clean up some G2D codes for readability
        drm/exynos: Fix G2D core malfunctioning issue
        drm/exynos: clear node object type at gem unmap
        drm/exynos: Fix error routine to getting dma addr.
        drm/exynos: Replaced kzalloc & memcpy with kmemdup
        drm/exynos: fimd: calculate the correct address offset
        drm/exynos: Make mixer_check_timing static
        drm/exynos: modify the compatible string for exynos fimd
      ac165b00
    • L
      Merge tag 'pinctrl-fixes-for-v3.9' of... · 3912a677
      Linus Torvalds 提交于
      Merge tag 'pinctrl-fixes-for-v3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl
      
      Pull pinctrl fixes from Linus Walleij:
       "Here are a few pinctrl fixes for the v3.9 rc series:
         - Usecount bounds checking so we do not go below zero on mux
           usecounts.
         - Loop range checking in GPIO ranges in the DT range parser.
         - Proper print in debugfs for pinconf state.
         - Fix compilation bug in generic pinconf code.
         - Minor bugfixes to abx500 and mvebu drivers."
      
      * tag 'pinctrl-fixes-for-v3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl:
        pinmux: forbid mux_usecount to be set at UINT_MAX
        pinctrl: mvebu: fix checking for SoC specific controls
        pinctrl: generic: Fix compilation error
        pinctrl: Print the correct information in debugfs pinconf-state file
        pinctrl: abx500: Fix checking if pin use AlternateFunction register
        gpio: fix wrong checking condition for gpio range
      3912a677
    • L
      Merge branch 'x86/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 33b73e9b
      Linus Torvalds 提交于
      Pull x86 fixes from Peter Anvin:
       "A collection of minor fixes, more EFI variables paranoia
        (anti-bricking) plus the ability to disable the pstore either as a
        runtime default or completely, due to bricking concerns."
      
      * 'x86/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        efivars: Fix check for CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE
        x86, microcode_intel_early: Mark apply_microcode_early() as cpuinit
        efivars: Handle duplicate names from get_next_variable()
        efivars: explicitly calculate length of VariableName
        efivars: Add module parameter to disable use as a pstore backend
        efivars: Allow disabling use as a pstore backend
        x86-32, microcode_intel_early: Fix crash with CONFIG_DEBUG_VIRTUAL
        x86-64: Fix the failure case in copy_user_handle_tail()
      33b73e9b
  8. 24 3月, 2013 12 次提交
    • D
      Revert "drm/i915: write backlight harder" · b1289371
      Daniel Vetter 提交于
      This reverts commit cf0a6584.
      
      Turns out that cargo-culting breaks systems. Note that we can't revert
      further, since
      
      commit 770c1231
      Author: Takashi Iwai <tiwai@suse.de>
      Date:   Sat Aug 11 08:56:42 2012 +0200
      
          drm/i915: Fix blank panel at reopening lid
      
      fixed a regression in 3.6-rc kernels for which we've never figured out
      the exact root cause. But some further inspection of the backlight
      code reveals that it's seriously lacking locking. And especially the
      asle backlight update is know to get fired (through some smm magic)
      when writing specific backlight control registers. So the possibility
      of suffering from races is rather real.
      
      Until those races are fixed I don't think it makes sense to try
      further hacks. Which sucks a bit, but sometimes that's how it is :(
      
      References: http://www.mail-archive.com/intel-gfx@lists.freedesktop.org/msg18788.html
      Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=47941Tested-by: NTakashi Iwai <tiwai@suse.de>
      Cc: Jani Nikula <jani.nikula@intel.com>
      Cc: Takashi Iwai <tiwai@suse.de>
      Cc: stable@vger.kernel.org (the reverted commit was cc: stable, too)
      Signed-off-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
      b1289371
    • P
      drm/i915: don't disable the power well yet · 2124b72e
      Paulo Zanoni 提交于
      We're still not 100% ready to disable the power well, so don't disable
      it for now. When we disable it we break the audio driver (because some
      of the audio registers are on the power well) and machines with eDP on
      port D (because it doesn't use TRANSCODER_EDP).
      
      Also, instead of just reverting the code, add a Kernel option to let
      us disable it if we want. This will allow us to keep developing and
      testing the feature while it's not enabled.
      
      This fixes problems caused by the following commit:
        commit d6dd9eb1
        Author: Daniel Vetter <daniel.vetter@ffwll.ch>
        Date:   Tue Jan 29 16:35:20 2013 -0200
             drm/i915: dynamic Haswell display power well support
      
      References: http://www.mail-archive.com/intel-gfx@lists.freedesktop.org/msg18788.html
      Cc: Takashi Iwai <tiwai@suse.de>
      Cc: Mengdong Lin <mengdong.lin@intel.com>
      Signed-off-by: NPaulo Zanoni <paulo.r.zanoni@intel.com>
      Signed-off-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
      2124b72e
    • D
      Revert "drm/i915: set TRANSCODER_EDP even earlier" · bba2181c
      Daniel Vetter 提交于
      This reverts commit cc464b2a.
      
      The reason is that Takashi Iwai reported a regression bisected to this
      commit:
      
      http://www.mail-archive.com/intel-gfx@lists.freedesktop.org/msg18788.html
      
      His machine has eDP on port D (usual desktop all-in-on setup), which
      intel_dp.c identifies as an eDP panel, but the hsw ddi code
      mishandles.
      
      Closer inspection of the code reveals that haswell_crtc_mode_set also
      checks intel_encoder_is_pch_edp when setting is_cpu_edp. On haswell
      that doesn't make much sense (since there's no edp on the pch), but
      what this function _really_ checks is whether that edp connector is on
      port A or port D. It's just that on ilk-ivb port D was on the pch ...
      
      So that explains why this seemingly innocent change killed eDP on port
      D. Furthermore it looks like everything else accidentally works, since
      we've never enabled eDP on port D support for hsw intentionally (e.g.
      we still register the HDMI output for port D in that case).
      
      But in retrospective I also don't like that this leaks highly platform
      specific details into common code, and the reason is that the drm
      vblank layer sucks. So instead I think we should:
      - move the cpu_transcoder into the dynamic pipe_config tracking (once
        that's merged).
      - fix up the drm vblank layer to finally deal with kms crtc objects
        instead of int pipes.
      
      v2: Pimp commit message with the better diagnosis as discussed with
      Paulo on irc.
      
      Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
      Cc: Takashi Iwai <tiwai@suse.de>
      Reviewed-by: NPaulo Zanoni <paulo.r.zanoni@intel.com>
      Signed-off-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
      bba2181c
    • H
      Merge tag 'efi-for-3.9-rc4' into x86/urgent · b9726d9d
      H. Peter Anvin 提交于
      Signed-off-by: NH. Peter Anvin <hpa@linux.intel.com>
      b9726d9d
    • L
      Linux 3.9-rc4 · 8bb96604
      Linus Torvalds 提交于
      8bb96604
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending · a607a114
      Linus Torvalds 提交于
      Pull SCSI target fixes from Nicholas Bellinger:
       "These are mostly minor fixes this time around.  The iscsi-target CHAP
        big-endian bugfix and bump FD_MAX_SECTORS=2048 default patch to allow
        1MB sized I/Os for FILEIO backends on >= v3.5 code are both CC'ed to
        stable.
      
        Also, there is a persistent reservations regression that has recently
        been reported for >= v3.8.x code, that is currently being tracked down
        for v3.9."
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending:
        target/pscsi: Reject cross page boundary case in pscsi_map_sg
        target/file: Bump FD_MAX_SECTORS to 2048 to handle 1M sized I/Os
        tcm_vhost: Flush vhost_work in vhost_scsi_flush()
        tcm_vhost: Add missed lock in vhost_scsi_clear_endpoint()
        target: fix possible memory leak in core_tpg_register()
        target/iscsi: Fix mutual CHAP auth on big-endian arches
        target_core_sbc: use noop for SYNCHRONIZE_CACHE
      a607a114
    • L
      Merge tag 'md-3.9-fixes' of git://neil.brown.name/md · 22c3f2ff
      Linus Torvalds 提交于
      Pull md fixes from NeilBrown:
       "A few bugfixes for md
      
         - recent regressions in raid5
         - recent regressions in dmraid
         - a few instances of CONFIG_MULTICORE_RAID456 linger
      
        Several tagged for -stable"
      
      * tag 'md-3.9-fixes' of git://neil.brown.name/md:
        md: remove CONFIG_MULTICORE_RAID456 entirely
        md/raid5: ensure sync and DISCARD don't happen at the same time.
        MD: Prevent sysfs operations on uninitialized kobjects
        MD RAID5: Avoid accessing gendisk or queue structs when not available
        md/raid5: schedule_construction should abort if nothing to do.
      22c3f2ff
    • L
      Merge tag 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev · c8c1f167
      Linus Torvalds 提交于
      Pull libata updates from Jeff Garzik:
       "Simple stuff.  See one-line summaries."
      
      * tag 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
        pata_samsung_cf: use module_platform_driver_probe()
        [libata] Avoid specialized TLA's in ZPODD's Kconfig
        libata-acpi.c: fix copy and paste mistake in ata_acpi_register_power_resource
        sata_fsl: Remove redundant NULL check before kfree
        ahci: Add Device IDs for Intel Wellsburg PCH
        ata_piix: Add MODULE_PARM_DESC to prefer_ms_hyperv
      c8c1f167
    • L
      Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux · df2a8f39
      Linus Torvalds 提交于
      Pull i2c fixes from Wolfram Sang:
       "One bugfix for the tegra driver.  Two updates regarding email
        addresses and MAINTAINERS which I like to have up-to-date so people
        can be reached immediately.  While we are here, there is on PCI_ID
        addition."
      
      * 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
        MAINTAINERS: add maintainer entry for atmel i2c driver
        i2c: Fix my e-mail address in drivers and documentation
        i2c: iSMT: add Intel Avoton DeviceIDs
        i2c: tegra: check the clk_prepare_enable() return value
      df2a8f39
    • L
      Merge git://www.linux-watchdog.org/linux-watchdog · a4e71e79
      Linus Torvalds 提交于
      Pull watchdog fixes from Wim Van Sebroeck:
       "Fix a boot issues and correct the AcpiMmioSel bitmask in the
        sp5100_tco watchdog device driver"
      
      * git://www.linux-watchdog.org/linux-watchdog:
        watchdog: sp5100_tco: Set the AcpiMmioSel bitmask value to 1 instead of 2
        watchdog: sp5100_tco: Remove code that may cause a boot failure
      a4e71e79
    • T
      KMS: fix EDID detailed timing frame rate · c19b3b0f
      Torsten Duwe 提交于
      When KMS has parsed an EDID "detailed timing", it leaves the frame rate
      zeroed.  Consecutive (debug-) output of that mode thus yields 0 for
      vsync.  This simple fix also speeds up future invocations of
      drm_mode_vrefresh().
      
      While it is debatable whether this qualifies as a -stable fix I'd apply
      it for consistency's sake; drm_helper_probe_single_connector_modes()
      does the same thing already for all probed modes.
      
      Cc: stable@vger.kernel.org
      Signed-off-by: NTorsten Duwe <duwe@lst.de>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      c19b3b0f
    • T
      KMS: fix EDID detailed timing vsync parsing · 16dad1d7
      Torsten Duwe 提交于
      EDID spreads some values across multiple bytes; bit-fiddling is needed
      to retrieve these.  The current code to parse "detailed timings" has a
      cut&paste error that results in a vsync offset of at most 15 lines
      instead of 63.
      
      See
      
         http://en.wikipedia.org/wiki/EDID
      
      and in the "EDID Detailed Timing Descriptor" see bytes 10+11 show why
      that needs to be a left shift.
      
      Cc: stable@vger.kernel.org
      Signed-off-by: NTorsten Duwe <duwe@lst.de>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      16dad1d7
  9. 23 3月, 2013 3 次提交