diff options
| author | Marek Olšák <marek.olsak@amd.com> | 2016-10-24 21:16:11 +0200 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2016-10-27 11:22:44 +0100 |
| commit | cf82ceb21e789d350c236e37a478b80ce191ebb0 (patch) | |
| tree | 2737b37fb1a808240bef358ca1009b6dae26f141 /src/gallium/drivers | |
| parent | b214af38b9f5c1422d53f6477483dec984c14952 (diff) | |
| download | external_mesa3d-cf82ceb21e789d350c236e37a478b80ce191ebb0.zip external_mesa3d-cf82ceb21e789d350c236e37a478b80ce191ebb0.tar.gz external_mesa3d-cf82ceb21e789d350c236e37a478b80ce191ebb0.tar.bz2 | |
gallium/radeon: make sure the address of separate CMASK is aligned properly
This should fix random GPU hangs on Hawaii and Fiji.
Cc: 11.2 12.0 13.0 <mesa-stable@lists.freedesktop.org>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
(cherry picked from commit dce05b342355eac9296ee7110385b16d6edb059d)
Diffstat (limited to 'src/gallium/drivers')
| -rw-r--r-- | src/gallium/drivers/radeon/r600_texture.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/gallium/drivers/radeon/r600_texture.c b/src/gallium/drivers/radeon/r600_texture.c index b57cc92..27035c0 100644 --- a/src/gallium/drivers/radeon/r600_texture.c +++ b/src/gallium/drivers/radeon/r600_texture.c @@ -826,8 +826,9 @@ static void r600_texture_alloc_cmask_separate(struct r600_common_screen *rscreen } rtex->cmask_buffer = (struct r600_resource *) - pipe_buffer_create(&rscreen->b, PIPE_BIND_CUSTOM, - PIPE_USAGE_DEFAULT, rtex->cmask.size); + r600_aligned_buffer_create(&rscreen->b, 0, PIPE_USAGE_DEFAULT, + rtex->cmask.size, + rtex->cmask.alignment); if (rtex->cmask_buffer == NULL) { rtex->cmask.size = 0; return; |