diff options
| author | Marek Olšák <[email protected]> | 2014-03-22 17:36:15 +0100 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2014-04-09 01:45:16 +0200 |
| commit | 4d641803e8f8763dcf4a262c6bcf2d1ba0431ca2 (patch) | |
| tree | 50bbbbca73a5b63769ca50a8956155d82d499307 /src/gallium | |
| parent | fb5cf3490ebbc173211b6c04c869e3fb9f4dbecc (diff) | |
radeonsi: allow fast color clear and Hyper-Z with 1D-tiled surfaces on CIK
This depends on my kernel fix. Hyper-Z is still disabled by default.
Diffstat (limited to 'src/gallium')
| -rw-r--r-- | src/gallium/drivers/radeon/r600_texture.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/gallium/drivers/radeon/r600_texture.c b/src/gallium/drivers/radeon/r600_texture.c index 30610a2db65..e39b9ec0316 100644 --- a/src/gallium/drivers/radeon/r600_texture.c +++ b/src/gallium/drivers/radeon/r600_texture.c @@ -481,9 +481,9 @@ static unsigned si_texture_htile_alloc_size(struct r600_common_screen *rscreen, unsigned slice_elements, slice_bytes, pipe_interleave_bytes, base_align; unsigned num_pipes = rscreen->tiling_info.num_channels; - /* HTILE doesn't work with 1D tiling (there's massive corruption - * in glxgears). */ - if (rtex->surface.level[0].mode != RADEON_SURF_MODE_2D) + /* HTILE is broken with 1D tiling on old kernels and CIK. */ + if (rtex->surface.level[0].mode == RADEON_SURF_MODE_1D && + rscreen->chip_class >= CIK && rscreen->info.drm_minor < 38) return 0; switch (num_pipes) { @@ -1255,9 +1255,9 @@ void evergreen_do_fast_color_clear(struct r600_common_context *rctx, continue; } - /* fast color clear with 1D tiling doesn't work on CIK */ + /* fast color clear with 1D tiling doesn't work on old kernels and CIK */ if (tex->surface.level[0].mode == RADEON_SURF_MODE_1D && - rctx->chip_class >= CIK) { + rctx->chip_class >= CIK && rctx->screen->info.drm_minor < 38) { continue; } |