fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-07 17:20:21 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

d3d12: d3d12_promote_to_permanent_residency to accept res array batch

Browse source 
Reviewed-by: Pohsiang (John) Hsu <pohhsu@microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/37982>
This commit is contained in:
Silvio Vilerino 2025-10-19 10:41:11 -04:00 • committed by Pohsiang (John) Hsu
parent 07224f6d15
commit 4e1bb2111f
3 changed files with 58 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
src/gallium/drivers/d3d12/d3d12_residency.cpp
View file

@ -281,25 +281,60 @@ d3d12_deinit_residency(struct d3d12_screen *screen)
}
void
d3d12_promote_to_permanent_residency(struct d3d12_screen *screen, struct d3d12_resource* resource)
d3d12_promote_to_permanent_residency(struct d3d12_screen *screen, struct d3d12_resource** resources, unsigned count)
{
if (count == 0)
return;
mtx_lock(&screen->submit_mutex);
uint64_t offset;
struct d3d12_bo *base_bo = d3d12_bo_get_base(resource->bo, &offset);
/* Promote non-permanent resident resources to permanent residency*/
if(base_bo->residency_status != d3d12_permanently_resident) {
/* Mark as permanently resident*/
base_bo->residency_status = d3d12_permanently_resident;
/* If it wasn't made resident before, make it*/
bool was_made_resident = (base_bo->residency_status == d3d12_resident);
if(!was_made_resident) {
ID3D12Pageable *pageable = base_bo->res;
ASSERTED HRESULT hr = screen->dev->MakeResident(1, &pageable);
ID3D12Pageable *pageables_to_make_resident[residency_batch_size];
unsigned num_to_make_resident = 0;
auto flush_batch = [](struct d3d12_screen *screen, ID3D12Pageable **pageables, unsigned count) {
if (count > 0) {
ASSERTED HRESULT hr = screen->dev->MakeResident(count, pageables);
assert(SUCCEEDED(hr));
debug_printf("D3D12: Promoted %u resources to permanent residency\n", count);
}
};
for (unsigned i = 0; i < count; ++i) {
uint64_t offset;
struct d3d12_bo *base_bo = d3d12_bo_get_base(resources[i]->bo, &offset);
if (base_bo->residency_status != d3d12_permanently_resident) {
bool needs_make_resident = (base_bo->residency_status != d3d12_resident);
base_bo->residency_status = d3d12_permanently_resident;
if (needs_make_resident) {
assert(num_to_make_resident < residency_batch_size);
pageables_to_make_resident[num_to_make_resident++] = base_bo->res;
if (num_to_make_resident == residency_batch_size) {
flush_batch(screen, pageables_to_make_resident, num_to_make_resident);
num_to_make_resident = 0;
}
}
}
}
flush_batch(screen, pageables_to_make_resident, num_to_make_resident);
mtx_unlock(&screen->submit_mutex);
}
void
d3d12_promote_to_permanent_residency(struct d3d12_screen *screen, struct d3d12_resource* resource)
{
// Early out for null resource or if the bo is already permanently resident
if (!resource)
return;
if (resource->bo) {
uint64_t offset;
struct d3d12_bo *base_bo = d3d12_bo_get_base(resource->bo, &offset);
if (base_bo->residency_status == d3d12_permanently_resident)
return;
}
d3d12_promote_to_permanent_residency(screen, &resource, 1);
}

3
src/gallium/drivers/d3d12/d3d12_residency.h
View file

@ -35,5 +35,8 @@ d3d12_init_residency(struct d3d12_screen *screen);
void
d3d12_deinit_residency(struct d3d12_screen *screen);
void
d3d12_promote_to_permanent_residency(struct d3d12_screen *screen, struct d3d12_resource** resources, unsigned count);
void
d3d12_promote_to_permanent_residency(struct d3d12_screen *screen, struct d3d12_resource* resource);

7
src/gallium/drivers/d3d12/d3d12_video_enc.cpp
View file

@ -3286,8 +3286,11 @@ d3d12_video_encoder_encode_bitstream_impl(struct pipe_video_codec *codec,
pD3D12Enc->m_pOutputBitstreamBuffers.resize(num_slice_objects, NULL);
for (uint32_t slice_idx = 0; slice_idx < num_slice_objects;slice_idx++) {
pD3D12Enc->m_pOutputBitstreamBuffers[slice_idx] = (struct d3d12_resource *) slice_destinations[slice_idx];
// Make permanently resident for video use
d3d12_promote_to_permanent_residency(pD3D12Enc->m_pD3D12Screen, pD3D12Enc->m_pOutputBitstreamBuffers[slice_idx]);
}
// Make permanently resident for video use - batch promote all slice buffers
if (num_slice_objects > 0) {
d3d12_promote_to_permanent_residency(pD3D12Enc->m_pD3D12Screen, pD3D12Enc->m_pOutputBitstreamBuffers.data(), num_slice_objects);
}
// Make permanently resident for video use