diff --git a/src/etnaviv/drm/etnaviv_gpu.c b/src/etnaviv/drm/etnaviv_gpu.c
index 6b7f498034a..ad32fe31949 100644
--- a/src/etnaviv/drm/etnaviv_gpu.c
+++ b/src/etnaviv/drm/etnaviv_gpu.c
@@ -57,13 +57,13 @@ struct etna_gpu *etna_gpu_new(struct etna_device *dev, unsigned int core)
 	gpu->dev = dev;
 	gpu->core = core;
 
-	gpu->model    	= get_param(dev, core, ETNAVIV_PARAM_GPU_MODEL);
-	gpu->revision 	= get_param(dev, core, ETNAVIV_PARAM_GPU_REVISION);
+	gpu->info.model    	= get_param(dev, core, ETNAVIV_PARAM_GPU_MODEL);
+	gpu->info.revision 	= get_param(dev, core, ETNAVIV_PARAM_GPU_REVISION);
 
-	if (!gpu->model)
+	if (!gpu->info.model)
 		goto fail;
 
-	DEBUG_MSG(" GPU model:          0x%x (rev %x)", gpu->model, gpu->revision);
+	DEBUG_MSG(" GPU model:          0x%x (rev %x)", gpu->info.model, gpu->info.revision);
 
 	return gpu;
 fail:
@@ -86,10 +86,10 @@ int etna_gpu_get_param(struct etna_gpu *gpu, enum etna_param_id param,
 
 	switch(param) {
 	case ETNA_GPU_MODEL:
-		*value = gpu->model;
+		*value = gpu->info.model;
 		return 0;
 	case ETNA_GPU_REVISION:
-		*value = gpu->revision;
+		*value = gpu->info.revision;
 		return 0;
 	case ETNA_GPU_FEATURES_0:
 		*value = get_param(dev, core, ETNAVIV_PARAM_GPU_FEATURES_0);
diff --git a/src/etnaviv/drm/etnaviv_priv.h b/src/etnaviv/drm/etnaviv_priv.h
index f7432abd04a..360af004613 100644
--- a/src/etnaviv/drm/etnaviv_priv.h
+++ b/src/etnaviv/drm/etnaviv_priv.h
@@ -39,6 +39,7 @@
 
 #include <xf86drm.h>
 
+#include "etna_core_info.h"
 #include "util/list.h"
 #include "util/log.h"
 #include "util/macros.h"
@@ -121,8 +122,7 @@ struct etna_bo {
 struct etna_gpu {
 	struct etna_device *dev;
 	uint32_t core;
-	uint32_t model;
-	uint32_t revision;
+	struct etna_core_info info;
 };
 
 struct etna_pipe {
diff --git a/src/etnaviv/drm/meson.build b/src/etnaviv/drm/meson.build
index 697ca1dd229..962448d4e33 100644
--- a/src/etnaviv/drm/meson.build
+++ b/src/etnaviv/drm/meson.build
@@ -43,6 +43,7 @@ libetnaviv_drm = static_library(
   dependencies : [
     dep_libdrm,
     dep_valgrind,
+    idep_etna_common,
   ],
   build_by_default : false,
 )