diff options
| author | Dave Airlie <airlied@redhat.com> | 2024-06-28 08:10:08 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2024-06-28 08:20:37 +1000 |
| commit | 91fdc5e76513e280595279ef78d3170fbfb9d369 (patch) | |
| tree | 0056194dec8fe0ad52e3cd6335e56e8b9d950911 /lib | |
| parent | 275fee9dccf76a31124232a8167d9289432e2e9e (diff) | |
| parent | 61bfcd190820d1dce846e58a4c9ddca8db4751ed (diff) | |
| download | lwn-91fdc5e76513e280595279ef78d3170fbfb9d369.tar.gz lwn-91fdc5e76513e280595279ef78d3170fbfb9d369.zip | |
Merge tag 'drm-misc-next-2024-06-27' of https://gitlab.freedesktop.org/drm/misc/kernel into drm-next
drm-misc-next for 6.11:
UAPI Changes:
Cross-subsystem Changes:
Core Changes:
- panic: Monochrome logo support, Various fixes
- ttm: Improve the number of page faults on some platforms, Fix test
build breakage with PREEMPT_RT, more test coverage and various test
improvements
Driver Changes:
- Add missing MODULE_DESCRIPTION where needed
- ipu-v3: Various fixes
- vc4: Monochrome TV support
- bridge:
- analogix_dp: Various improvements and reworks, handle AUX
transfers timeout
- tc358767: Fix DRM_BRIDGE_ATTACH_NO_CONNECTOR, Fix clock
calculations
- panels:
- More transitions to mipi_dsi wrapped functions
- New panels: Lincoln Technologies LCD197, Ortustech COM35H3P70ULC,
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Maxime Ripard <mripard@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240627-congenial-pistachio-nyala-848cf4@houat
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/fonts/Kconfig | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/fonts/Kconfig b/lib/fonts/Kconfig index befcb463f738..3ac26bdbc3ff 100644 --- a/lib/fonts/Kconfig +++ b/lib/fonts/Kconfig @@ -105,7 +105,8 @@ config FONT_SUN8x16 config FONT_SUN12x22 bool "Sparc console 12x22 font (not supported by all drivers)" - depends on (FRAMEBUFFER_CONSOLE && (!SPARC && FONTS || SPARC)) || DRM_PANIC + depends on FRAMEBUFFER_CONSOLE || DRM_PANIC + depends on !SPARC && FONTS help This is the high resolution console font for Sun machines with very big letters (like the letters used in the SPARC PROM). If the @@ -113,7 +114,8 @@ config FONT_SUN12x22 config FONT_TER16x32 bool "Terminus 16x32 font (not supported by all drivers)" - depends on (FRAMEBUFFER_CONSOLE && (!SPARC && FONTS || SPARC)) || DRM_PANIC + depends on FRAMEBUFFER_CONSOLE || DRM_PANIC + depends on !SPARC && FONTS || SPARC help Terminus Font is a clean, fixed width bitmap font, designed for long (8 and more hours per day) work with computers. |