1. 31 Jan, 2015 4 commits
  2. 29 Jan, 2015 3 commits
    • Wang, Yalin's avatar
      agp: change agp_free_page_array to use kvfree · e4100553
      Wang, Yalin authored
      Change agp_free_page_array to use kvfree function,
      remove the duplicated code.
      Signed-off-by: default avatarYalin Wang <yalin.wang@sonymobile.com>
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      e4100553
    • Dave Airlie's avatar
      Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into drm-next · b3869b17
      Dave Airlie authored
      This backmerges drm-fixes into drm-next mainly for the amdkfd
      stuff, I'm not 100% confident, but it builds and the amdkfd
      folks can fix anything up.
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      Conflicts:
      	drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
      	drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h
      b3869b17
    • Dave Airlie's avatar
      Merge tag 'drm/panel/for-3.20-rc1' of git://anongit.freedesktop.org/tegra/linux into drm-next · 7b83741b
      Dave Airlie authored
      drm/panel: Changes for v3.20-rc1
      
      This contains the long-awaited drm_bridge series that makes Chromebooks
      work for people. I had thought this would've been perfect by now, but
      then I go and build test it and the first thing it does is yell about a
      recursive dependency. I fixed that up because I was feeling bad for not
      getting around to look at this earlier.
      
      Biseds that there is new support for two more panels, a couple of fixup
      patches to the Sharp LQ101R1SX01 dual-channel DSI panel driver and a
      potential NULL pointer dereference fix.
      
      * tag 'drm/panel/for-3.20-rc1' of git://anongit.freedesktop.org/tegra/linux: (23 commits)
        drm/bridge: dw-hdmi: Adapt to bridge API change
        drm/sti: fixup for bridge interface
        drm/bridge: dw-hdmi: Fix return error path
        drm: Check the right variable when setting formats
        Documentation: bridge: Add documentation for ps8622 DT properties
        Documentation: devicetree: Add vendor prefix for parade
        Documentation: drm: bridge: move to video/bridge
        drm/bridge: ptn3460: use gpiod interface
        drm/bridge: ptn3460: probe connector at the end of bridge attach
        drm/bridge: ptn3460: support drm_panel
        drm/exynos: dp: support drm_bridge
        drm/bridge: ptn3460: Convert to I2C driver model
        drm/bridge: make bridge registration independent of drm flow
        drm/bridge: do not pass drm_bridge_funcs to drm_bridge_init
        drm/bridge: ptn3460: Few trivial cleanups
        drm/panel: simple: Add AVIC TM070DDH03 panel support
        of: Add vendor prefix for Shanghai AVIC Optoelectronics Co., Ltd.
        drm/panel: sharp: lq101r1sx01: Remove unneeded include
        drm/panel: sharp: lq101r1sx01: Respect power timings
        drm/panel: sharp: lq101r1sx01: Add delay after display on
        ...
      7b83741b
  3. 28 Jan, 2015 24 commits
  4. 27 Jan, 2015 9 commits
    • Dave Airlie's avatar
      Merge tag 'topic/atomic-core-2015-01-27' of git://anongit.freedesktop.org/drm-intel into drm-next · 21773f16
      Dave Airlie authored
      * tag 'topic/atomic-core-2015-01-27' of git://anongit.freedesktop.org/drm-intel:
        drm/atomic: Fix potential use of state after free
        drm/atomic-helper: debug output for modesets
        drm/atomic-helpers: Saner encoder/crtc callbacks
        drm/atomic-helpers: Recover full cursor plane behaviour
        drm/atomic-helper: add connector->dpms() implementation
        drm/atomic: Add drm_crtc_state->active
        drm: Add standardized boolean props
        drm/plane-helper: Fix transitional helper kerneldocs
        drm/plane-helper: Skip prepare_fb/cleanup_fb when newfb==oldfb
      
      Conflicts:
      	include/drm/drm_crtc_helper.h
      21773f16
    • Dave Airlie's avatar
      Merge tag 'drm/tegra/for-3.20-rc1' of git://anongit.freedesktop.org/tegra/linux into drm-next · 2f5b4ef1
      Dave Airlie authored
      drm/tegra: Changes for v3.20-rc1
      
      The biggest part of these changes is the conversion to atomic mode-
      setting. A lot of cleanup and demidlayering was required before the
      conversion, with the result being a whole lot of changes.
      
      Besides the atomic mode-setting support, the host1x bus now has the
      proper infrastructure to support suspend/resume for child devices.
      
      Finally, a couple of smaller cleanup patches round things off.
      
      * tag 'drm/tegra/for-3.20-rc1' of git://anongit.freedesktop.org/tegra/linux: (54 commits)
        drm/tegra: Use correct relocation target offsets
        drm/tegra: Add minimal power management
        drm/tegra: dc: Unify enabling the display controller
        drm/tegra: Track tiling and format in plane state
        drm/tegra: Track active planes in CRTC state
        drm/tegra: Remove unused ->mode_fixup() callbacks
        drm/tegra: Atomic conversion, phase 3, step 3
        drm/tegra: Atomic conversion, phase 3, step 2
        drm/tegra: dc: Use atomic clock state in modeset
        drm/tegra: sor: Implement ->atomic_check()
        drm/tegra: hdmi: Implement ->atomic_check()
        drm/tegra: dsi: Implement ->atomic_check()
        drm/tegra: rgb: Implement ->atomic_check()
        drm/tegra: dc: Store clock setup in atomic state
        drm/tegra: Atomic conversion, phase 3, step 1
        drm/tegra: Atomic conversion, phase 2
        drm/tegra: Atomic conversion, phase 1
        drm/tegra: dc: Do not needlessly deassert reset
        drm/tegra: Output cleanup functions cannot fail
        drm/tegra: Remove remnants of the output midlayer
        ...
      2f5b4ef1
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 59343cd7
      Linus Torvalds authored
      Pull networking fixes from David Miller:
      
       1) Don't OOPS on socket AIO, from Christoph Hellwig.
      
       2) Scheduled scans should be aborted upon RFKILL, from Emmanuel
          Grumbach.
      
       3) Fix sleep in atomic context in kvaser_usb, from Ahmed S Darwish.
      
       4) Fix RCU locking across copy_to_user() in bpf code, from Alexei
          Starovoitov.
      
       5) Lots of crash, memory leak, short TX packet et al bug fixes in
          sh_eth from Ben Hutchings.
      
       6) Fix memory corruption in SCTP wrt.  INIT collitions, from Daniel
          Borkmann.
      
       7) Fix return value logic for poll handlers in netxen, enic, and bnx2x.
          From Eric Dumazet and Govindarajulu Varadarajan.
      
       8) Header length calculation fix in mac80211 from Fred Chou.
      
       9) mv643xx_eth doesn't handle highmem correctly in non-TSO code paths.
          From Ezequiel Garcia.
      
      10) udp_diag has bogus logic in it's hash chain skipping, copy same fix
          tcp diag used.  From Herbert Xu.
      
      11) amd-xgbe programs wrong rx flow control register, from Thomas
          Lendacky.
      
      12) Fix race leading to use after free in ping receive path, from Subash
          Abhinov Kasiviswanathan.
      
      13) Cache redirect routes otherwise we can get a heavy backlog of rcu
          jobs liberating DST_NOCACHE entries.  From Hannes Frederic Sowa.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (48 commits)
        net: don't OOPS on socket aio
        stmmac: prevent probe drivers to crash kernel
        bnx2x: fix napi poll return value for repoll
        ipv6: replacing a rt6_info needs to purge possible propagated rt6_infos too
        sh_eth: Fix DMA-API usage for RX buffers
        sh_eth: Check for DMA mapping errors on transmit
        sh_eth: Ensure DMA engines are stopped before freeing buffers
        sh_eth: Remove RX overflow log messages
        ping: Fix race in free in receive path
        udp_diag: Fix socket skipping within chain
        can: kvaser_usb: Fix state handling upon BUS_ERROR events
        can: kvaser_usb: Retry the first bulk transfer on -ETIMEDOUT
        can: kvaser_usb: Send correct context to URB completion
        can: kvaser_usb: Do not sleep in atomic context
        ipv4: try to cache dst_entries which would cause a redirect
        samples: bpf: relax test_maps check
        bpf: rcu lock must not be held when calling copy_to_user()
        net: sctp: fix slab corruption from use after free on INIT collisions
        net: mv643xx_eth: Fix highmem support in non-TSO egress path
        sh_eth: Fix serialisation of interrupt disable with interrupt & NAPI handlers
        ...
      59343cd7
    • Christoph Hellwig's avatar
      net: don't OOPS on socket aio · 06539d30
      Christoph Hellwig authored
      Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      06539d30
    • Andy Shevchenko's avatar
      stmmac: prevent probe drivers to crash kernel · 9afec6ef
      Andy Shevchenko authored
      In the case when alloc_netdev fails we return NULL to a caller. But there is no
      check for NULL in the probe drivers. This patch changes NULL to an error
      pointer. The function description is amended to reflect what we may get
      returned.
      Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      9afec6ef
    • Linus Torvalds's avatar
      Merge tag 'powerpc-3.19-5' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux · 7da323bb
      Linus Torvalds authored
      Pull powerpc fixes from Michael Ellerman:
       "Two powerpc fixes"
      
      * tag 'powerpc-3.19-5' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux:
        powerpc/powernv: Restore LPCR with LPCR_PECE1 cleared
        powerpc/xmon: Fix another endiannes issue in RTAS call from xmon
      7da323bb
    • Linus Torvalds's avatar
      Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux · 41592e2f
      Linus Torvalds authored
      Pull one more module fix from Rusty Russell:
       "SCSI was using module_refcount() to figure out when the module was
        unloading: this broke with new atomic refcounting.  The code is still
        suspicious, but this solves the WARN_ON()"
      
      * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux:
        scsi: always increment reference count
      41592e2f
    • David Ung's avatar
      drm/tegra: Use correct relocation target offsets · 31f40f86
      David Ung authored
      When copying a relocation from userspace, copy the correct target
      offset.
      Signed-off-by: default avatarDavid Ung <davidu@nvidia.com>
      Fixes: 961e3bea ("drm/tegra: Make job submission 64-bit safe")
      Cc: stable@vger.kernel.org
      [treding@nvidia.com: provide a better commit message]
      Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
      31f40f86
    • Thierry Reding's avatar
      drm/tegra: Add minimal power management · 359ae687
      Thierry Reding authored
      For now only disable the KMS hotplug polling helper logic upon suspend
      and re-enable it on resume.
      Reviewed-by: default avatarSean Paul <seanpaul@chromium.org>
      Reviewed-by: default avatarMark Zhang <markz@nvidia.com>
      Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
      359ae687