Skip to content

Commit 35a8b27

Browse files
committed
drm/asahi: Adapt fault_control module parameter
Signed-off-by: Janne Grunau <j@jannau.net>
1 parent 8624ca3 commit 35a8b27

3 files changed

Lines changed: 5 additions & 4 deletions

File tree

drivers/gpu/drm/asahi/asahi.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ kernel::module_platform_driver! {
4040
},
4141
fault_control: u32 {
4242
default: 0xb,
43-
permissions: 0,
43+
// permissions: 0,
4444
description: "Fault control (0x0: hard faults, 0xb: macOS default)",
4545
},
4646
initial_tvb_size: usize {

drivers/gpu/drm/asahi/file.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
use crate::debug::*;
1111
use crate::driver::AsahiDevice;
1212
use crate::{
13-
alloc, buffer, driver, gem, hw, mmu, queue,
13+
alloc, buffer, driver, gem, hw, mmu, module_parameters, queue,
1414
util::{align, align_down, RangeExt},
1515
};
1616
use core::mem::MaybeUninit;
@@ -301,7 +301,7 @@ impl File {
301301
params.firmware_version[i] = *gpu.get_dyncfg().firmware_version.get(i).unwrap_or(&0);
302302
}
303303

304-
if *crate::fault_control.read() == 0xb {
304+
if *module_parameters::fault_control.get() == 0xb {
305305
params.feat_compat |= hw::feat::compat::SOFT_FAULTS;
306306
}
307307

drivers/gpu/drm/asahi/initdata.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
use crate::f32;
1515
use crate::fw::initdata::*;
1616
use crate::fw::types::*;
17+
use crate::module_parameters;
1718
use crate::{driver::AsahiDevice, gem, gpu, hw, mmu};
1819
use kernel::error::{Error, Result};
1920
use kernel::macros::versions;
@@ -700,7 +701,7 @@ impl<'a> InitDataBuilder::ver<'a> {
700701
unk_903c: 1,
701702
#[ver(V < V13_0B4)]
702703
unk_903c: 0,
703-
fault_control: *crate::fault_control.read(),
704+
fault_control: *module_parameters::fault_control.get(),
704705
do_init: 1,
705706
progress_check_interval_3d: 40,
706707
progress_check_interval_ta: 10,

0 commit comments

Comments
 (0)