KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

r300g: take advantage of KEEP_TILING_FLAGS flush flag 

This fixes at least two multi-context-related races.
This commit is contained in:
Marek Olšák 2011-12-13 20:27:48 +01:00
parent 10e931219f
commit 35d2764f85
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gallium/drivers/r300/r300_flush.c
View File

@ -72,6 +72,10 @@ void r300_flush(struct pipe_context *pipe,
if (r300->draw && !r300->draw_vbo_locked)
r300_draw_flush_vbuf(r300);
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,

8
src/gallium/drivers/r300/r300_state.c
View File

@ -872,8 +872,12 @@ r300_set_framebuffer_state(struct pipe_context* pipe,
r300_mark_atom_dirty(r300, &r300->dsa_state);
}
/* The tiling flags are dependent on the surface miplevel, unfortunately. */
r300_fb_set_tiling_flags(r300, state);
if (r300->screen->info.drm_minor < 12) {
/* The tiling flags are dependent on the surface miplevel, unfortunately.
* This workarounds a bad design decision in old kernels which were
* rewriting tile fields in registers. */
r300_fb_set_tiling_flags(r300, state);
}
util_copy_framebuffer_state(r300->fb_state.state, state);