1. 09 Apr, 2015 16 commits
  2. 08 Apr, 2015 7 commits
    • Dave Airlie's avatar
      Merge tag 'v4.0-rc7' into drm-next · 1d8ac08d
      Dave Airlie authored
      Linux 4.0-rc7
      
      Requested by Alex for fixes -next needs.
      
      Conflicts:
      	drivers/gpu/drm/i915/intel_sprite.c
      1d8ac08d
    • Dave Airlie's avatar
      Merge tag 'imx-drm-fixes-2015-03-31' of git://git.pengutronix.de/git/pza/linux into drm-next · 5c7f0c27
      Dave Airlie authored
      imx-drm limit fixes
      
      Fix IPU IC downscaler to its hardware limitation of 4:1 and the
      IPU DI pixel clock divider integer part to 8-bit.
      
      * tag 'imx-drm-fixes-2015-03-31' of git://git.pengutronix.de/git/pza/linux:
        gpu: ipu-v3: turns out the IPU can only downsize 4:1
        gpu: ipu-v3: limit pixel clock divider to 8-bits
        drm/radeon: programm the VCE fw BAR as well
        drm/radeon: always dump the ring content if it's available
        radeon: Do not directly dereference pointers to BIOS area.
        drm/radeon/dpm: fix 120hz handling harder
      5c7f0c27
    • Dave Airlie's avatar
      Merge branch 'msm-next' of git://people.freedesktop.org/~robclark/linux into drm-next · fa37a8c8
      Dave Airlie authored
      1) support for "stolen mem" for splash-screen take-over
      2) additional hdmi pixel clks
      3) various pipe flush related fixes
      4) support for snapdragon 410 (8x16)
      5) support for DSI and dual-DSI
      
      It includes one small patch to export tile-group functions (which was ack'd
      by you), as these are used to explain to userspace dual-dsi configurations
      (with left and right tile).
      
      * 'msm-next' of git://people.freedesktop.org/~robclark/linux: (24 commits)
        drm/msm/mdp5: Enable DSI connector in msm drm driver
        drm/msm: Initial add DSI connector support
        drm/msm: Add split display interface
        drm/msm/mdp5: Move *_modeset_init out of construct_encoder function
        drm: export tile-group functions
        drm/msm/mdp5: Remove CTL flush dummy bits
        drm/msm/mdp5: Update headers (add CTL flush bits)
        drm/msm/mdp5: Add hardware configuration for msm8x16
        drm/msm/mdp5: Get SMP client list from mdp5_cfg
        drm/msm/mdp5: Update headers (remove enum mdp5_client_id)
        drm/msm/mdp5: Separate MDP5 domain from MDSS domain
        drm/msm/mdp5: Update headers (introduce MDP5 domain)
        drm/msm/dsi: Update generated DSI header file
        drm/msm/mdp5: Fix PIPE source image size settings
        drm/msm/mdp5: Update generated mdp5 header file with DSI support
        drm/msm/mdp5: Add pingpong entry to mdp5 config table
        drm/msm/mdp5: Make the intf connection in config module
        drm/msm/mdp5: Add START signal to kick off certain pipelines
        drm/msm/mdp5: Enhance operation mode for pipeline configuration
        drm/msm/mdp5: Update generated header files
        ...
      fa37a8c8
    • Dave Airlie's avatar
      Merge tag 'drm/panel/for-4.1-rc1' of git://anongit.freedesktop.org/tegra/linux into drm-next · a08aad54
      Dave Airlie authored
      drm/panel: Changes for v4.1-rc1
      
      This set of changes adds support for a whole bunch of new panels, mostly
      simple ones. There's now also support for panels to provide display
      timings rather than fixed modes, which should allow panels to work with
      a larger number of display drivers. Eventually drivers should migrate to
      this new interface and the fixed modes removed from panels.
      
      There are also a couple of sparse fixes for the PS8622 and PS8625 bridge
      drivers.
      
      * tag 'drm/panel/for-4.1-rc1' of git://anongit.freedesktop.org/tegra/linux:
        drm/panel: Add support for Ampire AM-800480R3TMQW-A1H 800x480 7" panel
        of: Add vendor prefix for Ampire Co., Ltd.
        drm/panel: Add display timing for HannStar HSD070PWW1
        drm/panel: simple: Add display timing support
        drm/panel: Add display timing support
        drm/panel: Add support for OrtusTech COM43H4M85ULC panel
        of: Add vendor prefix for Ortus Technology Co., Ltd.
        drm/panel: Add bus format for Giantplus GPG482739QS5 panel
        drm/panel: simple: Add support for AUO b101ean01 panel
        drm/panel: simple: Add support for Innolux ZJ070NA-01P
        drm/panel: simple: Add support for Innolux AT043TN24
        drm/panel: simple: Add support for Shelly SCA07010-BFN-LNN
        drm/panel: simple: Add support for Samsung LTN140AT29 panel
        drm: Remove unused DRM_MODE_OBJECT_BRIDGE
        drm/bridge: ptn3460: Fix sparse warnings
        drm/bridge: ps8622: Fix sparse warnings
        drm/bridge: Add I2C based driver for ps8622/ps8625 bridge
      a08aad54
    • Dave Airlie's avatar
      Merge tag 'drm/tegra/for-4.1-rc1' of git://anongit.freedesktop.org/tegra/linux into drm-next · 1ddd36ed
      Dave Airlie authored
      drm/tegra: Changes for v4.1-rc1
      
      Perhaps the most noteworthy change in this set is the implementation of
      a hardware VBLANK counter using host1x syncpoints. The SOR registers can
      now be dumped via debugfs, which can be useful while debugging. The IOVA
      address space maintained by the driver can also be dumped via debugfs.
      
      Other than than, these changes are mostly cleanup work, such as making
      register names more consistent or removing unused code (that was left
      over after the atomic mode-setting conversion). There's also a fix for
      eDP that makes the driver cope with firmware that already initialized
      the display (such as the firmware on the Tegra-based Chromebooks).
      
      * tag 'drm/tegra/for-4.1-rc1' of git://anongit.freedesktop.org/tegra/linux:
        drm/tegra: sor: Reset during initialization
        drm/tegra: gem: Return 64-bit offset for mmap(2)
        drm/tegra: hdmi: Name register fields consistently
        drm/tegra: hdmi: Resets are synchronous
        drm/tegra: dc: Document tegra_dc_state_setup_clock()
        drm/tegra: dc: Remove unused callbacks
        drm/tegra: dc: Remove unused function
        drm/tegra: dc: Use base atomic state helpers
        drm/atomic: Add helpers for state-subclassing drivers
        drm/tegra: dc: Implement hardware VBLANK counter
        gpu: host1x: Export host1x_syncpt_read()
        drm/tegra: sor: Dump registers via debugfs
        drm/tegra: sor: Registers are 32-bit
        drm/tegra: Provide debugfs file for the IOVA space
        drm/tegra: dc: Check for valid parent clock
      1ddd36ed
    • Dave Airlie's avatar
      Merge tag 'omapdrm-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux into drm-next · 67a0375f
      Dave Airlie authored
      omapdrm changes for 4.1
      
      * universal plane support
      * refactoring to prepare work atomic modesetting work
      * a lot of small fixes
      
      * tag 'omapdrm-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux: (36 commits)
        drm/omap: tiler: add hibernation callback
        drm/omap: add hibernation callbacks
        drm/omap: keep ref to old_fb
        drm/omap: fix race conditon in DMM
        drm/omap: fix race condition with dev->obj_list
        drm/omap: do not use BUG_ON(!spin_is_locked(x))
        drm/omap: only ignore DIGIT SYNC LOST for TV output
        drm/omap: fix race with error_irq
        drm/omap: use DRM_ERROR_RATELIMITED() for error irqs
        drm/omap: stop connector polling during suspend
        drm/omap: remove dummy PM functions
        drm/omap: tiler: fix race condition with engine->async
        drm/omap: fix plane's channel selection
        drm/omap: fix TILER on OMAP5
        drm/omap: handle incompatible buffer stride and pixel size
        drm/omap: fix error handling in omap_framebuffer_create()
        drm/omap: fix operation without fbdev
        drm/omap: add a comment why locking is missing
        drm/omap: add pin refcounting to omap_framebuffer
        drm/omap: clear omap_obj->paddr in omap_gem_put_paddr()
        ...
      67a0375f
    • Dave Airlie's avatar
      Merge branch 'drm-next0401' of git://github.com/markyzq/kernel-drm-rockchip into drm-next · 4d0982c6
      Dave Airlie authored
         These are based on drm-next branch, fix some drm/rockchip problem.
         Please pull them.
      
      * 'drm-next0401' of git://github.com/markyzq/kernel-drm-rockchip:
        drm/rockchip: vop: add vop power domain support
        drm: rockchip: Turn off VT switching on suspend
        drm/rockchip: register all connectors after bind
        drm/rockchip: fix clk enable disable mismatch in vop_crtc_mode_set
      4d0982c6
  3. 06 Apr, 2015 8 commits
    • Linus Torvalds's avatar
      Linux 4.0-rc7 · f22e6e84
      Linus Torvalds authored
      f22e6e84
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 442bb4ba
      Linus Torvalds authored
      Pull networking fixes from David Miller:
      
       1) In TCP, don't register an FRTO for cumulatively ACK'd data that was
          previously SACK'd, from Neal Cardwell.
      
       2) Need to hold RNL mutex in ipv4 multicast code namespace cleanup,
          from Cong WANG.
      
       3) Similarly we have to hold RNL mutex for fib_rules_unregister(), also
          from Cong WANG.
      
       4) Revert and rework netns nsid allocation fix, from Nicolas Dichtel.
      
       5) When we encapsulate for a tunnel device, skb->sk still points to the
          user socket.  So this leads to cases where we retraverse the
          ipv4/ipv6 output path with skb->sk being of some other address
          family (f.e. AF_PACKET).  This can cause things to crash since the
          ipv4 output path is dereferencing an AF_PACKET socket as if it were
          an ipv4 one.
      
          The short term fix for 'net' and -stable is to elide these socket
          checks once we've entered an encapsulation sequence by testing
          xmit_recursion.
      
          Longer term we have a better solution wherein we pass the tunnel's
          socket down through the output paths, but that is way too invasive
          for 'net' and -stable.
      
          From Hannes Frederic Sowa.
      
       6) l2tp_init() failure path forgets to unregister per-net ops, from
          Cong WANG.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
        net/mlx4_core: Fix error message deprecation for ConnectX-2 cards
        net: dsa: fix filling routing table from OF description
        l2tp: unregister l2tp_net_ops on failure path
        mvneta: dont call mvneta_adjust_link() manually
        ipv6: protect skb->sk accesses from recursive dereference inside the stack
        netns: don't allocate an id for dead netns
        Revert "netns: don't clear nsid too early on removal"
        ip6mr: call del_timer_sync() in ip6mr_free_table()
        net: move fib_rules_unregister() under rtnl lock
        ipv4: take rtnl_lock and mark mrt table as freed on namespace cleanup
        tcp: fix FRTO undo on cumulative ACK of SACKed range
        xen-netfront: transmit fully GSO-sized packets
      442bb4ba
    • Jack Morgenstein's avatar
      net/mlx4_core: Fix error message deprecation for ConnectX-2 cards · fde913e2
      Jack Morgenstein authored
      Commit 1daa4303 ("net/mlx4_core: Deprecate error message at
      ConnectX-2 cards startup to debug") did the deprecation only for port 1
      of the card. Need to deprecate for port 2 as well.
      
      Fixes: 1daa4303 ("net/mlx4_core: Deprecate error message at ConnectX-2 cards startup to debug")
      Signed-off-by: default avatarJack Morgenstein <jackm@dev.mellanox.co.il>
      Signed-off-by: default avatarAmir Vadai <amirv@mellanox.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      fde913e2
    • Pavel Nakonechny's avatar
      net: dsa: fix filling routing table from OF description · 30303813
      Pavel Nakonechny authored
      According to description in 'include/net/dsa.h', in cascade switches
      configurations where there are more than one interconnected devices,
      'rtable' array in 'dsa_chip_data' structure is used to indicate which
      port on this switch should be used to send packets to that are destined
      for corresponding switch.
      
      However, dsa_of_setup_routing_table() fills 'rtable' with port numbers
      of the _target_ switch, but not current one.
      
      This commit removes redundant devicetree parsing and adds needed port
      number as a function argument. So dsa_of_setup_routing_table() now just
      looks for target switch number by parsing parent of 'link' device node.
      
      To remove possible misunderstandings with the way of determining target
      switch number, a corresponding comment was added to the source code and
      to the DSA device tree bindings documentation file.
      
      This was tested on a custom board with two Marvell 88E6095 switches with
      following corresponding routing tables: { -1, 10 } and { 8, -1 }.
      Signed-off-by: default avatarPavel Nakonechny <pavel.nakonechny@skitlab.ru>
      Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
      Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      30303813
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input · 9e441639
      Linus Torvalds authored
      Pull input fixes from Dmitry Torokhov:
       "Updates for the input subsystem - two more tweaks for ALPS driver to
        work out kinks after splitting the touchpad, trackstick, and potential
        external PS/2 mouse into separate input devices.
      
        Changes to support ALPS SS4 devices (protocol V8) will be coming in
        4.1..."
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
        Input: alps - document stick behavior for protocol V2
        Input: alps - report V2 Dualpoint Stick events via the right evdev node
        Input: alps - report interleaved bare PS/2 packets via dev3
      9e441639
    • WANG Cong's avatar
      67e04c29
    • Stas Sergeev's avatar
      mvneta: dont call mvneta_adjust_link() manually · ecf7b361
      Stas Sergeev authored
      mvneta_adjust_link() is a callback for of_phy_connect() and should
      not be called directly. The result of calling it directly is as below:
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      ecf7b361
    • hannes@stressinduktion.org's avatar
      ipv6: protect skb->sk accesses from recursive dereference inside the stack · f60e5990
      hannes@stressinduktion.org authored
      We should not consult skb->sk for output decisions in xmit recursion
      levels > 0 in the stack. Otherwise local socket settings could influence
      the result of e.g. tunnel encapsulation process.
      
      ipv6 does not conform with this in three places:
      
      1) ip6_fragment: we do consult ipv6_npinfo for frag_size
      
      2) sk_mc_loop in ipv6 uses skb->sk and checks if we should
         loop the packet back to the local socket
      
      3) ip6_skb_dst_mtu could query the settings from the user socket and
         force a wrong MTU
      
      Furthermore:
      In sk_mc_loop we could potentially land in WARN_ON(1) if we use a
      PF_PACKET socket ontop of an IPv6-backed vxlan device.
      
      Reuse xmit_recursion as we are currently only interested in protecting
      tunnel devices.
      
      Cc: Jiri Pirko <jiri@resnulli.us>
      Signed-off-by: default avatarHannes Frederic Sowa <hannes@stressinduktion.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      f60e5990
  4. 05 Apr, 2015 3 commits
  5. 04 Apr, 2015 3 commits
    • Linus Torvalds's avatar
      Merge tag 'usb-4.0-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb · f8b3d8a5
      Linus Torvalds authored
      Pull USB fixes from Greg KH:
       "Here are some small USB fixes and new device ids for 4.0-rc6.  Nothing
        major, some xhci fixes for reported problems, and some usb-serial
        device ids.
      
        All have been in linux-next for a while"
      
      * tag 'usb-4.0-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
        USB: ftdi_sio: Use jtag quirk for SNAP Connect E10
        usb: isp1760: fix spin unlock in the error path of isp1760_udc_start
        usb: xhci: apply XHCI_AVOID_BEI quirk to all Intel xHCI controllers
        usb: xhci: handle Config Error Change (CEC) in xhci driver
        USB: keyspan_pda: add new device id
        USB: ftdi_sio: Added custom PID for Synapse Wireless product
      f8b3d8a5
    • Linus Torvalds's avatar
      Merge tag 'staging-4.0-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging · 8eb6dcf9
      Linus Torvalds authored
      Pull staging driver fixes from Greg KH:
       "Here are some staging driver fixes, well, really all just IIO driver
        fixes, for 4.0-rc6.  They fix issues that have been reported with
        these drivers.
      
        All of these patches have been in linux-next for a while"
      
      * tag 'staging-4.0-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
        iio: imu: Use iio_trigger_get for indio_dev->trig assignment
        iio: adc: vf610: use ADC clock within specification
        iio/adc/cc10001_adc.c: Fix !HAS_IOMEM build
        iio: core: Fix double free.
        iio:inv-mpu6050: Fix inconsistency for the scale channel
        staging: iio: dummy: Fix undefined symbol build error
        iio: inv_mpu6050: Clear timestamps fifo while resetting hardware fifo
        staging: iio: hmc5843: Set iio name property in sysfs
        iio: bmc150: change sampling frequency
        iio: fix drivers that check buffer->scan_mask
      8eb6dcf9
    • Linus Torvalds's avatar
      Merge tag 'tty-4.0-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty · eca8258b
      Linus Torvalds authored
      Pull tty/serial fixes from Greg KH:
       "Here are 3 serial driver fixes for 4.0-rc6.  They fix some reported
        issues with the samsung and fsl_lpuart drivers.
      
        All have been in linux-next for a while"
      
      * tag 'tty-4.0-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
        tty: serial: fsl_lpuart: clear receive flag on FIFO flush
        tty: serial: fsl_lpuart: specify transmit FIFO size
        serial: samsung: Clear operation mode on UART shutdown
      eca8258b
  6. 03 Apr, 2015 3 commits