]> git.karo-electronics.de Git - karo-tx-linux.git/log
karo-tx-linux.git
11 years agoMerge remote-tracking branch 'bluetooth/master'
Thierry Reding [Mon, 21 Oct 2013 10:52:53 +0000 (12:52 +0200)]
Merge remote-tracking branch 'bluetooth/master'

11 years agoMerge remote-tracking branch 'wireless-next/master'
Thierry Reding [Mon, 21 Oct 2013 10:52:07 +0000 (12:52 +0200)]
Merge remote-tracking branch 'wireless-next/master'

Conflicts:
drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h
drivers/net/wireless/iwlwifi/pcie/drv.c

11 years agoMerge remote-tracking branch 'net-next/master'
Thierry Reding [Mon, 21 Oct 2013 10:47:20 +0000 (12:47 +0200)]
Merge remote-tracking branch 'net-next/master'

Conflicts:
arch/h8300/include/uapi/asm/socket.h
arch/parisc/include/uapi/asm/socket.h
drivers/net/usb/qmi_wwan.c
include/net/dst.h

11 years agoMerge remote-tracking branch 'slave-dma/next'
Thierry Reding [Mon, 21 Oct 2013 10:44:51 +0000 (12:44 +0200)]
Merge remote-tracking branch 'slave-dma/next'

11 years agoMerge remote-tracking branch 'dlm/next'
Thierry Reding [Mon, 21 Oct 2013 10:44:48 +0000 (12:44 +0200)]
Merge remote-tracking branch 'dlm/next'

11 years agoMerge remote-tracking branch 'ubi/linux-next'
Thierry Reding [Mon, 21 Oct 2013 10:44:46 +0000 (12:44 +0200)]
Merge remote-tracking branch 'ubi/linux-next'

11 years agoMerge remote-tracking branch 'thermal/next'
Thierry Reding [Mon, 21 Oct 2013 10:44:43 +0000 (12:44 +0200)]
Merge remote-tracking branch 'thermal/next'

11 years agoMerge remote-tracking branch 'idle/next'
Thierry Reding [Mon, 21 Oct 2013 10:44:38 +0000 (12:44 +0200)]
Merge remote-tracking branch 'idle/next'

11 years agoMerge remote-tracking branch 'pm/linux-next'
Thierry Reding [Mon, 21 Oct 2013 10:44:33 +0000 (12:44 +0200)]
Merge remote-tracking branch 'pm/linux-next'

11 years agoMerge remote-tracking branch 'libata/for-next'
Thierry Reding [Mon, 21 Oct 2013 10:44:31 +0000 (12:44 +0200)]
Merge remote-tracking branch 'libata/for-next'

11 years agoMerge remote-tracking branch 'kbuild/for-next'
Thierry Reding [Mon, 21 Oct 2013 10:44:28 +0000 (12:44 +0200)]
Merge remote-tracking branch 'kbuild/for-next'

11 years agoMerge remote-tracking branch 'v4l-dvb/master'
Thierry Reding [Mon, 21 Oct 2013 10:44:26 +0000 (12:44 +0200)]
Merge remote-tracking branch 'v4l-dvb/master'

11 years agoMerge remote-tracking branch 'hwmon-staging/hwmon-next'
Thierry Reding [Mon, 21 Oct 2013 10:44:25 +0000 (12:44 +0200)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'

11 years agoMerge remote-tracking branch 'i2c/i2c/for-next'
Thierry Reding [Mon, 21 Oct 2013 10:44:23 +0000 (12:44 +0200)]
Merge remote-tracking branch 'i2c/i2c/for-next'

11 years agoMerge remote-tracking branch 'hid/for-next'
Thierry Reding [Mon, 21 Oct 2013 10:44:21 +0000 (12:44 +0200)]
Merge remote-tracking branch 'hid/for-next'

11 years agoMerge remote-tracking branch 'pci/next'
Thierry Reding [Mon, 21 Oct 2013 10:44:20 +0000 (12:44 +0200)]
Merge remote-tracking branch 'pci/next'

11 years agoMerge remote-tracking branch 'vfs/for-next'
Thierry Reding [Mon, 21 Oct 2013 10:44:16 +0000 (12:44 +0200)]
Merge remote-tracking branch 'vfs/for-next'

Conflicts:
fs/nfs/direct.c
fs/nfs/file.c

11 years agoMerge remote-tracking branch 'xfs/for-next'
Thierry Reding [Mon, 21 Oct 2013 10:44:10 +0000 (12:44 +0200)]
Merge remote-tracking branch 'xfs/for-next'

11 years agoMerge remote-tracking branch 'nfsd/nfsd-next'
Thierry Reding [Mon, 21 Oct 2013 10:44:03 +0000 (12:44 +0200)]
Merge remote-tracking branch 'nfsd/nfsd-next'

11 years agoMerge remote-tracking branch 'nfs/linux-next'
Thierry Reding [Mon, 21 Oct 2013 10:44:02 +0000 (12:44 +0200)]
Merge remote-tracking branch 'nfs/linux-next'

11 years agoMerge remote-tracking branch 'logfs/master'
Thierry Reding [Mon, 21 Oct 2013 10:43:57 +0000 (12:43 +0200)]
Merge remote-tracking branch 'logfs/master'

11 years agoMerge remote-tracking branch 'jfs/jfs-next'
Thierry Reding [Mon, 21 Oct 2013 10:43:55 +0000 (12:43 +0200)]
Merge remote-tracking branch 'jfs/jfs-next'

11 years agoMerge remote-tracking branch 'gfs2/master'
Thierry Reding [Mon, 21 Oct 2013 10:43:54 +0000 (12:43 +0200)]
Merge remote-tracking branch 'gfs2/master'

11 years agoMerge remote-tracking branch 'fuse/for-next'
Thierry Reding [Mon, 21 Oct 2013 10:43:53 +0000 (12:43 +0200)]
Merge remote-tracking branch 'fuse/for-next'

11 years agoMerge remote-tracking branch 'fscache/fscache'
Thierry Reding [Mon, 21 Oct 2013 10:43:52 +0000 (12:43 +0200)]
Merge remote-tracking branch 'fscache/fscache'

11 years agoMerge remote-tracking branch 'f2fs/dev'
Thierry Reding [Mon, 21 Oct 2013 10:43:51 +0000 (12:43 +0200)]
Merge remote-tracking branch 'f2fs/dev'

11 years agoMerge remote-tracking branch 'ext4/dev'
Thierry Reding [Mon, 21 Oct 2013 10:43:50 +0000 (12:43 +0200)]
Merge remote-tracking branch 'ext4/dev'

11 years agoMerge remote-tracking branch 'ecryptfs/next'
Thierry Reding [Mon, 21 Oct 2013 10:43:48 +0000 (12:43 +0200)]
Merge remote-tracking branch 'ecryptfs/next'

11 years agoMerge remote-tracking branch 'cifs/for-next'
Thierry Reding [Mon, 21 Oct 2013 10:43:45 +0000 (12:43 +0200)]
Merge remote-tracking branch 'cifs/for-next'

11 years agoMerge remote-tracking branch 'ceph/master'
Thierry Reding [Mon, 21 Oct 2013 10:43:44 +0000 (12:43 +0200)]
Merge remote-tracking branch 'ceph/master'

11 years agoMerge remote-tracking branch 'aio-direct/for-next'
Thierry Reding [Mon, 21 Oct 2013 10:43:43 +0000 (12:43 +0200)]
Merge remote-tracking branch 'aio-direct/for-next'

11 years agoMerge remote-tracking branch 'sh/sh-latest'
Thierry Reding [Mon, 21 Oct 2013 10:43:36 +0000 (12:43 +0200)]
Merge remote-tracking branch 'sh/sh-latest'

Conflicts:
arch/sh/kernel/cpu/sh2a/Makefile
drivers/tty/serial/sh-sci.c
include/linux/serial_sci.h

11 years agoMerge remote-tracking branch 's390/features'
Thierry Reding [Mon, 21 Oct 2013 10:43:15 +0000 (12:43 +0200)]
Merge remote-tracking branch 's390/features'

11 years agoMerge remote-tracking branch 'mpc5xxx/next'
Thierry Reding [Mon, 21 Oct 2013 10:43:13 +0000 (12:43 +0200)]
Merge remote-tracking branch 'mpc5xxx/next'

11 years agoMerge remote-tracking branch 'powerpc/next'
Thierry Reding [Mon, 21 Oct 2013 10:43:12 +0000 (12:43 +0200)]
Merge remote-tracking branch 'powerpc/next'

11 years agoMerge remote-tracking branch 'parisc-hd/for-next'
Thierry Reding [Mon, 21 Oct 2013 10:43:11 +0000 (12:43 +0200)]
Merge remote-tracking branch 'parisc-hd/for-next'

11 years agoMerge remote-tracking branch 'mips/mips-for-linux-next'
Thierry Reding [Mon, 21 Oct 2013 10:43:08 +0000 (12:43 +0200)]
Merge remote-tracking branch 'mips/mips-for-linux-next'

11 years agoMerge remote-tracking branch 'm68k/for-next'
Thierry Reding [Mon, 21 Oct 2013 10:43:03 +0000 (12:43 +0200)]
Merge remote-tracking branch 'm68k/for-next'

11 years agoMerge remote-tracking branch 'ia64/next'
Thierry Reding [Mon, 21 Oct 2013 10:43:02 +0000 (12:43 +0200)]
Merge remote-tracking branch 'ia64/next'

11 years agoMerge remote-tracking branch 'h8300-remove/h8300-remove'
Thierry Reding [Mon, 21 Oct 2013 10:43:00 +0000 (12:43 +0200)]
Merge remote-tracking branch 'h8300-remove/h8300-remove'

11 years agoMerge remote-tracking branch 'c6x/for-linux-next'
Thierry Reding [Mon, 21 Oct 2013 10:42:59 +0000 (12:42 +0200)]
Merge remote-tracking branch 'c6x/for-linux-next'

11 years agoMerge remote-tracking branch 'arm-perf/for-next/perf'
Thierry Reding [Mon, 21 Oct 2013 10:42:59 +0000 (12:42 +0200)]
Merge remote-tracking branch 'arm-perf/for-next/perf'

11 years agoMerge remote-tracking branch 'arm/for-next'
Thierry Reding [Mon, 21 Oct 2013 10:42:58 +0000 (12:42 +0200)]
Merge remote-tracking branch 'arm/for-next'

11 years agoMerge remote-tracking branch 'arc/for-next'
Thierry Reding [Mon, 21 Oct 2013 10:42:57 +0000 (12:42 +0200)]
Merge remote-tracking branch 'arc/for-next'

11 years agoMerge remote-tracking branch 'drm-intel-fixes/for-linux-next-fixes'
Thierry Reding [Mon, 21 Oct 2013 10:42:55 +0000 (12:42 +0200)]
Merge remote-tracking branch 'drm-intel-fixes/for-linux-next-fixes'

11 years agoMerge remote-tracking branch 'input-current/for-linus'
Thierry Reding [Mon, 21 Oct 2013 10:42:47 +0000 (12:42 +0200)]
Merge remote-tracking branch 'input-current/for-linus'

11 years agoMerge remote-tracking branch 'tty.current/tty-linus'
Thierry Reding [Mon, 21 Oct 2013 10:42:46 +0000 (12:42 +0200)]
Merge remote-tracking branch 'tty.current/tty-linus'

11 years agoMerge remote-tracking branch 'wireless/master'
Thierry Reding [Mon, 21 Oct 2013 10:42:45 +0000 (12:42 +0200)]
Merge remote-tracking branch 'wireless/master'

11 years agoMerge remote-tracking branch 'sound-current/for-linus'
Thierry Reding [Mon, 21 Oct 2013 10:42:45 +0000 (12:42 +0200)]
Merge remote-tracking branch 'sound-current/for-linus'

11 years agoMerge remote-tracking branch 'ipsec/master'
Thierry Reding [Mon, 21 Oct 2013 10:42:44 +0000 (12:42 +0200)]
Merge remote-tracking branch 'ipsec/master'

11 years agoMerge remote-tracking branch 'net/master'
Thierry Reding [Mon, 21 Oct 2013 10:42:44 +0000 (12:42 +0200)]
Merge remote-tracking branch 'net/master'

11 years agoMerge branch 'dma_complete' into next
Vinod Koul [Mon, 21 Oct 2013 08:57:38 +0000 (14:27 +0530)]
Merge branch 'dma_complete' into next

11 years agodmaengine: remove unused DMA_SUCCESS
Vinod Koul [Thu, 17 Oct 2013 01:59:57 +0000 (07:29 +0530)]
dmaengine: remove unused DMA_SUCCESS

after all the users are converted

Acked-by: Dan Williams <dan.j.williams@intel.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
11 years agonet: use DMA_COMPLETE for dma completion status
Vinod Koul [Wed, 16 Oct 2013 15:37:39 +0000 (21:07 +0530)]
net: use DMA_COMPLETE for dma completion status

Acked-by: David S. Miller <davem@davemloft.net>
Acked-by: Dan Williams <dan.j.williams@intel.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
11 years agoserial: sh: use DMA_COMPLETE for dma completion status
Vinod Koul [Wed, 16 Oct 2013 15:36:19 +0000 (21:06 +0530)]
serial: sh: use DMA_COMPLETE for dma completion status

Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Acked-by: Dan Williams <dan.j.williams@intel.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
11 years agoasync_tx: use DMA_COMPLETE for dma completion status
Vinod Koul [Wed, 16 Oct 2013 15:35:50 +0000 (21:05 +0530)]
async_tx: use DMA_COMPLETE for dma completion status

Acked-by: Dan Williams <dan.j.williams@intel.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
11 years agodmaengine: txx9: use DMA_COMPLETE for dma completion status
Vinod Koul [Wed, 16 Oct 2013 15:35:16 +0000 (21:05 +0530)]
dmaengine: txx9: use DMA_COMPLETE for dma completion status

Acked-by: Dan Williams <dan.j.williams@intel.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
11 years agodmaengine: tegra: use DMA_COMPLETE for dma completion status
Vinod Koul [Wed, 16 Oct 2013 15:34:50 +0000 (21:04 +0530)]
dmaengine: tegra: use DMA_COMPLETE for dma completion status

Acked-by: Dan Williams <dan.j.williams@intel.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
11 years agodmaengine: ste: use DMA_COMPLETE for dma completion status
Vinod Koul [Wed, 16 Oct 2013 15:34:24 +0000 (21:04 +0530)]
dmaengine: ste: use DMA_COMPLETE for dma completion status

Acked-by: Dan Williams <dan.j.williams@intel.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
11 years agodmaengine: sh: use DMA_COMPLETE for dma completion status
Vinod Koul [Wed, 16 Oct 2013 15:34:06 +0000 (21:04 +0530)]
dmaengine: sh: use DMA_COMPLETE for dma completion status

Acked-by: Dan Williams <dan.j.williams@intel.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
11 years agodmaengine: sa11x0: use DMA_COMPLETE for dma completion status
Vinod Koul [Wed, 16 Oct 2013 15:33:47 +0000 (21:03 +0530)]
dmaengine: sa11x0: use DMA_COMPLETE for dma completion status

Acked-by: Dan Williams <dan.j.williams@intel.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
11 years agodmaengine: ppc4xx: use DMA_COMPLETE for dma completion status
Vinod Koul [Wed, 16 Oct 2013 15:22:38 +0000 (20:52 +0530)]
dmaengine: ppc4xx: use DMA_COMPLETE for dma completion status

Acked-by: Dan Williams <dan.j.williams@intel.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
11 years agodmaengine: omap: use DMA_COMPLETE for dma completion status
Vinod Koul [Wed, 16 Oct 2013 15:21:54 +0000 (20:51 +0530)]
dmaengine: omap: use DMA_COMPLETE for dma completion status

Acked-by: Dan Williams <dan.j.williams@intel.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
11 years agodmaengine: mxs-dma: use DMA_COMPLETE for dma completion status
Vinod Koul [Wed, 16 Oct 2013 15:21:30 +0000 (20:51 +0530)]
dmaengine: mxs-dma: use DMA_COMPLETE for dma completion status

Acked-by: Dan Williams <dan.j.williams@intel.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
11 years agodmaengine: mv_xor: use DMA_COMPLETE for dma completion status
Vinod Koul [Wed, 16 Oct 2013 15:21:04 +0000 (20:51 +0530)]
dmaengine: mv_xor: use DMA_COMPLETE for dma completion status

Acked-by: Dan Williams <dan.j.williams@intel.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
11 years agodmaengine: mmp_tdma: use DMA_COMPLETE for dma completion status
Vinod Koul [Wed, 16 Oct 2013 15:20:36 +0000 (20:50 +0530)]
dmaengine: mmp_tdma: use DMA_COMPLETE for dma completion status

Acked-by: Dan Williams <dan.j.williams@intel.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Zhangfei Gao <zhangfei.gao@gmail.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
11 years agodmaengine: k3dma: use DMA_COMPLETE for dma completion status
Vinod Koul [Wed, 16 Oct 2013 15:20:09 +0000 (20:50 +0530)]
dmaengine: k3dma: use DMA_COMPLETE for dma completion status

Acked-by: Dan Williams <dan.j.williams@intel.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Zhangfei Gao <zhangfei.gao@linaro.org>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
11 years agodmaengine: iop: use DMA_COMPLETE for dma completion status
Vinod Koul [Wed, 16 Oct 2013 15:19:42 +0000 (20:49 +0530)]
dmaengine: iop: use DMA_COMPLETE for dma completion status

Acked-by: Dan Williams <dan.j.williams@intel.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
11 years agodmaengine: ioat: use DMA_COMPLETE for dma completion status
Vinod Koul [Wed, 16 Oct 2013 15:18:52 +0000 (20:48 +0530)]
dmaengine: ioat: use DMA_COMPLETE for dma completion status

Acked-by: Dan Williams <dan.j.williams@intel.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
11 years agodmaengine: intel_mid_dma: use DMA_COMPLETE for dma completion status
Vinod Koul [Wed, 16 Oct 2013 10:20:33 +0000 (15:50 +0530)]
dmaengine: intel_mid_dma: use DMA_COMPLETE for dma completion status

Acked-by: Dan Williams <dan.j.williams@intel.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
11 years agodmaengine: imx-sdma: use DMA_COMPLETE for dma completion status
Vinod Koul [Wed, 16 Oct 2013 08:37:06 +0000 (14:07 +0530)]
dmaengine: imx-sdma: use DMA_COMPLETE for dma completion status

Acked-by: Dan Williams <dan.j.williams@intel.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
11 years agodmaengine: imx-dma: use DMA_COMPLETE for dma completion status
Vinod Koul [Wed, 16 Oct 2013 08:36:24 +0000 (14:06 +0530)]
dmaengine: imx-dma: use DMA_COMPLETE for dma completion status

Acked-by: Dan Williams <dan.j.williams@intel.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
11 years agodmaengine: edma: use DMA_COMPLETE for dma completion status
Vinod Koul [Wed, 16 Oct 2013 08:12:15 +0000 (13:42 +0530)]
dmaengine: edma: use DMA_COMPLETE for dma completion status

Tested-by: Joel Fernandes <joelf@ti.com>
Acked-by: Dan Williams <dan.j.williams@intel.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
11 years agodmaengine: dw: use DMA_COMPLETE for dma completion status
Vinod Koul [Wed, 16 Oct 2013 08:11:15 +0000 (13:41 +0530)]
dmaengine: dw: use DMA_COMPLETE for dma completion status

Acked-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Acked-by: Dan Williams <dan.j.williams@intel.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
11 years agodrm/i915/dp: workaround BIOS eDP bpp clamping issue
Jani Nikula [Mon, 21 Oct 2013 07:52:07 +0000 (10:52 +0300)]
drm/i915/dp: workaround BIOS eDP bpp clamping issue

This isn't a real fix to the problem, but rather a stopgap measure while
trying to find a proper solution.

There are several laptops out there that fail to light up the eDP panel
in UEFI boot mode. They seem to be mostly IVB machines, including but
apparently not limited to Dell XPS 13, Asus TX300, Asus UX31A, Asus
UX32VD, Acer Aspire S7. They seem to work in CSM or legacy boot.

The difference between UEFI and CSM is that the BIOS provides a
different VBT to the kernel. The UEFI VBT typically specifies 18 bpp and
1.62 GHz link for eDP, while CSM VBT has 24 bpp and 2.7 GHz link. We end
up clamping to 18 bpp in UEFI mode, which we can fit in the 1.62 Ghz
link, and for reasons yet unknown fail to light up the panel.

Dithering from 24 to 18 bpp itself seems to work; if we use 18 bpp with
2.7 GHz link, the eDP panel lights up. So essentially this is a link
speed issue, and *not* a bpp clamping issue.

The bug raised its head since
commit 657445fe8660100ad174600ebfa61536392b7624
Author: Daniel Vetter <daniel.vetter@ffwll.ch>
Date:   Sat May 4 10:09:18 2013 +0200

    Revert "drm/i915: revert eDP bpp clamping code changes"

which started clamping bpp *before* computing the link requirements, and
thus affecting the required bandwidth. Clamping after the computations
kept the link at 2.7 GHz.

Even though the BIOS tells us to use 18 bpp through the VBT, it happily
boots up at 24 bpp and 2.7 GHz itself! Use this information to
selectively ignore the VBT provided value.

We can't ignore the VBT eDP bpp altogether, as there are other laptops
that do require the clamping to be used due to EDID reporting higher bpp
than the panel can support.

Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=59841
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=67950
Tested-by: Ulf Winkelvos <ulf@winkelvos.de>
Tested-by: jkp <jkp@iki.fi>
CC: stable@vger.kernel.org
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
11 years agodrm/i915: Add support for pipe_bpp readout
Ville Syrjälä [Mon, 21 Oct 2013 07:52:06 +0000 (10:52 +0300)]
drm/i915: Add support for pipe_bpp readout

On CTG+ read out the pipe bpp setting from hardware and fill it into
pipe config. Also check it appropriately.

v2: Don't do the pipe_bpp extraction inside the PCH only code block on
    ILK+.
    Avoid the PIPECONF read as we already have read it for the
    PIPECONF_EANBLE check.

Note: This is already in drm-intel-next-queued as
commit 42571aefafb1d330ef84eb29418832f72e7dfb4c
Author: Ville Syrjälä <ville.syrjala@linux.intel.com>
Date:   Fri Sep 6 23:29:00 2013 +0300

    drm/i915: Add support for pipe_bpp readout

but is needed for the following bugfix.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Cc: stable@vger.kernel.org
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
11 years agodmaengine: dmatest: use DMA_COMPLETE for dma completion status
Vinod Koul [Wed, 16 Oct 2013 08:07:27 +0000 (13:37 +0530)]
dmaengine: dmatest: use DMA_COMPLETE for dma completion status

Acked-by: Dan Williams <dan.j.williams@intel.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
11 years agodmaengine: jz4740: use DMA_COMPLETE for dma completion status
Vinod Koul [Wed, 16 Oct 2013 08:06:54 +0000 (13:36 +0530)]
dmaengine: jz4740: use DMA_COMPLETE for dma completion status

Acked-by: Dan Williams <dan.j.williams@intel.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
11 years agodmaengine: cppi41: use DMA_COMPLETE for dma completion status
Vinod Koul [Wed, 16 Oct 2013 08:06:28 +0000 (13:36 +0530)]
dmaengine: cppi41: use DMA_COMPLETE for dma completion status

Acked-by: Dan Williams <dan.j.williams@intel.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
11 years agodmaengine: coh901318: use DMA_COMPLETE for dma completion status
Vinod Koul [Wed, 16 Oct 2013 08:05:45 +0000 (13:35 +0530)]
dmaengine: coh901318: use DMA_COMPLETE for dma completion status

Acked-by: Dan Williams <dan.j.williams@intel.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
11 years agodmaengine: at_hdma: use DMA_COMPLETE for dma completion status
Vinod Koul [Wed, 16 Oct 2013 08:04:35 +0000 (13:34 +0530)]
dmaengine: at_hdma: use DMA_COMPLETE for dma completion status

Acked-by: Dan Williams <dan.j.williams@intel.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
11 years agodmaengine: amba-pl08x: use DMA_COMPLETE for dma completion status
Vinod Koul [Wed, 16 Oct 2013 08:03:02 +0000 (13:33 +0530)]
dmaengine: amba-pl08x: use DMA_COMPLETE for dma completion status

Acked-by: Dan Williams <dan.j.williams@intel.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
11 years agodmaengine: use DMA_COMPLETE for dma completion status
Vinod Koul [Wed, 16 Oct 2013 07:59:02 +0000 (13:29 +0530)]
dmaengine: use DMA_COMPLETE for dma completion status

the DMA_SUCCESS is a misnomer as dmaengine indicates the transfer is complete and
gives no guarantee of the transfer success. Hence we should use DMA_COMPLTE
instead of DMA_SUCCESS

Acked-by: Dan Williams <dan.j.williams@intel.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
11 years agoMerge branch 'for-linus' into next
Vinod Koul [Mon, 21 Oct 2013 07:27:31 +0000 (12:57 +0530)]
Merge branch 'for-linus' into next

11 years agodma: edma: Increase maximum SG limit to 20
Joel Fernandes [Mon, 23 Sep 2013 23:05:15 +0000 (18:05 -0500)]
dma: edma: Increase maximum SG limit to 20

davinci-pcm uses 16 as the no.of periods. With this, in EDMA we have to
allocate atleast 17 slots: 1 slot for channel, and 16 slots the periods.

Due to this, the MAX_NR_SG limitation causes problems, set it to 20 to make
cyclic DMA work when davinci-pcm is converted to use DMA Engine. Also add
a comment clarifying this.

Signed-off-by: Joel Fernandes <joelf@ti.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
11 years agodma: edma: Split out PaRAM set calculations into its own function
Joel Fernandes [Mon, 23 Sep 2013 23:05:13 +0000 (18:05 -0500)]
dma: edma: Split out PaRAM set calculations into its own function

PaRAM set calculation is abstracted into its own function to
enable better reuse for other DMA cases such as cyclic. We adapt
the Slave SG case to use the new function.

This provides a much cleaner abstraction to the internals of the
PaRAM set. However, any PaRAM attributes that are not common to
all DMA types must be set separately such as setting of interrupts.
This function takes care of the most-common attributes.

Also added comments clarifying A-sync case calculations.

Signed-off-by: Joel Fernandes <joelf@ti.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
11 years agoMerge branch 'parisc-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/deller...
Linus Torvalds [Sun, 20 Oct 2013 22:20:45 +0000 (23:20 +0100)]
Merge branch 'parisc-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux

Pull parsic fixes from Helge Deller:
 "There are just two small fixes in here:
   - Revert a commit which exported the flush_cache_page function.  This
     was noticed by Christoph Hellwig.
   - Enable the DEVTMPFS, DEVTMPFS_MOUNT and BLK_DEV_INITRD config
     options in the parisc defconfigs so that latest udev/initrd finds
     the root disk at boot"

* 'parisc-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
  parisc: enable DEVTMPFS, DEVTMPFS_MOUNT and BLK_DEV_INITRD in defconfigs
  Revert "parisc: Export flush_cache_page() (needed by lustre)"

11 years agoparisc: make "make install" not depend on vmlinux
Helge Deller [Fri, 18 Oct 2013 19:18:46 +0000 (21:18 +0200)]
parisc: make "make install" not depend on vmlinux

Install targets (install, zinstall, uinstall) on parisc have a
dependency to vmlinux. This may cause parts of the kernel to be rebuilt
during installation. We must avoid this since this may run as root.
Install targets "ABSOLUTELY MUST NOT MODIFY THE SOURCE TREE." as Linus
emphasized this in:

http://lkml.org/lkml/2013/7/10/600

So on parisc and maybe other archs we need the same as for x86:

1648e4f8 x86, kbuild: make "make install" not depend on vmlinux

This parisc patch was inspired by:

19514fc6 arm, kbuild: make "make install" not depend on vmlinux

Signed-off-by: Helge Deller <deller@gmx.de>
11 years agoparisc: add kernel audit feature
Helge Deller [Tue, 15 Oct 2013 17:25:46 +0000 (19:25 +0200)]
parisc: add kernel audit feature

Implement missing functions for parisc to provide kernel audit feature.

Signed-off-by: Helge Deller <deller@gmx.de>
11 years agoparisc: break out SOCK_NONBLOCK define to own asm header file
Helge Deller [Mon, 14 Oct 2013 19:04:13 +0000 (21:04 +0200)]
parisc: break out SOCK_NONBLOCK define to own asm header file

Break SOCK_NONBLOCK out to its own asm-file as other arches do. This
fixes build errors with auditd and probably other packages.

Signed-off-by: Helge Deller <deller@gmx.de>
11 years agoparisc: provide macro to create exception table entries
Helge Deller [Sun, 13 Oct 2013 19:11:30 +0000 (21:11 +0200)]
parisc: provide macro to create exception table entries

Provide a macro ASM_EXCEPTIONTABLE_ENTRY() to create exception table
entries and convert all open-coded places to use that macro.

This patch is a first step toward creating a exception table which only
holds 32bit pointers even on a 64bit kernel. That way in my own kernel
I was able to reduce the in-kernel exception table from 44kB to 22kB.

Signed-off-by: Helge Deller <deller@gmx.de>
11 years agoparisc: add generic 32- and 64-bit defconfigs
Helge Deller [Wed, 10 Jul 2013 21:52:52 +0000 (23:52 +0200)]
parisc: add generic 32- and 64-bit defconfigs

New defconfigs which should be able to boot on any 32/64bit machine.
Many drivers are selected to be compiled-in to avoid the need for an
additional initrd and still being able to boot.

Signed-off-by: Helge Deller <deller@gmx.de>
11 years agoBluetooth: Update Set Discoverable to support LE
Johan Hedberg [Sun, 20 Oct 2013 16:00:07 +0000 (19:00 +0300)]
Bluetooth: Update Set Discoverable to support LE

This patch updates the Set Discoverable management command to also be
applicable for LE. In particular this affects the advertising flags
where we can say "general discoverable" or "limited discoverable".

Since the device flags may not be up-to-date when the advertising data
is written this patch introduces a get_adv_discov_flags() helper
function which also looks at any pending mgmt commands (a pending
set_discoverable would be the exception when the flags are not yet
correct).

The patch also adds HCI_DISCOVERABLE flag clearing to the
mgmt_discoverable_timeout function, since the code was previously
relying on the mgmt_discoverable callback to handle this, which is only
called for the BR/EDR-only HCI_Write_Scan_Enable command.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
11 years agoBluetooth: Move HCI_LIMITED_DISCOVERABLE changes to a general place
Johan Hedberg [Sat, 19 Oct 2013 20:38:22 +0000 (23:38 +0300)]
Bluetooth: Move HCI_LIMITED_DISCOVERABLE changes to a general place

We'll soon be introducing also LE support for the Set Discoverable
management command, so move the HCI_LIMITED_DISCOVERABLE flag clearing
and setting out from the if-branch that is only used for a BR/EDR
specific HCI command.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
11 years agoBluetooth: Fix sending write_scan_enable when BR/EDR is disabled
Johan Hedberg [Sat, 19 Oct 2013 20:38:21 +0000 (23:38 +0300)]
Bluetooth: Fix sending write_scan_enable when BR/EDR is disabled

We should only send the HCI_Write_Scan_Enable command from
mgmt_set_powered_failed() when BR/EDR support is enabled. This is
particularly important when the discoverable setting is also tied to LE.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
11 years agoBluetooth: Move mgmt_pending_find to avoid forward declarations
Johan Hedberg [Sat, 19 Oct 2013 20:38:20 +0000 (23:38 +0300)]
Bluetooth: Move mgmt_pending_find to avoid forward declarations

We will soon need this function for updating the advertising data, so
move it higher up in mgmt.c to avoid a forward declaration.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
11 years agoBluetooth: Fix updating settings when there are no HCI commands to send
Johan Hedberg [Sat, 19 Oct 2013 20:38:19 +0000 (23:38 +0300)]
Bluetooth: Fix updating settings when there are no HCI commands to send

It is possible that the Set Connectable management command doesn't cause
any HCI commands to send (such as when BR/EDR is disabled). We can't
just send a response to user space in this case but must also update the
necessary device flags and settings. This patch fixes the issue by using
the recently introduced set_connectable_update_settings function.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
11 years agoBluetooth: Refactor set_connectable settings update to separate function
Johan Hedberg [Sat, 19 Oct 2013 20:38:18 +0000 (23:38 +0300)]
Bluetooth: Refactor set_connectable settings update to separate function

We will need to directly update the device flags and notify user space
of the new settings not just when we're powered off but also if it turns
out that there are no HCI commands to send (which can happen in
particular when BR/EDR is disabled). Since this is a considerable amount
of code, refactor it to a separate function so it can be reused for the
"no HCI commands to send" case.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
11 years agoBluetooth: Add missing check for BREDR_ENABLED flag in update_class()
Johan Hedberg [Sat, 19 Oct 2013 20:38:17 +0000 (23:38 +0300)]
Bluetooth: Add missing check for BREDR_ENABLED flag in update_class()

We shouldn't be sending the HCI_Write_Class_Of_Device command when
BR/EDR is disabled since this is a BR/EDR-only command.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
11 years agoBluetooth: Check for flag instead of features in update_adv_data()
Johan Hedberg [Sat, 19 Oct 2013 20:38:16 +0000 (23:38 +0300)]
Bluetooth: Check for flag instead of features in update_adv_data()

It's better to check for the device flag instead of device features so
that we avoid unnecessary HCI commands when the feature is supported but
disabled (i.e. the flag is unset).

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>