fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-02-18 10:30:39 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

freedreno/drm/virtio: Handle read after upload

Browse source 
If we get CPU access (such as a read) after an upload transfer, we need
to ensure that the host has handled the upload.  Do this by stalling
when the buffer is mapped.  (The previous commit ensures we don't try to
do a pointless upload for an already mapped buffer.)

Signed-off-by: Rob Clark <robdclark@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18604>
This commit is contained in:
Rob Clark 2022-09-14 14:06:15 -07:00 • committed by Marge Bot
parent 8c8e13e3b5
commit 76fbc8be6d
2 changed files with 21 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/freedreno/drm/virtio/virtio_bo.c
View file

@ -52,9 +52,23 @@ virtio_bo_offset(struct fd_bo *bo, uint64_t *offset)
{
struct virtio_bo *virtio_bo = to_virtio_bo(bo);
int ret = bo_allocate(virtio_bo);
if (ret)
return ret;
/* If we have uploaded, we need to wait for host to handle that
* before we can allow guest-side CPU access:
*/
if (virtio_bo->has_upload_seqno) {
virtio_bo->has_upload_seqno = false;
virtio_execbuf_flush(bo->dev);
virtio_host_sync(bo->dev, &(struct msm_ccmd_req) {
.seqno = virtio_bo->upload_seqno,
});
}
*offset = virtio_bo->offset;
return 0;
}
@ -186,12 +200,13 @@ static void
bo_upload(struct fd_bo *bo, unsigned off, void *src, unsigned len)
{
unsigned req_len = sizeof(struct msm_ccmd_gem_upload_req) + align(len, 4);
struct virtio_bo *virtio_bo = to_virtio_bo(bo);
uint8_t buf[req_len];
struct msm_ccmd_gem_upload_req *req = (void *)buf;
req->hdr = MSM_CCMD(GEM_UPLOAD, req_len);
req->res_id = to_virtio_bo(bo)->res_id;
req->res_id = virtio_bo->res_id;
req->pad = 0;
req->off = off;
req->len = len;
@ -199,6 +214,9 @@ bo_upload(struct fd_bo *bo, unsigned off, void *src, unsigned len)
memcpy(req->payload, src, len);
virtio_execbuf(bo->dev, &req->hdr, false);
virtio_bo->upload_seqno = req->hdr.seqno;
virtio_bo->has_upload_seqno = true;
}
static void

2
src/freedreno/drm/virtio/virtio_priv.h
View file

@ -174,6 +174,8 @@ struct virtio_bo {
uint64_t offset;
uint32_t res_id;
uint32_t blob_id;
uint32_t upload_seqno;
bool has_upload_seqno;
};
FD_DEFINE_CAST(fd_bo, virtio_bo);