OSDN Git Service
(root)
/
android-x86
/
external-libdrm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
freedreno: update uapi
[android-x86/external-libdrm.git]
/
freedreno
/
freedreno_ringbuffer.c
diff --git
a/freedreno/freedreno_ringbuffer.c
b/freedreno/freedreno_ringbuffer.c
index
4443790
..
984da24
100644
(file)
--- a/
freedreno/freedreno_ringbuffer.c
+++ b/
freedreno/freedreno_ringbuffer.c
@@
-26,14
+26,18
@@
* Rob Clark <robclark@freedesktop.org>
*/
* Rob Clark <robclark@freedesktop.org>
*/
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
#include <assert.h>
#include "freedreno_drmif.h"
#include "freedreno_priv.h"
#include "freedreno_ringbuffer.h"
#include <assert.h>
#include "freedreno_drmif.h"
#include "freedreno_priv.h"
#include "freedreno_ringbuffer.h"
-struct fd_ringbuffer *
fd_ringbuffer_new(struct fd_pipe *pipe,
-
uint32_t size)
+struct fd_ringbuffer *
+
fd_ringbuffer_new(struct fd_pipe *pipe,
uint32_t size)
{
struct fd_ringbuffer *ring;
{
struct fd_ringbuffer *ring;
@@
-61,7
+65,7
@@
void fd_ringbuffer_del(struct fd_ringbuffer *ring)
* the bookkeeping works out properly.
*/
void fd_ringbuffer_set_parent(struct fd_ringbuffer *ring,
* the bookkeeping works out properly.
*/
void fd_ringbuffer_set_parent(struct fd_ringbuffer *ring,
- struct fd_ringbuffer *parent)
+
struct fd_ringbuffer *parent)
{
ring->parent = parent;
}
{
ring->parent = parent;
}
@@
-72,6
+76,8
@@
void fd_ringbuffer_reset(struct fd_ringbuffer *ring)
if (ring->pipe->id == FD_PIPE_2D)
start = &ring->start[0x140];
ring->cur = ring->last_start = start;
if (ring->pipe->id == FD_PIPE_2D)
start = &ring->start[0x140];
ring->cur = ring->last_start = start;
+ if (ring->funcs->reset)
+ ring->funcs->reset(ring);
}
/* maybe get rid of this and use fd_ringmarker_flush() from DDX too? */
}
/* maybe get rid of this and use fd_ringmarker_flush() from DDX too? */
@@
-86,13
+92,15
@@
uint32_t fd_ringbuffer_timestamp(struct fd_ringbuffer *ring)
}
void fd_ringbuffer_reloc(struct fd_ringbuffer *ring,
}
void fd_ringbuffer_reloc(struct fd_ringbuffer *ring,
- const struct fd_reloc *reloc)
+
const struct fd_reloc *reloc)
{
ring->funcs->emit_reloc(ring, reloc);
}
{
ring->funcs->emit_reloc(ring, reloc);
}
-void fd_ringbuffer_emit_reloc_ring(struct fd_ringbuffer *ring,
- struct fd_ringmarker *target, struct fd_ringmarker *end)
+void
+fd_ringbuffer_emit_reloc_ring(struct fd_ringbuffer *ring,
+ struct fd_ringmarker *target,
+ struct fd_ringmarker *end)
{
assert(target->ring == end->ring);
ring->funcs->emit_reloc_ring(ring, target, end);
{
assert(target->ring == end->ring);
ring->funcs->emit_reloc_ring(ring, target, end);
@@
-126,7
+134,7
@@
void fd_ringmarker_mark(struct fd_ringmarker *marker)
}
uint32_t fd_ringmarker_dwords(struct fd_ringmarker *start,
}
uint32_t fd_ringmarker_dwords(struct fd_ringmarker *start,
- struct fd_ringmarker *end)
+
struct fd_ringmarker *end)
{
return end->cur - start->cur;
}
{
return end->cur - start->cur;
}