Maarten Lankhorst
1e98380cbd
drm/nouveau: use different register to wait for secret scrubber ...
Fixes long delay when waiting for scrubber on some secret engines.
The exit interrupt seems to not always be generated, so use secret
scrubber active register instead.
Later fuc engines also no longer generate an interrupt, so don't wait
there.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2013-01-31 15:59:57 +10:00
Merge branch 'x86-acpi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2012-12-14 10:03:23 -08:00
Merge tag 'tegra-for-3.8-fixes-for-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into fixes
2012-12-17 10:04:27 -08:00
1) More ACPI fixes
2012-12-15 12:37:18 -08:00
solos-pci: ensure all TX packets are aligned to 4 bytes
2012-12-19 14:53:53 -08:00
vfs: turn is_dir argument to kern_path_create into a lookup_flags arg
2012-12-20 18:50:02 -05:00
MTD pull for 3.8
2012-12-19 12:47:41 -08:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client
2012-12-20 14:00:13 -08:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2012-12-12 18:07:07 -08:00
ARM: OMAP: Fix drivers to depend on omap for internal devices
2012-12-16 15:23:37 -08:00
Some nice cleanups, and even a patch my wife did as a "live" demo for
2012-12-20 08:37:05 -08:00
MTD pull for 3.8
2012-12-19 12:47:41 -08:00
ARM: arm-soc: Updates for Marvell mvebu/kirkwood
2012-12-14 14:54:26 -08:00
ACPI and power management updates for 3.8-rc1
2012-12-11 12:45:35 -08:00
ARM: arm-soc: SoC updates for 3.8
2012-12-12 12:05:15 -08:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
2012-12-18 09:58:09 -08:00
Merge branch 'pm-devfreq'
2012-12-07 23:13:36 +01:00
dmatest: check for dma mapping error
2012-12-17 17:15:13 -08:00
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2012-12-14 14:27:45 -08:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2012-12-13 12:00:02 -08:00
drivers/firmware/dmi_scan.c: fetch dmi version from SMBIOS if it exists
2012-12-20 17:40:19 -08:00
gpio/mvebu-gpio: Make mvebu-gpio depend on OF_CONFIG
2012-12-19 22:15:14 +00:00
drm/nouveau: use different register to wait for secret scrubber
2013-01-31 15:59:57 +10:00
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
2012-12-13 19:22:22 -08:00
hwmon-vid: Add support for AMD family 11h to 15h processors
2012-12-19 22:17:02 +01:00
Merge branch 'i2c-embedded/for-next' of git://git.pengutronix.de/git/wsa/linux
2012-12-18 16:51:10 -08:00
This is the MFD patch set for the 3.8 merge window.
2012-12-16 18:55:20 -08:00
Second batch of InfiniBand/RDMA changes for 3.8:
2012-12-21 16:40:26 -08:00
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2012-12-19 12:56:42 -08:00
IOMMU Updates for Linux v3.8
2012-12-20 10:07:25 -08:00
TTY/Serial merge for 3.8-rc1
2012-12-11 14:08:47 -08:00
ARM: arm-soc: Device-tree updates, take 2
2012-12-14 14:42:53 -08:00
mISDN: fix race in timer canceling on module unloading
2012-12-14 13:14:07 -05:00
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds
2012-12-15 12:52:42 -08:00
lguest: fix typo
2012-12-18 15:19:06 +10:30
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
2012-12-18 09:58:09 -08:00
Miscellaneous device-mapper fixes, cleanups and performance improvements.
2012-12-21 17:08:06 -08:00
Merge branches 'iommu/fixes', 'dma-debug', 'x86/amd', 'x86/vt-d', 'arm/tegra' and 'arm/omap' into next
2012-12-16 12:24:09 +01:00
drivers/message/fusion/mptscsih.c: missing break
2012-12-18 15:02:12 -08:00
ARM: arm-soc fixes for 3.8
2012-12-20 07:21:54 -08:00
Merge git://www.linux-watchdog.org/linux-watchdog
2012-12-21 17:10:29 -08:00
This is the MFD patch set for the 3.8 merge window.
2012-12-16 18:55:20 -08:00
Nothing exciting, just clean-ups and nicification. Oh, and one small
2012-12-20 07:39:03 -08:00
Second batch of InfiniBand/RDMA changes for 3.8:
2012-12-21 16:40:26 -08:00
of: Fix export of of_find_matching_node_and_match()
2012-12-19 10:58:53 +00:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
2012-12-13 14:20:19 -08:00
ARM: arm-soc: Header cleanups
2012-12-12 11:45:16 -08:00
pinctrl: exynos5440/samsung: Staticize pcfgs
2012-12-18 19:00:25 -08:00
Corentin has moved
2012-12-17 17:15:14 -08:00
Driver core updates for 3.8-rc1
2012-12-11 13:13:55 -08:00
In part2:
2012-12-19 08:14:08 -08:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2012-12-12 18:07:07 -08:00
pwm: Changes for v3.8-rc1
2012-12-19 08:19:07 -08:00
Driver core updates for 3.8-rc1
2012-12-11 13:13:55 -08:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2012-12-13 12:00:02 -08:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2012-12-13 12:00:02 -08:00
virtio: rpmsg: make it clear that virtqueue_add_buf() no longer returns > 0
2012-12-18 15:20:36 +10:30
revert "rtc: recycle id when unloading a rtc driver"
2012-12-20 17:40:20 -08:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
2012-12-13 14:20:19 -08:00
Second batch of InfiniBand/RDMA changes for 3.8:
2012-12-21 16:40:26 -08:00
spi/sh-hspi: fix return value check in hspi_probe().
2012-12-19 15:11:41 +00:00
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2012-12-14 14:27:45 -08:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace
2012-12-17 15:44:47 -08:00
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
2012-12-15 14:25:10 -08:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2012-12-13 12:00:02 -08:00
Merge branch 'omap-for-v3.8/fixes-for-merge-window' into omap-for-v3.8/fixes-for-merge-window-v2
2012-12-16 11:28:10 -08:00
ARM: arm-soc: SoC updates for 3.8
2012-12-12 12:05:15 -08:00
usb: musb: use io{read,write}*_rep accessors
2012-12-17 17:15:13 -08:00
vfio-pci: Enable device before attempting reset
2012-12-07 13:43:51 -07:00
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
2012-12-15 14:25:10 -08:00
backlight: locomolcd: fix checkpatch error and warning
2012-12-18 15:02:11 -08:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
2012-12-18 09:58:09 -08:00
Some nice cleanups, and even a patch my wife did as a "live" demo for
2012-12-20 08:37:05 -08:00
ARM: OMAP: Fix drivers to depend on omap for internal devices
2012-12-16 15:23:37 -08:00
watchdog: Orion: Fix possible null-deference in orion_wdt_probe
2012-12-19 22:25:10 +01:00
Feature:
2012-12-16 17:39:14 -08:00
1e98380cbd