r600g: add llano support

Signed-off-by: Alex Deucher <alexdeucher@gmail.com>

6 files changed, 65 insertions, 0 deletions

diff --git a/src/gallium/drivers/r600/evergreen_state.c b/src/gallium/drivers/r600/evergreen_state.c
index 14860af4dd3..ea37b17c9a4 100644
--- a/src/gallium/drivers/r600/evergreen_state.c
+++ b/src/gallium/drivers/r600/evergreen_state.c
@@ -1250,12 +1250,54 @@ void evergreen_init_config(struct r600_pipe_context *rctx)
 		num_vs_stack_entries = 42;
 		num_gs_stack_entries = 42;
 		num_es_stack_entries = 42;
 		num_hs_stack_entries = 42;
 		num_ls_stack_entries = 42;
 		break;
+	case CHIP_SUMO:
+		num_ps_gprs = 93;
+		num_vs_gprs = 46;
+		num_temp_gprs = 4;
+		num_gs_gprs = 31;
+		num_es_gprs = 31;
+		num_hs_gprs = 23;
+		num_ls_gprs = 23;
+		num_ps_threads = 96;
+		num_vs_threads = 25;
+		num_gs_threads = 25;
+		num_es_threads = 25;
+		num_hs_threads = 25;
+		num_ls_threads = 25;
+		num_ps_stack_entries = 42;
+		num_vs_stack_entries = 42;
+		num_gs_stack_entries = 42;
+		num_es_stack_entries = 42;
+		num_hs_stack_entries = 42;
+		num_ls_stack_entries = 42;
+		break;
+	case CHIP_SUMO2:
+		num_ps_gprs = 93;
+		num_vs_gprs = 46;
+		num_temp_gprs = 4;
+		num_gs_gprs = 31;
+		num_es_gprs = 31;
+		num_hs_gprs = 23;
+		num_ls_gprs = 23;
+		num_ps_threads = 96;
+		num_vs_threads = 25;
+		num_gs_threads = 25;
+		num_es_threads = 25;
+		num_hs_threads = 25;
+		num_ls_threads = 25;
+		num_ps_stack_entries = 85;
+		num_vs_stack_entries = 85;
+		num_gs_stack_entries = 85;
+		num_es_stack_entries = 85;
+		num_hs_stack_entries = 85;
+		num_ls_stack_entries = 85;
+		break;
 	case CHIP_BARTS:
 		num_ps_gprs = 93;
 		num_vs_gprs = 46;
 		num_temp_gprs = 4;
 		num_gs_gprs = 31;
 		num_es_gprs = 31;
@@ -1319,12 +1361,14 @@ void evergreen_init_config(struct r600_pipe_context *rctx)
 	}
 
 	tmp = 0x00000000;
 	switch (family) {
 	case CHIP_CEDAR:
 	case CHIP_PALM:
+	case CHIP_SUMO:
+	case CHIP_SUMO2:
 	case CHIP_CAICOS:
 		break;
 	default:
 		tmp |= S_008C00_VC_ENABLE(1);
 		break;
 	}
diff --git a/src/gallium/drivers/r600/r600.h b/src/gallium/drivers/r600/r600.h
index 996418aa03a..b90de7c65d6 100644
--- a/src/gallium/drivers/r600/r600.h
+++ b/src/gallium/drivers/r600/r600.h
@@ -89,12 +89,14 @@ enum radeon_family {
 	CHIP_CEDAR,
 	CHIP_REDWOOD,
 	CHIP_JUNIPER,
 	CHIP_CYPRESS,
 	CHIP_HEMLOCK,
 	CHIP_PALM,
+	CHIP_SUMO,
+	CHIP_SUMO2,
 	CHIP_BARTS,
 	CHIP_TURKS,
 	CHIP_CAICOS,
 	CHIP_CAYMAN,
 	CHIP_LAST,
 };
diff --git a/src/gallium/drivers/r600/r600_asm.c b/src/gallium/drivers/r600/r600_asm.c
index 00572cbd5bd..dda429e48fa 100644
--- a/src/gallium/drivers/r600/r600_asm.c
+++ b/src/gallium/drivers/r600/r600_asm.c
@@ -219,12 +219,14 @@ int r600_bc_init(struct r600_bc *bc, enum radeon_family family)
 	case CHIP_CEDAR:
 	case CHIP_REDWOOD:
 	case CHIP_JUNIPER:
 	case CHIP_CYPRESS:
 	case CHIP_HEMLOCK:
 	case CHIP_PALM:
+	case CHIP_SUMO:
+	case CHIP_SUMO2:
 	case CHIP_BARTS:
 	case CHIP_TURKS:
 	case CHIP_CAICOS:
 		bc->chiprev = CHIPREV_EVERGREEN;
 		break;
 	case CHIP_CAYMAN:
diff --git a/src/gallium/drivers/r600/r600_pipe.c b/src/gallium/drivers/r600/r600_pipe.c
index 402ccb27fe3..f924d798765 100644
--- a/src/gallium/drivers/r600/r600_pipe.c
+++ b/src/gallium/drivers/r600/r600_pipe.c
@@ -256,12 +256,14 @@ static struct pipe_context *r600_create_context(struct pipe_screen *screen, void
 	case CHIP_CEDAR:
 	case CHIP_REDWOOD:
 	case CHIP_JUNIPER:
 	case CHIP_CYPRESS:
 	case CHIP_HEMLOCK:
 	case CHIP_PALM:
+	case CHIP_SUMO:
+	case CHIP_SUMO2:
 	case CHIP_BARTS:
 	case CHIP_TURKS:
 	case CHIP_CAICOS:
 	case CHIP_CAYMAN:
 		evergreen_init_state_functions(rctx);
 		if (evergreen_context_init(&rctx->ctx, rctx->radeon)) {
@@ -331,12 +333,14 @@ static const char *r600_get_family_name(enum radeon_family family)
 	case CHIP_CEDAR: return "AMD CEDAR";
 	case CHIP_REDWOOD: return "AMD REDWOOD";
 	case CHIP_JUNIPER: return "AMD JUNIPER";
 	case CHIP_CYPRESS: return "AMD CYPRESS";
 	case CHIP_HEMLOCK: return "AMD HEMLOCK";
 	case CHIP_PALM: return "AMD PALM";
+	case CHIP_SUMO: return "AMD SUMO";
+	case CHIP_SUMO2: return "AMD SUMO2";
 	case CHIP_BARTS: return "AMD BARTS";
 	case CHIP_TURKS: return "AMD TURKS";
 	case CHIP_CAICOS: return "AMD CAICOS";
 	case CHIP_CAYMAN: return "AMD CAYMAN";
 	default: return "AMD unknown";
 	}
diff --git a/src/gallium/winsys/r600/drm/r600_drm.c b/src/gallium/winsys/r600/drm/r600_drm.c
index cbed89d3abe..03fe385334c 100644
--- a/src/gallium/winsys/r600/drm/r600_drm.c
+++ b/src/gallium/winsys/r600/drm/r600_drm.c
@@ -317,12 +317,14 @@ static struct radeon *radeon_new(int fd, unsigned device)
 	case CHIP_CEDAR:
 	case CHIP_REDWOOD:
 	case CHIP_JUNIPER:
 	case CHIP_CYPRESS:
 	case CHIP_HEMLOCK:
 	case CHIP_PALM:
+	case CHIP_SUMO:
+	case CHIP_SUMO2:
 	case CHIP_BARTS:
 	case CHIP_TURKS:
 	case CHIP_CAICOS:
 		radeon->chip_class = EVERGREEN;
 		/* set default group bytes, overridden by tiling info ioctl */
 		radeon->tiling_info.group_bytes = 512;
diff --git a/src/gallium/winsys/r600/drm/radeon_pciid.c b/src/gallium/winsys/r600/drm/radeon_pciid.c
index b999e45a8ec..5c41a10bdba 100644
--- a/src/gallium/winsys/r600/drm/radeon_pciid.c
+++ b/src/gallium/winsys/r600/drm/radeon_pciid.c
@@ -436,12 +436,23 @@ static const struct pci_id radeon_pci_id[] = {
 	{0x1002, 0x9611, CHIP_RS780},
 	{0x1002, 0x9612, CHIP_RS780},
 	{0x1002, 0x9613, CHIP_RS780},
 	{0x1002, 0x9614, CHIP_RS780},
 	{0x1002, 0x9615, CHIP_RS780},
 	{0x1002, 0x9616, CHIP_RS780},
+	{0x1002, 0x9640, CHIP_SUMO},
+	{0x1002, 0x9641, CHIP_SUMO},
+	{0x1002, 0x9642, CHIP_SUMO2},
+	{0x1002, 0x9643, CHIP_SUMO2},
+	{0x1002, 0x9644, CHIP_SUMO2},
+	{0x1002, 0x9645, CHIP_SUMO2},
+	{0x1002, 0x9647, CHIP_SUMO},
+	{0x1002, 0x9648, CHIP_SUMO},
+	{0x1002, 0x964a, CHIP_SUMO},
+	{0x1002, 0x964e, CHIP_SUMO},
+	{0x1002, 0x964f, CHIP_SUMO},
 	{0x1002, 0x9710, CHIP_RS880},
 	{0x1002, 0x9711, CHIP_RS880},
 	{0x1002, 0x9712, CHIP_RS880},
 	{0x1002, 0x9713, CHIP_RS880},
 	{0x1002, 0x9714, CHIP_RS880},
 	{0x1002, 0x9715, CHIP_RS880},