diff options
| author | Jerome Glisse <jglisse@redhat.com> | 2013-01-28 14:48:46 -0500 |
|---|---|---|
| committer | Jerome Glisse <jglisse@redhat.com> | 2013-01-28 14:51:40 -0500 |
| commit | 72916698b056d0559263e84372bb45cd83a1c2c2 (patch) | |
| tree | 923631099fde92a5b6ce5cd114de8435dd20d720 /src/gallium/drivers/r600/r600_state_common.c | |
| parent | dbb2d192de33064ae6cdb799d71c5ac89a6ea8ff (diff) | |
r600g: fix segfault with old kernel9.1-branchpoint
Old kernel do not have dma support, patch pushed were missing some
of the check needed to not use dma.
Signed-off-by: Jerome Glisse <jglisse@redhat.com>
Diffstat (limited to 'src/gallium/drivers/r600/r600_state_common.c')
| -rw-r--r-- | src/gallium/drivers/r600/r600_state_common.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gallium/drivers/r600/r600_state_common.c b/src/gallium/drivers/r600/r600_state_common.c index b547d647cba..9386f618b3a 100644 --- a/src/gallium/drivers/r600/r600_state_common.c +++ b/src/gallium/drivers/r600/r600_state_common.c @@ -1274,7 +1274,9 @@ static void r600_draw_vbo(struct pipe_context *ctx, const struct pipe_draw_info } /* make sure that the gfx ring is only one active */ - rctx->rings.dma.flush(rctx, RADEON_FLUSH_ASYNC); + if (rctx->rings.dma.cs) { + rctx->rings.dma.flush(rctx, RADEON_FLUSH_ASYNC); + } if (!r600_update_derived_state(rctx)) { /* useless to render because current rendering command |