diff options
| author | Marek Olšák <[email protected]> | 2015-08-08 14:12:10 +0200 |
|---|---|---|
| committer | Bas Nieuwenhuizen <[email protected]> | 2016-04-19 18:10:30 +0200 |
| commit | f4b77c764a2469b20cfe49ec3ea3cca8e49dea92 (patch) | |
| tree | e673ebf1fbb4bef6a7bd40e77b30134dac5fa83c /src/gallium/winsys/radeon | |
| parent | 1d2ac7a7ca720b03365e135d19f101561d4e4b6b (diff) | |
gallium/radeon: move ring_type into winsyses
Not used by drivers.
Reviewed-by: Bas Nieuwenhuizen <[email protected]>
Diffstat (limited to 'src/gallium/winsys/radeon')
| -rw-r--r-- | src/gallium/winsys/radeon/drm/radeon_drm_cs.c | 10 | ||||
| -rw-r--r-- | src/gallium/winsys/radeon/drm/radeon_drm_cs.h | 1 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/gallium/winsys/radeon/drm/radeon_drm_cs.c b/src/gallium/winsys/radeon/drm/radeon_drm_cs.c index b50e19c0381..6b2694c6938 100644 --- a/src/gallium/winsys/radeon/drm/radeon_drm_cs.c +++ b/src/gallium/winsys/radeon/drm/radeon_drm_cs.c @@ -197,8 +197,8 @@ radeon_drm_cs_create(struct radeon_winsys_ctx *ctx, cs->csc = &cs->csc1; cs->cst = &cs->csc2; cs->base.buf = cs->csc->buf; - cs->base.ring_type = ring_type; cs->base.max_dw = ARRAY_SIZE(cs->csc->buf); + cs->ring_type = ring_type; p_atomic_inc(&ws->num_cs); return &cs->base; @@ -281,7 +281,7 @@ static unsigned radeon_add_buffer(struct radeon_drm_cs *cs, * This doesn't have to be done if virtual memory is enabled, * because there is no offset patching with virtual memory. */ - if (cs->base.ring_type != RING_DMA || cs->ws->info.has_virtual_memory) { + if (cs->ring_type != RING_DMA || cs->ws->info.has_virtual_memory) { return i; } } @@ -466,7 +466,7 @@ static void radeon_drm_cs_flush(struct radeon_winsys_cs *rcs, struct radeon_drm_cs *cs = radeon_drm_cs(rcs); struct radeon_cs_context *tmp; - switch (cs->base.ring_type) { + switch (cs->ring_type) { case RING_DMA: /* pad DMA ring to 8 DWs */ if (cs->ws->info.chip_class <= SI) { @@ -526,7 +526,7 @@ static void radeon_drm_cs_flush(struct radeon_winsys_cs *rcs, p_atomic_inc(&cs->cst->relocs_bo[i].bo->num_active_ioctls); } - switch (cs->base.ring_type) { + switch (cs->ring_type) { case RING_DMA: cs->cst->flags[0] = 0; cs->cst->flags[1] = RADEON_CS_RING_DMA; @@ -566,7 +566,7 @@ static void radeon_drm_cs_flush(struct radeon_winsys_cs *rcs, cs->cst->flags[0] |= RADEON_CS_END_OF_FRAME; cs->cst->cs.num_chunks = 3; } - if (cs->base.ring_type == RING_COMPUTE) { + if (cs->ring_type == RING_COMPUTE) { cs->cst->flags[1] = RADEON_CS_RING_COMPUTE; cs->cst->cs.num_chunks = 3; } diff --git a/src/gallium/winsys/radeon/drm/radeon_drm_cs.h b/src/gallium/winsys/radeon/drm/radeon_drm_cs.h index 4ffa91ae8b2..c643b76a9cd 100644 --- a/src/gallium/winsys/radeon/drm/radeon_drm_cs.h +++ b/src/gallium/winsys/radeon/drm/radeon_drm_cs.h @@ -59,6 +59,7 @@ struct radeon_cs_context { struct radeon_drm_cs { struct radeon_winsys_cs base; + enum ring_type ring_type; /* We flip between these two CS. While one is being consumed * by the kernel in another thread, the other one is being filled |