fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 11:00:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

freedreno/drm/virtio: Remove unused header

Browse source 
A remnant from a very early version, prior to refactoring out
fd_ringbuffer_sp to share more code btwn msm and virtgpu backends.
Somehow this never got removed.

Signed-off-by: Rob Clark <robdclark@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23533>
This commit is contained in:
Rob Clark 2023-05-19 13:16:38 -07:00 • committed by Marge Bot
parent 6ae6536ed9
commit 37834e3d7c
2 changed files with 0 additions and 135 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/freedreno/drm/meson.build
View file

@ -55,7 +55,6 @@ libfreedreno_drm_virtio_files = files(
'virtio/virtio_pipe.c',
'virtio/virtio_priv.h',
'virtio/virtio_ringbuffer.c',
'virtio/virtio_ringbuffer.h',
)
if freedreno_kmds.contains('virtio')
libfreedreno_drm_files += libfreedreno_drm_virtio_files

134
src/freedreno/drm/virtio/virtio_ringbuffer.h
View file

@ -1,134 +0,0 @@
/*
* Copyright © 2022 Google, Inc.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice (including the next
* paragraph) shall be included in all copies or substantial portions of the
* Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
#ifdef X
#undef X
#endif
/*
* TODO make this magic easier to share btw msm_ringbuffer_sp and virtio_ringbuffer
*/
#if PTRSZ == 32
#define X(n) n##_32
#else
#define X(n) n##_64
#endif
static void X(emit_reloc_common)(struct fd_ringbuffer *ring,
const struct fd_reloc *reloc)
{
(*ring->cur++) = (uint32_t)reloc->iova;
#if PTRSZ == 64
(*ring->cur++) = (uint32_t)(reloc->iova >> 32);
#endif
}
static void X(virtio_ringbuffer_emit_reloc_nonobj)(struct fd_ringbuffer *ring,
const struct fd_reloc *reloc)
{
X(emit_reloc_common)(ring, reloc);
assert(!(ring->flags & _FD_RINGBUFFER_OBJECT));
struct virtio_ringbuffer *virtio_ring = to_virtio_ringbuffer(ring);
struct virtio_submit *virtio_submit = to_virtio_submit(virtio_ring->u.submit);
virtio_submit_append_bo(virtio_submit, reloc->bo);
}
static void X(virtio_ringbuffer_emit_reloc_obj)(struct fd_ringbuffer *ring,
const struct fd_reloc *reloc)
{
X(emit_reloc_common)(ring, reloc);
assert(ring->flags & _FD_RINGBUFFER_OBJECT);
struct virtio_ringbuffer *virtio_ring = to_virtio_ringbuffer(ring);
/* Avoid emitting duplicate BO references into the list. Ringbuffer
* objects are long-lived, so this saves ongoing work at draw time in
* exchange for a bit at context setup/first draw. And the number of
* relocs per ringbuffer object is fairly small, so the O(n^2) doesn't
* hurt much.
*/
if (!virtio_ringbuffer_references_bo(ring, reloc->bo)) {
APPEND(&virtio_ring->u, reloc_bos, fd_bo_ref(reloc->bo));
}
}
static uint32_t X(virtio_ringbuffer_emit_reloc_ring)(
struct fd_ringbuffer *ring, struct fd_ringbuffer *target, uint32_t cmd_idx)
{
struct virtio_ringbuffer *virtio_target = to_virtio_ringbuffer(target);
struct fd_bo *bo;
uint32_t size;
if ((target->flags & FD_RINGBUFFER_GROWABLE) &&
(cmd_idx < virtio_target->u.nr_cmds)) {
bo = virtio_target->u.cmds[cmd_idx].ring_bo;
size = virtio_target->u.cmds[cmd_idx].size;
} else {
bo = virtio_target->ring_bo;
size = offset_bytes(target->cur, target->start);
}
if (ring->flags & _FD_RINGBUFFER_OBJECT) {
X(virtio_ringbuffer_emit_reloc_obj)(ring, &(struct fd_reloc){
.bo = bo,
.iova = bo->iova + virtio_target->offset,
.offset = virtio_target->offset,
});
} else {
X(virtio_ringbuffer_emit_reloc_nonobj)(ring, &(struct fd_reloc){
.bo = bo,
.iova = bo->iova + virtio_target->offset,
.offset = virtio_target->offset,
});
}
if (!(target->flags & _FD_RINGBUFFER_OBJECT))
return size;
struct virtio_ringbuffer *virtio_ring = to_virtio_ringbuffer(ring);
if (ring->flags & _FD_RINGBUFFER_OBJECT) {
for (unsigned i = 0; i < virtio_target->u.nr_reloc_bos; i++) {
struct fd_bo *target_bo = virtio_target->u.reloc_bos[i];
if (!virtio_ringbuffer_references_bo(ring, target_bo))
APPEND(&virtio_ring->u, reloc_bos, fd_bo_ref(target_bo));
}
} else {
// TODO it would be nice to know whether we have already
// seen this target before. But hopefully we hit the
// append_bo() fast path enough for this to not matter:
struct virtio_submit *virtio_submit = to_virtio_submit(virtio_ring->u.submit);
for (unsigned i = 0; i < virtio_target->u.nr_reloc_bos; i++) {
virtio_submit_append_bo(virtio_submit, virtio_target->u.reloc_bos[i]);
}
}
return size;
}