diff options
| author | Alex Deucher <[email protected]> | 2012-09-03 15:11:12 -0400 |
|---|---|---|
| committer | Andreas Boll <[email protected]> | 2012-10-16 21:58:23 +0200 |
| commit | 0c597717d9443f005fae20756c2ef3d25ca80122 (patch) | |
| tree | 7d448c640c0a955edaf39f3149c7ea152020182e /src | |
| parent | 06e174191d33f6af6fcaf6ec0174d41ea9f3618e (diff) | |
r600g: 8.0.x support for Trinity
This is a backport of the following commits from master:
b4082f492b4b55df4c636445e47b97d1f1e4b5b2
75f9d24ac4a539a8f0c16c9bd66e11dc394ba81b
Signed-off-by: Alex Deucher <[email protected]>
Diffstat (limited to 'src')
| -rw-r--r-- | src/gallium/drivers/r600/evergreen_hw_context.c | 4 | ||||
| -rw-r--r-- | src/gallium/drivers/r600/r600.h | 1 | ||||
| -rw-r--r-- | src/gallium/drivers/r600/r600_pipe.c | 3 |
3 files changed, 5 insertions, 3 deletions
diff --git a/src/gallium/drivers/r600/evergreen_hw_context.c b/src/gallium/drivers/r600/evergreen_hw_context.c index 7e698f1f169..b09bde17197 100644 --- a/src/gallium/drivers/r600/evergreen_hw_context.c +++ b/src/gallium/drivers/r600/evergreen_hw_context.c @@ -930,7 +930,7 @@ int evergreen_context_init(struct r600_context *ctx, struct r600_screen *screen) } /* add blocks */ - if (ctx->screen->family == CHIP_CAYMAN) + if (ctx->screen->family >= CHIP_CAYMAN) r = r600_context_add_block(ctx, cayman_config_reg_list, Elements(cayman_config_reg_list), PKT3_SET_CONFIG_REG, EVERGREEN_CONFIG_REG_OFFSET); else @@ -938,7 +938,7 @@ int evergreen_context_init(struct r600_context *ctx, struct r600_screen *screen) Elements(evergreen_config_reg_list), PKT3_SET_CONFIG_REG, EVERGREEN_CONFIG_REG_OFFSET); if (r) goto out_err; - if (ctx->screen->family == CHIP_CAYMAN) + if (ctx->screen->family >= CHIP_CAYMAN) r = r600_context_add_block(ctx, cayman_context_reg_list, Elements(cayman_context_reg_list), PKT3_SET_CONTEXT_REG, EVERGREEN_CONTEXT_REG_OFFSET); else diff --git a/src/gallium/drivers/r600/r600.h b/src/gallium/drivers/r600/r600.h index 4bfb5a980f1..f74d4d006cf 100644 --- a/src/gallium/drivers/r600/r600.h +++ b/src/gallium/drivers/r600/r600.h @@ -66,6 +66,7 @@ enum radeon_family { CHIP_TURKS, CHIP_CAICOS, CHIP_CAYMAN, + CHIP_ARUBA, CHIP_LAST, }; diff --git a/src/gallium/drivers/r600/r600_pipe.c b/src/gallium/drivers/r600/r600_pipe.c index 008a0b90d10..91bc4e6d12a 100644 --- a/src/gallium/drivers/r600/r600_pipe.c +++ b/src/gallium/drivers/r600/r600_pipe.c @@ -333,6 +333,7 @@ static const char *r600_get_family_name(enum radeon_family family) case CHIP_TURKS: return "AMD TURKS"; case CHIP_CAICOS: return "AMD CAICOS"; case CHIP_CAYMAN: return "AMD CAYMAN"; + case CHIP_ARUBA: return "AMD ARUBA"; default: return "AMD unknown"; } } @@ -777,7 +778,7 @@ struct pipe_screen *r600_screen_create(struct radeon_winsys *ws) } /* setup class */ - if (rscreen->family == CHIP_CAYMAN) { + if (rscreen->family >= CHIP_CAYMAN) { rscreen->chip_class = CAYMAN; } else if (rscreen->family >= CHIP_CEDAR) { rscreen->chip_class = EVERGREEN; |