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

Commit 3806a271 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-next-2016-12-30' of git://anongit.freedesktop.org/git/drm-misc into drm-next 

First -misc pull for 4.11:
- drm_mm rework + lots of selftests (Chris Wilson)
- new connector_list locking+iterators
- plenty of kerneldoc updates
- format handling rework from Ville
- atomic helper changes from Maarten for better plane corner-case handling
  in drivers, plus the i915 legacy cursor patch that needs this
- bridge cleanup from Laurent
- plus plenty of small stuff all over
- also contains a merge of the 4.10 docs tree so that we could apply the
  dma-buf kerneldoc patches

It's a lot more than usual, but due to the merge window blackout it also
covers about 4 weeks, so all in line again on a per-week basis. The more
annoying part with no pull request for 4 weeks is managing cross-tree
work. The -intel pull request I'll follow up with does conflict quite a
bit with -misc here. Longer-term (if drm-misc keeps growing) a
drm-next-queued to accept pull request for the next merge window during
this time might be useful.

I'd also like to backmerge -rc2+this into drm-intel next week, we have
quite a pile of patches waiting for the stuff in here.

* tag 'drm-misc-next-2016-12-30' of git://anongit.freedesktop.org/git/drm-misc: (126 commits)
  drm: Add kerneldoc markup for new @scan parameters in drm_mm
  drm/mm: Document locking rules
  drm: Use drm_mm_insert_node_in_range_generic() for everyone
  drm: Apply range restriction after color adjustment when allocation
  drm: Wrap drm_mm_node.hole_follows
  drm: Apply tight eviction scanning to color_adjust
  drm: Simplify drm_mm scan-list manipulation
  drm: Optimise power-of-two alignments in drm_mm_scan_add_block()
  drm: Compute tight evictions for drm_mm_scan
  drm: Fix application of color vs range restriction when scanning drm_mm
  drm: Unconditionally do the range check in drm_mm_scan_add_block()
  drm: Rename prev_node to hole in drm_mm_scan_add_block()
  drm: Fix O= out-of-tree builds for selftests
  drm: Extract struct drm_mm_scan from struct drm_mm
  drm: Add asserts to catch overflow in drm_mm_init() and drm_mm_init_scan()
  drm: Simplify drm_mm_clean()
  drm: Detect overflow in drm_mm_reserve_node()
  drm: Fix kerneldoc for drm_mm_scan_remove_block()
  drm: Promote drm_mm alignment to u64
  drm: kselftest for drm_mm and restricted color eviction
  ...
parents a121103c 9b8b75de

Documentation/devicetree/bindings/display/bridge/ti,ths8135.txt

0 → 100644
+46 −0
Original line number Diff line number Diff line 
THS8135 Video DAC

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



This is the binding for Texas Instruments THS8135 Video DAC bridge.



Required properties:



- compatible: Must be "ti,ths8135"



Required nodes:



This device has two video ports. Their connections are modelled using the OF

graph bindings specified in Documentation/devicetree/bindings/graph.txt.



- Video port 0 for RGB input

- Video port 1 for VGA output



Example

-------



vga-bridge {

	compatible = "ti,ths8135";

	#address-cells = <1>;

	#size-cells = <0>;



	ports {

		#address-cells = <1>;

		#size-cells = <0>;



		port@0 {

			reg = <0>;



			vga_bridge_in: endpoint {

				remote-endpoint = <&lcdc_out_vga>;

			};

		};



		port@1 {

			reg = <1>;



			vga_bridge_out: endpoint {

				remote-endpoint = <&vga_con_in>;

			};

		};

	};

};

Documentation/devicetree/bindings/display/hisilicon/hisi-ade.txt

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ Required properties: 
  "clk_ade_core" for the ADE core clock.

  "clk_codec_jpeg" for the media NOC QoS clock, which use the same clock with

  jpeg codec.

  "clk_ade_pix" for the ADE pixel clok.

  "clk_ade_pix" for the ADE pixel clock.

- assigned-clocks: Should contain "clk_ade_core" and "clk_codec_jpeg" clocks'

  phandle + clock-specifier pairs.

- assigned-clock-rates: clock rates, one for each entry in assigned-clocks.

Documentation/dma-buf-sharing.txt

deleted100644 → 0
+0 −482

File deleted.

Preview size limit exceeded, changes collapsed.

Documentation/driver-api/dma-buf.rst

+92 −0

File changed.

Preview size limit exceeded, changes collapsed.

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -3966,7 +3966,7 @@ F: drivers/dma-buf/ 
F:	include/linux/dma-buf*

F:	include/linux/reservation.h

F:	include/linux/*fence.h

F:	Documentation/dma-buf-sharing.txt

F:	Documentation/driver-api/dma-buf.rst

T:	git git://anongit.freedesktop.org/drm/drm-misc



SYNC FILE FRAMEWORK