geemili
/
drm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

freedreno: add some asserts 

Things are worse if we issueibcmds with bogus gpu ptrs, so it is better
to just make userspace crash when things go pear shaped.

Signed-off-by: Rob Clark <robclark@freedesktop.org>
main
Rob Clark 2013-05-15 13:21:24 -04:00
parent 0b89e2730c
commit acfbf394a9
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
freedreno/freedreno_ringbuffer.c
View File

@ -26,6 +26,8 @@
* Rob Clark <robclark@freedesktop.org> * Rob Clark <robclark@freedesktop.org>
*/ */
#include <assert.h>
#include "freedreno_drmif.h" #include "freedreno_drmif.h"
#include "freedreno_priv.h" #include "freedreno_priv.h"
#include "freedreno_ringbuffer.h" #include "freedreno_ringbuffer.h"
@ -201,7 +203,9 @@ uint32_t fd_ringbuffer_timestamp(struct fd_ringbuffer *ring)
void fd_ringbuffer_emit_reloc(struct fd_ringbuffer *ring, void fd_ringbuffer_emit_reloc(struct fd_ringbuffer *ring,
struct fd_bo *bo, uint32_t offset, uint32_t or) struct fd_bo *bo, uint32_t offset, uint32_t or)
{ {
(*ring->cur++) = fd_bo_gpuaddr(bo, offset) | or; uint32_t addr = fd_bo_gpuaddr(bo, offset);
assert(addr);
(*ring->cur++) = addr | or;
fd_pipe_add_submit(ring->pipe, bo); fd_pipe_add_submit(ring->pipe, bo);
} }
@ -209,6 +213,7 @@ void fd_ringbuffer_emit_reloc_shift(struct fd_ringbuffer *ring,
struct fd_bo *bo, uint32_t offset, uint32_t or, int32_t shift) struct fd_bo *bo, uint32_t offset, uint32_t or, int32_t shift)
{ {
uint32_t addr = fd_bo_gpuaddr(bo, offset); uint32_t addr = fd_bo_gpuaddr(bo, offset);
assert(addr);
if (shift < 0) if (shift < 0)
addr >>= -shift; addr >>= -shift;
else else