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

gpu/intel: sanity check tail pointer alignment

Browse Source 
According to spec the tail pointer points to the next qword instructions
which will be used by the software.

p 1354, Doc Ref # IHD-OS-BDW-Vol 2c-11.15

issue #4254
This commit is contained in:
Alexander Boettcher
2021-08-05 16:07:45 +02:00
committed by Christian Helmuth
parent cc2363d421
commit c5d8a43418
1 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -559,7 +559,7 @@ struct Igd::Device
_completed_seqno = rcs.seqno(); _completed_seqno = rcs.seqno();
} }
void setup_ring_buffer(Genode::addr_t const buffer_addr, bool setup_ring_buffer(Genode::addr_t const buffer_addr,
Genode::addr_t const scratch_addr) Genode::addr_t const scratch_addr)
{ {
_current_seqno++; _current_seqno++;
@ -708,8 +708,19 @@ struct Igd::Device
} }
} }
addr_t const offset = (((tail + advance) * sizeof(uint32_t)) >> 3) - 1; addr_t const offset = ((tail + advance) * sizeof(uint32_t));
rcs.context->tail_offset(offset % ((4*4096)>>3));
if (offset % 8) {
Genode::error("ring offset misaligned - abort");
return false;
}
el.ring_flush(tail, tail + advance);
/* tail_offset must be specified in qword */
rcs.context->tail_offset((offset % (rcs.ring_size())) / 8);
return true;
} }
void rcs_map_ppgtt(addr_t vo, addr_t pa, size_t size) void rcs_map_ppgtt(addr_t vo, addr_t pa, size_t size)
@ -1433,7 +1444,7 @@ class Gpu::Session_component : public Genode::Session_object<Gpu::Session>
bool found = false; bool found = false;
_buffer_registry.for_each([&] (Buffer &buffer) { _buffer_registry.for_each([&] (Buffer &buffer) {
if (!(buffer.cap == cap)) { return; } if (found || !(buffer.cap == cap)) { return; }
if (!buffer.ppgtt_va_valid) { if (!buffer.ppgtt_va_valid) {
Genode::error("Invalid execbuffer"); Genode::error("Invalid execbuffer");
@ -1441,8 +1452,7 @@ class Gpu::Session_component : public Genode::Session_object<Gpu::Session>
throw Gpu::Session::Invalid_state(); throw Gpu::Session::Invalid_state();
} }
_vgpu.setup_ring_buffer(buffer.ppgtt_va, _device._ggtt->scratch_page()); found = _vgpu.setup_ring_buffer(buffer.ppgtt_va, _device._ggtt->scratch_page());
found = true;
}); });
if (!found) if (!found)