From f1bc791c22b7221d19078d3669f4722a3655eced Mon Sep 17 00:00:00 2001 From: Sebastian Sumpf Date: Fri, 20 Jan 2023 18:36:23 +0100 Subject: [PATCH] gpu_session: rename Gpu::Virtual_address:va rename 'va' into 'value' to stay consistent with other types. issue #4713 --- repos/libports/src/lib/libdrm/ioctl_iris.cc | 6 +++--- repos/libports/src/lib/libdrm/ioctl_lima.cc | 6 +++--- repos/os/include/gpu_session/gpu_session.h | 2 +- repos/os/src/drivers/gpu/intel/main.cc | 14 +++++++------- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/repos/libports/src/lib/libdrm/ioctl_iris.cc b/repos/libports/src/lib/libdrm/ioctl_iris.cc index 1b84350fe1..9d483577c8 100644 --- a/repos/libports/src/lib/libdrm/ioctl_iris.cc +++ b/repos/libports/src/lib/libdrm/ioctl_iris.cc @@ -62,7 +62,7 @@ enum { verbose_ioctl = false }; namespace Utils { Gpu::Virtual_address limit_to_48bit(Gpu::Virtual_address addr) { - return Gpu::Virtual_address { addr.va & ((1ULL << 48) - 1) }; } + return Gpu::Virtual_address { addr.value & ((1ULL << 48) - 1) }; } } namespace Gpu @@ -582,12 +582,12 @@ struct Drm::Context if (b.busy) Genode::warning("handle: ", obj[i].handle, " reused but is busy"); - if (b.gpu_vaddr_valid && b.gpu_vaddr.va != obj[i].offset) { + if (b.gpu_vaddr_valid && b.gpu_vaddr.value != obj[i].offset) { _unmap_buffer_gpu(b); } if (!b.gpu_vaddr_valid) - _map_buffer_gpu(b, Gpu::Virtual_address { .va = obj[i].offset }); + _map_buffer_gpu(b, Gpu::Virtual_address { .value = obj[i].offset }); if (!b.gpu_vaddr_valid) { Genode::error("handle: ", obj[i].handle, diff --git a/repos/libports/src/lib/libdrm/ioctl_lima.cc b/repos/libports/src/lib/libdrm/ioctl_lima.cc index 8408d6558f..2a617a924f 100644 --- a/repos/libports/src/lib/libdrm/ioctl_lima.cc +++ b/repos/libports/src/lib/libdrm/ioctl_lima.cc @@ -493,9 +493,9 @@ class Lima::Call arg.offset = reinterpret_cast<::uint64_t>(b.mmap_addr()); Gpu::Virtual_address const va = b.va; - if (va.va == (Gpu::addr_t)-1) + if (va.value == (Gpu::addr_t)-1) return; - arg.va = (uint32_t)va.va; + arg.va = (uint32_t)va.value; result = 0; }); @@ -683,7 +683,7 @@ class Lima::Call { return _apply_handle(gem_close.handle, [&] (Lima::Buffer &b) { - _va_alloc.free((void *)b.va.va); + _va_alloc.free((void *)b.va.value); destroy(_heap, &b); }) ? 0 : -1; } diff --git a/repos/os/include/gpu_session/gpu_session.h b/repos/os/include/gpu_session/gpu_session.h index 28c64fc0da..1a5903baf1 100644 --- a/repos/os/include/gpu_session/gpu_session.h +++ b/repos/os/include/gpu_session/gpu_session.h @@ -67,7 +67,7 @@ struct Gpu::Sequence_number struct Gpu::Virtual_address { - Genode::uint64_t va; + Genode::uint64_t value; }; diff --git a/repos/os/src/drivers/gpu/intel/main.cc b/repos/os/src/drivers/gpu/intel/main.cc index 1947d2d16a..0bbbe51ded 100644 --- a/repos/os/src/drivers/gpu/intel/main.cc +++ b/repos/os/src/drivers/gpu/intel/main.cc @@ -2023,19 +2023,19 @@ class Gpu::Session_component : public Genode::Session_object } try { - _vgpu.rcs_map_ppgtt(va.va, phys_addr + offset, size); + _vgpu.rcs_map_ppgtt(va.value, phys_addr + offset, size); } catch (Level_4_translation_table::Double_insertion) { - error("PPGTT: Double insertion: va: ", Hex(va.va), " offset: ", Hex(offset), + error("PPGTT: Double insertion: va: ", Hex(va.value), " offset: ", Hex(offset), "size: ", Hex(size)); throw Mapping_vram_failed(); } catch(...) { - error("PPGTT: invalid address/range/alignment: va: ", Hex(va.va), + error("PPGTT: invalid address/range/alignment: va: ", Hex(va.value), " offset: ", Hex(offset), "size: ", Hex(size)); throw Mapping_vram_failed(); } - new (_heap) Vram_local::Mapping(vram_local.mappings, offset, va.va, size); + new (_heap) Vram_local::Mapping(vram_local.mappings, offset, va.value, size); }; if (_resource_guard.avail_caps() == false) @@ -2065,11 +2065,11 @@ class Gpu::Session_component : public Genode::Session_object vram_local.mappings.with_element(offset, [&] (Vram_local::Mapping &mapping) { - if (mapping.ppgtt_va != va.va) { - Genode::error("VRAM: not mapped at ", Hex(va.va), " offset: ", Hex(offset)); + if (mapping.ppgtt_va != va.value) { + Genode::error("VRAM: not mapped at ", Hex(va.value), " offset: ", Hex(offset)); return; } - _vgpu.rcs_unmap_ppgtt(va.va, mapping.ppgtt_va_size); + _vgpu.rcs_unmap_ppgtt(va.value, mapping.ppgtt_va_size); destroy(_heap, &mapping); }, [&] () { error("VRAM: nothing mapped at offset ", Hex(offset)); }