Mesa (master): freedreno: add Adreno 640 ID

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 01cae57c80839fcb0defc76f450f1938e96e8ae7
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=01cae57c80839fcb0defc76f450f1938e96e8ae7

Author: Jonathan Marek <jonathan at marek.ca>
Date:   Thu Nov  7 07:28:37 2019 -0500

freedreno: add Adreno 640 ID

A640 seems to work without any other changes (glmark and vkcube).

Signed-off-by: Jonathan Marek <jonathan at marek.ca>
Reviewed-by: Kristian H. Kristensen <hoegsberg at google.com>

---

 src/freedreno/vulkan/tu_device.c                 | 1 +
 src/gallium/drivers/freedreno/a6xx/fd6_context.c | 9 +++++++++
 src/gallium/drivers/freedreno/freedreno_screen.c | 1 +
 3 files changed, 11 insertions(+)

diff --git a/src/freedreno/vulkan/tu_device.c b/src/freedreno/vulkan/tu_device.c
index bdd34b5fa9f..edf38b0a402 100644
--- a/src/freedreno/vulkan/tu_device.c
+++ b/src/freedreno/vulkan/tu_device.c
@@ -257,6 +257,7 @@ tu_physical_device_init(struct tu_physical_device *device,
 
    switch (device->gpu_id) {
    case 630:
+   case 640:
       device->tile_align_w = 32;
       device->tile_align_h = 32;
       break;
diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_context.c b/src/gallium/drivers/freedreno/a6xx/fd6_context.c
index d613e4c5e2b..9bd3e348d8a 100644
--- a/src/gallium/drivers/freedreno/a6xx/fd6_context.c
+++ b/src/gallium/drivers/freedreno/a6xx/fd6_context.c
@@ -124,6 +124,15 @@ PC_UNKNOWN_9805:
 		fd6_ctx->magic.PC_UNKNOWN_9805 = 0x1;
 		fd6_ctx->magic.SP_UNKNOWN_A0F8 = 0x1;
 		break;
+	case 640:
+		fd6_ctx->magic.RB_UNKNOWN_8E04_blit = 0x00100000;
+		fd6_ctx->magic.RB_CCU_CNTL_gmem     = 0x7c400000;
+		fd6_ctx->magic.RB_CCU_CNTL_bypass   = 0x10000000;
+		fd6_ctx->magic.PC_UNKNOWN_9805 = 0x1;
+		fd6_ctx->magic.SP_UNKNOWN_A0F8 = 0x1;
+		break;
+	default:
+		unreachable("missing magic config");
 	}
 
 	pctx = &fd6_ctx->base.base;
diff --git a/src/gallium/drivers/freedreno/freedreno_screen.c b/src/gallium/drivers/freedreno/freedreno_screen.c
index 6f75f6ed22b..fb84bb9b6c5 100644
--- a/src/gallium/drivers/freedreno/freedreno_screen.c
+++ b/src/gallium/drivers/freedreno/freedreno_screen.c
@@ -919,6 +919,7 @@ fd_screen_create(struct fd_device *dev, struct renderonly *ro)
 		break;
 	case 618:
 	case 630:
+	case 640:
 		fd6_screen_init(pscreen);
 		break;
 	default: