drm/asahi: RiiR page tables

Author: jannau

drivers/gpu/drm/asahi/alloc.rs

@@ -36,8 +36,8 @@ use crate::object::{
 use crate::util::RangeExt;
 
 use core::cmp::Ordering;
+use core::fmt;
 use core::fmt::{
-    self,
     Debug,
     Formatter, //
 };
@@ -469,7 +469,7 @@ impl RawAllocation for SimpleAllocation {
 pub(crate) struct SimpleAllocator {
     dev: AsahiDevRef,
     range: Range<u64>,
-    prot: u32,
+    prot: mmu::Prot,
     vm: mmu::Vm,
     min_align: usize,
     cpu_maps: bool,
@@ -484,7 +484,7 @@ impl SimpleAllocator {
         vm: &mmu::Vm,
         range: Range<u64>,
         min_align: usize,
-        prot: u32,
+        prot: mmu::Prot,
         _block_size: usize,
         mut cpu_maps: bool,
         _name: fmt::Arguments<'_>,
@@ -678,7 +678,7 @@ pub(crate) struct HeapAllocator {
     dev: AsahiDevRef,
     range: Range<u64>,
     top: u64,
-    prot: u32,
+    prot: mmu::Prot,
     vm: mmu::Vm,
     min_align: usize,
     block_size: usize,
@@ -698,7 +698,7 @@ impl HeapAllocator {
         vm: &mmu::Vm,
         range: Range<u64>,
         min_align: usize,
-        prot: u32,
+        prot: mmu::Prot,
         block_size: usize,
         mut cpu_maps: bool,
         name: fmt::Arguments<'_>,

drivers/gpu/drm/asahi/asahi.rs

@@ -20,6 +20,7 @@ mod mem;
 mod microseq;
 mod mmu;
 mod object;
+mod pgtable;
 mod queue;
 mod regs;
 mod slotalloc;

drivers/gpu/drm/asahi/gem.rs

@@ -99,7 +99,7 @@ impl ObjectRef {
         vm: &crate::mmu::Vm,
         range: Range<u64>,
         alignment: u64,
-        prot: u32,
+        prot: mmu::Prot,
         guard: bool,
     ) -> Result<crate::mmu::KernelMapping> {
         // Only used for kernel objects now
@@ -116,7 +116,7 @@ impl ObjectRef {
         obj_range: Range<usize>,
         range: Range<u64>,
         alignment: u64,
-        prot: u32,
+        prot: mmu::Prot,
         guard: bool,
     ) -> Result<crate::mmu::KernelMapping> {
         if obj_range.end > self.gem.size() {
@@ -137,7 +137,7 @@ impl ObjectRef {
         &mut self,
         vm: &crate::mmu::Vm,
         addr: u64,
-        prot: u32,
+        prot: mmu::Prot,
         guard: bool,
     ) -> Result<crate::mmu::KernelMapping> {
         if self.gem.flags & uapi::drm_asahi_gem_flags_DRM_ASAHI_GEM_VM_PRIVATE != 0