#include "draw/draw_context.h"
#include "draw/draw_private.h"
-#include "util/u_simple_list.h"
+#include "util/simple_list.h"
#include "util/u_upload_mgr.h"
-#include "os/os_time.h"
+#include "util/os_time.h"
#include "r300_context.h"
#include "r300_cs.h"
#include "r300_emit.h"
-static void r300_flush_and_cleanup(struct r300_context *r300, unsigned flags)
+static void r300_flush_and_cleanup(struct r300_context *r300, unsigned flags,
+ struct pipe_fence_handle **fence)
{
struct r300_atom *atom;
r500_emit_index_bias(r300, 0);
/* The DDX doesn't set these regs. */
- if (r300->screen->info.drm_minor >= 6) {
+ {
CS_LOCALS(r300);
OUT_CS_REG_SEQ(R300_GB_MSPOS0, 2);
OUT_CS(0x66666666);
}
r300->flush_counter++;
- r300->rws->cs_flush(r300->cs, flags);
+ r300->rws->cs_flush(r300->cs, flags, fence);
r300->dirty_hw = 0;
/* New kitchen sink, baby. */
struct pipe_fence_handle **fence)
{
struct r300_context *r300 = r300_context(pipe);
- struct pb_buffer **rfence = (struct pb_buffer**)fence;
-
- if (r300->screen->info.drm_minor >= 12) {
- flags |= RADEON_FLUSH_KEEP_TILING_FLAGS;
- }
-
- if (rfence) {
- /* Create a fence, which is a dummy BO. */
- *rfence = r300->rws->buffer_create(r300->rws, 1, 1, TRUE,
- RADEON_DOMAIN_GTT);
- /* Add the fence as a dummy relocation. */
- r300->rws->cs_add_reloc(r300->cs,
- r300->rws->buffer_get_cs_handle(*rfence),
- RADEON_USAGE_READWRITE, RADEON_DOMAIN_GTT);
- }
if (r300->dirty_hw) {
- r300_flush_and_cleanup(r300, flags);
+ r300_flush_and_cleanup(r300, flags, fence);
} else {
- if (rfence) {
+ if (fence) {
/* We have to create a fence object, but the command stream is empty
* and we cannot emit an empty CS. Let's write to some reg. */
CS_LOCALS(r300);
OUT_CS_REG(RB3D_COLOR_CHANNEL_MASK, 0);
- r300->rws->cs_flush(r300->cs, flags);
+ r300->rws->cs_flush(r300->cs, flags, fence);
} else {
/* Even if hw is not dirty, we should at least reset the CS in case
* the space checking failed for the first draw operation. */
- r300->rws->cs_flush(r300->cs, flags);
+ r300->rws->cs_flush(r300->cs, flags, NULL);
}
}
r300_decompress_zmask(r300);
}
- r300_flush_and_cleanup(r300, flags);
+ if (fence && *fence)
+ r300->rws->fence_reference(fence, NULL);
+ r300_flush_and_cleanup(r300, flags, fence);
}
/* Revoke Hyper-Z access, so that some other process can take it. */
static void r300_flush_wrapped(struct pipe_context *pipe,
struct pipe_fence_handle **fence,
- enum pipe_flush_flags flags)
+ unsigned flags)
{
- r300_flush(pipe,
- flags & PIPE_FLUSH_END_OF_FRAME ? RADEON_FLUSH_END_OF_FRAME : 0,
- fence);
+ if (flags & PIPE_FLUSH_HINT_FINISH)
+ flags &= ~PIPE_FLUSH_ASYNC;
+
+ r300_flush(pipe, flags, fence);
}
void r300_init_flush_functions(struct r300_context* r300)