diff mbox series

[9/9] kernel/x86: remove DRM support

Message ID 84206cdc3e0670d9f20f8a6791120206133425f8.1682539911.git.ehem+openwrt@m5p.com
State New
Headers show
Series (mostly) x86 kernel configuration adjustments | expand

Commit Message

Elliott Mitchell April 19, 2023, 8:54 p.m. UTC
Direct Rendering Manager is mainly for running X (possibly Wayland
too).  As OpenWRT is meant for networking devices, there is no need
for the support to be present.

Signed-off-by: Elliott Mitchell <ehem+openwrt@m5p.com>
---
 target/linux/x86/64/config-5.10      | 40 ----------------------------
 target/linux/x86/64/config-5.15      | 40 ----------------------------
 target/linux/x86/generic/config-5.10 | 39 ---------------------------
 target/linux/x86/generic/config-5.15 | 39 ---------------------------
 target/linux/x86/legacy/config-5.10  | 40 ----------------------------
 target/linux/x86/legacy/config-5.15  | 40 ----------------------------
 6 files changed, 238 deletions(-)

Comments

Stefan Lippers-Hollmann April 26, 2023, 10:50 p.m. UTC | #1
Hi

On 2023-04-19, Elliott Mitchell wrote:
> Direct Rendering Manager is mainly for running X (possibly Wayland
> too).  As OpenWRT is meant for networking devices, there is no need
> for the support to be present.

That is only partially true, the Linux kernel is making a strong push
away from deprecated (FB_*) graphics drivers to DRM based ones, with 
kernel based mode setting this is getting more (any) attention for 
console support as well. Even without getting anywhere near X/ Wayland,
there is more than just a 80x25 tty on real hardware (and even VMs).

Regards
	Stefan Lippers-Hollmann
Elliott Mitchell April 27, 2023, 12:11 a.m. UTC | #2
On Thu, Apr 27, 2023 at 12:50:52AM +0200, Stefan Lippers-Hollmann wrote:
> On 2023-04-19, Elliott Mitchell wrote:
> > Direct Rendering Manager is mainly for running X (possibly Wayland
> > too).  As OpenWRT is meant for networking devices, there is no need
> > for the support to be present.
> 
> That is only partially true, the Linux kernel is making a strong push
> away from deprecated (FB_*) graphics drivers to DRM based ones, with 
> kernel based mode setting this is getting more (any) attention for 
> console support as well. Even without getting anywhere near X/ Wayland,
> there is more than just a 80x25 tty on real hardware (and even VMs).

Real x86 hardware often has the capability to use a serial port as
console.  The conventional UEFI implementation fully supports this use
case.  I can well believe a number of manufacturers disabling the
functionality though.

VMs *can* have more than a 80x25 tty.  By the time you're getting to 4
or more VMs you should be thinking about disabling the functionality due
to the heavy overhead (unless the OS in the VM doesn't support serial
consoles).
Thibaut VARÈNE April 27, 2023, 9:21 a.m. UTC | #3
> Le 27 avr. 2023 à 02:11, Elliott Mitchell <ehem+openwrt@m5p.com> a écrit :
> 
> On Thu, Apr 27, 2023 at 12:50:52AM +0200, Stefan Lippers-Hollmann wrote:
>> On 2023-04-19, Elliott Mitchell wrote:
>>> Direct Rendering Manager is mainly for running X (possibly Wayland
>>> too).  As OpenWRT is meant for networking devices, there is no need
>>> for the support to be present.
>> 
>> That is only partially true, the Linux kernel is making a strong push
>> away from deprecated (FB_*) graphics drivers to DRM based ones, with 
>> kernel based mode setting this is getting more (any) attention for 
>> console support as well. Even without getting anywhere near X/ Wayland,
>> there is more than just a 80x25 tty on real hardware (and even VMs).
> 
> Real x86 hardware often has the capability to use a serial port as
> console.  The conventional UEFI implementation fully supports this use
> case.  I can well believe a number of manufacturers disabling the
> functionality though.
> 
> VMs *can* have more than a 80x25 tty.  By the time you're getting to 4
> or more VMs you should be thinking about disabling the functionality due
> to the heavy overhead (unless the OS in the VM doesn't support serial
> consoles).

You seem to assume that x86 is only/mainly run on VMs.
That is not necessarily the case, and I see no reason to degrade device support that way.

Would you mind documenting the measurable gains from your changes, so we have some metric to assess their relevance?

Cheers,
T
Philip Prindeville April 28, 2023, 5:18 p.m. UTC | #4
> On Apr 27, 2023, at 3:21 AM, Thibaut <hacks@slashdirt.org> wrote:
> 
> 
> 
>> Le 27 avr. 2023 à 02:11, Elliott Mitchell <ehem+openwrt@m5p.com> a écrit :
>> 
>> On Thu, Apr 27, 2023 at 12:50:52AM +0200, Stefan Lippers-Hollmann wrote:
>>> On 2023-04-19, Elliott Mitchell wrote:
>>>> Direct Rendering Manager is mainly for running X (possibly Wayland
>>>> too).  As OpenWRT is meant for networking devices, there is no need
>>>> for the support to be present.
>>> 
>>> That is only partially true, the Linux kernel is making a strong push
>>> away from deprecated (FB_*) graphics drivers to DRM based ones, with 
>>> kernel based mode setting this is getting more (any) attention for 
>>> console support as well. Even without getting anywhere near X/ Wayland,
>>> there is more than just a 80x25 tty on real hardware (and even VMs).
>> 
>> Real x86 hardware often has the capability to use a serial port as
>> console.  The conventional UEFI implementation fully supports this use
>> case.  I can well believe a number of manufacturers disabling the
>> functionality though.
>> 
>> VMs *can* have more than a 80x25 tty.  By the time you're getting to 4
>> or more VMs you should be thinking about disabling the functionality due
>> to the heavy overhead (unless the OS in the VM doesn't support serial
>> consoles).
> 
> You seem to assume that x86 is only/mainly run on VMs.
> That is not necessarily the case, and I see no reason to degrade device support that way.
> 
> Would you mind documenting the measurable gains from your changes, so we have some metric to assess their relevance?
> 
> Cheers,
> T


True enough.  I have net4801 (Geode), net5501 (Geode), alix2 (Geode), apu6 (GX-412TC), and Supermicro Xeon D1548 based routers right in front of me.

Let's also not forget that Openwrt is used downstream in many projects that we have limited visibility into.


-Philip
Elliott Mitchell April 29, 2023, 3:45 a.m. UTC | #5
On Thu, Apr 27, 2023 at 11:21:28AM +0200, Thibaut wrote:
> 
> > Le 27 avr. 2023 à 02:11, Elliott Mitchell <ehem+openwrt@m5p.com> a écrit :
> > 
> > On Thu, Apr 27, 2023 at 12:50:52AM +0200, Stefan Lippers-Hollmann wrote:
> >> On 2023-04-19, Elliott Mitchell wrote:
> >>> Direct Rendering Manager is mainly for running X (possibly Wayland
> >>> too).  As OpenWRT is meant for networking devices, there is no need
> >>> for the support to be present.
> >> 
> >> That is only partially true, the Linux kernel is making a strong push
> >> away from deprecated (FB_*) graphics drivers to DRM based ones, with 
> >> kernel based mode setting this is getting more (any) attention for 
> >> console support as well. Even without getting anywhere near X/ Wayland,
> >> there is more than just a 80x25 tty on real hardware (and even VMs).
> > 
> > Real x86 hardware often has the capability to use a serial port as
> > console.  The conventional UEFI implementation fully supports this use
> > case.  I can well believe a number of manufacturers disabling the
> > functionality though.
> > 
> > VMs *can* have more than a 80x25 tty.  By the time you're getting to 4
> > or more VMs you should be thinking about disabling the functionality due
> > to the heavy overhead (unless the OS in the VM doesn't support serial
> > consoles).
> 
> You seem to assume that x86 is only/mainly run on VMs.
> That is not necessarily the case, and I see no reason to degrade device support that way.

Okay, as already stated there are at least two solutions to this.

1> Turn most functionality into modules and include support for runtime
loading of kernel modules.

2> Create more kernel variants for OpenWRT/x86.


> Would you mind documenting the measurable gains from your changes, so we have some metric to assess their relevance?
> 

I had suspected as much, but fully disabling ISA DMA didn't directly
have much impact (less than 4195 byte reduction).  I was already guessing
most of the gain was CONFIG_ISA=n, but hoped purging ISA DMA might
squeeze out a bit more.

Removing AGP shrunk vmlinux.bin by 4KB.  Since the kernel is a multiple
of page size, this means a reduction of 1-8191 bytes.  This though may
have translated into a larger impact when CONFIG_DRM was set to no.

Setting CONFIG_DRM=n resulted in a vmlinux.bin delta of -2203648 bytes.
Not quite a 10% reduction in kernel runtime size, but close.  Here we
have a major impact on kernel size.

Removing USB support is certainly inappropriate for a desktop build, but
appropriate for something using a serial console (some types of VM).
That has a delta of -2117632 bytes.

Looks like Hyper-V support is a pig.  I'm merely going from the size of
handy distribution modules, but appears to need ~1MB of memory.

Again going by handy distribution modules, the Fusion MPT used by
VMware is closer to ~350KB (not including the need for the SCSI layer).

Xen meanwhile is ~200KB total.
Thibaut VARÈNE April 29, 2023, 12:32 p.m. UTC | #6
> Le 29 avr. 2023 à 05:45, Elliott Mitchell <ehem+openwrt@m5p.com> a écrit :
> 
> On Thu, Apr 27, 2023 at 11:21:28AM +0200, Thibaut wrote:
>> 
>>> Le 27 avr. 2023 à 02:11, Elliott Mitchell <ehem+openwrt@m5p.com> a écrit :
>>> 
[…]
>> You seem to assume that x86 is only/mainly run on VMs.
>> That is not necessarily the case, and I see no reason to degrade device support that way.
> 
> Okay, as already stated there are at least two solutions to this.
> 
> 1> Turn most functionality into modules and include support for runtime
> loading of kernel modules.
> 
> 2> Create more kernel variants for OpenWRT/x86.

3> leave things as they are.

The current setup supports a very large scope of hardware and virtualizations with minimal fuss, and will happily run with 128M RAM with Luci enabled (I just tested that with 22.03.4 x86/64 stock image in a 128M RAM VM: after boot it had 64M free). Maybe this info could be added to the x86 wiki page.

It’s likely it could even be convinced to run with 64M only if you really needed(?) that, which is the current lowest recommandation across all OpenWrt targets.

So it seems to me you’re trying to fix a problem that isn’t there.

As pointed out by Felix, if you need something highly tailored it’s easy to achieve as well.

HTH
T
Philip Prindeville May 1, 2023, 3:09 p.m. UTC | #7
> On Apr 28, 2023, at 9:45 PM, Elliott Mitchell <ehem+openwrt@m5p.com> wrote:
> 
> On Thu, Apr 27, 2023 at 11:21:28AM +0200, Thibaut wrote:
>> 
>>> Le 27 avr. 2023 à 02:11, Elliott Mitchell <ehem+openwrt@m5p.com> a écrit :
>>> 
>>> On Thu, Apr 27, 2023 at 12:50:52AM +0200, Stefan Lippers-Hollmann wrote:
>>>> On 2023-04-19, Elliott Mitchell wrote:
>>>>> Direct Rendering Manager is mainly for running X (possibly Wayland
>>>>> too).  As OpenWRT is meant for networking devices, there is no need
>>>>> for the support to be present.
>>>> 
>>>> That is only partially true, the Linux kernel is making a strong push
>>>> away from deprecated (FB_*) graphics drivers to DRM based ones, with 
>>>> kernel based mode setting this is getting more (any) attention for 
>>>> console support as well. Even without getting anywhere near X/ Wayland,
>>>> there is more than just a 80x25 tty on real hardware (and even VMs).
>>> 
>>> Real x86 hardware often has the capability to use a serial port as
>>> console.  The conventional UEFI implementation fully supports this use
>>> case.  I can well believe a number of manufacturers disabling the
>>> functionality though.
>>> 
>>> VMs *can* have more than a 80x25 tty.  By the time you're getting to 4
>>> or more VMs you should be thinking about disabling the functionality due
>>> to the heavy overhead (unless the OS in the VM doesn't support serial
>>> consoles).
>> 
>> You seem to assume that x86 is only/mainly run on VMs.
>> That is not necessarily the case, and I see no reason to degrade device support that way.
> 
> Okay, as already stated there are at least two solutions to this.
> 
> 1> Turn most functionality into modules and include support for runtime
> loading of kernel modules.
> 
> 2> Create more kernel variants for OpenWRT/x86.
> 
> 
>> Would you mind documenting the measurable gains from your changes, so we have some metric to assess their relevance?
>> 
> 
> I had suspected as much, but fully disabling ISA DMA didn't directly
> have much impact (less than 4195 byte reduction).  I was already guessing
> most of the gain was CONFIG_ISA=n, but hoped purging ISA DMA might
> squeeze out a bit more.
> 
> Removing AGP shrunk vmlinux.bin by 4KB.  Since the kernel is a multiple
> of page size, this means a reduction of 1-8191 bytes.  This though may
> have translated into a larger impact when CONFIG_DRM was set to no.
> 
> Setting CONFIG_DRM=n resulted in a vmlinux.bin delta of -2203648 bytes.
> Not quite a 10% reduction in kernel runtime size, but close.  Here we
> have a major impact on kernel size.
> 
> Removing USB support is certainly inappropriate for a desktop build, but
> appropriate for something using a serial console (some types of VM).
> That has a delta of -2117632 bytes.


I occasionally use the USB pass-thru with memory sticks to install or recover an VM.

-Philip
diff mbox series

Patch

diff --git a/target/linux/x86/64/config-5.10 b/target/linux/x86/64/config-5.10
index b226b347bd..07e7505c98 100644
--- a/target/linux/x86/64/config-5.10
+++ b/target/linux/x86/64/config-5.10
@@ -95,46 +95,6 @@  CONFIG_CRYPTO_XTS=y
 CONFIG_DMA_ACPI=y
 CONFIG_DMA_OPS=y
 CONFIG_DMA_SHARED_BUFFER=y
-CONFIG_DRM=y
-CONFIG_DRM_BOCHS=y
-CONFIG_DRM_BRIDGE=y
-CONFIG_DRM_FBDEV_EMULATION=y
-CONFIG_DRM_FBDEV_OVERALLOC=100
-CONFIG_DRM_GEM_SHMEM_HELPER=y
-CONFIG_DRM_I915=y
-CONFIG_DRM_I915_CAPTURE_ERROR=y
-CONFIG_DRM_I915_COMPRESS_ERROR=y
-# CONFIG_DRM_I915_DEBUG is not set
-# CONFIG_DRM_I915_DEBUG_GUC is not set
-# CONFIG_DRM_I915_DEBUG_MMIO is not set
-# CONFIG_DRM_I915_DEBUG_RUNTIME_PM is not set
-# CONFIG_DRM_I915_DEBUG_VBLANK_EVADE is not set
-CONFIG_DRM_I915_FENCE_TIMEOUT=10000
-CONFIG_DRM_I915_FORCE_PROBE=""
-CONFIG_DRM_I915_GVT=y
-CONFIG_DRM_I915_HEARTBEAT_INTERVAL=2500
-# CONFIG_DRM_I915_LOW_LEVEL_TRACEPOINTS is not set
-CONFIG_DRM_I915_MAX_REQUEST_BUSYWAIT=8000
-CONFIG_DRM_I915_PREEMPT_TIMEOUT=640
-# CONFIG_DRM_I915_SELFTEST is not set
-CONFIG_DRM_I915_STOP_TIMEOUT=100
-# CONFIG_DRM_I915_SW_FENCE_CHECK_DAG is not set
-# CONFIG_DRM_I915_SW_FENCE_DEBUG_OBJECTS is not set
-CONFIG_DRM_I915_TIMESLICE_DURATION=1
-CONFIG_DRM_I915_USERFAULT_AUTOSUSPEND=250
-CONFIG_DRM_I915_USERPTR=y
-# CONFIG_DRM_I915_WERROR is not set
-CONFIG_DRM_KMS_FB_HELPER=y
-CONFIG_DRM_KMS_HELPER=y
-CONFIG_DRM_MIPI_DSI=y
-CONFIG_DRM_PANEL=y
-CONFIG_DRM_PANEL_BRIDGE=y
-CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y
-CONFIG_DRM_TTM=y
-CONFIG_DRM_TTM_DMA_PAGE_POOL=y
-CONFIG_DRM_TTM_HELPER=y
-CONFIG_DRM_VIRTIO_GPU=y
-CONFIG_DRM_VRAM_HELPER=y
 CONFIG_EFI=y
 CONFIG_EFIVAR_FS=m
 # CONFIG_EFI_BOOTLOADER_CONTROL is not set
diff --git a/target/linux/x86/64/config-5.15 b/target/linux/x86/64/config-5.15
index 7f5b80e54a..fa7fd3993c 100644
--- a/target/linux/x86/64/config-5.15
+++ b/target/linux/x86/64/config-5.15
@@ -105,46 +105,6 @@  CONFIG_CRYPTO_XTS=y
 CONFIG_DMA_ACPI=y
 CONFIG_DMA_OPS=y
 CONFIG_DMA_SHARED_BUFFER=y
-CONFIG_DRM=y
-CONFIG_DRM_BOCHS=y
-CONFIG_DRM_BRIDGE=y
-CONFIG_DRM_FBDEV_EMULATION=y
-CONFIG_DRM_FBDEV_OVERALLOC=100
-CONFIG_DRM_GEM_SHMEM_HELPER=y
-# CONFIG_DRM_HYPERV is not set
-CONFIG_DRM_I915=y
-CONFIG_DRM_I915_CAPTURE_ERROR=y
-CONFIG_DRM_I915_COMPRESS_ERROR=y
-# CONFIG_DRM_I915_DEBUG is not set
-# CONFIG_DRM_I915_DEBUG_GUC is not set
-# CONFIG_DRM_I915_DEBUG_MMIO is not set
-# CONFIG_DRM_I915_DEBUG_RUNTIME_PM is not set
-# CONFIG_DRM_I915_DEBUG_VBLANK_EVADE is not set
-CONFIG_DRM_I915_FENCE_TIMEOUT=10000
-CONFIG_DRM_I915_FORCE_PROBE=""
-CONFIG_DRM_I915_GVT=y
-CONFIG_DRM_I915_HEARTBEAT_INTERVAL=2500
-# CONFIG_DRM_I915_LOW_LEVEL_TRACEPOINTS is not set
-CONFIG_DRM_I915_MAX_REQUEST_BUSYWAIT=8000
-CONFIG_DRM_I915_PREEMPT_TIMEOUT=640
-CONFIG_DRM_I915_REQUEST_TIMEOUT=20000
-# CONFIG_DRM_I915_SELFTEST is not set
-CONFIG_DRM_I915_STOP_TIMEOUT=100
-# CONFIG_DRM_I915_SW_FENCE_CHECK_DAG is not set
-# CONFIG_DRM_I915_SW_FENCE_DEBUG_OBJECTS is not set
-CONFIG_DRM_I915_TIMESLICE_DURATION=1
-CONFIG_DRM_I915_USERFAULT_AUTOSUSPEND=250
-CONFIG_DRM_I915_USERPTR=y
-# CONFIG_DRM_I915_WERROR is not set
-CONFIG_DRM_KMS_HELPER=y
-CONFIG_DRM_MIPI_DSI=y
-CONFIG_DRM_PANEL=y
-CONFIG_DRM_PANEL_BRIDGE=y
-CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y
-CONFIG_DRM_TTM=y
-CONFIG_DRM_TTM_HELPER=y
-CONFIG_DRM_VIRTIO_GPU=y
-CONFIG_DRM_VRAM_HELPER=y
 CONFIG_EFI=y
 CONFIG_EFIVAR_FS=m
 # CONFIG_EFI_BOOTLOADER_CONTROL is not set
diff --git a/target/linux/x86/generic/config-5.10 b/target/linux/x86/generic/config-5.10
index 6da10e3776..6cc3f3d809 100644
--- a/target/linux/x86/generic/config-5.10
+++ b/target/linux/x86/generic/config-5.10
@@ -54,45 +54,6 @@  CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
 CONFIG_DMA_ACPI=y
 CONFIG_DMA_OPS=y
 CONFIG_DMA_SHARED_BUFFER=y
-CONFIG_DRM=y
-CONFIG_DRM_BOCHS=y
-CONFIG_DRM_BRIDGE=y
-CONFIG_DRM_FBDEV_EMULATION=y
-CONFIG_DRM_FBDEV_OVERALLOC=100
-CONFIG_DRM_GEM_SHMEM_HELPER=y
-CONFIG_DRM_I915=y
-CONFIG_DRM_I915_CAPTURE_ERROR=y
-CONFIG_DRM_I915_COMPRESS_ERROR=y
-# CONFIG_DRM_I915_DEBUG is not set
-# CONFIG_DRM_I915_DEBUG_GUC is not set
-# CONFIG_DRM_I915_DEBUG_MMIO is not set
-# CONFIG_DRM_I915_DEBUG_RUNTIME_PM is not set
-# CONFIG_DRM_I915_DEBUG_VBLANK_EVADE is not set
-CONFIG_DRM_I915_FENCE_TIMEOUT=10000
-CONFIG_DRM_I915_FORCE_PROBE=""
-CONFIG_DRM_I915_HEARTBEAT_INTERVAL=2500
-# CONFIG_DRM_I915_LOW_LEVEL_TRACEPOINTS is not set
-CONFIG_DRM_I915_MAX_REQUEST_BUSYWAIT=8000
-CONFIG_DRM_I915_PREEMPT_TIMEOUT=640
-# CONFIG_DRM_I915_SELFTEST is not set
-CONFIG_DRM_I915_STOP_TIMEOUT=100
-# CONFIG_DRM_I915_SW_FENCE_CHECK_DAG is not set
-# CONFIG_DRM_I915_SW_FENCE_DEBUG_OBJECTS is not set
-CONFIG_DRM_I915_TIMESLICE_DURATION=1
-CONFIG_DRM_I915_USERFAULT_AUTOSUSPEND=250
-CONFIG_DRM_I915_USERPTR=y
-# CONFIG_DRM_I915_WERROR is not set
-CONFIG_DRM_KMS_FB_HELPER=y
-CONFIG_DRM_KMS_HELPER=y
-CONFIG_DRM_MIPI_DSI=y
-CONFIG_DRM_PANEL=y
-CONFIG_DRM_PANEL_BRIDGE=y
-CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y
-CONFIG_DRM_TTM=y
-CONFIG_DRM_TTM_DMA_PAGE_POOL=y
-CONFIG_DRM_TTM_HELPER=y
-CONFIG_DRM_VIRTIO_GPU=y
-CONFIG_DRM_VRAM_HELPER=y
 CONFIG_EFI=y
 CONFIG_EFIVAR_FS=m
 # CONFIG_EFI_BOOTLOADER_CONTROL is not set
diff --git a/target/linux/x86/generic/config-5.15 b/target/linux/x86/generic/config-5.15
index 491e9737f5..d83e0341cd 100644
--- a/target/linux/x86/generic/config-5.15
+++ b/target/linux/x86/generic/config-5.15
@@ -56,45 +56,6 @@  CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
 # CONFIG_DEBUG_HOTPLUG_CPU0 is not set
 CONFIG_DMA_ACPI=y
 CONFIG_DMA_SHARED_BUFFER=y
-CONFIG_DRM=y
-CONFIG_DRM_BOCHS=y
-CONFIG_DRM_BRIDGE=y
-CONFIG_DRM_FBDEV_EMULATION=y
-CONFIG_DRM_FBDEV_OVERALLOC=100
-CONFIG_DRM_GEM_SHMEM_HELPER=y
-# CONFIG_DRM_HYPERV is not set
-CONFIG_DRM_I915=y
-CONFIG_DRM_I915_CAPTURE_ERROR=y
-CONFIG_DRM_I915_COMPRESS_ERROR=y
-# CONFIG_DRM_I915_DEBUG is not set
-# CONFIG_DRM_I915_DEBUG_GUC is not set
-# CONFIG_DRM_I915_DEBUG_MMIO is not set
-# CONFIG_DRM_I915_DEBUG_RUNTIME_PM is not set
-# CONFIG_DRM_I915_DEBUG_VBLANK_EVADE is not set
-CONFIG_DRM_I915_FENCE_TIMEOUT=10000
-CONFIG_DRM_I915_FORCE_PROBE=""
-CONFIG_DRM_I915_HEARTBEAT_INTERVAL=2500
-# CONFIG_DRM_I915_LOW_LEVEL_TRACEPOINTS is not set
-CONFIG_DRM_I915_MAX_REQUEST_BUSYWAIT=8000
-CONFIG_DRM_I915_PREEMPT_TIMEOUT=640
-CONFIG_DRM_I915_REQUEST_TIMEOUT=20000
-# CONFIG_DRM_I915_SELFTEST is not set
-CONFIG_DRM_I915_STOP_TIMEOUT=100
-# CONFIG_DRM_I915_SW_FENCE_CHECK_DAG is not set
-# CONFIG_DRM_I915_SW_FENCE_DEBUG_OBJECTS is not set
-CONFIG_DRM_I915_TIMESLICE_DURATION=1
-CONFIG_DRM_I915_USERFAULT_AUTOSUSPEND=250
-CONFIG_DRM_I915_USERPTR=y
-# CONFIG_DRM_I915_WERROR is not set
-CONFIG_DRM_KMS_HELPER=y
-CONFIG_DRM_MIPI_DSI=y
-CONFIG_DRM_PANEL=y
-CONFIG_DRM_PANEL_BRIDGE=y
-CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y
-CONFIG_DRM_TTM=y
-CONFIG_DRM_TTM_HELPER=y
-CONFIG_DRM_VIRTIO_GPU=y
-CONFIG_DRM_VRAM_HELPER=y
 CONFIG_EFI=y
 CONFIG_EFIVAR_FS=m
 # CONFIG_EFI_BOOTLOADER_CONTROL is not set
diff --git a/target/linux/x86/legacy/config-5.10 b/target/linux/x86/legacy/config-5.10
index e5284822a5..0b19b2f93e 100644
--- a/target/linux/x86/legacy/config-5.10
+++ b/target/linux/x86/legacy/config-5.10
@@ -36,46 +36,6 @@  CONFIG_CRYPTO_BLAKE2S=y
 CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
 CONFIG_DMA_ACPI=y
 CONFIG_DMA_SHARED_BUFFER=y
-CONFIG_DRM=y
-CONFIG_DRM_AMDGPU=y
-# CONFIG_DRM_AMD_DC is not set
-CONFIG_DRM_BOCHS=y
-CONFIG_DRM_BRIDGE=y
-CONFIG_DRM_FBDEV_EMULATION=y
-CONFIG_DRM_FBDEV_OVERALLOC=100
-CONFIG_DRM_I915=y
-CONFIG_DRM_I915_CAPTURE_ERROR=y
-CONFIG_DRM_I915_COMPRESS_ERROR=y
-# CONFIG_DRM_I915_DEBUG is not set
-# CONFIG_DRM_I915_DEBUG_GUC is not set
-# CONFIG_DRM_I915_DEBUG_MMIO is not set
-# CONFIG_DRM_I915_DEBUG_RUNTIME_PM is not set
-# CONFIG_DRM_I915_DEBUG_VBLANK_EVADE is not set
-CONFIG_DRM_I915_FENCE_TIMEOUT=10000
-CONFIG_DRM_I915_FORCE_PROBE=""
-CONFIG_DRM_I915_HEARTBEAT_INTERVAL=2500
-# CONFIG_DRM_I915_LOW_LEVEL_TRACEPOINTS is not set
-CONFIG_DRM_I915_MAX_REQUEST_BUSYWAIT=8000
-CONFIG_DRM_I915_PREEMPT_TIMEOUT=640
-# CONFIG_DRM_I915_SELFTEST is not set
-CONFIG_DRM_I915_STOP_TIMEOUT=100
-# CONFIG_DRM_I915_SW_FENCE_CHECK_DAG is not set
-# CONFIG_DRM_I915_SW_FENCE_DEBUG_OBJECTS is not set
-CONFIG_DRM_I915_TIMESLICE_DURATION=1
-CONFIG_DRM_I915_USERFAULT_AUTOSUSPEND=250
-CONFIG_DRM_I915_USERPTR=y
-# CONFIG_DRM_I915_WERROR is not set
-CONFIG_DRM_KMS_FB_HELPER=y
-CONFIG_DRM_KMS_HELPER=y
-CONFIG_DRM_MIPI_DSI=y
-CONFIG_DRM_PANEL=y
-CONFIG_DRM_PANEL_BRIDGE=y
-CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y
-CONFIG_DRM_RADEON=y
-CONFIG_DRM_SCHED=y
-CONFIG_DRM_TTM=y
-CONFIG_DRM_TTM_HELPER=y
-CONFIG_DRM_VRAM_HELPER=y
 # CONFIG_EL3 is not set
 CONFIG_FB=y
 CONFIG_FB_CFB_COPYAREA=y
diff --git a/target/linux/x86/legacy/config-5.15 b/target/linux/x86/legacy/config-5.15
index 7e943138d4..76df106209 100644
--- a/target/linux/x86/legacy/config-5.15
+++ b/target/linux/x86/legacy/config-5.15
@@ -39,46 +39,6 @@  CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
 # CONFIG_CS89x0_ISA is not set
 CONFIG_DMA_ACPI=y
 CONFIG_DMA_SHARED_BUFFER=y
-CONFIG_DRM=y
-CONFIG_DRM_AMDGPU=y
-# CONFIG_DRM_AMD_DC is not set
-CONFIG_DRM_BOCHS=y
-CONFIG_DRM_BRIDGE=y
-CONFIG_DRM_FBDEV_EMULATION=y
-CONFIG_DRM_FBDEV_OVERALLOC=100
-CONFIG_DRM_I915=y
-CONFIG_DRM_I915_CAPTURE_ERROR=y
-CONFIG_DRM_I915_COMPRESS_ERROR=y
-# CONFIG_DRM_I915_DEBUG is not set
-# CONFIG_DRM_I915_DEBUG_GUC is not set
-# CONFIG_DRM_I915_DEBUG_MMIO is not set
-# CONFIG_DRM_I915_DEBUG_RUNTIME_PM is not set
-# CONFIG_DRM_I915_DEBUG_VBLANK_EVADE is not set
-CONFIG_DRM_I915_FENCE_TIMEOUT=10000
-CONFIG_DRM_I915_FORCE_PROBE=""
-CONFIG_DRM_I915_HEARTBEAT_INTERVAL=2500
-# CONFIG_DRM_I915_LOW_LEVEL_TRACEPOINTS is not set
-CONFIG_DRM_I915_MAX_REQUEST_BUSYWAIT=8000
-CONFIG_DRM_I915_PREEMPT_TIMEOUT=640
-CONFIG_DRM_I915_REQUEST_TIMEOUT=20000
-# CONFIG_DRM_I915_SELFTEST is not set
-CONFIG_DRM_I915_STOP_TIMEOUT=100
-# CONFIG_DRM_I915_SW_FENCE_CHECK_DAG is not set
-# CONFIG_DRM_I915_SW_FENCE_DEBUG_OBJECTS is not set
-CONFIG_DRM_I915_TIMESLICE_DURATION=1
-CONFIG_DRM_I915_USERFAULT_AUTOSUSPEND=250
-CONFIG_DRM_I915_USERPTR=y
-# CONFIG_DRM_I915_WERROR is not set
-CONFIG_DRM_KMS_HELPER=y
-CONFIG_DRM_MIPI_DSI=y
-CONFIG_DRM_PANEL=y
-CONFIG_DRM_PANEL_BRIDGE=y
-CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y
-CONFIG_DRM_RADEON=y
-CONFIG_DRM_SCHED=y
-CONFIG_DRM_TTM=y
-CONFIG_DRM_TTM_HELPER=y
-CONFIG_DRM_VRAM_HELPER=y
 # CONFIG_EL3 is not set
 CONFIG_FB=y
 CONFIG_FB_CFB_COPYAREA=y