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

Commit 148b1e11 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

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



Ben Widawsky/Daniel Stone need the extended modifier support from
drm-misc to be able to merge CCS support for i915.ko

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parents 3ec0af7f 09ef2378

Documentation/devicetree/bindings/display/rockchip/rockchip-vop.txt

+4 −0
Original line number Diff line number Diff line
@@ -8,8 +8,12 @@ Required properties: 
- compatible: value should be one of the following

		"rockchip,rk3036-vop";

		"rockchip,rk3288-vop";

		"rockchip,rk3368-vop";

		"rockchip,rk3366-vop";

		"rockchip,rk3399-vop-big";

		"rockchip,rk3399-vop-lit";

		"rockchip,rk3228-vop";

		"rockchip,rk3328-vop";



- interrupts: should contain a list of all VOP IP block interrupts in the

		 order: VSYNC, LCD_SYSTEM. The interrupt specifier

Documentation/devicetree/bindings/display/st,stm32-ltdc.txt

+103 −2
Original line number Diff line number Diff line 
* STMicroelectronics STM32 lcd-tft display controller



- ltdc: lcd-tft display controller host

  must be a sub-node of st-display-subsystem

  Required properties:

  - compatible: "st,stm32-ltdc"

  - reg: Physical base address of the IP registers and length of memory mapped region.
@@ -13,8 +12,40 @@ 
  Required nodes:

    - Video port for RGB output.



Example:

* STMicroelectronics STM32 DSI controller specific extensions to Synopsys

  DesignWare MIPI DSI host controller



The STMicroelectronics STM32 DSI controller uses the Synopsys DesignWare MIPI

DSI host controller. For all mandatory properties & nodes, please refer

to the related documentation in [5].



Mandatory properties specific to STM32 DSI:

- #address-cells: Should be <1>.

- #size-cells: Should be <0>.

- compatible: "st,stm32-dsi".

- clock-names:

  - phy pll reference clock string name, must be "ref".

- resets: see [5].

- reset-names: see [5].



Mandatory nodes specific to STM32 DSI:

- ports: A node containing DSI input & output port nodes with endpoint

  definitions as documented in [3] & [4].

  - port@0: DSI input port node, connected to the ltdc rgb output port.

  - port@1: DSI output port node, connected to a panel or a bridge input port.

- panel or bridge node: A node containing the panel or bridge description as

  documented in [6].

  - port: panel or bridge port node, connected to the DSI output port (port@1).



Note: You can find more documentation in the following references

[1] Documentation/devicetree/bindings/clock/clock-bindings.txt

[2] Documentation/devicetree/bindings/reset/reset.txt

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

[4] Documentation/devicetree/bindings/graph.txt

[5] Documentation/devicetree/bindings/display/bridge/dw_mipi_dsi.txt

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



Example 1: RGB panel

/ {

	...

	soc {
@@ -34,3 +65,73 @@ Example: 
		};

	};

};



Example 2: DSI panel



/ {

	...

	soc {

	...

		ltdc: display-controller@40016800 {

			compatible = "st,stm32-ltdc";

			reg = <0x40016800 0x200>;

			interrupts = <88>, <89>;

			resets = <&rcc STM32F4_APB2_RESET(LTDC)>;

			clocks = <&rcc 1 CLK_LCD>;

			clock-names = "lcd";



			port {

				ltdc_out_dsi: endpoint {

					remote-endpoint = <&dsi_in>;

				};

			};

		};





		dsi: dsi@40016c00 {

			#address-cells = <1>;

			#size-cells = <0>;

			compatible = "st,stm32-dsi";

			reg = <0x40016c00 0x800>;

			clocks = <&rcc 1 CLK_F469_DSI>, <&clk_hse>;

			clock-names = "ref", "pclk";

			resets = <&rcc STM32F4_APB2_RESET(DSI)>;

			reset-names = "apb";



			ports {

				#address-cells = <1>;

				#size-cells = <0>;



				port@0 {

					reg = <0>;

					dsi_in: endpoint {

						remote-endpoint = <&ltdc_out_dsi>;

					};

				};



				port@1 {

					reg = <1>;

					dsi_out: endpoint {

						remote-endpoint = <&dsi_in_panel>;

					};

				};



			};



			panel-dsi@0 {

				reg = <0>; /* dsi virtual channel (0..3) */

				compatible = ...;

				enable-gpios = ...;



				port {

					dsi_in_panel: endpoint {

						remote-endpoint = <&dsi_out>;

					};

				};



			};



		};



	};

};

Documentation/gpu/todo.rst

+2 −2
Original line number Diff line number Diff line
@@ -108,8 +108,8 @@ This would be especially useful for tinydrm: 
  crtc state, clear that to the max values, x/y = 0 and w/h = MAX_INT, in

  __drm_atomic_helper_crtc_duplicate_state().



- Move tinydrm_merge_clips into drm_framebuffer.c, dropping the tinydrm_

  prefix ofc and using drm_fb_. drm_framebuffer.c makes sense since this

- Move tinydrm_merge_clips into drm_framebuffer.c, dropping the tinydrm\_

  prefix ofc and using drm_fb\_. drm_framebuffer.c makes sense since this

  is a function useful to implement the fb->dirty function.



- Create a new drm_fb_dirty function which does essentially what e.g.

drivers/char/agp/ali-agp.c

+1 −1
Original line number Diff line number Diff line
@@ -381,7 +381,7 @@ static void agp_ali_remove(struct pci_dev *pdev) 
	agp_put_bridge(bridge);

}



static struct pci_device_id agp_ali_pci_table[] = {

static const struct pci_device_id agp_ali_pci_table[] = {

	{

	.class		= (PCI_CLASS_BRIDGE_HOST << 8),

	.class_mask	= ~0,

drivers/char/agp/amd-k7-agp.c

+2 −2
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
#define AMD_TLBFLUSH	0x0c	/* In mmio region (32-bit register) */

#define AMD_CACHEENTRY	0x10	/* In mmio region (32-bit register) */



static struct pci_device_id agp_amdk7_pci_table[];

static const struct pci_device_id agp_amdk7_pci_table[];



struct amd_page_map {

	unsigned long *real;
@@ -508,7 +508,7 @@ static int agp_amdk7_resume(struct pci_dev *pdev) 
#endif /* CONFIG_PM */



/* must be the same order as name table above */

static struct pci_device_id agp_amdk7_pci_table[] = {

static const struct pci_device_id agp_amdk7_pci_table[] = {

	{

	.class		= (PCI_CLASS_BRIDGE_HOST << 8),

	.class_mask	= ~0,