Commit f8ca7b74 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-next-fixes-2021-11-10' of... 

Merge tag 'drm-misc-next-fixes-2021-11-10' of git://anongit.freedesktop.org/drm/drm-misc

 into drm-next

Removed the TTM Huge Page functionnality to address a crash, a timeout
fix for udl, CONFIG_FB dependency improvements, a fix for a circular
locking depency in imx, a NULL pointer dereference fix for virtio, and a
naming collision fix for drm/locking.

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

From: Maxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/20211110082114.vfpkpnecwdfg27lk@gilmour
parents 917a6f0b bcae3af2

MAINTAINERS

+1 −2
Original line number Diff line number Diff line
@@ -6154,8 +6154,7 @@ T: git git://anongit.freedesktop.org/drm/drm 
F:	Documentation/devicetree/bindings/display/

F:	Documentation/devicetree/bindings/gpu/

F:	Documentation/gpu/

F:	drivers/gpu/drm/

F:	drivers/gpu/vga/

F:	drivers/gpu/

F:	include/drm/

F:	include/linux/vga*

F:	include/uapi/drm/

drivers/gpu/drm/Kconfig

+2 −3
Original line number Diff line number Diff line
@@ -117,9 +117,8 @@ config DRM_DEBUG_MODESET_LOCK 


config DRM_FBDEV_EMULATION

	bool "Enable legacy fbdev support for your modesetting driver"

	depends on DRM

	depends on FB=y || FB=DRM

	select DRM_KMS_HELPER

	depends on DRM_KMS_HELPER

	depends on FB=y || FB=DRM_KMS_HELPER

	select FB_CFB_FILLRECT

	select FB_CFB_COPYAREA

	select FB_CFB_IMAGEBLIT

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

+4 −3
Original line number Diff line number Diff line
@@ -61,7 +61,8 @@ static vm_fault_t amdgpu_gem_fault(struct vm_fault *vmf) 
		}



		 ret = ttm_bo_vm_fault_reserved(vmf, vmf->vma->vm_page_prot,

					       TTM_BO_VM_NUM_PREFAULT, 1);

						TTM_BO_VM_NUM_PREFAULT);



		 drm_dev_exit(idx);

	} else {

		ret = ttm_bo_vm_dummy_page(vmf, vmf->vma->vm_page_prot);

drivers/gpu/drm/drm_modeset_lock.c

+7 −7
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ 
static DEFINE_WW_CLASS(crtc_ww_class);



#if IS_ENABLED(CONFIG_DRM_DEBUG_MODESET_LOCK)

static noinline depot_stack_handle_t __stack_depot_save(void)

static noinline depot_stack_handle_t __drm_stack_depot_save(void)

{

	unsigned long entries[8];

	unsigned int n;
@@ -89,7 +89,7 @@ static noinline depot_stack_handle_t __stack_depot_save(void) 
	return stack_depot_save(entries, n, GFP_NOWAIT | __GFP_NOWARN);

}



static void __stack_depot_print(depot_stack_handle_t stack_depot)

static void __drm_stack_depot_print(depot_stack_handle_t stack_depot)

{

	struct drm_printer p = drm_debug_printer("drm_modeset_lock");

	unsigned long *entries;
@@ -108,11 +108,11 @@ static void __stack_depot_print(depot_stack_handle_t stack_depot) 
	kfree(buf);

}

#else /* CONFIG_DRM_DEBUG_MODESET_LOCK */

static depot_stack_handle_t __stack_depot_save(void)

static depot_stack_handle_t __drm_stack_depot_save(void)

{

	return 0;

}

static void __stack_depot_print(depot_stack_handle_t stack_depot)

static void __drm_stack_depot_print(depot_stack_handle_t stack_depot)

{

}

#endif /* CONFIG_DRM_DEBUG_MODESET_LOCK */
@@ -266,7 +266,7 @@ EXPORT_SYMBOL(drm_modeset_acquire_fini); 
void drm_modeset_drop_locks(struct drm_modeset_acquire_ctx *ctx)

{

	if (WARN_ON(ctx->contended))

		__stack_depot_print(ctx->stack_depot);

		__drm_stack_depot_print(ctx->stack_depot);



	while (!list_empty(&ctx->locked)) {

		struct drm_modeset_lock *lock;
@@ -286,7 +286,7 @@ static inline int modeset_lock(struct drm_modeset_lock *lock, 
	int ret;



	if (WARN_ON(ctx->contended))

		__stack_depot_print(ctx->stack_depot);

		__drm_stack_depot_print(ctx->stack_depot);



	if (ctx->trylock_only) {

		lockdep_assert_held(&ctx->ww_ctx);
@@ -317,7 +317,7 @@ static inline int modeset_lock(struct drm_modeset_lock *lock, 
		ret = 0;

	} else if (ret == -EDEADLK) {

		ctx->contended = lock;

		ctx->stack_depot = __stack_depot_save();

		ctx->stack_depot = __drm_stack_depot_save();

	}



	return ret;

drivers/gpu/drm/imx/imx-drm-core.c

+0 −2
Original line number Diff line number Diff line
@@ -81,7 +81,6 @@ static void imx_drm_atomic_commit_tail(struct drm_atomic_state *state) 
	struct drm_plane_state *old_plane_state, *new_plane_state;

	bool plane_disabling = false;

	int i;

	bool fence_cookie = dma_fence_begin_signalling();



	drm_atomic_helper_commit_modeset_disables(dev, state);
@@ -112,7 +111,6 @@ static void imx_drm_atomic_commit_tail(struct drm_atomic_state *state) 
	}



	drm_atomic_helper_commit_hw_done(state);

	dma_fence_end_signalling(fence_cookie);

}



static const struct drm_mode_config_helper_funcs imx_drm_mode_config_helpers = {