diff --git a/docs/skills/kernel-cache.md b/docs/skills/kernel-cache.md index d1e0014b..097f24d1 100644 --- a/docs/skills/kernel-cache.md +++ b/docs/skills/kernel-cache.md @@ -148,11 +148,19 @@ open, and the gaming flavors failed the ISO test on a black screen with kernel, came up through `simpledrm`. The script enables `SYSFB_SIMPLEFB` and `DRM_SIMPLEDRM` (the firmware framebuffer as a KMS device on any hardware), plus `DRM_VIRTIO_GPU` and `DRM_BOCHS` for VMs, and gates on `DRM_SIMPLEDRM` -like the filesystem options. Native drivers for real gaming GPUs (amdgpu, xe) -are not enabled yet: they need linux-firmware in the image, which the install -set does not carry (projectbluefin/utah#97). When diagnosing a black live -session, compare `live-serial.log` for `[drm] Initialized` lines between the -`main` and `gaming` diagnostics artifacts before reading GDM logs. +like the filesystem options. + +Native GPU drivers for real gaming hardware are built as modules: `DRM_AMDGPU` +(with Display Core, `DRM_AMD_DC`) for AMD GPUs and `DRM_XE` for Intel Arc and +Battlemage, both gated in `required_config`. `DRM_NOUVEAU` is omitted because +the NVIDIA flavors use the proprietary module. Runtime firmware blobs +(`amd-gpu-firmware`, `intel-gpu-firmware`) are tracked in projectbluefin/utah#97 +and are not yet carried by the base install set. When diagnosing display issues on +real hardware, verify whether the installed gaming flavor initializes its native +driver (`[drm] Initialized amdgpu` in the journal) or falls back to +`simpledrm` if firmware is absent. When diagnosing a black live session, compare `live-serial.log` +for `[drm] Initialized` lines between the `main` and `gaming` diagnostics +artifacts before reading GDM logs. ```bash just kernel-cache-tag diff --git a/scripts/install-ogc-kernel.sh b/scripts/install-ogc-kernel.sh index 2459391e..9d19438b 100644 --- a/scripts/install-ogc-kernel.sh +++ b/scripts/install-ogc-kernel.sh @@ -49,7 +49,8 @@ required_config=(SCHED_CLASS_EXT NTSYNC ANDROID_BINDERFS OVERLAY_FS SQUASHFS SQUASHFS_ZSTD EROFS_FS BTRFS_FS BLK_DEV_LOOP ISO9660_FS BLK_DEV_DM DM_SNAPSHOT DM_CRYPT CRYPTO_XTS FUSE_FS FS_VERITY - SYSFB_SIMPLEFB DRM_SIMPLEDRM) + SYSFB_SIMPLEFB DRM_SIMPLEDRM + DRM_AMDGPU DRM_XE) verify_config() { local config="$1" symbol for symbol in "${required_config[@]}"; do @@ -148,12 +149,15 @@ scripts/config --module OVERLAY_FS --module SQUASHFS --enable SQUASHFS_ZSTD \ --enable FS_VERITY # The firmware framebuffer as a KMS device (see required_config above), plus # the two paravirtual GPUs QEMU offers, so a VM gets a proper display rather -# than the boot framebuffer. Native GPU drivers for real gaming hardware -# (amdgpu, xe) are a separate decision: they need linux-firmware in the image, -# which the install set does not carry yet (projectbluefin/utah#97). +# than the boot framebuffer. Native GPU drivers for real gaming hardware: +# amdgpu (with Display Core) for AMD GPUs and xe for Intel Arc / Battlemage. +# Note: runtime firmware blobs (amd-gpu-firmware, intel-gpu-firmware) are tracked +# in projectbluefin/utah#97; enabling driver modules here prepares the kernel build. +# DRM_NOUVEAU is omitted because the nvidia flavors use the proprietary module. scripts/config --enable SYSFB --enable SYSFB_SIMPLEFB \ --enable DRM --enable DRM_SIMPLEDRM \ - --module DRM_VIRTIO_GPU --module DRM_BOCHS + --module DRM_VIRTIO_GPU --module DRM_BOCHS \ + --module DRM_AMDGPU --enable DRM_AMD_DC --module DRM_XE scripts/config --set-str LOCALVERSION "-ogc1" --disable LOCALVERSION_AUTO make olddefconfig @@ -174,6 +178,8 @@ require_config '^CONFIG_SCHED_CLASS_EXT=y$' CONFIG_SCHED_CLASS_EXT require_config '^CONFIG_NTSYNC=(y|m)$' CONFIG_NTSYNC require_config '^CONFIG_ANDROID_BINDERFS=y$' CONFIG_ANDROID_BINDERFS require_config '^CONFIG_DRM_SIMPLEDRM=y$' CONFIG_DRM_SIMPLEDRM +require_config '^CONFIG_DRM_AMDGPU=(y|m)$' CONFIG_DRM_AMDGPU +require_config '^CONFIG_DRM_XE=(y|m)$' CONFIG_DRM_XE verify_config .config make modules_prepare diff --git a/tests/test_iso_ci.py b/tests/test_iso_ci.py index b0f35a9a..e5ba254a 100644 --- a/tests/test_iso_ci.py +++ b/tests/test_iso_ci.py @@ -72,7 +72,8 @@ def test_ogc_config_gate_rejects_each_missing_live_boot_feature(self): names = gate.split("(", 1)[1].split(")", 1)[0].split() for required in ["OVERLAY_FS", "SQUASHFS", "SQUASHFS_ZSTD", "EROFS_FS", "BLK_DEV_LOOP", "DM_SNAPSHOT", "DM_CRYPT", "CRYPTO_XTS", - "FUSE_FS", "FS_VERITY", "SYSFB_SIMPLEFB", "DRM_SIMPLEDRM"]: + "FUSE_FS", "FS_VERITY", "SYSFB_SIMPLEFB", "DRM_SIMPLEDRM", + "DRM_AMDGPU", "DRM_XE"]: self.assertIn(required, names) self.assertRegex(script, rf"--(?:enable|module) {required}(?:\s|$)") self.assertEqual(script.count("verify_config /usr/lib/utah/ogc-kernel.config"), 2)