Commit 15bb7991 authored by Dave Airlie's avatar Dave Airlie
Browse files

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



drm-misc-next for 5.17:

UAPI Changes:

Cross-subsystem Changes:

 * dma-buf: Make fences mandatory in dma_resv_add_excl_fence

Core Changes:

 * Move hashtable to legacy code
 * Return error pointers from struct drm_driver.gem_create_object

 * cma-helper: Improve public interfaces; Remove CONFIG_DRM_KMS_CMA_HELPER option
 * mipi-dbi: Don't depend on CMA helpers
 * ttm: Don't include DRM hashtable; Stop prunning fences after wait; Documentation

Driver Changes:

 * aspeed: Select CONFIG_DRM_GEM_CMA_HELPER

 * bridge/lontium-lt9611: Fix HDMI sensing
 * bridge/parade-ps8640: Fixes
 * bridge/sn65dsi86: Defer probe is no dsi host found

 * fsl-dcu: Select CONFIG_DRM_GEM_CMA_HELPER

 * i915: Remove dma_resv_prune

 * omapdrm: Fix scatterlist export; Support virtual planes; Fixes

 * panel: Boe-tv110c9m,Inx-hj110iz: Update init code

 * qxl: Use dma-resv iterator

 * rockchip: Use generic fbdev emulation

 * tidss: Fixes

 * vmwgfx: Fix leak on probe errors; Fail probing on broken hosts; New
   placement for MOB page tables; Hide internal BOs from userspace; Cleanups

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/YbHskHZc9HoAYuPZ@linux-uq9g.fritz.box
parents 15f09a99 03848335

Documentation/gpu/todo.rst

+11 −0
Original line number Diff line number Diff line
@@ -646,6 +646,17 @@ See drivers/gpu/drm/amd/display/TODO for tasks. 


Contact: Harry Wentland, Alex Deucher



vmwgfx: Replace hashtable with Linux' implementation

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



The vmwgfx driver uses its own hashtable implementation. Replace the

code with Linux' implementation and update the callers. It's mostly a

refactoring task, but the interfaces are different.



Contact: Zack Rusin, Thomas Zimmermann <tzimmermann@suse.de>



Level: Intermediate



Bootsplash

==========

drivers/dma-buf/dma-resv.c

+1 −2
Original line number Diff line number Diff line
@@ -305,7 +305,6 @@ void dma_resv_add_excl_fence(struct dma_resv *obj, struct dma_fence *fence) 
	if (old)

		i = old->shared_count;



	if (fence)

	dma_fence_get(fence);



	write_seqcount_begin(&obj->seq);

drivers/gpu/drm/Kconfig

+0 −7
Original line number Diff line number Diff line
@@ -217,13 +217,6 @@ config DRM_GEM_CMA_HELPER 
	help

	  Choose this if you need the GEM CMA helper functions



config DRM_KMS_CMA_HELPER

	bool

	depends on DRM

	select DRM_GEM_CMA_HELPER

	help

	  Choose this if you need the KMS CMA helper functions



config DRM_GEM_SHMEM_HELPER

	tristate

	depends on DRM && MMU

drivers/gpu/drm/Makefile

+4 −4
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
drm-y       :=	drm_aperture.o drm_auth.o drm_cache.o \

		drm_file.o drm_gem.o drm_ioctl.o \

		drm_drv.o \

		drm_sysfs.o drm_hashtab.o drm_mm.o \

		drm_sysfs.o drm_mm.o \

		drm_crtc.o drm_fourcc.o drm_modes.o drm_edid.o drm_displayid.o \

		drm_trace_points.o drm_prime.o \

		drm_vma_manager.o \
@@ -20,8 +20,8 @@ drm-y := drm_aperture.o drm_auth.o drm_cache.o \ 
		drm_managed.o drm_vblank_work.o



drm-$(CONFIG_DRM_LEGACY) += drm_agpsupport.o drm_bufs.o drm_context.o drm_dma.o \

			    drm_irq.o drm_legacy_misc.o drm_lock.o drm_memory.o \

			    drm_scatter.o drm_vm.o

			    drm_hashtab.o drm_irq.o drm_legacy_misc.o drm_lock.o \

			    drm_memory.o drm_scatter.o drm_vm.o

drm-$(CONFIG_DRM_LIB_RANDOM) += lib/drm_random.o

drm-$(CONFIG_COMPAT) += drm_ioc32.o

drm-$(CONFIG_DRM_PANEL) += drm_panel.o
@@ -36,6 +36,7 @@ obj-$(CONFIG_DRM_DP_AUX_BUS) += drm_dp_aux_bus.o 
obj-$(CONFIG_DRM_NOMODESET) += drm_nomodeset.o



drm_cma_helper-y := drm_gem_cma_helper.o

drm_cma_helper-$(CONFIG_DRM_KMS_HELPER) += drm_fb_cma_helper.o

obj-$(CONFIG_DRM_GEM_CMA_HELPER) += drm_cma_helper.o



drm_shmem_helper-y := drm_gem_shmem_helper.o
@@ -60,7 +61,6 @@ drm_kms_helper-y := drm_bridge_connector.o drm_crtc_helper.o drm_dp_helper.o \ 


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

drm_kms_helper-$(CONFIG_DRM_FBDEV_EMULATION) += drm_fb_helper.o

drm_kms_helper-$(CONFIG_DRM_KMS_CMA_HELPER) += drm_fb_cma_helper.o

drm_kms_helper-$(CONFIG_DRM_DP_AUX_CHARDEV) += drm_dp_aux_dev.o

drm_kms_helper-$(CONFIG_DRM_DP_CEC) += drm_dp_cec.o

drivers/gpu/drm/arm/Kconfig

+0 −2
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ config DRM_HDLCD 
	depends on DRM && OF && (ARM || ARM64 || COMPILE_TEST)

	depends on COMMON_CLK

	select DRM_KMS_HELPER

	select DRM_KMS_CMA_HELPER

	help

	  Choose this option if you have an ARM High Definition Colour LCD

	  controller.
@@ -27,7 +26,6 @@ config DRM_MALI_DISPLAY 
	depends on DRM && OF && (ARM || ARM64 || COMPILE_TEST)

	depends on COMMON_CLK

	select DRM_KMS_HELPER

	select DRM_KMS_CMA_HELPER

	select DRM_GEM_CMA_HELPER

	select VIDEOMODE_HELPERS

	help