diff options
author | Rob Clark | 2013-04-12 10:28:13 -0500 |
---|---|---|
committer | Rob Clark | 2013-04-13 07:13:57 -0500 |
commit | e5d8a9c1d6375feb74feb52f419a025f1abf94d1 (patch) | |
tree | 107498d4f647af14482813d190f10add44c75d51 | |
parent | a36cdb858e21f287d7b51ded2f211f1c84bda90b (diff) | |
download | external-libdrm-e5d8a9c1d6375feb74feb52f419a025f1abf94d1.tar.gz external-libdrm-e5d8a9c1d6375feb74feb52f419a025f1abf94d1.tar.xz external-libdrm-e5d8a9c1d6375feb74feb52f419a025f1abf94d1.zip |
freedreno: add shifted reloc
Needed for RB_COPY_DEST_BASE register on a3xx.
Signed-off-by: Rob Clark <robdclark@gmail.com>
-rw-r--r-- | freedreno/freedreno_ringbuffer.c | 12 | ||||
-rw-r--r-- | freedreno/freedreno_ringbuffer.h | 2 |
2 files changed, 14 insertions, 0 deletions
diff --git a/freedreno/freedreno_ringbuffer.c b/freedreno/freedreno_ringbuffer.c index 822412a9..f1879964 100644 --- a/freedreno/freedreno_ringbuffer.c +++ b/freedreno/freedreno_ringbuffer.c | |||
@@ -203,6 +203,18 @@ void fd_ringbuffer_emit_reloc(struct fd_ringbuffer *ring, | |||
203 | fd_pipe_add_submit(ring->pipe, bo); | 203 | fd_pipe_add_submit(ring->pipe, bo); |
204 | } | 204 | } |
205 | 205 | ||
206 | void fd_ringbuffer_emit_reloc_shift(struct fd_ringbuffer *ring, | ||
207 | struct fd_bo *bo, uint32_t offset, uint32_t or, int32_t shift) | ||
208 | { | ||
209 | uint32_t addr = fd_bo_gpuaddr(bo, offset); | ||
210 | if (shift < 0) | ||
211 | addr >>= -shift; | ||
212 | else | ||
213 | addr <<= shift; | ||
214 | (*ring->cur++) = addr | or; | ||
215 | fd_pipe_add_submit(ring->pipe, bo); | ||
216 | } | ||
217 | |||
206 | void fd_ringbuffer_emit_reloc_ring(struct fd_ringbuffer *ring, | 218 | void fd_ringbuffer_emit_reloc_ring(struct fd_ringbuffer *ring, |
207 | struct fd_ringmarker *target) | 219 | struct fd_ringmarker *target) |
208 | { | 220 | { |
diff --git a/freedreno/freedreno_ringbuffer.h b/freedreno/freedreno_ringbuffer.h index 4fb668f7..051bbca9 100644 --- a/freedreno/freedreno_ringbuffer.h +++ b/freedreno/freedreno_ringbuffer.h | |||
@@ -74,6 +74,8 @@ static inline void fd_ringbuffer_emit(struct fd_ringbuffer *ring, | |||
74 | 74 | ||
75 | void fd_ringbuffer_emit_reloc(struct fd_ringbuffer *ring, | 75 | void fd_ringbuffer_emit_reloc(struct fd_ringbuffer *ring, |
76 | struct fd_bo *bo, uint32_t offset, uint32_t or); | 76 | struct fd_bo *bo, uint32_t offset, uint32_t or); |
77 | void fd_ringbuffer_emit_reloc_shift(struct fd_ringbuffer *ring, | ||
78 | struct fd_bo *bo, uint32_t offset, uint32_t or, int32_t shift); | ||
77 | void fd_ringbuffer_emit_reloc_ring(struct fd_ringbuffer *ring, | 79 | void fd_ringbuffer_emit_reloc_ring(struct fd_ringbuffer *ring, |
78 | struct fd_ringmarker *target); | 80 | struct fd_ringmarker *target); |
79 | 81 | ||