aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2015-03-11drm/vmwgfx: Correctly NULLify dma buffer pointer on failureColin Ian King1-4/+6
cppcheck on lines 917 and 977 show an ineffective assignment to the dma buffer pointer: [drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c:917]: [drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c:977]: (warning) Assignment of function parameter has no effect outside the function. Did you forget dereferencing it? On a successful DMA buffer lookup, the dma buffer pointer is assigned, however, on failure it currently is left in an undefined state. The original intention in the error exit path was to nullify the pointer on an error (which the original code failed to do properly). This patch fixes this also ensures all failure paths nullify the buffer pointer on the error return. Fortunately the callers to vmw_translate_mob_ptr and vmw_translate_guest_ptr are checking on a return status and not on the dma buffer pointer, so the original code worked. Reviewed-by: Thomas Hellstrom <[email protected]> Signed-off-by: Colin Ian King <[email protected]>
2015-03-11drm/vmwgfx: Reorder device takedown somewhatThomas Hellstrom1-37/+40
To take down the MOB and GMR memory types, the driver may have to issue fence objects and thus make sure that the fence manager is taken down after those memory types. Reorder device init accordingly. Cc: <[email protected]> Signed-off-by: Thomas Hellstrom <[email protected]> Reviewed-by: Sinclair Yeh <[email protected]>
2015-03-11drm/vmwgfx: Fix a couple of lock dependency violationsThomas Hellstrom2-16/+6
Experimental lockdep annotation added to the TTM lock has unveiled a couple of lock dependency violations in the vmwgfx driver. In both cases it turns out that the device_private::reservation_sem is not needed so the offending code is moved out of that lock. Cc: <[email protected]> Acked-by: Sinclair Yeh <[email protected]> Signed-off-by: Thomas Hellstrom <[email protected]>
2015-03-11ARM: Kirkwood: add DT description for nas2bigSimon Guinot3-0/+145
This patch adds the DT description for the LaCie "2Big NAS" (nas2big). This NAS is an hardware upgrade of the 2Big Network v2. Chipset and device list: - CPU Marvell 88F6282 1600Mhz - SDRAM memory, 256MB DDR3 (2x128MB x8) 533Mhz - 1 Ethernet Gigabit port (PHY Marvell 88E1518) - Flash memory, NAND 256MB TSOP48 - I2C EEPROM, 512 bytes (AT24 type) - PCIe SATA controller JMicron JMB360 (eSATA) - I2C fan controller GMT G762 (with a separate alarm GPIO) - 1 USB2 host port - 1 push button - 1 power switch - 2 SATA LEDs (bi-color, blue and red) - 1 power LED (bi-color, blue and red) - CPLD for LEDs and start-up management (Altera Max EMP3064) Signed-off-by: Simon Guinot <[email protected]> Acked-by: Andrew Lunn <[email protected]> Signed-off-by: Gregory CLEMENT <[email protected]>
2015-03-11selftests/exec: Check if the syscall exists and bail if notMichael Ellerman1-1/+9
On systems which don't implement sys_execveat(), this test produces a lot of output. Add a check at the beginning to see if the syscall is present, and if not just note one error and return. When we run on a system that doesn't implement the syscall we will get ENOSYS back from the kernel, so change the logic that handles __NR_execveat not being defined to also use ENOSYS rather than -ENOSYS. Signed-off-by: Michael Ellerman <[email protected]> Acked-by: David Drysdale <[email protected]> Signed-off-by: Shuah Khan <[email protected]>
2015-03-11ALSA: hda - Fix built-in mic on Compaq Presario CQ60Takashi Iwai1-0/+11
Compaq Presario CQ60 laptop with CX20561 gives a wrong pin for the built-in mic NID 0x17 instead of NID 0x1d, and it results in the non-working mic. This patch just remaps the pin correctly via fixup. Bugzilla: https://bugzilla.opensuse.org/show_bug.cgi?id=920604 Cc: <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2015-03-11ARM: at91: pm_slowclock: fix the compilation errorWenyou Yang1-0/+2
When compiling the kernel in thumb2 (CONFIG_THUMB2_KERNEL option activated), we hit a compilation crash. The error message is listed below: ---8< ----- Error: cannot use register index with PC-relative addressing -- `str r0,.saved_lpr' --->8---- Add the .arm directive in the assembly files related to power management. Signed-off-by: Wenyou Yang <[email protected]> Signed-off-by: Nicolas Ferre <[email protected]>
2015-03-11ARM: at91/dt: fix USB high-speed clock to select UTMINicolas Ferre4-5/+5
The UTMI clock must be selected by any high-speed USB IP. The logic behind it needs this particular clock. So, correct the clock in the device tree files affected. Reported-by: Bo Shen <[email protected]> Signed-off-by: Nicolas Ferre <[email protected]> Cc: <[email protected]> #3.18
2015-03-11ARM: at91/dt: fix at91 udc compatible stringsBoris Brezillon3-3/+4
The at91rm9200, at91sam9260, at91sam9261 and at91sam9263 SoCs have slightly different UDC IPs. Those differences were previously handled with cpu_is_at91xx macro which are about to be dropped for multi-platform support, thus we need to change compatible strings. Signed-off-by: Boris Brezillon <[email protected]> Signed-off-by: Nicolas Ferre <[email protected]>
2015-03-11ARM: at91/dt: declare matrix node as a syscon deviceBoris Brezillon1-1/+1
There is no specific driver handling the AHB matrix, this is a simple syscon device. the matrix is needed by several other drivers including the USB on some SoCs (at91sam9261 for instance). Without this definition, the USB will not work on these SoCs. Signed-off-by: Boris Brezillon <[email protected]> Signed-off-by: Nicolas Ferre <[email protected]>
2015-03-11Merge tag 'imx-fixes-4.0' of ↵Arnd Bergmann2-0/+4
git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into fixes Pull "The i.MX fixes for 4.0" from Shawn Guo: It includes a couple of i.MX6 dts fixes, which set an input supply to vbus regulator. Without the fixes, the voltage of vbus is incorrect after system boots up. * tag 'imx-fixes-4.0' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: ARM: imx6sl-evk: set swbst_reg as vbus's parent reg ARM: imx6qdl-sabresd: set swbst_reg as vbus's parent reg
2015-03-11ARM: vexpress: update CONFIG_USB_ISP1760 optionSudeep Holla1-1/+1
Commit 7ef077a8ad35 ("usb: isp1760: Move driver from drivers/usb/host/ to drivers/usb/isp1760/") moved the isp1760 driver and changed the Kconfig option. This makes CONFIG_USB_ISP1760_HCD not selectable directly anymore. This results in driver being not compiled in when using vexpress_defconfig and the USB is non-functional. This patch updates the CONFIG_USB_ISP1760_HCD to CONFIG_USB_ISP1760 to get back USB functional on vexpress platforms. Cc: Liviu Dudau <[email protected]> Cc: Lorenzo Pieralisi <[email protected]> Reported-by: Mathieu Poirier <[email protected]> Tested-by: Mathieu Poirier <[email protected]> Signed-off-by: Sudeep Holla <[email protected]> Signed-off-by: Arnd Bergmann <[email protected]>
2015-03-11ARM: digicolor: add the machine directory to MakefileBaruch Siach1-0/+1
Make the digicolor specific DT_MACHINE_START entry visible. Fixes: df8d742e929 (ARM: initial support for Conexant Digicolor CX92755 SoC) Signed-off-by: Baruch Siach <[email protected]> Signed-off-by: Arnd Bergmann <[email protected]>
2015-03-11Merge tag 'fixes-v4.0-rc2' of ↵Arnd Bergmann20-132/+191
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes Pull "omap fixes against v4.0-rc2" from Tony Lindgren: Fixes for various omap variants, mostly minor fixes for various SoCs with the bigger changes being for the dra7 clocks and hwmod data: - Fix wl12xx for dm3730-evm - Fix omap4 prm save and clea - Fix hwmod clkdm use count - Fix hwmod data for pcie on dra7 - Fix lockdep for hwmod - Fix USB on most omap3 boars by enabling it in the defconfig - Fix the bypass clock source for omap5 and dra7 - Fix the ehrpwm clock for am33xx and am43xx - Enable AES and SHAM for BeagleBone white - Use rmii clock for am335x-lxm - Fix polling intervals for omap5 thermal zones - Fix slewctrl for am33xx and am43xx - Fix dra7-evm dcan pinctrl * tag 'fixes-v4.0-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: OMAP2+: Fix wl12xx on dm3730-evm with mainline u-boot ARM: OMAP: enable TWL4030_USB in omap2plus_defconfig ARM: dts: dra7x-evm: avoid possible contention while muxing on CAN lines ARM: dts: dra7x-evm: Don't use dcan1_rx.gpio1_15 in DCAN pinctrl ARM: dts: am43xx: fix SLEWCTRL_FAST pinctrl binding ARM: dts: am33xx: fix SLEWCTRL_FAST pinctrl binding ARM: dts: OMAP5: fix polling intervals for thermal zones ARM: dts: am335x-lxm: Use rmii-clock-ext ARM: dts: am335x-bone-common: enable aes and sham ARM: dts: am43xx-clocks: Fix ehrpwm tbclk data on am43xx ARM: dts: am33xx-clocks: Fix ehrpwm tbclk data on am33xx ARM: dts: OMAP5: Fix the bypass clock source for dpll_iva and others ARM: dts: DRA7x: Fix the bypass clock source for dpll_iva and others ARM: OMAP4+: PRM: fix omap4 version of prm_save_and_clear_irqen ARM: OMAP2+: hwmod: fix deassert hardreset clkdm usecounting ARM: DRA7: hwmod_data: Fix hwmod data for pcie ARM: omap2+: omap_hwmod: Set unique lock_class_key per hwmod
2015-03-11ARM: STi: Add STiH410 SoC supportFabrice GASNIER2-0/+5
This patch adds support to STiH410 SoC. Please note "st,stih410" is already present in device tree. The problem is that it is missing the entry in the match table, and so the L2 cache and other cpus than 0 don't get initialized. Signed-off-by: Fabrice Gasnier <[email protected]> Tested-by: Maxime Coquelin <[email protected]> Acked-by: Peter Griffin <[email protected]> Acked-by: Lee Jones <[email protected]> Signed-off-by: Maxime Coquelin <[email protected]> Signed-off-by: Arnd Bergmann <[email protected]>
2015-03-11xen-pciback: limit guest control of command registerJan Beulich3-14/+51
Otherwise the guest can abuse that control to cause e.g. PCIe Unsupported Request responses by disabling memory and/or I/O decoding and subsequently causing (CPU side) accesses to the respective address ranges, which (depending on system configuration) may be fatal to the host. Note that to alter any of the bits collected together as PCI_COMMAND_GUEST permissive mode is now required to be enabled globally or on the specific device. This is CVE-2015-2150 / XSA-120. Signed-off-by: Jan Beulich <[email protected]> Reviewed-by: Konrad Rzeszutek Wilk <[email protected]> Cc: <[email protected]> Signed-off-by: David Vrabel <[email protected]>
2015-03-11Merge tag 'at91-fixes2' of ↵Arnd Bergmann3-4/+9
git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91 into fixes Pull "Second fixes batch for AT91 on 4.0" from Nicolas Ferre: - little fix for !MMU debug: may also help for randconfig - fix of 2 errors in LCD clock definitions - in PM code, not writing the key leads to not execute the action * tag 'at91-fixes2' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91: ARM: at91/pm: MOR register KEY was missing ARM: at91/dt: sama5d4: fix lcdck clock definition ARM: at91/dt: sama5d4: rename lcd_clk into lcdc_clk ARM: at91: debug: fix non MMU debug
2015-03-11Merge tag 'socfpga_fixes_for_v4.0' of ↵Arnd Bergmann3-1/+12
git://git.rocketboards.org/linux-socfpga-next into fixes Pull "Fixes for v4.0 on the SoCFPGA platform" from Dinh Nguyen: - Fix the SCU virtual mapping - Add misssing DMA channels for UART nodes - Fix a sporadic SMP error where CPU1 was not seeing its start address * tag 'socfpga_fixes_for_v4.0' of git://git.rocketboards.org/linux-socfpga-next: ARM: socfpga: make sure socfpga_cpu1start_addr is properly flushed ARM: socfpga: fix uart DMA binding error ARM: socfpga: Correct SCU virtual mapping in socfpga
2015-03-11MAINTAINERS: add Freescale Vybrid SoCStefan Agner1-0/+10
Add Freescale Vybrid family as a own entry, along with an entry for the so far orphan Vybrid device tree files. Also add myself as a designated reviewer. Acked-by: Shawn Guo <[email protected]> Signed-off-by: Stefan Agner <[email protected]> Signed-off-by: Arnd Bergmann <[email protected]>
2015-03-11MAINTAINERS: Remove self as ARM mach-bcm co-maintainerMatt Porter1-1/+0
Removing myself as a co-maintainer. Signed-off-by: Matt Porter <[email protected]> Signed-off-by: Arnd Bergmann <[email protected]>
2015-03-11drm/radeon: drop setting UPLL to sleep modeChristian König1-4/+2
Just keep it working, seems to fix some PLL problems. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=73378 Signed-off-by: Christian König <[email protected]> Signed-off-by: Alex Deucher <[email protected]> Cc: [email protected]
2015-03-11drm/radeon: fix wait to actually occur after the signaling callbackMaarten Lankhorst1-23/+45
A normal wait adds to the front of the tail. By doing something similar to fence_default_wait the fence code can run without racing. This is a complete fix for "panic on suspend from KDE with radeon", and a partial fix for "Radeon: System pauses on TAHITI". On tahiti si_irq_set needs to be fixed too, to completely flush the writes before radeon_fence_activity is called in radeon_fence_enable_signaling. Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=90741 Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=90861 Signed-off-by: Maarten Lankhorst <[email protected]> Reported-by: Jon Arne Jørgensen <[email protected]> Reported-and-tested-by: Gustaw Smolarczyk <[email protected]> Cc: [email protected] (v3.18+) Signed-off-by: Alex Deucher <[email protected]>
2015-03-11ARM: imx6sl-evk: set swbst_reg as vbus's parent regPeter Chen1-0/+2
USB vbus 5V is from PMIC SWBST, so set swbst_reg as vbus's parent reg, it fixed a bug that the voltage of vbus is incorrect due to swbst_reg is disabled after boots up. Cc: [email protected] Signed-off-by: Peter Chen <[email protected]> Signed-off-by: Shawn Guo <[email protected]>
2015-03-11ARM: imx6qdl-sabresd: set swbst_reg as vbus's parent regPeter Chen1-0/+2
USB vbus 5V is from PMIC SWBST, so set swbst_reg as vbus's parent reg, it fixed a bug that the voltage of vbus is incorrect due to swbst_reg is disabled after boots up. Cc: [email protected] Signed-off-by: Peter Chen <[email protected]> Signed-off-by: Shawn Guo <[email protected]>
2015-03-10Merge tag 'for-linus-20150310' of git://git.infradead.org/linux-mtdLinus Torvalds2-6/+45
Pull MTD fixes from Brian Norris: * pxa3xx_nand - fix timeout issues when draining the FIFO (BCH only) - don't crash when no chip-selects are used * hisi504_nand - depend on HAS_DMA, to fix compile errors * tag 'for-linus-20150310' of git://git.infradead.org/linux-mtd: mtd: nand: MTD_NAND_HISI504 should depend on HAS_DMA mtd: pxa3xx_nand: fix driver when num_cs is 0 mtd: nand: pxa3xx: Fix PIO FIFO draining
2015-03-11ARM: shmobile: r8a7791: sound enables Audio DMAC entry on DTSIKuninori Morimoto1-22/+108
This patch adds Audio DMAC (= rcar-dmac) entry for sound Signed-off-by: Kuninori Morimoto <[email protected]> Signed-off-by: Simon Horman <[email protected]>
2015-03-11ARM: shmobile: r8a7790: sound enables Audio DMAC entry on DTSIKuninori Morimoto1-22/+108
This patch adds Audio DMAC (= rcar-dmac) entry for sound Signed-off-by: Kuninori Morimoto <[email protected]> Signed-off-by: Simon Horman <[email protected]>
2015-03-11ARM: shmobile: r8a7791: enable Audio DMAC peri peri via sound driverKuninori Morimoto1-9/+3
Audio DMAC peri peri is no longer DMAEngine. it is supported by sound driver. this patch enable it. Signed-off-by: Kuninori Morimoto <[email protected]> Signed-off-by: Simon Horman <[email protected]>
2015-03-11ARM: shmobile: r8a7790: enable Audio DMAC peri peri via sound driverKuninori Morimoto1-9/+3
Audio DMAC peri peri is no longer DMAEngine. it is supported by sound driver. this patch enable it. Signed-off-by: Kuninori Morimoto <[email protected]> Signed-off-by: Simon Horman <[email protected]>
2015-03-11ARM: shmobile: r8a7791: add reg-names for soundKuninori Morimoto1-0/+2
Rensas R-Car sound driver supports reg-names. Let's use it. Signed-off-by: Kuninori Morimoto <[email protected]> Signed-off-by: Simon Horman <[email protected]>
2015-03-11ARM: shmobile: r8a7790: add reg-names for soundKuninori Morimoto1-0/+2
Rensas R-Car sound driver supports reg-names. Let's use it. Signed-off-by: Kuninori Morimoto <[email protected]> Signed-off-by: Simon Horman <[email protected]>
2015-03-10Merge tag 'iommu-fixes-v4.0-rc3' of ↵Linus Torvalds5-2/+26
git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu Pull iommu fixes from Joerg Roedel: "The patches contain: - fix multiple ARM IOMMU drivers to behave well when the hardware is not present - mark MSM driver as broken - fix build errors with the new ARM generic io-page-table code" * tag 'iommu-fixes-v4.0-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu: iommu/io-pgtable-arm: Add built time dependency iommu/msm: Mark driver BROKEN iommu/rockchip: Play nice in multi-platform builds iommu/omap: Play nice in multi-platform builds iommu/exynos: Play nice in multi-platform builds iommu/io-pgtable-arm: Fix self-test WARNs on i386
2015-03-10ARM: dts: cygnus: enable GPIO based hook detectionRay Jui1-0/+13
This enables GPIO based phone hook detection for Broadcom BCM911360 phone factor board (bcm911360_entphn) Signed-off-by: Ray Jui <[email protected]> Acked-by: Linus Walleij <[email protected]> Signed-off-by: Florian Fainelli <[email protected]>
2015-03-10ARM: dts: enable GPIO for Broadcom CygnusRay Jui1-0/+30
This enables all 3 GPIO controllers including the ASIU GPIO, the chipcommonG GPIO, and the ALWAYS-ON GPIO, for Broadcom Cygnus SoC Signed-off-by: Ray Jui <[email protected]> Reviewed-by: Scott Branden <[email protected]> Tested-by: Dmitry Torokhov <[email protected]> Acked-by: Linus Walleij <[email protected]> Signed-off-by: Florian Fainelli <[email protected]>
2015-03-10ARM: dts: enable IOMUX for Broadcom CygnusRay Jui1-0/+6
This enables the IOMUX support for Broadcom Cygnus SoC Signed-off-by: Ray Jui <[email protected]> Tested-by: Dmitry Torokhov <[email protected]> Acked-by: Linus Walleij <[email protected]> Signed-off-by: Florian Fainelli <[email protected]>
2015-03-10of: unittest: Add options string testcase variantsPeter Hurley1-0/+11
Add testcase variants with '/' in the options string to test for scan beyond end path name terminated by ':'. Signed-off-by: Peter Hurley <[email protected]> Signed-off-by: Rob Herring <[email protected]>
2015-03-10of: fix handling of '/' in options for of_find_node_by_path()Leif Lindholm1-8/+15
Ensure proper handling of paths with appended options (after ':'), where those options may contain a '/'. Fixes: 7914a7c5651a ("of: support passing console options with stdout-path") Reported-by: Peter Hurley <[email protected]> Signed-off-by: Leif Lindholm <[email protected]> Cc: <[email protected]> # 3.19 Signed-off-by: Rob Herring <[email protected]>
2015-03-10of/unittest: Fix the wrong expected value in of_selftest_property_stringWang Long1-2/+2
This patch fix the wrong expected value of of_property_match_string in of_selftest_property_string. Signed-off-by: Wang Long <[email protected]> Signed-off-by: Rob Herring <[email protected]>
2015-03-10of/unittest: remove the duplicate of_changeset_initWang Long1-1/+0
Remove the duplicate of_changeset_init. In of_selftest_changeset testcase, the "struct of_changeset chgset" is initialized twice, but only once is enough. so, drop the first initializtion code. Signed-off-by: Wang Long <[email protected]> Signed-off-by: Rob Herring <[email protected]>
2015-03-10dt: submitting-patches: clarify that DT maintainers are to be cced on bindingsMatt Porter1-0/+3
The exact steps provided for submitting binding patches can be read as requiring the bindings to be sent only to the [email protected] list. Since the DT maintainers would like to be Cced on any binding submissions, make this requirement explicit in step 2. Signed-off-by: Matt Porter <[email protected]> Signed-off-by: Rob Herring <[email protected]>
2015-03-10of: unittest: fix I2C dependencyArnd Bergmann1-6/+6
The unittest fails to link if I2C or I2C_MUX is a loadable module: drivers/built-in.o: In function `selftest_i2c_mux_remove': unittest.c:(.text+0xb0ce4): undefined reference to `i2c_del_mux_adapter' This changes the newly added IS_ENABLED() checks to use IS_BUILTIN() instead, which evaluates to false if the other driver is a module. Reported-by: Chen Gang <[email protected]> Signed-off-by: Arnd Bergmann <[email protected]> Fixes: d5e75500ca401 ("of: unitest: Add I2C overlay unit tests.") Signed-off-by: Rob Herring <[email protected]>
2015-03-10of/overlay: Remove unused variableFabio Estevam1-1/+1
Commit 3e7f7626fd49a ("of/overlay: Do not generate duplicate nodes") removed the only use of the 'grandchild' variable, which leads to the following build warning: drivers/of/overlay.c: In function 'of_overlay_apply_single_device_node': drivers/of/overlay.c:89:31: warning: unused variable 'grandchild' [-Wunused-variable] struct device_node *tchild, *grandchild; ^ Remove this unused variable. Signed-off-by: Fabio Estevam <[email protected]> Signed-off-by: Rob Herring <[email protected]>
2015-03-10Documentation: DT: Renamed of-serial.txt to 8250.txtChunyan Zhang1-0/+0
The file of-serial.txt was only for 8250 compatible UART implementations, so renamed it to 8250.txt to avoid confusing other persons. This is suggested by Arnd, see: http://lists.infradead.org/pipermail/linux-arm-kernel/2014-September/291455.html Signed-off-by: Chunyan Zhang <[email protected]> Acked-by: Mark Rutland <[email protected]> Signed-off-by: Rob Herring <[email protected]>
2015-03-10of: Fix premature bootconsole disable with 'stdout-path'Peter Hurley1-1/+3
Support for devicetree serial consoles via 'stdout-path' causes bootconsoles to be disabled when the vt dummy console loads, since there is no preferred console (the preferred console is not added until the device is probed). Ensure there is at least a preferred console, even if never matched. Requires: "console: Fix console name size mismatch" Cc: Andrew Morton <[email protected]> Signed-off-by: Peter Hurley <[email protected]> Signed-off-by: Rob Herring <[email protected]>
2015-03-10ALSA: firewire-lib: leave unit reference counting completelyTakashi Sakamoto1-2/+1
With previous commit, this module managed to leave the counting to each drivers, but the isochronous resources functionality still increment/decrement the count. This commit purge such codes to leave the responsibility to each drivers. Fix: c6f224dc20ad ('ALSA: firewire-lib: remove reference counting') Signed-off-by: Takashi Sakamoto <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2015-03-10Revert "ALSA: dice: fix wrong offsets for Dice interface"Takashi Sakamoto2-11/+11
This reverts commit 8cdebf71098c07168ef6335e2f1f35d85dbe3049. The reverted commit breaks out-stream functionality of Dice driver. Signed-off-by: Takashi Sakamoto <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2015-03-10Merge tag 'v4.0-rc3' into HEADRob Herring490-2578/+4877
Linux 4.0-rc3 Merging in v4.0-rc3 because commit 30a22c215a00 (console: Fix console name size mismatch) is a dependency.
2015-03-10drm/i915: Prevent TLB error on first execution on SNBChris Wilson1-2/+16
Long ago I found that I was getting sporadic errors when booting SNB, with the symptom being that the first batch died with IPEHR != *ACTHD, typically caused by the TLB being invalid. These magically disappeared if I held the forcewake during the entire ring initialisation sequence. (It can probably be shortened to a short critical section, but the whole initialisation is full of register writes and so we would be taking and releasing forcewake almost continually, and so holding it over the entire sequence will probably be a net win!) Note some of the kernels I encounted the issue already had the deferred forcewake release, so it is still relevant. I know that there have been a few other reports with similar failure conditions on SNB, I think such as References: https://bugs.freedesktop.org/show_bug.cgi?id=80913 v2: Wrap i915_gem_init_hw() with its own security blanket as we take that path following resume and reset. Signed-off-by: Chris Wilson <[email protected]> Reviewed-by: Daniel Vetter <[email protected]> Cc: [email protected] Signed-off-by: Jani Nikula <[email protected]>
2015-03-10drm/i915: Do both mt and gen6 style forcewake reset on ivb probeMika Kuoppala1-1/+7
commit 05a2fb157e44 ("drm/i915: Consolidate forcewake code") failed to take into account that we have used to reset both the gen6 style and the multithreaded style forcewake registers. This is due to fact that ivb can use either, depending on how the bios has set up the machine. Mimic the old semantics before we have determined the correct variety and reset both before the ecobus probe. Cc: Chris Wilson <[email protected]> Cc: Huang Ying <[email protected]> Signed-off-by: Mika Kuoppala <[email protected]> Reviewed-by: Chris Wilson <[email protected]> Signed-off-by: Jani Nikula <[email protected]>
2015-03-10drm/i915: Make WAIT_IOCTL negative timeouts be indefinite againChris Wilson1-3/+4
This fixes a regression from commit 5ed0bdf21a85d78e04f89f15ccf227562177cbd9 Author: Thomas Gleixner <[email protected]> Date: Wed Jul 16 21:05:06 2014 +0000 drm: i915: Use nsec based interfaces that made a negative timeout return immediately rather than the previously defined behaviour of waiting indefinitely. Testcase: igt/gem_wait Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=89494 Signed-off-by: Chris Wilson <[email protected]> Cc: Daniel Vetter <[email protected]> Cc: Ben Widawsky <[email protected]> Cc: Kristian Høgsberg <[email protected]> Cc: [email protected] Reviewed-by: Daniel Vetter <[email protected]> [Jani: fixed a checkpatch complaint about whitespace.] Signed-off-by: Jani Nikula <[email protected]>