diff options
author | Marek Olšák <[email protected]> | 2014-04-20 18:11:56 +0200 |
---|---|---|
committer | Marek Olšák <[email protected]> | 2014-04-25 01:33:12 +0200 |
commit | 3d0c4f3b01569f43318e648786ae79f7b6b4948e (patch) | |
tree | 7c4c62d1b35fba081c54e5f3b322dc5558e3c9e8 /src/gallium/drivers/r600/evergreen_state.c | |
parent | ecc8a37ec5be7fca79205f08666fb76474ab5c0d (diff) |
r600g: fix for an MSAA hang on RV770
Cc: 10.0 10.1 [email protected]
Reviewed-by: Alex Deucher <[email protected]>
Diffstat (limited to 'src/gallium/drivers/r600/evergreen_state.c')
-rw-r--r-- | src/gallium/drivers/r600/evergreen_state.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/gallium/drivers/r600/evergreen_state.c b/src/gallium/drivers/r600/evergreen_state.c index fc54ae7606a..6f277906f59 100644 --- a/src/gallium/drivers/r600/evergreen_state.c +++ b/src/gallium/drivers/r600/evergreen_state.c @@ -1381,7 +1381,10 @@ static void evergreen_set_framebuffer_state(struct pipe_context *ctx, } log_samples = util_logbase2(rctx->framebuffer.nr_samples); - if (rctx->b.chip_class == CAYMAN && rctx->db_misc_state.log_samples != log_samples) { + /* This is for Cayman to program SAMPLE_RATE, and for RV770 to fix a hw bug. */ + if ((rctx->b.chip_class == CAYMAN || + rctx->b.family == CHIP_RV770) && + rctx->db_misc_state.log_samples != log_samples) { rctx->db_misc_state.log_samples = log_samples; rctx->db_misc_state.atom.dirty = true; } |