Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 05adb185 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next-queued 



Pull in latest drm-next from Dave Airlie to get at all the drm-misc
goodies, specifically:
- dma_fence error state handling rework (Chris needs that for error
  recovery)
- crc support locking changes (Tomeu's i915 crc patches need that).

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
parents 957870f9 282d0a35

Documentation/admin-guide/kernel-parameters.txt

+12 −1
Original line number Original line Diff line number Diff line
@@ -106,6 +106,16 @@ 
			use by PCI

			use by PCI

			Format: <irq>,<irq>...

			Format: <irq>,<irq>...





	acpi_mask_gpe=  [HW,ACPI]

			Due to the existence of _Lxx/_Exx, some GPEs triggered

			by unsupported hardware/firmware features can result in

                        GPE floodings that cannot be automatically disabled by

                        the GPE dispatcher.

			This facility can be used to prevent such uncontrolled

			GPE floodings.

			Format: <int>

			Support masking of GPEs numbered from 0x00 to 0x7f.



	acpi_no_auto_serialize	[HW,ACPI]

	acpi_no_auto_serialize	[HW,ACPI]

			Disable auto-serialization of AML methods

			Disable auto-serialization of AML methods

			AML control methods that contain the opcodes to create

			AML control methods that contain the opcodes to create
@@ -3811,10 +3821,11 @@ 
			it if 0 is given (See Documentation/cgroup-v1/memory.txt)

			it if 0 is given (See Documentation/cgroup-v1/memory.txt)





	swiotlb=	[ARM,IA-64,PPC,MIPS,X86]

	swiotlb=	[ARM,IA-64,PPC,MIPS,X86]

			Format: { <int> | force }

			Format: { <int> | force | noforce }

			<int> -- Number of I/O TLB slabs

			<int> -- Number of I/O TLB slabs

			force -- force using of bounce buffers even if they

			force -- force using of bounce buffers even if they

			         wouldn't be automatically used by the kernel

			         wouldn't be automatically used by the kernel

			noforce -- Never use bounce buffers (for debugging)





	switches=	[HW,M68k]

	switches=	[HW,M68k]

Documentation/block/queue-sysfs.txt

+3 −3
Original line number Original line Diff line number Diff line
@@ -54,9 +54,9 @@ This is the hardware sector size of the device, in bytes. 




io_poll (RW)

io_poll (RW)

------------

------------

When read, this file shows the total number of block IO polls and how

When read, this file shows whether polling is enabled (1) or disabled

many returned success.  Writing '0' to this file will disable polling

(0).  Writing '0' to this file will disable polling for this device.

for this device.  Writing any non-zero value will enable this feature.

Writing any non-zero value will enable this feature.





io_poll_delay (RW)

io_poll_delay (RW)

------------------

------------------

Documentation/devicetree/bindings/input/tps65218-pwrbutton.txt

+3 −1
Original line number Original line Diff line number Diff line
@@ -8,8 +8,9 @@ This driver provides a simple power button event via an Interrupt. 
Required properties:

Required properties:

- compatible: should be "ti,tps65217-pwrbutton" or "ti,tps65218-pwrbutton"

- compatible: should be "ti,tps65217-pwrbutton" or "ti,tps65218-pwrbutton"





Required properties for TPS65218:

Required properties:

- interrupts: should be one of the following

- interrupts: should be one of the following

   - <2>: For controllers compatible with tps65217

   - <3 IRQ_TYPE_EDGE_BOTH>: For controllers compatible with tps65218

   - <3 IRQ_TYPE_EDGE_BOTH>: For controllers compatible with tps65218





Examples:

Examples:
@@ -17,6 +18,7 @@ Examples: 
&tps {

&tps {

	tps65217-pwrbutton {

	tps65217-pwrbutton {

		compatible = "ti,tps65217-pwrbutton";

		compatible = "ti,tps65217-pwrbutton";

		interrupts = <2>;

	};

	};

};

};

Documentation/devicetree/bindings/power/supply/tps65217_charger.txt

+6 −1
Original line number Original line Diff line number Diff line
@@ -2,11 +2,16 @@ TPS65217 Charger 




Required Properties:

Required Properties:

-compatible: "ti,tps65217-charger"

-compatible: "ti,tps65217-charger"

-interrupts: TPS65217 interrupt numbers for the AC and USB charger input change.

             Should be <0> for the USB charger and <1> for the AC adapter.

-interrupt-names: Should be "USB" and "AC"





This node is a subnode of the tps65217 PMIC.

This node is a subnode of the tps65217 PMIC.





Example:

Example:





	tps65217-charger {

	tps65217-charger {

		compatible = "ti,tps65090-charger";

		compatible = "ti,tps65217-charger";

		interrupts = <0>, <1>;

		interrupt-names = "USB", "AC";

	};
 
	};

Documentation/driver-api/infrastructure.rst

+0 −15
Original line number Original line Diff line number Diff line
@@ -55,21 +55,6 @@ Device Drivers DMA Management 
.. kernel-doc:: drivers/base/dma-mapping.c

.. kernel-doc:: drivers/base/dma-mapping.c

   :export:

   :export:





Device Drivers Power Management

-------------------------------



.. kernel-doc:: drivers/base/power/main.c

   :export:



Device Drivers ACPI Support

---------------------------



.. kernel-doc:: drivers/acpi/scan.c

   :export:



.. kernel-doc:: drivers/acpi/scan.c

   :internal:



Device drivers PnP support

Device drivers PnP support

--------------------------

--------------------------