diff options
| author | Maxime Ripard <mripard@kernel.org> | 2024-07-30 09:09:23 +0200 |
|---|---|---|
| committer | Maxime Ripard <mripard@kernel.org> | 2024-07-30 09:09:23 +0200 |
| commit | a1ff5a7d78a036d6c2178ee5acd6ba4946243800 (patch) | |
| tree | 6652a7fba9fc417eaf327b7578447a4583ebd5da /drivers/gpu/drm/Kconfig | |
| parent | b5fbf924f125ba3638cfdc21c0515eb7e76264ca (diff) | |
| parent | 8400291e289ee6b2bf9779ff1c83a291501f017b (diff) | |
| download | linux-a1ff5a7d78a036d6c2178ee5acd6ba4946243800.tar.gz linux-a1ff5a7d78a036d6c2178ee5acd6ba4946243800.tar.bz2 linux-a1ff5a7d78a036d6c2178ee5acd6ba4946243800.zip | |
Merge drm/drm-fixes into drm-misc-fixes
Let's start the new drm-misc-fixes cycle by bringing in 6.11-rc1.
Signed-off-by: Maxime Ripard <mripard@kernel.org>
Diffstat (limited to 'drivers/gpu/drm/Kconfig')
| -rw-r--r-- | drivers/gpu/drm/Kconfig | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig index d08d79bbb0f6..6b2c6b91f962 100644 --- a/drivers/gpu/drm/Kconfig +++ b/drivers/gpu/drm/Kconfig @@ -79,6 +79,7 @@ config DRM_KUNIT_TEST depends on DRM && KUNIT && MMU select DRM_BUDDY select DRM_DISPLAY_DP_HELPER + select DRM_DISPLAY_HDMI_STATE_HELPER select DRM_DISPLAY_HELPER select DRM_EXEC select DRM_EXPORT_FOR_TESTS if m @@ -106,8 +107,7 @@ config DRM_KMS_HELPER config DRM_PANIC bool "Display a user-friendly message when a kernel panic occurs" - depends on DRM && !FRAMEBUFFER_CONSOLE - select DRM_KMS_HELPER + depends on DRM && !(FRAMEBUFFER_CONSOLE && VT_CONSOLE) select FONT_SUPPORT help Enable a drm panic handler, which will display a user-friendly message @@ -136,6 +136,19 @@ config DRM_PANIC_DEBUG This is unsafe and should not be enabled on a production build. If in doubt, say "N". +config DRM_PANIC_SCREEN + string "Panic screen formatter" + default "user" + depends on DRM_PANIC + help + This option enable to choose what will be displayed when a kernel + panic occurs. You can choose between "user", a short message telling + the user to reboot the system, or "kmsg" which will display the last + lines of kmsg. + This can also be overridden by drm.panic_screen=xxxx kernel parameter + or by writing to /sys/module/drm/parameters/panic_screen sysfs entry + Default is "user" + config DRM_DEBUG_DP_MST_TOPOLOGY_REFS bool "Enable refcount backtrace history in the DP MST helpers" depends on STACKTRACE_SUPPORT @@ -234,6 +247,7 @@ config DRM_TTM_KUNIT_TEST default n depends on DRM && KUNIT && MMU && (UML || COMPILE_TEST) select DRM_TTM + select DRM_BUDDY select DRM_EXPORT_FOR_TESTS if m select DRM_KUNIT_TEST_HELPERS default KUNIT_ALL_TESTS |