summaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers/radeon
diff options
context:
space:
mode:
authorSamuel Li <samuel.li@amd.com>2014-05-01 13:27:58 -0400
committerAlex Deucher <alexander.deucher@amd.com>2014-05-02 17:30:27 -0400
commitaad669b1e90491f7c3951016456e8a2660d91a85 (patch)
treeaeaebb5e9b17e8e374fe42efaf2841c17eeeb23b /src/gallium/drivers/radeon
parentb26175b6c386215c9f9cecef6e2db3502f1e9c56 (diff)
downloadexternal_mesa3d-aad669b1e90491f7c3951016456e8a2660d91a85.zip
external_mesa3d-aad669b1e90491f7c3951016456e8a2660d91a85.tar.gz
external_mesa3d-aad669b1e90491f7c3951016456e8a2660d91a85.tar.bz2
radeonsi: add support for Mullins asics.
v2: name defaults to kabini for older llvm v3: fix llvm version check Signed-off-by: Samuel Li <samuel.li@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Leo Liu <leo.liu@amd.com> Reviewed-by: Marek Olšák <marek.olsak@amd.com> Reviewed-by: Tom Stellard <thomas.stellard@amd.com>
Diffstat (limited to 'src/gallium/drivers/radeon')
-rw-r--r--src/gallium/drivers/radeon/r600_pipe_common.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/gallium/drivers/radeon/r600_pipe_common.c b/src/gallium/drivers/radeon/r600_pipe_common.c
index 957186a..70c4d1a 100644
--- a/src/gallium/drivers/radeon/r600_pipe_common.c
+++ b/src/gallium/drivers/radeon/r600_pipe_common.c
@@ -293,6 +293,7 @@ static const char* r600_get_name(struct pipe_screen* pscreen)
case CHIP_KAVERI: return "AMD KAVERI";
case CHIP_KABINI: return "AMD KABINI";
case CHIP_HAWAII: return "AMD HAWAII";
+ case CHIP_MULLINS: return "AMD MULLINS";
default: return "AMD unknown";
}
}
@@ -410,6 +411,12 @@ const char *r600_get_llvm_processor_name(enum radeon_family family)
case CHIP_KABINI: return "kabini";
case CHIP_KAVERI: return "kaveri";
case CHIP_HAWAII: return "hawaii";
+ case CHIP_MULLINS:
+#if HAVE_LLVM >= 0x0305
+ return "mullins";
+#else
+ return "kabini";
+#endif
default: return "";
#endif
}