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

freedreno: make cmdstream bo's read-only to GPU

Browse source 
If nothing else, this will make problems with cmdstream getting blit
over with pixels easier to track down (ie. faults when it first happens
rather than strange failures later from corrupted cmdstream when a
stateobj is later reused).

(NOTE this somewhat depends on the kernel supporting the flag, and the
iommu implementation.  But the worst case is just that the cmdstream
ends up writeable as before.)

Signed-off-by: Rob Clark <robdclark@gmail.com>
This commit is contained in:
Rob Clark 2019-01-09 13:03:43 -05:00
parent 286de96af8
commit 04aff7e42b
2 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/freedreno/drm/msm_bo.c
View file

@ -166,6 +166,9 @@ int msm_bo_new_handle(struct fd_device *dev,
if (flags & DRM_FREEDRENO_GEM_SCANOUT) if (flags & DRM_FREEDRENO_GEM_SCANOUT)
req.flags |= MSM_BO_SCANOUT; req.flags |= MSM_BO_SCANOUT;
if (flags & DRM_FREEDRENO_GEM_GPUREADONLY)
req.flags |= MSM_BO_GPU_READONLY;
ret = drmCommandWriteRead(dev->fd, DRM_MSM_GEM_NEW, ret = drmCommandWriteRead(dev->fd, DRM_MSM_GEM_NEW,
&req, sizeof(req)); &req, sizeof(req));
if (ret) if (ret)

13
src/freedreno/drm/msm_ringbuffer_sp.c
View file

@ -186,8 +186,8 @@ msm_submit_suballoc_ring_bo(struct fd_submit *submit,
if (!suballoc_bo) { if (!suballoc_bo) {
// TODO possibly larger size for streaming bo? // TODO possibly larger size for streaming bo?
msm_ring->ring_bo = fd_bo_new_ring( msm_ring->ring_bo = fd_bo_new_ring(submit->pipe->dev,
submit->pipe->dev, 0x8000, 0); 0x8000, DRM_FREEDRENO_GEM_GPUREADONLY);
msm_ring->offset = 0; msm_ring->offset = 0;
} else { } else {
msm_ring->ring_bo = fd_bo_ref(suballoc_bo); msm_ring->ring_bo = fd_bo_ref(suballoc_bo);
@ -225,7 +225,8 @@ msm_submit_sp_new_ringbuffer(struct fd_submit *submit, uint32_t size,
size = INIT_SIZE; size = INIT_SIZE;
msm_ring->offset = 0; msm_ring->offset = 0;
msm_ring->ring_bo = fd_bo_new_ring(submit->pipe->dev, size, 0); msm_ring->ring_bo = fd_bo_new_ring(submit->pipe->dev, size,
DRM_FREEDRENO_GEM_GPUREADONLY);
} }
if (!msm_ringbuffer_sp_init(msm_ring, size, flags)) if (!msm_ringbuffer_sp_init(msm_ring, size, flags))
@ -375,7 +376,8 @@ msm_ringbuffer_sp_grow(struct fd_ringbuffer *ring, uint32_t size)
finalize_current_cmd(ring); finalize_current_cmd(ring);
fd_bo_del(msm_ring->ring_bo); fd_bo_del(msm_ring->ring_bo);
msm_ring->ring_bo = fd_bo_new_ring(pipe->dev, size, 0); msm_ring->ring_bo = fd_bo_new_ring(pipe->dev, size,
DRM_FREEDRENO_GEM_GPUREADONLY);
ring->start = fd_bo_map(msm_ring->ring_bo); ring->start = fd_bo_map(msm_ring->ring_bo);
ring->end = &(ring->start[size/4]); ring->end = &(ring->start[size/4]);
@ -558,7 +560,8 @@ msm_ringbuffer_sp_new_object(struct fd_pipe *pipe, uint32_t size)
msm_ring->u.pipe = pipe; msm_ring->u.pipe = pipe;
msm_ring->offset = 0; msm_ring->offset = 0;
msm_ring->ring_bo = fd_bo_new_ring(pipe->dev, size, 0); msm_ring->ring_bo = fd_bo_new_ring(pipe->dev, size,
DRM_FREEDRENO_GEM_GPUREADONLY);
msm_ring->base.refcnt = 1; msm_ring->base.refcnt = 1;
return msm_ringbuffer_sp_init(msm_ring, size, _FD_RINGBUFFER_OBJECT); return msm_ringbuffer_sp_init(msm_ring, size, _FD_RINGBUFFER_OBJECT);