Skip to content

Commit 33267b4

Browse files
PlaidCatPlaidCat
committed
[CIQ] v6.12.19 - rebased configs
These are all default options that are extending other selections already present in our configs. FW_CACHE is enabled ddue to PM_SLEEP being enabled in all kernels drm/nouveau: select FW caching Upstream commit 6b481ab DRM_CLIENT_SELECTION is enabled due to this change for nouveau drm/nouveau: Run DRM default client setup Upstream commit ef35089 DRM_CLIENT_SETUP is selected if DRM_CLIENT_SELECTION is selected and if DRM_FBDEV_EMULATION is selected which is selected in all configs drm: Add client-agnostic setup helper Upstream comimt d07fdf9
1 parent 9218707 commit 33267b4

File tree

6 files changed

+24
-12
lines changed

6 files changed

+24
-12
lines changed

‎ciq/configs/kernel-aarch64-64k-debug.config‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#
22
# Automatically generated file; DO NOT EDIT.
3-
# Linux/arm64 6.12.17 Kernel Configuration
3+
# Linux/arm64 6.12.19 Kernel Configuration
44
#
55
CONFIG_CC_VERSION_TEXT="gcc (scripts/dummy-tools/gcc)"
66
CONFIG_CC_IS_GCC=y
@@ -2114,7 +2114,7 @@ CONFIG_EXTRA_FIRMWARE=""
21142114
CONFIG_FW_LOADER_COMPRESS=y
21152115
CONFIG_FW_LOADER_COMPRESS_XZ=y
21162116
# CONFIG_FW_LOADER_COMPRESS_ZSTD is not set
2117-
# CONFIG_FW_CACHE is not set
2117+
CONFIG_FW_CACHE=y
21182118
CONFIG_FW_UPLOAD=y
21192119
# end of Firmware loader
21202120

@@ -5301,6 +5301,8 @@ CONFIG_DRM_KMS_HELPER=y
53015301
# CONFIG_DRM_PANIC is not set
53025302
# CONFIG_DRM_DEBUG_DP_MST_TOPOLOGY_REFS is not set
53035303
# CONFIG_DRM_DEBUG_MODESET_LOCK is not set
5304+
CONFIG_DRM_CLIENT_SELECTION=y
5305+
CONFIG_DRM_CLIENT_SETUP=y
53045306
CONFIG_DRM_FBDEV_EMULATION=y
53055307
CONFIG_DRM_FBDEV_OVERALLOC=100
53065308
# CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM is not set

‎ciq/configs/kernel-aarch64-64k.config‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#
22
# Automatically generated file; DO NOT EDIT.
3-
# Linux/arm64 6.12.17 Kernel Configuration
3+
# Linux/arm64 6.12.19 Kernel Configuration
44
#
55
CONFIG_CC_VERSION_TEXT="gcc (scripts/dummy-tools/gcc)"
66
CONFIG_CC_IS_GCC=y
@@ -2110,7 +2110,7 @@ CONFIG_EXTRA_FIRMWARE=""
21102110
CONFIG_FW_LOADER_COMPRESS=y
21112111
CONFIG_FW_LOADER_COMPRESS_XZ=y
21122112
# CONFIG_FW_LOADER_COMPRESS_ZSTD is not set
2113-
# CONFIG_FW_CACHE is not set
2113+
CONFIG_FW_CACHE=y
21142114
CONFIG_FW_UPLOAD=y
21152115
# end of Firmware loader
21162116

@@ -5285,6 +5285,8 @@ CONFIG_DRM_KMS_HELPER=y
52855285
# CONFIG_DRM_PANIC is not set
52865286
# CONFIG_DRM_DEBUG_DP_MST_TOPOLOGY_REFS is not set
52875287
# CONFIG_DRM_DEBUG_MODESET_LOCK is not set
5288+
CONFIG_DRM_CLIENT_SELECTION=y
5289+
CONFIG_DRM_CLIENT_SETUP=y
52885290
CONFIG_DRM_FBDEV_EMULATION=y
52895291
CONFIG_DRM_FBDEV_OVERALLOC=100
52905292
# CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM is not set

‎ciq/configs/kernel-aarch64-debug.config‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#
22
# Automatically generated file; DO NOT EDIT.
3-
# Linux/arm64 6.12.17 Kernel Configuration
3+
# Linux/arm64 6.12.19 Kernel Configuration
44
#
55
CONFIG_CC_VERSION_TEXT="gcc (scripts/dummy-tools/gcc)"
66
CONFIG_CC_IS_GCC=y
@@ -2117,7 +2117,7 @@ CONFIG_EXTRA_FIRMWARE=""
21172117
CONFIG_FW_LOADER_COMPRESS=y
21182118
CONFIG_FW_LOADER_COMPRESS_XZ=y
21192119
# CONFIG_FW_LOADER_COMPRESS_ZSTD is not set
2120-
# CONFIG_FW_CACHE is not set
2120+
CONFIG_FW_CACHE=y
21212121
CONFIG_FW_UPLOAD=y
21222122
# end of Firmware loader
21232123

@@ -5305,6 +5305,8 @@ CONFIG_DRM_KMS_HELPER=y
53055305
# CONFIG_DRM_PANIC is not set
53065306
# CONFIG_DRM_DEBUG_DP_MST_TOPOLOGY_REFS is not set
53075307
# CONFIG_DRM_DEBUG_MODESET_LOCK is not set
5308+
CONFIG_DRM_CLIENT_SELECTION=y
5309+
CONFIG_DRM_CLIENT_SETUP=y
53085310
CONFIG_DRM_FBDEV_EMULATION=y
53095311
CONFIG_DRM_FBDEV_OVERALLOC=100
53105312
# CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM is not set

‎ciq/configs/kernel-aarch64.config‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#
22
# Automatically generated file; DO NOT EDIT.
3-
# Linux/arm64 6.12.17 Kernel Configuration
3+
# Linux/arm64 6.12.19 Kernel Configuration
44
#
55
CONFIG_CC_VERSION_TEXT="gcc (scripts/dummy-tools/gcc)"
66
CONFIG_CC_IS_GCC=y
@@ -2113,7 +2113,7 @@ CONFIG_EXTRA_FIRMWARE=""
21132113
CONFIG_FW_LOADER_COMPRESS=y
21142114
CONFIG_FW_LOADER_COMPRESS_XZ=y
21152115
# CONFIG_FW_LOADER_COMPRESS_ZSTD is not set
2116-
# CONFIG_FW_CACHE is not set
2116+
CONFIG_FW_CACHE=y
21172117
CONFIG_FW_UPLOAD=y
21182118
# end of Firmware loader
21192119

@@ -5289,6 +5289,8 @@ CONFIG_DRM_KMS_HELPER=y
52895289
# CONFIG_DRM_PANIC is not set
52905290
# CONFIG_DRM_DEBUG_DP_MST_TOPOLOGY_REFS is not set
52915291
# CONFIG_DRM_DEBUG_MODESET_LOCK is not set
5292+
CONFIG_DRM_CLIENT_SELECTION=y
5293+
CONFIG_DRM_CLIENT_SETUP=y
52925294
CONFIG_DRM_FBDEV_EMULATION=y
52935295
CONFIG_DRM_FBDEV_OVERALLOC=100
52945296
# CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM is not set

‎ciq/configs/kernel-x86_64-debug.config‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#
22
# Automatically generated file; DO NOT EDIT.
3-
# Linux/x86_64 6.12.17 Kernel Configuration
3+
# Linux/x86_64 6.12.19 Kernel Configuration
44
#
55
CONFIG_CC_VERSION_TEXT="gcc (scripts/dummy-tools/gcc)"
66
CONFIG_CC_IS_GCC=y
@@ -2174,7 +2174,7 @@ CONFIG_EXTRA_FIRMWARE=""
21742174
CONFIG_FW_LOADER_COMPRESS=y
21752175
CONFIG_FW_LOADER_COMPRESS_XZ=y
21762176
# CONFIG_FW_LOADER_COMPRESS_ZSTD is not set
2177-
# CONFIG_FW_CACHE is not set
2177+
CONFIG_FW_CACHE=y
21782178
CONFIG_FW_UPLOAD=y
21792179
# end of Firmware loader
21802180

@@ -5306,6 +5306,8 @@ CONFIG_DRM_KMS_HELPER=y
53065306
# CONFIG_DRM_PANIC is not set
53075307
# CONFIG_DRM_DEBUG_DP_MST_TOPOLOGY_REFS is not set
53085308
# CONFIG_DRM_DEBUG_MODESET_LOCK is not set
5309+
CONFIG_DRM_CLIENT_SELECTION=y
5310+
CONFIG_DRM_CLIENT_SETUP=y
53095311
CONFIG_DRM_FBDEV_EMULATION=y
53105312
CONFIG_DRM_FBDEV_OVERALLOC=100
53115313
# CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM is not set

‎ciq/configs/kernel-x86_64.config‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#
22
# Automatically generated file; DO NOT EDIT.
3-
# Linux/x86_64 6.12.17 Kernel Configuration
3+
# Linux/x86_64 6.12.19 Kernel Configuration
44
#
55
CONFIG_CC_VERSION_TEXT="gcc (scripts/dummy-tools/gcc)"
66
CONFIG_CC_IS_GCC=y
@@ -2170,7 +2170,7 @@ CONFIG_EXTRA_FIRMWARE=""
21702170
CONFIG_FW_LOADER_COMPRESS=y
21712171
CONFIG_FW_LOADER_COMPRESS_XZ=y
21722172
# CONFIG_FW_LOADER_COMPRESS_ZSTD is not set
2173-
# CONFIG_FW_CACHE is not set
2173+
CONFIG_FW_CACHE=y
21742174
CONFIG_FW_UPLOAD=y
21752175
# end of Firmware loader
21762176

@@ -5290,6 +5290,8 @@ CONFIG_DRM_KMS_HELPER=y
52905290
# CONFIG_DRM_PANIC is not set
52915291
# CONFIG_DRM_DEBUG_DP_MST_TOPOLOGY_REFS is not set
52925292
# CONFIG_DRM_DEBUG_MODESET_LOCK is not set
5293+
CONFIG_DRM_CLIENT_SELECTION=y
5294+
CONFIG_DRM_CLIENT_SETUP=y
52935295
CONFIG_DRM_FBDEV_EMULATION=y
52945296
CONFIG_DRM_FBDEV_OVERALLOC=100
52955297
# CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM is not set

0 commit comments

Comments
 (0)