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

Commit 09ef2378 authored by Dave Airlie's avatar Dave Airlie
Browse files

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

UAPI Changes:
- vc4: Add ioctl to allow attaching a label to a bo (Eric)
- Add new format/modifier blob plane property (Ben)
- armada: Use __u32/__u64 instead of uint32_t/uint64_t (Mikko)
- [kinda uapi] fb_helper: Expose display_info size via fb_info (David)

Core Changes:
- Default gem_dumb_[map_offset|destroy] as mmap/destroy implementations (Noralf)
- Simplify atomic properties by removing the helpers and handling in core (Daniel)

Driver Changes:
- stm: Add STM32 DSI controller driver (Phillipe)
- vc4: Add HDMI CEC support (Hans)
- rockchip: Refactor register init & soc version handling (Mark)
- misc: Remove .load_lut, .gamma_set, .gamma_get dead code (Peter)
- dw-hdmi: Add HDMI CEC support (Russell)

Cc: Philippe CORNU <philippe.cornu@st.com>
Cc: Hans Verkuil <hans.verkuil@cisco.com>
Cc: Eric Anholt <eric@anholt.net>
Cc: Noralf Trønnes <noralf@tronnes.org>
Cc: Ben Widawsky <ben@bwidawsk.net>
Cc: Mark yao <mark.yao@rock-chips.com>
Cc: Peter Rosin <peda@axentia.se>
Cc: Russell King <rmk+kernel@armlinux.org.uk>
Cc: Mikko Rapeli <mikko.rapeli@iki.fi>
Cc: David Lechner <david@lechnology.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>

* tag 'drm-misc-next-2017-08-08' of git://anongit.freedesktop.org/git/drm-misc: (107 commits)
  drm: Nuke drm_atomic_legacy_backoff
  drm: Nuke drm_atomic_helper_connector_dpms
  drm: Nuke drm_atomic_helper_connector_set_property
  drm: Nuke drm_atomic_helper_plane_set_property
  drm: Nuke drm_atomic_helper_crtc_set_property
  drm: Handle properties in the core for atomic drivers
  drm: Don't update property values for atomic drivers
  drm/omap: Rework the rotation-on-crtc hack
  drm/radeon: Use the drm_driver.dumb_destroy default
  drm/i915: Use the drm_driver.dumb_destroy default
  drm/sti: Use .dumb_map_offset and .dumb_destroy defaults
  drm: bridge: synopsys/dw-hdmi: Provide default configuration function for HDMI 2.0 PHY
  drm/fb-helper: pass physical dimensions to fbdev
  uapi drm/armada_drm.h: use __u32 and __u64 instead of uint32_t and uint64_t
  drm/bridge: dw-hdmi: remove CEC engine register definitions
  drm/bridge: dw-hdmi: add cec driver
  drm/bridge: dw-hdmi: add missing cec_notifier_put
  drm: remove unused and redundant callbacks
  staging: vboxvideo: remove dead gamma lut code
  drm: dw-hdmi-i2s: add missing company name on Copyright
  ...
parents d7206612 16fece01

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/dma-buf/sw_sync.c

+80 −70
Original line number Diff line number Diff line
@@ -125,6 +125,75 @@ static void sync_timeline_put(struct sync_timeline *obj) 
	kref_put(&obj->kref, sync_timeline_free);

}



static const char *timeline_fence_get_driver_name(struct dma_fence *fence)

{

	return "sw_sync";

}



static const char *timeline_fence_get_timeline_name(struct dma_fence *fence)

{

	struct sync_timeline *parent = dma_fence_parent(fence);



	return parent->name;

}



static void timeline_fence_release(struct dma_fence *fence)

{

	struct sync_pt *pt = dma_fence_to_sync_pt(fence);

	struct sync_timeline *parent = dma_fence_parent(fence);



	if (!list_empty(&pt->link)) {

		unsigned long flags;



		spin_lock_irqsave(fence->lock, flags);

		if (!list_empty(&pt->link)) {

			list_del(&pt->link);

			rb_erase(&pt->node, &parent->pt_tree);

		}

		spin_unlock_irqrestore(fence->lock, flags);

	}



	sync_timeline_put(parent);

	dma_fence_free(fence);

}



static bool timeline_fence_signaled(struct dma_fence *fence)

{

	struct sync_timeline *parent = dma_fence_parent(fence);



	return !__dma_fence_is_later(fence->seqno, parent->value);

}



static bool timeline_fence_enable_signaling(struct dma_fence *fence)

{

	return true;

}



static void timeline_fence_value_str(struct dma_fence *fence,

				    char *str, int size)

{

	snprintf(str, size, "%d", fence->seqno);

}



static void timeline_fence_timeline_value_str(struct dma_fence *fence,

					     char *str, int size)

{

	struct sync_timeline *parent = dma_fence_parent(fence);



	snprintf(str, size, "%d", parent->value);

}



static const struct dma_fence_ops timeline_fence_ops = {

	.get_driver_name = timeline_fence_get_driver_name,

	.get_timeline_name = timeline_fence_get_timeline_name,

	.enable_signaling = timeline_fence_enable_signaling,

	.signaled = timeline_fence_signaled,

	.wait = dma_fence_default_wait,

	.release = timeline_fence_release,

	.fence_value_str = timeline_fence_value_str,

	.timeline_value_str = timeline_fence_timeline_value_str,

};



/**

 * sync_timeline_signal() - signal a status change on a sync_timeline

 * @obj:	sync_timeline to signal
@@ -144,11 +213,21 @@ static void sync_timeline_signal(struct sync_timeline *obj, unsigned int inc) 
	obj->value += inc;



	list_for_each_entry_safe(pt, next, &obj->pt_list, link) {

		if (!dma_fence_is_signaled_locked(&pt->base))

		if (!timeline_fence_signaled(&pt->base))

			break;



		list_del_init(&pt->link);

		rb_erase(&pt->node, &obj->pt_tree);



		/*

		 * A signal callback may release the last reference to this

		 * fence, causing it to be freed. That operation has to be

		 * last to avoid a use after free inside this loop, and must

		 * be after we remove the fence from the timeline in order to

		 * prevent deadlocking on timeline->lock inside

		 * timeline_fence_release().

		 */

		dma_fence_signal_locked(&pt->base);

	}



	spin_unlock_irq(&obj->lock);
@@ -216,75 +295,6 @@ static struct sync_pt *sync_pt_create(struct sync_timeline *obj, 
	return pt;

}



static const char *timeline_fence_get_driver_name(struct dma_fence *fence)

{

	return "sw_sync";

}



static const char *timeline_fence_get_timeline_name(struct dma_fence *fence)

{

	struct sync_timeline *parent = dma_fence_parent(fence);



	return parent->name;

}



static void timeline_fence_release(struct dma_fence *fence)

{

	struct sync_pt *pt = dma_fence_to_sync_pt(fence);

	struct sync_timeline *parent = dma_fence_parent(fence);



	if (!list_empty(&pt->link)) {

		unsigned long flags;



		spin_lock_irqsave(fence->lock, flags);

		if (!list_empty(&pt->link)) {

			list_del(&pt->link);

			rb_erase(&pt->node, &parent->pt_tree);

		}

		spin_unlock_irqrestore(fence->lock, flags);

	}



	sync_timeline_put(parent);

	dma_fence_free(fence);

}



static bool timeline_fence_signaled(struct dma_fence *fence)

{

	struct sync_timeline *parent = dma_fence_parent(fence);



	return !__dma_fence_is_later(fence->seqno, parent->value);

}



static bool timeline_fence_enable_signaling(struct dma_fence *fence)

{

	return true;

}



static void timeline_fence_value_str(struct dma_fence *fence,

				    char *str, int size)

{

	snprintf(str, size, "%d", fence->seqno);

}



static void timeline_fence_timeline_value_str(struct dma_fence *fence,

					     char *str, int size)

{

	struct sync_timeline *parent = dma_fence_parent(fence);



	snprintf(str, size, "%d", parent->value);

}



static const struct dma_fence_ops timeline_fence_ops = {

	.get_driver_name = timeline_fence_get_driver_name,

	.get_timeline_name = timeline_fence_get_timeline_name,

	.enable_signaling = timeline_fence_enable_signaling,

	.signaled = timeline_fence_signaled,

	.wait = dma_fence_default_wait,

	.release = timeline_fence_release,

	.fence_value_str = timeline_fence_value_str,

	.timeline_value_str = timeline_fence_timeline_value_str,

};



/*

 * *WARNING*

 *

drivers/dma-buf/sync_file.c

+3 −2
Original line number Diff line number Diff line
@@ -304,7 +304,7 @@ static int sync_file_release(struct inode *inode, struct file *file) 
{

	struct sync_file *sync_file = file->private_data;



	if (test_bit(POLL_ENABLED, &sync_file->fence->flags))

	if (test_bit(POLL_ENABLED, &sync_file->flags))

		dma_fence_remove_callback(sync_file->fence, &sync_file->cb);

	dma_fence_put(sync_file->fence);

	kfree(sync_file);
@@ -318,7 +318,8 @@ static unsigned int sync_file_poll(struct file *file, poll_table *wait) 


	poll_wait(file, &sync_file->wq, wait);



	if (!test_and_set_bit(POLL_ENABLED, &sync_file->fence->flags)) {

	if (list_empty(&sync_file->cb.node) &&

	    !test_and_set_bit(POLL_ENABLED, &sync_file->flags)) {

		if (dma_fence_add_callback(sync_file->fence, &sync_file->cb,

					   fence_check_cb_func) < 0)

			wake_up_all(&sync_file->wq);