Commit bc67f799 authored by Keith Packard's avatar Keith Packard
Browse files

Merge branch 'drm-intel-fixes' into drm-intel-next

parents 89c61432 c7ad3810
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -518,7 +518,7 @@ N: Zach Brown
E: zab@zabbo.net
D: maestro pci sound

M: David Brownell
N: David Brownell
D: Kernel engineer, mentor, and friend.  Maintained USB EHCI and
D: gadget layers, SPI subsystem, GPIO subsystem, and more than a few
D: device drivers.  His encouragement also helped many engineers get
+4 −0
Original line number Diff line number Diff line
@@ -22,6 +22,10 @@ Supported chips:
    Prefix: 'f71869'
    Addresses scanned: none, address read from Super I/O config space
    Datasheet: Available from the Fintek website
  * Fintek F71869A
    Prefix: 'f71869a'
    Addresses scanned: none, address read from Super I/O config space
    Datasheet: Not public
  * Fintek F71882FG and F71883FG
    Prefix: 'f71882fg'
    Addresses scanned: none, address read from Super I/O config space
+6 −2
Original line number Diff line number Diff line
@@ -9,8 +9,8 @@ Supported chips:
  Socket S1G3: Athlon II, Sempron, Turion II
* AMD Family 11h processors:
  Socket S1G2: Athlon (X2), Sempron (X2), Turion X2 (Ultra)
* AMD Family 12h processors: "Llano"
* AMD Family 14h processors: "Brazos" (C/E/G-Series)
* AMD Family 12h processors: "Llano" (E2/A4/A6/A8-Series)
* AMD Family 14h processors: "Brazos" (C/E/G/Z-Series)
* AMD Family 15h processors: "Bulldozer"

  Prefix: 'k10temp'
@@ -20,12 +20,16 @@ Supported chips:
    http://support.amd.com/us/Processor_TechDocs/31116.pdf
  BIOS and Kernel Developer's Guide (BKDG) for AMD Family 11h Processors:
    http://support.amd.com/us/Processor_TechDocs/41256.pdf
  BIOS and Kernel Developer's Guide (BKDG) for AMD Family 12h Processors:
    http://support.amd.com/us/Processor_TechDocs/41131.pdf
  BIOS and Kernel Developer's Guide (BKDG) for AMD Family 14h Models 00h-0Fh Processors:
    http://support.amd.com/us/Processor_TechDocs/43170.pdf
  Revision Guide for AMD Family 10h Processors:
    http://support.amd.com/us/Processor_TechDocs/41322.pdf
  Revision Guide for AMD Family 11h Processors:
    http://support.amd.com/us/Processor_TechDocs/41788.pdf
  Revision Guide for AMD Family 12h Processors:
    http://support.amd.com/us/Processor_TechDocs/44739.pdf
  Revision Guide for AMD Family 14h Models 00h-0Fh Processors:
    http://support.amd.com/us/Processor_TechDocs/47534.pdf
  AMD Family 11h Processor Power and Thermal Data Sheet for Notebooks:
+21 −5
Original line number Diff line number Diff line
@@ -501,13 +501,29 @@ helper functions described in Section 4. In that case, pm_runtime_resume()
should be used.  Of course, for this purpose the device's run-time PM has to be
enabled earlier by calling pm_runtime_enable().

If the device bus type's or driver's ->probe() or ->remove() callback runs
If the device bus type's or driver's ->probe() callback runs
pm_runtime_suspend() or pm_runtime_idle() or their asynchronous counterparts,
they will fail returning -EAGAIN, because the device's usage counter is
incremented by the core before executing ->probe() and ->remove().  Still, it
may be desirable to suspend the device as soon as ->probe() or ->remove() has
finished, so the PM core uses pm_runtime_idle_sync() to invoke the
subsystem-level idle callback for the device at that time.
incremented by the driver core before executing ->probe().  Still, it may be
desirable to suspend the device as soon as ->probe() has finished, so the driver
core uses pm_runtime_put_sync() to invoke the subsystem-level idle callback for
the device at that time.

Moreover, the driver core prevents runtime PM callbacks from racing with the bus
notifier callback in __device_release_driver(), which is necessary, because the
notifier is used by some subsystems to carry out operations affecting the
runtime PM functionality.  It does so by calling pm_runtime_get_sync() before
driver_sysfs_remove() and the BUS_NOTIFY_UNBIND_DRIVER notifications.  This
resumes the device if it's in the suspended state and prevents it from
being suspended again while those routines are being executed.

To allow bus types and drivers to put devices into the suspended state by
calling pm_runtime_suspend() from their ->remove() routines, the driver core
executes pm_runtime_put_sync() after running the BUS_NOTIFY_UNBIND_DRIVER
notifications in __device_release_driver().  This requires bus types and
drivers to make their ->remove() callbacks avoid races with runtime PM directly,
but also it allows of more flexibility in the handling of devices during the
removal of their drivers.

The user space can effectively disallow the driver of the device to power manage
it at run time by changing the value of its /sys/devices/.../power/control
+9 −8
Original line number Diff line number Diff line
@@ -1345,16 +1345,18 @@ F: drivers/auxdisplay/
F:	include/linux/cfag12864b.h

AVR32 ARCHITECTURE
M:	Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com>
M:	Haavard Skinnemoen <hskinnemoen@gmail.com>
M:	Hans-Christian Egtvedt <egtvedt@samfundet.no>
W:	http://www.atmel.com/products/AVR32/
W:	http://avr32linux.org/
W:	http://avrfreaks.net/
S:	Supported
S:	Maintained
F:	arch/avr32/

AVR32/AT32AP MACHINE SUPPORT
M:	Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com>
S:	Supported
M:	Haavard Skinnemoen <hskinnemoen@gmail.com>
M:	Hans-Christian Egtvedt <egtvedt@samfundet.no>
S:	Maintained
F:	arch/avr32/mach-at32ap/

AX.25 NETWORK LAYER
@@ -1390,7 +1392,6 @@ F: include/linux/backlight.h
BATMAN ADVANCED
M:	Marek Lindner <lindner_marek@yahoo.de>
M:	Simon Wunderlich <siwu@hrz.tu-chemnitz.de>
M:	Sven Eckelmann <sven@narfation.org>
L:	b.a.t.m.a.n@lists.open-mesh.org
W:	http://www.open-mesh.org/
S:	Maintained
@@ -1423,7 +1424,6 @@ S: Supported
F:	arch/blackfin/

BLACKFIN EMAC DRIVER
M:	Michael Hennerich <michael.hennerich@analog.com>
L:	uclinux-dist-devel@blackfin.uclinux.org
W:	http://blackfin.uclinux.org
S:	Supported
@@ -1639,7 +1639,7 @@ CAN NETWORK LAYER
M:	Oliver Hartkopp <socketcan@hartkopp.net>
M:	Oliver Hartkopp <oliver.hartkopp@volkswagen.de>
M:	Urs Thuermann <urs.thuermann@volkswagen.de>
L:	socketcan-core@lists.berlios.de
L:	socketcan-core@lists.berlios.de (subscribers-only)
L:	netdev@vger.kernel.org
W:	http://developer.berlios.de/projects/socketcan/
S:	Maintained
@@ -1651,7 +1651,7 @@ F: include/linux/can/raw.h

CAN NETWORK DRIVERS
M:	Wolfgang Grandegger <wg@grandegger.com>
L:	socketcan-core@lists.berlios.de
L:	socketcan-core@lists.berlios.de (subscribers-only)
L:	netdev@vger.kernel.org
W:	http://developer.berlios.de/projects/socketcan/
S:	Maintained
@@ -5181,6 +5181,7 @@ S: Supported
F:	drivers/net/qlcnic/

QLOGIC QLGE 10Gb ETHERNET DRIVER
M:	Jitendra Kalsaria <jitendra.kalsaria@qlogic.com>
M:	Ron Mercer <ron.mercer@qlogic.com>
M:	linux-driver@qlogic.com
L:	netdev@vger.kernel.org
Loading