From e10b47f157c0c62b783f5b4a2654f3a6a6224215 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?T=C3=B6r=C3=B6k=20Edwin?= Date: Mon, 18 Jun 2012 21:35:30 +0300 Subject: [PATCH 3/3] radeon/llvm: treat r600 separately from rv710 See https://bugs.freedesktop.org/show_bug.cgi?id=50317#c7 --- src/gallium/drivers/r600/r600_llvm.c | 2 ++ src/gallium/drivers/radeon/AMDIL7XXDevice.cpp | 4 +++- src/gallium/drivers/radeon/Processors.td | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/gallium/drivers/r600/r600_llvm.c b/src/gallium/drivers/r600/r600_llvm.c index 5e073e0..cb013d0 100644 --- a/src/gallium/drivers/r600/r600_llvm.c +++ b/src/gallium/drivers/r600/r600_llvm.c @@ -259,6 +259,8 @@ const char * r600_llvm_gpu_string(enum radeon_family family) case CHIP_RV635: case CHIP_RS780: case CHIP_RS880: + gpu_family = "r600"; + break; case CHIP_RV710: gpu_family = "rv710"; break; diff --git a/src/gallium/drivers/radeon/AMDIL7XXDevice.cpp b/src/gallium/drivers/radeon/AMDIL7XXDevice.cpp index d7c9657..d7d7478 100644 --- a/src/gallium/drivers/radeon/AMDIL7XXDevice.cpp +++ b/src/gallium/drivers/radeon/AMDIL7XXDevice.cpp @@ -18,7 +18,9 @@ AMDIL7XXDevice::AMDIL7XXDevice(AMDILSubtarget *ST) : AMDILDevice(ST) { setCaps(); std::string name = mSTM->getDeviceName(); - if (name == "rv710") { + if (name == "r600") { + mDeviceFlag = 0; + } else if (name == "rv710") { mDeviceFlag = OCL_DEVICE_RV710; } else if (name == "rv730") { mDeviceFlag = OCL_DEVICE_RV730; diff --git a/src/gallium/drivers/radeon/Processors.td b/src/gallium/drivers/radeon/Processors.td index 410d887..69f8401 100644 --- a/src/gallium/drivers/radeon/Processors.td +++ b/src/gallium/drivers/radeon/Processors.td @@ -13,6 +13,7 @@ class Proc Features> : Processor; +def : Proc<"r600", R600_EG_Itin, []>; def : Proc<"rv710", R600_EG_Itin, []>; def : Proc<"rv730", R600_EG_Itin, []>; def : Proc<"rv770", R600_EG_Itin, [FeatureFP64]>; -- 1.7.10