vasilito/RedBear-OS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: remove unreachable redox-drm driver match

Browse Source 
Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-openagent)

Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
This commit is contained in:
Vasilito
2026-05-07 20:53:09 +01:00
parent 612ef6ce36
commit 67b67892c5
3 changed files with 41 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
local/patches/redox-drm/P7-unreachable-pattern-cleanup.patch
+40
View File
@@ -0,0 +1,40 @@
--- a/src/drivers/mod.rs
+++ b/src/drivers/mod.rs
@@ -187,19 +187,6 @@ impl DriverRegistry {
let driver = virtio::VirtioDriver::new(full, firmware)?;
Ok(Arc::new(driver))
}
- PCI_VENDOR_ID_INTEL => {
- // Gate unsupported Intel GPU generations.
- // Only Gen12+ (Tiger Lake and newer) have validated firmware/DMC paths.
- // Older generations are rejected with a clear message.
- if !is_supported_intel_generation(full.device_id) {
- return Err(DriverError::Pci(format!(
- "Intel GPU {:#06x} at {} is Gen{} — Gen8+ (Skylake and newer) are supported; Gen4-Gen7 require different display hardware init and are not yet supported",
- full.device_id, full.location, intel_generation_name(full.device_id)
- )));
- }
- let driver = intel::IntelDriver::new(full, firmware)?;
- Ok(Arc::new(driver))
- }
_ => Err(DriverError::Pci(format!(
"unsupported GPU vendor {:#06x} at {}",
full.vendor_id, full.location
--- a/src/main.rs
+++ b/src/main.rs
@@ -279,8 +279,6 @@ const INTEL_ICL_DMC_KEYS: &[&str] = &["i915/icl_dmc_ver1_09.bin", "i915/icl_dm
const INTEL_GLK_DMC_KEYS: &[&str] = &["i915/glk_dmc_ver1_04.bin"];
const INTEL_RKL_DMC_KEYS: &[&str] = &["i915/rkl_dmc_ver2_03.bin", "i915/rkl_dmc_ver2_02.bin"];
-const INTEL_DG1_DMC_KEYS: &[&str] = &["i915/dg1_dmc_ver2_02.bin"];
-
fn intel_display_firmware_keys(device_id: u16) -> Option<&'static [&'static str]> {
match device_id {
// Gen12+ (Tiger Lake and newer)
@@ -309,8 +309,6 @@ fn intel_display_firmware_keys(device_id: u16) -> Option<&'static [&'static str]
| 0x9BCC | 0x9BE6 | 0x9BF6 => Some(INTEL_KBL_DMC_KEYS),
0x0A84 | 0x1A84 | 0x1A85 | 0x5A84 | 0x5A85 => Some(INTEL_GLK_DMC_KEYS),
- // DG1 (Gen12)
- 0x4905 | 0x4906 | 0x4907 | 0x4908 | 0x4909 => Some(INTEL_DG1_DMC_KEYS),
_ => None,
}
}
local/recipes/gpu/redox-drm/P7-unreachable-pattern-cleanup.patch
Symlink
+1
View File
@@ -0,0 +1 @@
../../../patches/redox-drm/P7-unreachable-pattern-cleanup.patch
local/recipes/gpu/redox-drm/source/src/drivers/mod.rs
-13
View File
@@ -182,19 +182,6 @@ impl DriverRegistry {
let driver = virtio::VirtioDriver::new(full, firmware)?;
Ok(Arc::new(driver))
}
PCI_VENDOR_ID_INTEL => {
// Gate unsupported Intel GPU generations.
// Only Gen12+ (Tiger Lake and newer) have validated firmware/DMC paths.
// Older generations are rejected with a clear message.
if !is_supported_intel_generation(full.device_id) {
return Err(DriverError::Pci(format!(
"Intel GPU {:#06x} at {} is Gen{} — Gen8+ (Skylake and newer) are supported; Gen4-Gen7 require different display hardware init and are not yet supported",
full.device_id, full.location, intel_generation_name(full.device_id)
)));
}
let driver = intel::IntelDriver::new(full, firmware)?;
Ok(Arc::new(driver))
}
_ => Err(DriverError::Pci(format!(
"unsupported GPU vendor {:#06x} at {}",
full.vendor_id, full.location