Skip to content

Commit e2c2d75

Browse files
harshimogalapallijfvogel
harshimogalapalli
authored and
jfvogel
committed
uek-rpm: Replace legacy FBDEV drivers with simpledrm and fbdev emulation layer
Orabug: 37638881 Overall config changes in this patch are: -FB_SIMPLE y DRM m -> y DRM_GEM_SHMEM_HELPER m -> y DRM_KMS_HELPER m -> y DRM_SIMPLEDRM n -> y FB_EFI y -> n SYSFB_SIMPLEFB n -> y Signed-off-by: Harshit Mogalapalli <[email protected]> Reviewed-by: Darren Kenny <[email protected]> Conflicts: uek-rpm/ol10/config-aarch64 uek-rpm/ol9/config-aarch64 Caused by earlier gcov commit, just simple merge. Signed-off-by: Jack Vogel <[email protected]>
1 parent 0a5b570 commit e2c2d75

10 files changed

+32
-22
lines changed

‎uek-rpm/ol10/config-aarch64

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1924,7 +1924,7 @@ CONFIG_DVB_DUMMY_FE=m
19241924
CONFIG_AUXDISPLAY=y
19251925
CONFIG_HD44780=m
19261926
CONFIG_HT16K33=m
1927-
CONFIG_DRM=m
1927+
CONFIG_DRM=y
19281928
CONFIG_DRM_LOAD_EDID_FIRMWARE=y
19291929
CONFIG_DRM_I2C_NXP_TDA998X=m
19301930
CONFIG_DRM_HDLCD=m
@@ -1990,7 +1990,7 @@ CONFIG_DRM_PL111=m
19901990
CONFIG_DRM_GUD=m
19911991
CONFIG_DRM_HYPERV=m
19921992
CONFIG_FB=y
1993-
CONFIG_FB_EFI=y
1993+
# CONFIG_FB_EFI is not set
19941994
CONFIG_FB_VIRTUAL=m
19951995
CONFIG_FB_HYPERV=m
19961996
CONFIG_FB_SIMPLE=y
@@ -3069,3 +3069,5 @@ CONFIG_USB_XHCI_PCI_RENESAS=m
30693069
CONFIG_XFS_ONLINE_REPAIR=y
30703070
CONFIG_MICROSOFT_MANA=m
30713071
CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
3072+
CONFIG_DRM_SIMPLEDRM=y
3073+
CONFIG_SYSFB_SIMPLEFB=y

‎uek-rpm/ol10/config-aarch64-debug

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1925,7 +1925,7 @@ CONFIG_DVB_DUMMY_FE=m
19251925
CONFIG_AUXDISPLAY=y
19261926
CONFIG_HD44780=m
19271927
CONFIG_HT16K33=m
1928-
CONFIG_DRM=m
1928+
CONFIG_DRM=y
19291929
CONFIG_DRM_LOAD_EDID_FIRMWARE=y
19301930
CONFIG_DRM_I2C_NXP_TDA998X=m
19311931
CONFIG_DRM_HDLCD=m
@@ -1991,7 +1991,7 @@ CONFIG_DRM_PL111=m
19911991
CONFIG_DRM_GUD=m
19921992
CONFIG_DRM_HYPERV=m
19931993
CONFIG_FB=y
1994-
CONFIG_FB_EFI=y
1994+
# CONFIG_FB_EFI is not set
19951995
CONFIG_FB_VIRTUAL=m
19961996
CONFIG_FB_HYPERV=m
19971997
CONFIG_FB_SIMPLE=y
@@ -3085,3 +3085,5 @@ CONFIG_TEST_BPF=m
30853085
CONFIG_USB_XHCI_PCI_RENESAS=m
30863086
CONFIG_XFS_ONLINE_REPAIR=y
30873087
CONFIG_MICROSOFT_MANA=m
3088+
CONFIG_DRM_SIMPLEDRM=y
3089+
CONFIG_SYSFB_SIMPLEFB=y

‎uek-rpm/ol10/config-x86_64

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1044,6 +1044,8 @@ CONFIG_MLX5_SF=y
10441044
CONFIG_MLXFW=m
10451045
# CONFIG_NET_VENDOR_META is not set
10461046
CONFIG_MICROSOFT_MANA=m
1047+
CONFIG_DRM_SIMPLEDRM=y
1048+
CONFIG_SYSFB_SIMPLEFB=y
10471049
CONFIG_MYRI10GE=m
10481050
# CONFIG_NET_VENDOR_NATSEMI is not set
10491051
CONFIG_S2IO=m
@@ -1871,7 +1873,7 @@ CONFIG_AGP_INTEL=y
18711873
CONFIG_AGP_SIS=y
18721874
CONFIG_AGP_VIA=y
18731875
CONFIG_VGA_SWITCHEROO=y
1874-
CONFIG_DRM=m
1876+
CONFIG_DRM=y
18751877
CONFIG_DRM_LOAD_EDID_FIRMWARE=y
18761878
CONFIG_DRM_I2C_NXP_TDA998X=m
18771879
CONFIG_DRM_RADEON=m
@@ -1901,7 +1903,7 @@ CONFIG_FB=y
19011903
CONFIG_FB_CIRRUS=m
19021904
CONFIG_FB_VGA16=m
19031905
CONFIG_FB_VESA=y
1904-
CONFIG_FB_EFI=y
1906+
# CONFIG_FB_EFI is not set
19051907
CONFIG_FB_NVIDIA=m
19061908
CONFIG_FB_NVIDIA_I2C=y
19071909
CONFIG_FB_RIVA=m

‎uek-rpm/ol10/config-x86_64-debug

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1054,6 +1054,8 @@ CONFIG_MLX5_SF=y
10541054
CONFIG_MLXFW=m
10551055
# CONFIG_NET_VENDOR_META is not set
10561056
CONFIG_MICROSOFT_MANA=m
1057+
CONFIG_DRM_SIMPLEDRM=y
1058+
CONFIG_SYSFB_SIMPLEFB=y
10571059
CONFIG_MYRI10GE=m
10581060
# CONFIG_NET_VENDOR_NATSEMI is not set
10591061
CONFIG_S2IO=m
@@ -1884,7 +1886,7 @@ CONFIG_AGP_INTEL=y
18841886
CONFIG_AGP_SIS=y
18851887
CONFIG_AGP_VIA=y
18861888
CONFIG_VGA_SWITCHEROO=y
1887-
CONFIG_DRM=m
1889+
CONFIG_DRM=y
18881890
CONFIG_DRM_LOAD_EDID_FIRMWARE=y
18891891
CONFIG_DRM_I2C_NXP_TDA998X=m
18901892
CONFIG_DRM_RADEON=m
@@ -1914,7 +1916,7 @@ CONFIG_FB=y
19141916
CONFIG_FB_CIRRUS=m
19151917
CONFIG_FB_VGA16=m
19161918
CONFIG_FB_VESA=y
1917-
CONFIG_FB_EFI=y
1919+
# CONFIG_FB_EFI is not set
19181920
CONFIG_FB_NVIDIA=m
19191921
CONFIG_FB_NVIDIA_I2C=y
19201922
CONFIG_FB_RIVA=m

‎uek-rpm/ol10/modules.yaml.S

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,9 +112,6 @@ modules-core:
112112
- dm-writecache
113113
- dm-zero
114114
- dns_resolver
115-
- drm
116-
- drm_kms_helper
117-
- drm_shmem_helper
118115
- drm_ttm_helper
119116
- drm_vram_helper
120117
- dummy

‎uek-rpm/ol9/config-aarch64

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1930,7 +1930,7 @@ CONFIG_DVB_DUMMY_FE=m
19301930
CONFIG_AUXDISPLAY=y
19311931
CONFIG_HD44780=m
19321932
CONFIG_HT16K33=m
1933-
CONFIG_DRM=m
1933+
CONFIG_DRM=y
19341934
CONFIG_DRM_LOAD_EDID_FIRMWARE=y
19351935
CONFIG_DRM_I2C_NXP_TDA998X=m
19361936
CONFIG_DRM_HDLCD=m
@@ -1996,7 +1996,7 @@ CONFIG_DRM_PL111=m
19961996
CONFIG_DRM_GUD=m
19971997
CONFIG_DRM_HYPERV=m
19981998
CONFIG_FB=y
1999-
CONFIG_FB_EFI=y
1999+
# CONFIG_FB_EFI is not set
20002000
CONFIG_FB_VIRTUAL=m
20012001
CONFIG_FB_HYPERV=m
20022002
CONFIG_FB_SIMPLE=y
@@ -3075,3 +3075,5 @@ CONFIG_USB_XHCI_PCI_RENESAS=m
30753075
CONFIG_XFS_ONLINE_REPAIR=y
30763076
CONFIG_MICROSOFT_MANA=m
30773077
CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
3078+
CONFIG_DRM_SIMPLEDRM=y
3079+
CONFIG_SYSFB_SIMPLEFB=y

‎uek-rpm/ol9/config-aarch64-debug

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1931,7 +1931,7 @@ CONFIG_DVB_DUMMY_FE=m
19311931
CONFIG_AUXDISPLAY=y
19321932
CONFIG_HD44780=m
19331933
CONFIG_HT16K33=m
1934-
CONFIG_DRM=m
1934+
CONFIG_DRM=y
19351935
CONFIG_DRM_LOAD_EDID_FIRMWARE=y
19361936
CONFIG_DRM_I2C_NXP_TDA998X=m
19371937
CONFIG_DRM_HDLCD=m
@@ -1997,7 +1997,7 @@ CONFIG_DRM_PL111=m
19971997
CONFIG_DRM_GUD=m
19981998
CONFIG_DRM_HYPERV=m
19991999
CONFIG_FB=y
2000-
CONFIG_FB_EFI=y
2000+
# CONFIG_FB_EFI is not set
20012001
CONFIG_FB_VIRTUAL=m
20022002
CONFIG_FB_HYPERV=m
20032003
CONFIG_FB_SIMPLE=y
@@ -3091,3 +3091,5 @@ CONFIG_TEST_BPF=m
30913091
CONFIG_USB_XHCI_PCI_RENESAS=m
30923092
CONFIG_XFS_ONLINE_REPAIR=y
30933093
CONFIG_MICROSOFT_MANA=m
3094+
CONFIG_DRM_SIMPLEDRM=y
3095+
CONFIG_SYSFB_SIMPLEFB=y

‎uek-rpm/ol9/config-x86_64

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1050,6 +1050,8 @@ CONFIG_MLX5_SF=y
10501050
CONFIG_MLXFW=m
10511051
# CONFIG_NET_VENDOR_META is not set
10521052
CONFIG_MICROSOFT_MANA=m
1053+
CONFIG_DRM_SIMPLEDRM=y
1054+
CONFIG_SYSFB_SIMPLEFB=y
10531055
CONFIG_MYRI10GE=m
10541056
# CONFIG_NET_VENDOR_NATSEMI is not set
10551057
CONFIG_S2IO=m
@@ -1877,7 +1879,7 @@ CONFIG_AGP_INTEL=y
18771879
CONFIG_AGP_SIS=y
18781880
CONFIG_AGP_VIA=y
18791881
CONFIG_VGA_SWITCHEROO=y
1880-
CONFIG_DRM=m
1882+
CONFIG_DRM=y
18811883
CONFIG_DRM_LOAD_EDID_FIRMWARE=y
18821884
CONFIG_DRM_I2C_NXP_TDA998X=m
18831885
CONFIG_DRM_RADEON=m
@@ -1907,7 +1909,7 @@ CONFIG_FB=y
19071909
CONFIG_FB_CIRRUS=m
19081910
CONFIG_FB_VGA16=m
19091911
CONFIG_FB_VESA=y
1910-
CONFIG_FB_EFI=y
1912+
# CONFIG_FB_EFI is not set
19111913
CONFIG_FB_NVIDIA=m
19121914
CONFIG_FB_NVIDIA_I2C=y
19131915
CONFIG_FB_RIVA=m

‎uek-rpm/ol9/config-x86_64-debug

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1060,6 +1060,8 @@ CONFIG_MLX5_SF=y
10601060
CONFIG_MLXFW=m
10611061
# CONFIG_NET_VENDOR_META is not set
10621062
CONFIG_MICROSOFT_MANA=m
1063+
CONFIG_DRM_SIMPLEDRM=y
1064+
CONFIG_SYSFB_SIMPLEFB=y
10631065
CONFIG_MYRI10GE=m
10641066
# CONFIG_NET_VENDOR_NATSEMI is not set
10651067
CONFIG_S2IO=m
@@ -1890,7 +1892,7 @@ CONFIG_AGP_INTEL=y
18901892
CONFIG_AGP_SIS=y
18911893
CONFIG_AGP_VIA=y
18921894
CONFIG_VGA_SWITCHEROO=y
1893-
CONFIG_DRM=m
1895+
CONFIG_DRM=y
18941896
CONFIG_DRM_LOAD_EDID_FIRMWARE=y
18951897
CONFIG_DRM_I2C_NXP_TDA998X=m
18961898
CONFIG_DRM_RADEON=m
@@ -1920,7 +1922,7 @@ CONFIG_FB=y
19201922
CONFIG_FB_CIRRUS=m
19211923
CONFIG_FB_VGA16=m
19221924
CONFIG_FB_VESA=y
1923-
CONFIG_FB_EFI=y
1925+
# CONFIG_FB_EFI is not set
19241926
CONFIG_FB_NVIDIA=m
19251927
CONFIG_FB_NVIDIA_I2C=y
19261928
CONFIG_FB_RIVA=m

‎uek-rpm/ol9/modules.yaml.S

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,9 +112,6 @@ modules-core:
112112
- dm-writecache
113113
- dm-zero
114114
- dns_resolver
115-
- drm
116-
- drm_kms_helper
117-
- drm_shmem_helper
118115
- drm_ttm_helper
119116
- drm_vram_helper
120117
- dummy

0 commit comments

Comments
 (0)