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

Commit 2454fcea authored by Daniel Vetter's avatar Daniel Vetter
Browse files

Merge tag 'drm-misc-next-2019-06-14' of git://anongit.freedesktop.org/drm/drm-misc into drm-next 



drm-misc-next for v5.3:

UAPI Changes:

Cross-subsystem Changes:
- Add code to signal all dma-fences when freed with pending signals.
- Annotate reservation object access in CONFIG_DEBUG_MUTEXES

Core Changes:
- Assorted documentation fixes.
- Use irqsave/restore spinlock to add crc entry.
- Move code around to drm_client, for internal modeset clients.
- Make drm_crtc.h and drm_debugfs.h self-contained.
- Remove drm_fb_helper_connector.
- Add bootsplash to todo.
- Fix lock ordering in pan_display_legacy.
- Support pinning buffers to current location in gem-vram.
- Remove the now unused locking functions from gem-vram.
- Remove the now unused kmap-object argument from vram helpers.
- Stop checking return value of debugfs_create.
- Add atomic encoder enable/disable helpers.
- pass drm_atomic_state to atomic connector check.
- Add atomic support for bridge enable/disable.
- Add self refresh helpers to core.

Driver Changes:
- Add extra delay to make MTP SDM845 work.
- Small fixes to virtio, vkms, sii902x, sii9234, ast, mcde, analogix, rockchip.
- Add zpos and ?BGR8888 support to meson.
- More removals of drm_os_linux and drmP headers for amd, radeon, sti, r128, r128, savage, sis.
- Allow synopsis to unwedge the i2c hdmi bus.
- Add orientation quirks for GPD panels.
- Edid cleanups and fixing handling for edid < 1.2.
- Add runtime pm to stm.
- Handle s/r in dw-hdmi.
- Add hooks for power on/off to dsi for stm.
- Remove virtio dirty tracking code, done in drm core.
- Rework BO handling in ast and mgag200.

Tiny conflict in drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c,
needed #include <linux/slab.h> to make it compile.

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/0e01de30-9797-853c-732f-4a5bd6e61445@linux.intel.com
parents 561564be 51e857af

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

+7 −0
Original line number Diff line number Diff line
@@ -38,6 +38,13 @@ Optional properties 
- phys: from general PHY binding: the phandle for the PHY device.

- phy-names: Should be "hdmi" if phys references an external phy.



Optional pinctrl entry:

- If you have both a "unwedge" and "default" pinctrl entry, dw_hdmi

  will switch to the unwedge pinctrl state for 10ms if it ever gets an

  i2c timeout.  It's intended that this unwedge pinctrl entry will

  cause the SDA line to be driven low to work around a hardware

  errata.



Example:



hdmi: hdmi@ff980000 {

Documentation/gpu/drm-kms-helpers.rst

+9 −0
Original line number Diff line number Diff line
@@ -181,6 +181,15 @@ Panel Helper Reference 
.. kernel-doc:: drivers/gpu/drm/drm_panel_orientation_quirks.c

   :export:



Panel Self Refresh Helper Reference

===================================



.. kernel-doc:: drivers/gpu/drm/drm_self_refresh_helper.c

   :doc: overview



.. kernel-doc:: drivers/gpu/drm/drm_self_refresh_helper.c

   :export:



HDCP Helper Functions Reference

===============================

Documentation/gpu/todo.rst

+19 −0
Original line number Diff line number Diff line
@@ -292,6 +292,10 @@ drm_fb_helper tasks 
- The max connector argument for drm_fb_helper_init() and

  drm_fb_helper_fbdev_setup() isn't used anymore and can be removed.



- The helper doesn't keep an array of connectors anymore so these can be

  removed: drm_fb_helper_single_add_all_connectors(),

  drm_fb_helper_add_one_connector() and drm_fb_helper_remove_one_connector().



Core refactorings

=================
@@ -480,5 +484,20 @@ i915 
  device_link_add to model the dependency between i915 and snd_had. See

  https://dri.freedesktop.org/docs/drm/driver-api/device_link.html



Bootsplash

==========



There is support in place now for writing internal DRM clients making it

possible to pick up the bootsplash work that was rejected because it was written

for fbdev.



- [v6,8/8] drm/client: Hack: Add bootsplash example

  https://patchwork.freedesktop.org/patch/306579/



- [RFC PATCH v2 00/13] Kernel based bootsplash

  https://lkml.org/lkml/2017/12/13/764



Contact: Sam Ravnborg



Outside DRM

===========

drivers/dma-buf/dma-fence.c

+19 −2
Original line number Diff line number Diff line
@@ -256,8 +256,25 @@ void dma_fence_release(struct kref *kref) 


	trace_dma_fence_destroy(fence);



	/* Failed to signal before release, could be a refcounting issue */

	WARN_ON(!list_empty(&fence->cb_list));

	if (WARN(!list_empty(&fence->cb_list),

		 "Fence %s:%s:%llx:%llx released with pending signals!\n",

		 fence->ops->get_driver_name(fence),

		 fence->ops->get_timeline_name(fence),

		 fence->context, fence->seqno)) {

		unsigned long flags;



		/*

		 * Failed to signal before release, likely a refcounting issue.

		 *

		 * This should never happen, but if it does make sure that we

		 * don't leave chains dangling. We set the error flag first

		 * so that the callbacks know this signal is due to an error.

		 */

		spin_lock_irqsave(fence->lock, flags);

		fence->error = -EDEADLK;

		dma_fence_signal_locked(fence);

		spin_unlock_irqrestore(fence->lock, flags);

	}



	if (fence->ops->release)

		fence->ops->release(fence);

drivers/gpu/drm/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ drm_kms_helper-y := drm_crtc_helper.o drm_dp_helper.o drm_dsc.o drm_probe_helper 
		drm_simple_kms_helper.o drm_modeset_helper.o \

		drm_scdc_helper.o drm_gem_framebuffer_helper.o \

		drm_atomic_state_helper.o drm_damage_helper.o \

		drm_format_helper.o

		drm_format_helper.o drm_self_refresh_helper.o



drm_kms_helper-$(CONFIG_DRM_PANEL_BRIDGE) += bridge/panel.o

drm_kms_helper-$(CONFIG_DRM_FBDEV_EMULATION) += drm_fb_helper.o