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

Commit 7a085c3a authored by Jani Nikula's avatar Jani Nikula
Browse files

Merge drm/drm-next into drm-intel-next-queued 



Although there's nothing crucial missing, it's been a long time since
the last backmerge. Catch up with drm-next.

Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parents 18cde299 f9885ef8

Documentation/ABI/stable/sysfs-devices-system-xen_memory

+9 −0
Original line number Diff line number Diff line
@@ -75,3 +75,12 @@ Contact: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> 
Description:

		Amount (in KiB) of low (or normal) memory in the

		balloon.



What:		/sys/devices/system/xen_memory/xen_memory0/scrub_pages

Date:		September 2018

KernelVersion:	4.20

Contact:	xen-devel@lists.xenproject.org

Description:

		Control scrubbing pages before returning them to Xen for others domains

		use. Can be set with xen_scrub_pages cmdline

		parameter. Default value controlled with CONFIG_XEN_SCRUB_PAGES_DEFAULT.

Documentation/admin-guide/kernel-parameters.txt

+12 −0
Original line number Diff line number Diff line
@@ -3523,6 +3523,12 @@ 
	ramdisk_size=	[RAM] Sizes of RAM disks in kilobytes

			See Documentation/blockdev/ramdisk.txt.



	random.trust_cpu={on,off}

			[KNL] Enable or disable trusting the use of the

			CPU's random number generator (if available) to

			fully seed the kernel's CRNG. Default is controlled

			by CONFIG_RANDOM_TRUST_CPU.



	ras=option[,option,...]	[KNL] RAS-specific options



		cec_disable	[X86]
@@ -4994,6 +5000,12 @@ 
			Disables the PV optimizations forcing the HVM guest to

			run as generic HVM guest with no PV drivers.



	xen_scrub_pages=	[XEN]

			Boolean option to control scrubbing pages before giving them back

			to Xen, for use by other domains. Can be also changed at runtime

			with /sys/devices/system/xen_memory/xen_memory0/scrub_pages.

			Default value controlled with CONFIG_XEN_SCRUB_PAGES_DEFAULT.



	xirc2ps_cs=	[NET,PCMCIA]

			Format:

			<irq>,<irq_mask>,<io>,<full_duplex>,<do_sound>,<lockup_hack>[,<irq2>[,<irq3>[,<irq4>]]]

Documentation/device-mapper/dm-raid.txt

+4 −0
Original line number Diff line number Diff line
@@ -348,3 +348,7 @@ Version History 
1.13.1  Fix deadlock caused by early md_stop_writes().  Also fix size an

	state races.

1.13.2  Fix raid redundancy validation and avoid keeping raid set frozen

1.14.0  Fix reshape race on small devices.  Fix stripe adding reshape

	deadlock/potential data corruption.  Update superblock when

	specific devices are requested via rebuild.  Fix RAID leg

	rebuild errors.

Documentation/devicetree/bindings/display/bridge/renesas,lvds.txt

+12 −1
Original line number Diff line number Diff line
@@ -15,10 +15,21 @@ Required properties: 
  - "renesas,r8a7796-lvds" for R8A7796 (R-Car M3-W) compatible LVDS encoders

  - "renesas,r8a77970-lvds" for R8A77970 (R-Car V3M) compatible LVDS encoders

  - "renesas,r8a77980-lvds" for R8A77980 (R-Car V3H) compatible LVDS encoders

  - "renesas,r8a77990-lvds" for R8A77990 (R-Car E3) compatible LVDS encoders

  - "renesas,r8a77995-lvds" for R8A77995 (R-Car D3) compatible LVDS encoders



- reg: Base address and length for the memory-mapped registers

- clocks: A phandle + clock-specifier pair for the functional clock

- clocks: A list of phandles + clock-specifier pairs, one for each entry in

  the clock-names property.

- clock-names: Name of the clocks. This property is model-dependent.

  - The functional clock, which mandatory for all models, shall be listed

    first, and shall be named "fck".

  - On R8A77990 and R8A77995, the LVDS encoder can use the EXTAL or

    DU_DOTCLKINx clocks. Those clocks are optional. When supplied they must be

    named "extal" and "dclkin.x" respectively, with "x" being the DU_DOTCLKIN

    numerical index.

  - When the clocks property only contains the functional clock, the

    clock-names property may be omitted.

- resets: A phandle + reset specifier for the module reset



Required nodes:

Documentation/devicetree/bindings/display/exynos/exynos_dsim.txt

+6 −19
Original line number Diff line number Diff line
@@ -21,6 +21,9 @@ Required properties: 
  - samsung,pll-clock-frequency: specifies frequency of the oscillator clock

  - #address-cells, #size-cells: should be set respectively to <1> and <0>

    according to DSI host bindings (see MIPI DSI bindings [1])

  - samsung,burst-clock-frequency: specifies DSI frequency in high-speed burst

    mode

  - samsung,esc-clock-frequency: specifies DSI frequency in escape mode



Optional properties:

  - power-domains: a phandle to DSIM power domain node
@@ -29,25 +32,9 @@ Child nodes: 
  Should contain DSI peripheral nodes (see MIPI DSI bindings [1]).



Video interfaces:

  Device node can contain video interface port nodes according to [2].

  The following are properties specific to those nodes:



  port node inbound:

    - reg: (required) must be 0.

  port node outbound:

    - reg: (required) must be 1.



  endpoint node connected from mic node (reg = 0):

    - remote-endpoint: specifies the endpoint in mic node. This node is required

		       for Exynos5433 mipi dsi. So mic can access to panel node

		       throughout this dsi node.

  endpoint node connected to panel node (reg = 1):

    - remote-endpoint: specifies the endpoint in panel node. This node is

		       required in all kinds of exynos mipi dsi to represent

		       the connection between mipi dsi and panel.

    - samsung,burst-clock-frequency: specifies DSI frequency in high-speed burst

      mode

    - samsung,esc-clock-frequency: specifies DSI frequency in escape mode

  Device node can contain following video interface port nodes according to [2]:

  0: RGB input,

  1: DSI output



[1]: Documentation/devicetree/bindings/display/mipi-dsi-bus.txt

[2]: Documentation/devicetree/bindings/media/video-interfaces.txt