Skip to content

Commit

Permalink
config-mpi: Disable frame buffer drivers
Browse files Browse the repository at this point in the history 
We only have devices supported by the Simple DRM driver, or build the
DRM drivers already.
  • Loading branch information
@pmenzel @donald
pmenzel authored and donald committed Aug 29, 2023
1 parent 33fd657 commit f3ba607
Showing 1 changed file with 1 addition and 28 deletions.
29 changes: 1 addition & 28 deletions config-mpi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -551,6 +551,7 @@ CONFIG_USB_NET_DM9601=m
CONFIG_INPUT_FF_MEMLESS=y
CONFIG_INPUT_EVDEV=y
# CONFIG_SERIO_SERPORT is not set
CONFIG_VT_HW_CONSOLE_BINDING=y
# CONFIG_LEGACY_PTYS is not set
CONFIG_SERIAL_8250=y
# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
Expand Down Expand Up @@ -631,24 +632,6 @@ CONFIG_DRM_MGAG200=m
CONFIG_DRM_BOCHS=m
CONFIG_DRM_CIRRUS_QEMU=m
CONFIG_DRM_SIMPLEDRM=y
CONFIG_FB=y
CONFIG_FB_CIRRUS=m
CONFIG_FB_PM2=m
CONFIG_FB_CYBER2000=m
CONFIG_FB_ARC=m
CONFIG_FB_VGA16=m
CONFIG_FB_EFI=y
CONFIG_FB_NVIDIA=m
CONFIG_FB_NVIDIA_I2C=y
CONFIG_FB_NVIDIA_DEBUG=y
CONFIG_FB_I740=m
CONFIG_FB_LE80578=m
CONFIG_FB_CARILLO_RANCH=m
CONFIG_FB_RADEON=m
CONFIG_FB_RADEON_DEBUG=y
CONFIG_FB_SMSCUFX=m
CONFIG_FB_UDL=m
CONFIG_FB_IBM_GXT4500=m
CONFIG_BACKLIGHT_CLASS_DEVICE=y
CONFIG_BACKLIGHT_APPLE=m
CONFIG_BACKLIGHT_SAHARA=m
Expand Down Expand Up @@ -829,16 +812,6 @@ CONFIG_X509_CERTIFICATE_PARSER=m
CONFIG_PKCS7_MESSAGE_PARSER=m
CONFIG_CRC16=y
CONFIG_CRC_ITU_T=y
CONFIG_FONTS=y
CONFIG_FONT_8x8=y
CONFIG_FONT_7x14=y
CONFIG_FONT_PEARL_8x8=y
CONFIG_FONT_ACORN_8x8=y
CONFIG_FONT_MINI_4x6=y
CONFIG_FONT_10x18=y
CONFIG_FONT_SUN8x16=y
CONFIG_FONT_SUN12x22=y
CONFIG_FONT_TER16x32=y
CONFIG_PRINTK_TIME=y
CONFIG_DYNAMIC_DEBUG=y
CONFIG_DEBUG_KERNEL=y
Expand Down

7 comments on commit f3ba607

@donald
Copy link
Contributor

@donald donald commented on f3ba607 Sep 8, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like this destroyed our qemu vnc server.

@donald
Copy link
Contributor

@donald donald commented on f3ba607 Sep 8, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, reverting the commit restores the console on the vnc display. Is the commit just a cleanup or required to avoid some mode switch on hardware?

@pmenzel
Copy link
Contributor Author

@pmenzel pmenzel commented on f3ba607 Sep 8, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry about that, it was supposed to be a cleanup.

No idea, why it doesn’t work, as there is a Bochs DRM driver.

@pmenzel
Copy link
Contributor Author

@pmenzel pmenzel commented on f3ba607 Sep 8, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Non-working (no fbcon):

[    1.753182] bochs-drm 0000:00:02.0: vgaarb: deactivate vga console
[    1.760518] Console: switching to colour dummy device 80x25
[    1.761660] [drm] Found bochs VGA, ID 0xb0c5.
[    1.762618] [drm] Framebuffer size 16384 kB @ 0xfd000000, mmio @ 0xfebd0000.
[    1.766553] [drm] Found EDID data blob.
[    1.767442] [drm] Initialized bochs-drm 1.0.0 20130925 for 0000:00:02.0 on minor 0

Working (with fbcon):

[    0.000000] Linux version 6.5.2.mx64.428-00118-g2bb542eff7d5 (buczek@dose.molgen.mpg.de) (gcc (GCC) 10.4.0, GNU ld (GNU Binutils) 2.41) #49 SMP PREEMPT_DYNAMIC Fri Sep  8 11:29:40 CEST 2023
[…]
[    1.774569] bochs-drm 0000:00:02.0: vgaarb: deactivate vga console
[    1.881464] Console: switching to colour dummy device 80x25
[    1.882069] [drm] Found bochs VGA, ID 0xb0c5.
[    1.883935] [drm] Framebuffer size 16384 kB @ 0xfd000000, mmio @ 0xfebd0000.
[    1.885523] [drm] Found EDID data blob.
[    1.886042] [drm] Initialized bochs-drm 1.0.0 20130925 for 0000:00:02.0 on minor 0
[    1.888123] fbcon: bochs-drmdrmfb (fb0) is primary device
[    1.895255] Console: switching to colour frame buffer device 160x50
[    1.901041] bochs-drm 0000:00:02.0: [drm] fb0: bochs-drmdrmfb frame buffer device

@donald
Copy link
Contributor

@donald donald commented on f3ba607 Sep 8, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We only need CONFIG_FB=y for the vnc console to work, no other CONFIG_FB_, no CONFIG_FONTS_ .
CONFIG_VT_HW_CONSOLE_BINDING=y can be removed, because it is implied.

Do you see any disadvantage to re-add CONFIG_FB=y ?

Setting "CONFIG_FB=m" (which adds CONFIG_FRAMEBUFFER_CONSOLE=y, CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y) does not seem to work.

@pmenzel
Copy link
Contributor Author

@pmenzel pmenzel commented on f3ba607 Sep 8, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, no advantages. We need to use it anyway, as CONFIG_FB_EFI=y needs to be added back for the Nvidia graphics devices. :/

@donald
Copy link
Contributor

@donald donald commented on f3ba607 Sep 8, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Corrections are in the linux-6.5.2-mpi branch.

https://github.molgen.mpg.de/mariux64/linux/tree/linux-6.5.2-mpi

Please sign in to comment.