1. 27 Feb, 2014 4 commits
    • Dave Airlie's avatar
      Merge branch 'drm-next-3.15' of git://people.freedesktop.org/~deathsimple/linux into drm-next · 4d538b79
      Dave Airlie authored
      So this is the initial pull request for radeon drm-next 3.15. Highlights:
      - VCE bringup including DPM support
      - Few cleanups for the ring handling code
      
      * 'drm-next-3.15' of git://people.freedesktop.org/~deathsimple/linux:
        drm/radeon: cleanup false positive lockup handling
        drm/radeon: drop radeon_ring_force_activity
        drm/radeon: drop drivers copy of the rptr
        drm/radeon/cik: enable/disable vce cg when encoding v2
        drm/radeon: add support for vce 2.0 clock gating
        drm/radeon/dpm: properly enable/disable vce when vce pg is enabled
        drm/radeon/dpm: enable dynamic vce state switching v2
        drm/radeon: add vce dpm support for KV/KB
        drm/radeon: enable vce dpm on CI
        drm/radeon: add vce dpm support for CI
        drm/radeon: fill in set_vce_clocks for CIK asics
        drm/radeon/dpm: fetch vce states from the vbios
        drm/radeon/dpm: fill in some initial vce infrastructure
        drm/radeon/dpm: move platform caps fetching to a separate function
        drm/radeon: add callback for setting vce clocks
        drm/radeon: add VCE version parsing and checking
        drm/radeon: add VCE ring query
        drm/radeon: initial VCE support v4
        drm/radeon: fix CP semaphores on CIK
      4d538b79
    • Dave Airlie's avatar
      Merge branch 'tda998x-devel' of git://ftp.arm.linux.org.uk/~rmk/linux-cubox into drm-next · c48cdd23
      Dave Airlie authored
      Updates from Jean-Fracois for the TDA998x driver, which are on top of
      the fixes you have previously pulled, except these changes aren't
      intended for -rc, but the next merge window.
      
      Several of these are issues of correctness - passing more correct HDMI
      info packets, not reading registers in older chips documented as write
      only (despite appearing to be read/write in later chips).  Others are
      code cleanups (using definitions rather than constants where we have
      them already in the kernel).
      
      Additional functionality is also added by way of optional support for
      the IRQ from the TDA998x, which allows us to avoid busy-waiting for
      the EDID reads.
      
      * 'tda998x-devel' of git://ftp.arm.linux.org.uk/~rmk/linux-cubox:
        drm/i2c: tda998x: always use the same device for all kernel messages
        drm/i2c: tda998x: adjust the audio clock divider for S/PDIF
        drm/i2c: tda998x: code optimization
        drm/i2c: tda998x: remove the unused variable ca_i2s
        drm/i2c: tda998x: make the audio code more readable
        drm/i2c: tda998x: use irq for connection status and EDID read
        drm/i2c: tda998x: always enable EDID read IRQ
        drm/i2c: tda998x: add DT documentation
        drm/i2c: tda998x: add DT support
        drm/i2c: tda998x: don't read write-only registers
        drm/i2c: tda998x: don't freeze the system at audio startup time
        drm/i2c: tda998x: change probe message origin
        drm/i2c: tda998x: code cleanup
        drm/i2c: tda998x: clean up error chip version checking
        drm/i2c: tda998x: check more I/O errors
        drm/i2c: tda998x: simplify the i2c read/write functions
        drm/i2c: tda998x: use ALSA IEC958 definitions and update audio frequency
        drm/i2c: tda998x: add the active aspect in HDMI AVI frame
        drm/i2c: tda998x: use HDMI constants
      c48cdd23
    • Dave Airlie's avatar
      Merge tag 'drm-intel-next-2014-02-07' of ssh://git.freedesktop.org/git/drm-intel into drm-next · 3e09dcd5
      Dave Airlie authored
      - Yet more steps towards atomic modeset from Ville.
      - DP panel power sequencing improvements from Paulo.
      - irq code cleanups from Ville.
      - 5.4 GHz dp lane clock support for bdw/hsw from Todd.
      - Clock readout support for hsw/bdw (aka fastboot) from Jesse.
      - Make pipe underruns report at ERROR level (Ville). This is to check our
        improved watermarks code.
      - Full ppgtt support from Ben for gen7.
      - More fbc fixes and improvements from Ville all over the place, unfortunately
        not yet enabled by default on more platforms.
      - w/a cleanups from Ville.
      - HiZ stall optimization settings (Chia-I Wu).
      - Display register mmio offset refactor patch from Antti.
      - RPS improvements for corner-cases from Jeff McGee.
      
      * tag 'drm-intel-next-2014-02-07' of ssh://git.freedesktop.org/git/drm-intel: (166 commits)
        drm/i915: Update rps interrupt limits
        drm/i915: Restore rps/rc6 on reset
        drm/i915: Prevent recursion by retiring requests when the ring is full
        drm/i915: Generate a hang error code
        drm/i915: unify FLIP_DONE macro names
        drm/i915: vlv: s/spin_lock_irqsave/spin_lock/ in irq handler
        drm/i915: factor out valleyview_pipestat_irq_handler
        drm/i915: vlv: don't unmask IIR[DISPLAY_PIPE_A/B_VBLANK] interrupt
        drm/i915: Reorganize display pipe register accesses
        drm/i915: Treat using a purged buffer as a source of EFAULT
        drm/i915: Convert EFAULT into a silent SIGBUS
        drm/i915: release mutex in i915_gem_init()'s error path
        drm/i915: check for oom when allocating private_default_ctx
        drm/i915/vlv: WA to fix Voltage not getting dropped to Vmin when Gfx is power gated.
        drm/i915: Get rid of acthd based guilty batch search
        drm/i915: Use hangcheck score to find guilty context
        drm/i915: Drop WaDisablePSDDualDispatchEnable:ivb for IVB GT2
        drm/i915: Fix IVB GT2 WaDisableDopClockGating and WaDisablePSDDualDispatchEnable
        drm/i915: Don't access snooped pages through the GTT (even for error capture)
        drm/i915: Only print information for filing bug reports once
        ...
      
      Conflicts:
      	drivers/gpu/drm/i915/intel_dp.c
      3e09dcd5
    • Dave Airlie's avatar
      Merge tag 'drm/dp-aux-for-3.15-rc1' of git://anongit.freedesktop.org/tegra/linux into drm-next · 6ba6b7cd
      Dave Airlie authored
      drm: DisplayPort AUX framework for v3.15-rc1
      
      This series of patches implements a small framework that abstracts away
      some of the functionality that the DisplayPort AUX channel provides. It
      comes with a set of generic helpers that use the driver implementations
      to reduce code duplication.
      
      * tag 'drm/dp-aux-for-3.15-rc1' of git://anongit.freedesktop.org/tegra/linux:
        drm/dp: Allow registering AUX channels as I2C busses
        drm/dp: Add DisplayPort link helpers
        drm/dp: Add drm_dp_dpcd_read_link_status()
        drm/dp: Add AUX channel infrastructure
      6ba6b7cd
  2. 26 Feb, 2014 4 commits
    • Thierry Reding's avatar
      drm/dp: Allow registering AUX channels as I2C busses · 88759686
      Thierry Reding authored
      Implements an I2C-over-AUX I2C adapter on top of the generic drm_dp_aux
      infrastructure. It extracts the retry logic from existing drivers, which
      should help in porting those drivers to this new helper.
      Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
      Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
      Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
      ---
      Changes in v5:
      - move comments partially to to header file
      - keep MOT set between I2C messages
      - return -EPROTO on short reads
      
      Changes in v4:
      - fix typo "bitrate" -> "bit rate"
      
      Changes in v3:
      - add back DRM_DEBUG_KMS and DRM_ERROR messages
      - embed i2c_adapter within struct drm_dp_aux
      - fix typo in comment
      88759686
    • Thierry Reding's avatar
      drm/dp: Add DisplayPort link helpers · 516c0f7c
      Thierry Reding authored
      Add a helper to probe a DP link (read out the supported DPCD revision,
      maximum rate, link count and capabilities) as well as power up the DP
      link and configure it accordingly.
      Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
      Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
      Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
      ---
      Changes in v5:
      - export helpers
      
      Changes in v4:
      - fix a couple of typos in comments as pointed out by Alex Deucher
      
      Changes in v3:
      - split into drm_dp_link_power_up() and drm_dp_link_configure()
      - do not change sink state for DPCD versions earlier than 1.1
      - sleep for 1-2 ms after setting local sink to D0 state
      - read and write consecutive registers where possible
      - read DPCD revision when link is probed
      - remove duplicate kerneldoc
      516c0f7c
    • Thierry Reding's avatar
      drm/dp: Add drm_dp_dpcd_read_link_status() · 8d4adc6a
      Thierry Reding authored
      The function reads the link status (6 bytes starting at offset 0x202)
      from the DPCD so that it can be conveniently passed to other DPCD
      helpers.
      Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
      Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
      Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
      8d4adc6a
    • Thierry Reding's avatar
      drm/dp: Add AUX channel infrastructure · c197db75
      Thierry Reding authored
      This is a superset of the current i2c_dp_aux bus functionality and can
      be used to transfer native AUX in addition to I2C-over-AUX messages.
      
      Helpers are provided to read and write the DPCD, either blockwise or
      byte-wise. Many of the existing helpers for DisplayPort take a copy of a
      portion of the DPCD and operate on that, without a way to write data
      back to the DPCD (e.g. for configuration of the link).
      
      Subsequent patches will build upon this infrastructure to provide common
      functionality in a generic way.
      Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
      Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
      Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
      ---
      Changes in v5:
      - move comments partially to struct drm_dp_aux_msg in header file
      - return -EPROTO on short reads in DPCD helpers
      
      Changes in v4:
      - fix a typo in a comment
      
      Changes in v3:
      - reorder drm_dp_dpcd_writeb() arguments to be more intuitive
      - return number of bytes transferred in drm_dp_dpcd_write()
      - factor out drm_dp_dpcd_access()
      - describe error codes
      c197db75
  3. 24 Feb, 2014 3 commits
    • Linus Torvalds's avatar
      Linux 3.14-rc4 · cfbf8d48
      Linus Torvalds authored
      cfbf8d48
    • Linus Torvalds's avatar
      Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 72673429
      Linus Torvalds authored
      Pull ARM SoC fixes from Olof Johansson:
       "A collection of fixes for ARM platforms.  Most are fixes for DTS
        files, mostly from DT conversion on OMAP which is still finding a few
        issues here and there.
      
        There's a couple of small stale code removal patches that we usually
        queue for the next release instead, but they seemed harmless enough to
        bring in now.
      
        Also, a fix for backlight on some PXA platforms, and a cache
        configuration fix for Tegra, etc"
      
      * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (25 commits)
        MAINTAINERS: add additional ARM BCM281xx/BCM11xxx maintainer
        ARM: tegra: only run PL310 init on systems with one
        ARM: tegra: Add head numbers to display controllers
        ARM: imx6: build pm-imx6q.c independently of CONFIG_PM
        ARM: tegra: fix RTC0 alias for Cardhu
        ARM: dove: dt: revert PMU interrupt controller node
        Documentation: dt: OMAP: Update Overo/Tobi
        ARM: dts: Add support for both OMAP35xx and OMAP36xx Overo/Tobi
        ARM: dts: omap3-tobi: Use the correct vendor prefix
        ARM: dts: omap3-tobi: Fix boot with OMAP36xx-based Overo
        ARM: OMAP2+: Remove legacy macros for zoom platforms
        ARM: OMAP2+: Remove MACH_NOKIA_N800
        ARM: dts: N900: add missing compatible property
        ARM: dts: N9/N950: fix boot hang with 3.14-rc1
        ARM: OMAP1: nokia770: enable tahvo-usb
        ARM: OMAP2+: gpmc: fix: DT ONENAND child nodes not probed when MTD_ONENAND is built as module
        ARM: OMAP2+: gpmc: fix: DT NAND child nodes not probed when MTD_NAND is built as module
        ARM: dts: omap3-gta04: Fix mmc1 properties.
        ARM: dts: omap3-gta04: Fix 'aux' gpio key flags.
        ARM: OMAP2+: add missing ARCH_HAS_OPP
        ...
      72673429
    • Linus Torvalds's avatar
      Merge tag 'regulator-v3.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator · 24c85258
      Linus Torvalds authored
      Pull regulator fixes from Mark Brown:
       "Mostly unexciting driver fixes, plus one fix to lower the severity of
        the log message when we don't use an optional regulator - the fixes
        for ACPI system made this come up more often and it was correctly
        observed that it was causing undue concern for users"
      
      * tag 'regulator-v3.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
        regulator: max14577: Fix invalid return value on DT parse success
        regulator: core: Change dummy supplies error message to a warning
        regulator: s5m8767: Add missing of_node_put
        regulator: s5m8767: Use of_get_child_by_name
        regulator: da9063: Bug fix when setting max voltage on LDOs 5-11
      24c85258
  4. 23 Feb, 2014 10 commits
  5. 22 Feb, 2014 7 commits
    • Greg Kroah-Hartman's avatar
      Revert "tty: Set correct tty name in 'active' sysfs attribute" · 5c0a2450
      Greg Kroah-Hartman authored
      This reverts commit d8a5dc30.
      
      This breaks plymouth installs, either because plymouth is using the file
      "incorrectly" or because the patch is incorrect.  Either way, this needs
      to be reverted until it is all figured out.
      Reported-by: default avatarJosh Boyer <jwboyer@fedoraproject.org>
      Reported-by: default avatarRay Strode <halfline@gmail.com>
      Cc: Lennart Poettering <lennart@poettering.net>
      Cc: Kay Sievers <kay@vrfy.org>
      Cc: Jiri Slaby <jslaby@suse.cz>
      Cc: David Herrmann <dh.herrmann@gmail.com>
      Cc: Werner Fink <werner@suse.de>
      Cc: Hannes Reinecke <hare@suse.de>
      Cc: stable <stable@vger.kernel.org>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      5c0a2450
    • Linus Torvalds's avatar
      Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 5580723f
      Linus Torvalds authored
      Pull scheduler fixes from Ingo Molnar:
       "Misc fixlets: a fair number of them resulting from the new
        SCHED_DEADLINE code"
      
      * 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        sched/deadline: Remove useless dl_nr_total
        sched/deadline: Test for CPU's presence explicitly
        sched: Add 'flags' argument to sched_{set,get}attr() syscalls
        sched: Fix information leak in sys_sched_getattr()
        sched,numa: add cond_resched to task_numa_work
        sched/core: Make dl_b->lock IRQ safe
        sched/core: Fix sched_rt_global_validate
        sched/deadline: Fix overflow to handle period==0 and deadline!=0
        sched/deadline: Fix bad accounting of nr_running
      5580723f
    • Linus Torvalds's avatar
      Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 9b3e7c9b
      Linus Torvalds authored
      Pull perf fixes from Ingo Molnar:
       "Misc fixlets from all around the place"
      
      * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        perf/x86/uncore: Fix IVT/SNB-EP uncore CBOX NID filter table
        perf/x86: Correctly use FEATURE_PDCM
        perf, nmi: Fix unknown NMI warning
        perf trace: Fix ioctl 'request' beautifier build problems on !(i386 || x86_64) arches
        perf trace: Add fallback definition of EFD_SEMAPHORE
        perf list: Fix checking for supported events on older kernels
        perf tools: Handle PERF_RECORD_HEADER_EVENT_TYPE properly
        perf probe: Do not add offset twice to uprobe address
        perf/x86: Fix Userspace RDPMC switch
        perf/x86/intel/p6: Add userspace RDPMC quirk for PPro
      9b3e7c9b
    • Linus Torvalds's avatar
      Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging · 0f0ca143
      Linus Torvalds authored
      Pull hwmon fix from Guenter Roeck:
       "Fix writing the minimum temperature in max1668 driver"
      
      * tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
        hwmon: (max1668) Fix writing the minimum temperature
      0f0ca143
    • Linus Torvalds's avatar
      Merge branch 'xfs-fixes-for-3.14-rc4' of git://oss.sgi.com/xfs/xfs · 645ceee8
      Linus Torvalds authored
      Pull xfs fixes from Dave Chinner:
       "This is the first pull request I've had to do for you, so I'm still
        sorting things out.  The reason I'm sending this and not Ben should be
        obvious from the first commit below - SGI has stepped down from the
        XFS maintainership role.  As such, I'd like to take another
        opportunity to thank them for their many years of effort maintaining
        XFS and supporting the XFS community that they developed from the
        ground up.
      
        So I haven't had time to work things like signed tags into my
        workflows yet, so this is just a repo branch I'm asking you to pull
        from.  And yes, I named the branch -rc4 because I wanted the fixes in
        rc4, not because the branch was for merging into -rc3.  Probably not
        right, either.
      
        Anyway, I should have everything sorted out by the time the next merge
        window comes around.  If there's anything that you don't like in the
        pull req, feel free to flame me unmercifully.
      
        The changes are fixes for recent regressions and important thinkos in
        verification code:
      
              - a log vector buffer alignment issue on ia32
              - timestamps on truncate got mangled
              - primary superblock CRC validation fixes and error message
                sanitisation"
      
      * 'xfs-fixes-for-3.14-rc4' of git://oss.sgi.com/xfs/xfs:
        xfs: limit superblock corruption errors to actual corruption
        xfs: skip verification on initial "guess" superblock read
        MAINTAINERS: SGI no longer maintaining XFS
        xfs: xfs_sb_read_verify() doesn't flag bad crcs on primary sb
        xfs: ensure correct log item buffer alignment
        xfs: ensure correct timestamp updates from truncate
      645ceee8
    • Ingo Molnar's avatar
      Merge tag 'perf-urgent-for-mingo' of... · a9d3f94e
      Ingo Molnar authored
      Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent
      
      Pull perf/urgent fixes from Arnaldo Carvalho de Melo:
      
        * Handle PERF_RECORD_HEADER_EVENT_TYPE properly. (Jiri Olsa)
      
        * Fix checking for supported events on older kernels in
          'perf list' (Vince Weaver)
      
        * Do not add offset twice to uprobe address in
          'perf probe' (Masami Hiramatsu)
      
        * Fix perf trace's ioctl 'request' beautifier build problems
          on !(i386 || x86_64) arches (Arnaldo Carvalho de Melo)
      
        * Fix 'perf trace' build by adding a fallback definition for
          EFD_SEMAPHORE (Ben Hutchings)
      Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
      Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
      a9d3f94e
    • Krzysztof Kozlowski's avatar
      regulator: max14577: Fix invalid return value on DT parse success · 08221fc4
      Krzysztof Kozlowski authored
      This fixes bug introduced in 667a6b7a (regulator: max14577: Add missing
      of_node_put). The DTS parsing function returned number of matched
      regulators as success status which then was compared against 0 in probe.
      
      Result was a probe fail after successful parsing the DTS:
      max14577-regulator: probe of max14577-regulator failed with error 2
      Signed-off-by: default avatarKrzysztof Kozlowski <k.kozlowski@samsung.com>
      Reviwed-by: default avatarSachin Kamat <sachin.kamat@linaro.org>
      Signed-off-by: default avatarMark Brown <broonie@linaro.org>
      08221fc4
  6. 21 Feb, 2014 12 commits