ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-06-22 00:41:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

gpu: introduce information dataspace

Browse Source 
The current info implementation (as RPC) is limited in a few ways:

  * The amount of data that may be transferred is constrained by the
    underlying base platform
  * Most information never changes during run time but is copied
    nonetheless
  * The information differs depending on the used GPU device and
    in its current implementation only contains Intel GPU specific
    details

With this commit the 'info' RPC call is replaced with the
'info_dataspace' call that transfers the capability for the dataspace
containing the information only. This is complemented by a client
local 'attached_info' call that allows for getting typed access to
the information. The layout of the information is moved to its own
and GPU-specific header file, e.g., 'gpu/info_intel.h'

Issue #4265.
This commit is contained in:
Josef Söntgen
2021-09-23 16:36:48 +02:00
committed by Norman Feske
parent cfb170c719
commit e37792ce94
7 changed files with 139 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
repos/os/src/drivers/gpu/intel/main.cc
View File

@ -13,6 +13,7 @@
/* Genode includes */
#include <base/attached_rom_dataspace.h>
#include <base/attached_ram_dataspace.h>
#include <base/component.h>
#include <base/heap.h>
#include <base/log.h>
@ -22,6 +23,7 @@
#include <base/session_object.h>
#include <dataspace/client.h>
#include <gpu_session/gpu_session.h>
#include <gpu/info_intel.h>
#include <io_mem_session/connection.h>
#include <irq_session/connection.h>
#include <platform_device/client.h>
@ -112,12 +114,12 @@ struct Igd::Device
} _pci_backend_alloc { _resources.platform() };
Device_info _info { };
Gpu::Info::Revision _revision { };
Gpu::Info::Slice_mask _slice_mask { };
Gpu::Info::Subslice_mask _subslice_mask { };
Gpu::Info::Eu_total _eus { };
Gpu::Info::Subslices _subslices { };
Device_info _info { };
Gpu::Info_intel::Revision _revision { };
Gpu::Info_intel::Slice_mask _slice_mask { };
Gpu::Info_intel::Subslice_mask _subslice_mask { };
Gpu::Info_intel::Eu_total _eus { };
Gpu::Info_intel::Subslices _subslices { };
void _pci_info(String<64> const &descr) const
{
@ -533,6 +535,8 @@ struct Igd::Device
enum {
APERTURE_SIZE = 32u << 20,
MAX_FENCES = 16,
INFO_SIZE = 4096,
};
Device &_device;
@ -541,7 +545,10 @@ struct Igd::Device
Engine<Rcs_context> rcs;
uint32_t active_fences { 0 };
uint64_t _current_seqno { 0 };
uint64_t _completed_seqno { 0 };
Genode::Attached_ram_dataspace _info_dataspace;
Gpu::Info_intel &_info {
*_info_dataspace.local_addr<Gpu::Info_intel>() };
uint32_t _id_alloc()
{
@ -551,13 +558,24 @@ struct Igd::Device
return v << 8;
}
Vgpu(Device &device, Allocator &alloc)
Vgpu(Device &device, Allocator &alloc,
Ram_allocator &ram, Region_map &rm)
:
_device(device),
_id(_id_alloc()),
rcs(_device, _id + Rcs_context::HW_ID, alloc)
rcs(_device, _id + Rcs_context::HW_ID, alloc),
_info_dataspace(ram, rm, INFO_SIZE)
{
_device.vgpu_created();
_info = Gpu::Info_intel(_device.id(), _device.features(),
APERTURE_SIZE,
_id, Gpu::Sequence_number { .value = 0 },
_device._revision,
_device._slice_mask,
_device._subslice_mask,
_device._eus,
_device._subslices);
}
~Vgpu()
@ -565,6 +583,11 @@ struct Igd::Device
_device.vgpu_released();
}
Genode::Dataspace_capability info_dataspace() const
{
return _info_dataspace.cap();
}
uint32_t id() const { return _id; }
void completion_sigh(Genode::Signal_context_capability sigh) {
@ -575,12 +598,12 @@ struct Igd::Device
uint64_t current_seqno() const { return _current_seqno; }
uint64_t completed_seqno() const { return _completed_seqno; }
uint64_t completed_seqno() const { return _info.last_completed.value; }
void user_complete()
{
/* remember last completed seqno for info object */
_completed_seqno = _device.seqno();
_info.last_completed =
Gpu::Sequence_number { .value = _device.seqno() };
}
bool setup_ring_buffer(Gpu::addr_t const buffer_addr)
@ -1150,7 +1173,7 @@ struct Igd::Device
}
_eus = Gpu::Info::Eu_total { eu_total };
_eus = Gpu::Info_intel::Eu_total { eu_total };
}
/*********************
@ -1540,7 +1563,7 @@ class Gpu::Session_component : public Genode::Session_object<Gpu::Session>
_rm(rm),
_ram(ram, _ram_quota_guard(), _cap_quota_guard()),
_device(device),
_vgpu(_device, _heap)
_vgpu(_device, _heap, ram, rm)
{ }
~Session_component()
@ -1561,16 +1584,9 @@ class Gpu::Session_component : public Genode::Session_object<Gpu::Session>
** Gpu session interface **
***************************/
Info info() const override
Genode::Dataspace_capability info_dataspace() const override
{
Genode::size_t const aperture_size = Igd::Device::Vgpu::APERTURE_SIZE;
return Info(_device.id(), _device.features(), aperture_size,
_vgpu.id(), { .value = _vgpu.completed_seqno() },
_device._revision,
_device._slice_mask,
_device._subslice_mask,
_device._eus,
_device._subslices);
return _vgpu.info_dataspace();
}
Gpu::Sequence_number exec_buffer(Buffer_id id,