Commit 31f408c8 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-next-2017-02-03' of git://anongit.freedesktop.org/git/drm-misc into drm-next 

Final 4.11 feature pull request:
- sii8520 bridge update from Andrzej
- ->release callback, maybe somewhen in the future we'll even get
  drm_device lifetimes correct! (Chris Wilson)
- drm_mm search improvements, and good docs for different search
  strategies now (Chris)
- simplify fbdev emulation init parameters (Gabriel)
- bunch of misc things all over

... and the first few patches from our small driver in drm-misc
experiment:
- cleanups for qxl and bochs from a few different people
- dsi support for vc4 (not yet the panel driver, that's under discussion
  still) from Eric
- meson rename to meson-drm to distinguish from other platform drivers
  (Neil Amstrong)

* tag 'drm-misc-next-2017-02-03' of git://anongit.freedesktop.org/git/drm-misc: (47 commits)
  drm: kselftest for drm_mm and bottom-up allocation
  drm: Improve drm_mm search (and fix topdown allocation) with rbtrees
  drm: Fix build when FBDEV_EMULATION is disabled
  drm: Rely on mode_config data for fb_helper initialization
  drm: Provide a driver hook for drm_dev_release()
  drm: meson: rename driver name to meson-drm
  drm: meson: rename module name to meson-drm
  drm/bridge/sii8620: enable interlace modes
  drm/bridge/sii8620: enable MHL3 mode if possible
  drm/bridge/sii8620: add HSIC initialization code
  drm/bridge/sii8620: improve gen2 write burst IRQ routine
  drm/bridge/sii8620: send EMSC features on request
  drm/bridge/sii8620: rewrite hdmi start sequence
  drm/bridge/mhl: add MHL3 infoframe related definitions
  drm/bridge/sii8620: fix disconnect sequence
  drm/bridge/sii8620: split EDID read and write code
  drm/bridge/sii8620: add delay during cbus reset
  drm/bridge/sii8620: do not stop MHL output when TMDS input is stopped
  drm/bridge/sii8620: set gen2 write burst before sending MSC command
  drm/bridge/sii8620: abstract out sink detection code
  ...
parents 99743ae4 bb18dfcc

Documentation/devicetree/bindings/display/brcm,bcm-vc4.txt

+35 −0
Original line number Diff line number Diff line
@@ -56,6 +56,18 @@ Required properties for V3D: 
- interrupts:	The interrupt number

		  See bindings/interrupt-controller/brcm,bcm2835-armctrl-ic.txt



Required properties for DSI:

- compatible:	Should be "brcm,bcm2835-dsi0" or "brcm,bcm2835-dsi1"

- reg:		Physical base address and length of the DSI block's registers

- interrupts:	The interrupt number

		  See bindings/interrupt-controller/brcm,bcm2835-armctrl-ic.txt

- clocks:	a) phy: The DSI PLL clock feeding the DSI analog PHY

		b) escape: The DSI ESC clock from CPRMAN

		c) pixel: The DSI pixel clock from CPRMAN

- clock-output-names:

		The 3 clocks output from the DSI analog PHY: dsi[01]_byte,

		dsi[01]_ddr2, and dsi[01]_ddr



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



Example:
@@ -99,6 +111,29 @@ dpi: dpi@7e208000 { 
	};

};



dsi1: dsi@7e700000 {

	compatible = "brcm,bcm2835-dsi1";

	reg = <0x7e700000 0x8c>;

	interrupts = <2 12>;

	#address-cells = <1>;

	#size-cells = <0>;

	#clock-cells = <1>;



	clocks = <&clocks BCM2835_PLLD_DSI1>,

		 <&clocks BCM2835_CLOCK_DSI1E>,

		 <&clocks BCM2835_CLOCK_DSI1P>;

	clock-names = "phy", "escape", "pixel";



	clock-output-names = "dsi1_byte", "dsi1_ddr2", "dsi1_ddr";



	pitouchscreen: panel@0 {

		compatible = "raspberrypi,touchscreen";

		reg = <0>;



		<...>

	};

};



vec: vec@7e806000 {

	compatible = "brcm,bcm2835-vec";

	reg = <0x7e806000 0x1000>;

Documentation/gpu/drm-mm.rst

+11 −4
Original line number Diff line number Diff line
@@ -291,10 +291,17 @@ To use :c:func:`drm_gem_mmap()`, drivers must fill the struct 
:c:type:`struct drm_driver <drm_driver>` gem_vm_ops field

with a pointer to VM operations.



struct vm_operations_struct \*gem_vm_ops struct

vm_operations_struct { void (\*open)(struct vm_area_struct \* area);

void (\*close)(struct vm_area_struct \* area); int (\*fault)(struct

vm_area_struct \*vma, struct vm_fault \*vmf); };

The VM operations is a :c:type:`struct vm_operations_struct <vm_operations_struct>`

made up of several fields, the more interesting ones being:



.. code-block:: c



	struct vm_operations_struct {

		void (*open)(struct vm_area_struct * area);

		void (*close)(struct vm_area_struct * area);

		int (*fault)(struct vm_fault *vmf);

	};





The open and close operations must update the GEM object reference

count. Drivers can use the :c:func:`drm_gem_vm_open()` and

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -3970,6 +3970,7 @@ S: Maintained 
L:	linux-media@vger.kernel.org

L:	dri-devel@lists.freedesktop.org

F:	drivers/dma-buf/sync_*

F:	drivers/dma-buf/dma-fence*

F:	drivers/dma-buf/sw_sync.c

F:	include/linux/sync_file.h

F:	include/uapi/linux/sync_file.h

drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c

+0 −1
Original line number Diff line number Diff line
@@ -374,7 +374,6 @@ int amdgpu_fbdev_init(struct amdgpu_device *adev) 
			&amdgpu_fb_helper_funcs);



	ret = drm_fb_helper_init(adev->ddev, &rfbdev->helper,

				 adev->mode_info.num_crtc,

				 AMDGPUFB_CONN_LIMIT);

	if (ret) {

		kfree(rfbdev);

drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c

+7 −9
Original line number Diff line number Diff line
@@ -97,8 +97,7 @@ int amdgpu_gtt_mgr_alloc(struct ttm_mem_type_manager *man, 
{

	struct amdgpu_gtt_mgr *mgr = man->priv;

	struct drm_mm_node *node = mem->mm_node;

	enum drm_mm_search_flags sflags = DRM_MM_SEARCH_BEST;

	enum drm_mm_allocator_flags aflags = DRM_MM_CREATE_DEFAULT;

	enum drm_mm_insert_mode mode;

	unsigned long fpfn, lpfn;

	int r;
@@ -115,15 +114,14 @@ int amdgpu_gtt_mgr_alloc(struct ttm_mem_type_manager *man, 
	else

		lpfn = man->size;



	if (place && place->flags & TTM_PL_FLAG_TOPDOWN) {

		sflags = DRM_MM_SEARCH_BELOW;

		aflags = DRM_MM_CREATE_TOP;

	}

	mode = DRM_MM_INSERT_BEST;

	if (place && place->flags & TTM_PL_FLAG_TOPDOWN)

		mode = DRM_MM_INSERT_HIGH;



	spin_lock(&mgr->lock);

	r = drm_mm_insert_node_in_range_generic(&mgr->mm, node, mem->num_pages,

						mem->page_alignment, 0,

						fpfn, lpfn, sflags, aflags);

	r = drm_mm_insert_node_in_range(&mgr->mm, node,

					mem->num_pages, mem->page_alignment, 0,

					fpfn, lpfn, mode);

	spin_unlock(&mgr->lock);



	if (!r) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE