diff options
| author | Michel Dänzer <[email protected]> | 2014-12-09 17:00:32 +0900 |
|---|---|---|
| committer | Michel Dänzer <[email protected]> | 2014-12-25 12:06:22 +0900 |
| commit | b3057f8097f88d9072df6d9c09bcc8c039b88a7c (patch) | |
| tree | 33638176cd21d9a64aa2a03d55bda4b7d5b5b1da | |
| parent | 229bf4475ff0a5dbeb9bc95250f7a40a983c2e28 (diff) | |
radeonsi: Don't modify PA_SC_RASTER_CONFIG register value if rb_mask == 0
E.g. this could happen on older kernels which don't support the
RADEON_INFO_SI_BACKEND_ENABLED_MASK query yet. The code in
si_write_harvested_raster_configs() doesn't deal with this correctly and
would probably mangle the value badly.
Cc: "10.4 10.3" <[email protected]>
Reviewed-by: Marek Olšák <[email protected]>
Reviewed-by: Tom Stellard <[email protected]>
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_state.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c index 097c31cc943..5a417b0211c 100644 --- a/src/gallium/drivers/radeonsi/si_state.c +++ b/src/gallium/drivers/radeonsi/si_state.c @@ -3032,8 +3032,10 @@ void si_init_config(struct si_context *sctx) break; } - /* Always use the default config when all backends are enabled. */ - if (rb_mask && util_bitcount(rb_mask) >= num_rb) { + /* Always use the default config when all backends are enabled + * (or when we failed to determine the enabled backends). + */ + if (!rb_mask || util_bitcount(rb_mask) >= num_rb) { si_pm4_set_reg(pm4, R_028350_PA_SC_RASTER_CONFIG, raster_config); } else { |