Commit c8a04cbe authored by Daniel Vetter's avatar Daniel Vetter
Browse files

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



drm-misc-next for 5.17:

UAPI Changes:

Cross-subsystem Changes:

 * Move 'nomodeset' kernel boot option into DRM subsystem

Core Changes:

 * Replace several DRM_*() logging macros with drm_*() equivalents
 * panel: Add quirk for Lenovo Yoga Book X91F/L
 * ttm: Documentation fixes

Driver Changes:

 * Cleanup nomodeset handling in drivers
 * Fixes
 * bridge/anx7625: Fix reading EDID; Fix error code
 * bridge/megachips: Probe both bridges before registering
 * vboxvideo: Fix ERR_PTR usage

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>

From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/YaSVz15Q7dAlEevU@linux-uq9g.fritz.box
parents c305ae99 69d84612

Documentation/admin-guide/kernel-parameters.txt

+7 −0
Original line number Diff line number Diff line
@@ -3545,6 +3545,13 @@ 
			shutdown the other cpus.  Instead use the REBOOT_VECTOR

			irq.



	nomodeset	Disable kernel modesetting. DRM drivers will not perform

			display-mode changes or accelerated rendering. Only the

			system framebuffer will be available for use if this was

			set-up by the firmware or boot loader.



			Useful as fallback, or for testing and debugging.



	nomodule	Disable module load



	nopat		[X86] Disable PAT (page attribute table extension of

drivers/gpu/drm/Kconfig

+6 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
menuconfig DRM

	tristate "Direct Rendering Manager (XFree86 4.1.0 and higher DRI support)"

	depends on (AGP || AGP=n) && !EMULATED_CMPXCHG && HAS_DMA

	select DRM_NOMODESET

	select DRM_PANEL_ORIENTATION_QUIRKS

	select HDMI

	select FB_CMDLINE
@@ -492,6 +493,11 @@ config DRM_EXPORT_FOR_TESTS 
config DRM_PANEL_ORIENTATION_QUIRKS

	tristate



# Separate option because nomodeset parameter is global and expected built-in

config DRM_NOMODESET

	bool

	default n



config DRM_LIB_RANDOM

	bool

	default n

drivers/gpu/drm/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -33,6 +33,8 @@ drm-$(CONFIG_DRM_PRIVACY_SCREEN) += drm_privacy_screen.o drm_privacy_screen_x86. 


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

obj-$(CONFIG_DRM_GEM_CMA_HELPER) += drm_cma_helper.o

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

+1 −4
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ 
#include "amdgpu_drv.h"



#include <drm/drm_pciids.h>

#include <linux/console.h>

#include <linux/module.h>

#include <linux/pm_runtime.h>

#include <linux/vga_switcheroo.h>
@@ -2516,10 +2515,8 @@ static int __init amdgpu_init(void) 
{

	int r;



	if (vgacon_text_force()) {

		DRM_ERROR("VGACON disables amdgpu kernel modesetting.\n");

	if (drm_firmware_drivers_only())

		return -EINVAL;

	}



	r = amdgpu_sync_init();

	if (r)

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

+0 −9
Original line number Diff line number Diff line
@@ -116,17 +116,8 @@ static void amdgpu_evict_flags(struct ttm_buffer_object *bo, 


	abo = ttm_to_amdgpu_bo(bo);

	if (abo->flags & AMDGPU_AMDKFD_CREATE_SVM_BO) {

		struct dma_fence *fence;

		struct dma_resv *resv = &bo->base._resv;



		rcu_read_lock();

		fence = rcu_dereference(resv->fence_excl);

		if (fence && !fence->ops->signaled)

			dma_fence_enable_sw_signaling(fence);



		placement->num_placement = 0;

		placement->num_busy_placement = 0;

		rcu_read_unlock();

		return;

	}