4 files changed, 74 insertions, 0 deletions

diff --git a/drivers/gpu/drm/etnaviv/Makefile b/drivers/gpu/drm/etnaviv/Makefile
index 9bb780c22501..46e5ffad69a6 100644
--- a/drivers/gpu/drm/etnaviv/Makefile
+++ b/drivers/gpu/drm/etnaviv/Makefile
@@ -9,6 +9,7 @@ etnaviv-y := \
         etnaviv_gem_submit.o \
         etnaviv_gem.o \
         etnaviv_gpu.o \
+        etnaviv_hwdb.o \
         etnaviv_iommu_v2.o \
         etnaviv_iommu.o \
         etnaviv_mmu.o \
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c
index 42ad286d5ec0..dfb12717a742 100644
--- a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c
+++ b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c
@@ -374,6 +374,13 @@ static void etnaviv_hw_identify(struct etnaviv_gpu *gpu)
         dev_info(gpu->dev, "model: GC%x, revision: %x\n",
                  gpu->identity.model, gpu->identity.revision);
 
+        /*
+         * If there is a match in the HWDB, we aren't interested in the
+         * remaining register values, as they might be wrong.
+         */
+        if (etnaviv_fill_identity_from_hwdb(gpu))
+                return;
+
         gpu->identity.features = gpu_read(gpu, VIVS_HI_CHIP_FEATURE);
 
         /* Disable fast clear on GC700. */
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gpu.h b/drivers/gpu/drm/etnaviv/etnaviv_gpu.h
index 18460df401b7..1620015f90ae 100644
--- a/drivers/gpu/drm/etnaviv/etnaviv_gpu.h
+++ b/drivers/gpu/drm/etnaviv/etnaviv_gpu.h
@@ -170,6 +170,7 @@ static inline bool fence_completed(struct etnaviv_gpu *gpu, u32 fence)
 int etnaviv_gpu_get_param(struct etnaviv_gpu *gpu, u32 param, u64 *value);
 
 int etnaviv_gpu_init(struct etnaviv_gpu *gpu);
+bool etnaviv_fill_identity_from_hwdb(struct etnaviv_gpu *gpu);
 
 #ifdef CONFIG_DEBUG_FS
 int etnaviv_gpu_debugfs(struct etnaviv_gpu *gpu, struct seq_file *m);
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_hwdb.c b/drivers/gpu/drm/etnaviv/etnaviv_hwdb.c
new file mode 100644
index 000000000000..ea08bb38caaf
--- /dev/null
+++ b/drivers/gpu/drm/etnaviv/etnaviv_hwdb.c
@@ -0,0 +1,65 @@
+/*
+ * Copyright (C) 2018 Etnaviv Project
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published by
+ * the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "etnaviv_gpu.h"
+
+static const struct etnaviv_chip_identity etnaviv_chip_identities[] = {
+        {
+                .model = 0x7000,
+                .revision = 0x6214,
+                .stream_count = 16,
+                .register_max = 64,
+                .thread_count = 1024,
+                .shader_core_count = 4,
+                .vertex_cache_size = 16,
+                .vertex_output_buffer_size = 1024,
+                .pixel_pipes = 2,
+                .instruction_count = 512,
+                .num_constants = 320,
+                .buffer_size = 0,
+                .varyings_count = 16,
+                .features = 0xe0287cad,
+                .minor_features0 = 0xc1799eff,
+                .minor_features1 = 0xfefbfad9,
+                .minor_features2 = 0xeb9d4fbf,
+                .minor_features3 = 0xedfffced,
+                .minor_features4 = 0xdb0dafc7,
+                .minor_features5 = 0xbb5ac333,
+                .minor_features6 = 0xfc8ee200,
+                .minor_features7 = 0x03fbfa6f,
+                .minor_features8 = 0x00ef0ef0,
+                .minor_features9 = 0x0edbf03c,
+                .minor_features10 = 0x90044250,
+                .minor_features11 = 0x00000024,
+        },
+};
+
+bool etnaviv_fill_identity_from_hwdb(struct etnaviv_gpu *gpu)
+{
+        struct etnaviv_chip_identity *ident = &gpu->identity;
+        int i;
+
+        for (i = 0; i < ARRAY_SIZE(etnaviv_chip_identities); i++) {
+                if (etnaviv_chip_identities[i].model == ident->model &&
+                    etnaviv_chip_identities[i].revision == ident->revision) {
+                        memcpy(ident, &etnaviv_chip_identities[i],
+                               sizeof(*ident));
+                        return true;
+                }
+        }
+
+        return false;
+}