From ffca423472ebab901d50ef63dc1f076bbc8303a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Roberto=20de=20Souza?= <jose.souza@intel.com>
Date: Tue, 13 Feb 2024 05:33:50 -0800
Subject: [PATCH] intel: Remove circular dependency between intel/dev and
 intel/common
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

intel/common has a build dependency on intel/dev so the later should
not have any dependendies on the first.

So here moving the definition of intel_engine_class to
intel_device_info.h because it is used in intel_device_info struct
and then including intel_device_info.h in intel_engine.h.

Signed-off-by: José Roberto de Souza <jose.souza@intel.com>
Reviewed-by: Sagar Ghuge <sagar.ghuge@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25233>
---
 src/intel/common/intel_engine.h          | 10 +---------
 src/intel/dev/intel_device_info.h        |  1 -
 src/intel/dev/intel_device_info.py       |  8 ++++++++
 src/intel/dev/intel_device_info_gen_h.py |  1 -
 4 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/intel/common/intel_engine.h b/src/intel/common/intel_engine.h
index 28efe7d85bb..cb1e8cc6520 100644
--- a/src/intel/common/intel_engine.h
+++ b/src/intel/common/intel_engine.h
@@ -25,17 +25,9 @@
 
 #include <stdint.h>
 
+#include "intel/dev/intel_device_info.h"
 #include "intel/dev/intel_kmd.h"
 
-enum intel_engine_class {
-   INTEL_ENGINE_CLASS_RENDER = 0,
-   INTEL_ENGINE_CLASS_COPY,
-   INTEL_ENGINE_CLASS_VIDEO,
-   INTEL_ENGINE_CLASS_VIDEO_ENHANCE,
-   INTEL_ENGINE_CLASS_COMPUTE,
-   INTEL_ENGINE_CLASS_INVALID
-};
-
 struct intel_engine_class_instance {
    enum intel_engine_class engine_class;
    uint16_t engine_instance;
diff --git a/src/intel/dev/intel_device_info.h b/src/intel/dev/intel_device_info.h
index 7d44e475065..4f2de5f160f 100644
--- a/src/intel/dev/intel_device_info.h
+++ b/src/intel/dev/intel_device_info.h
@@ -33,7 +33,6 @@
 #include "compiler/shader_enums.h"
 #include "intel_kmd.h"
 
-#include "intel/common/intel_engine.h"
 #include "intel/dev/intel_wa.h"
 
 #include "intel/dev/intel_device_info_gen.h"
diff --git a/src/intel/dev/intel_device_info.py b/src/intel/dev/intel_device_info.py
index e1204fbbc7a..ed721fb7701 100644
--- a/src/intel/dev/intel_device_info.py
+++ b/src/intel/dev/intel_device_info.py
@@ -166,6 +166,14 @@ Enum("intel_cooperative_matrix_component_type",
       "INTEL_CMAT_UINT32",
       "INTEL_CMAT_UINT8"])
 
+Enum("intel_engine_class",
+     ["INTEL_ENGINE_CLASS_RENDER",
+      "INTEL_ENGINE_CLASS_COPY",
+      "INTEL_ENGINE_CLASS_VIDEO",
+      "INTEL_ENGINE_CLASS_VIDEO_ENHANCE",
+      "INTEL_ENGINE_CLASS_COMPUTE",
+      "INTEL_ENGINE_CLASS_INVALID"])
+
 Struct("intel_cooperative_matrix_configuration",
    [Member("intel_cmat_scope", "scope",
            comment=dedent("""\
diff --git a/src/intel/dev/intel_device_info_gen_h.py b/src/intel/dev/intel_device_info_gen_h.py
index 22c5d968d05..ad48141716b 100755
--- a/src/intel/dev/intel_device_info_gen_h.py
+++ b/src/intel/dev/intel_device_info_gen_h.py
@@ -46,7 +46,6 @@ template = COPYRIGHT + """
 
 #include "util/macros.h"
 #include "compiler/shader_enums.h"
-#include "intel/common/intel_engine.h"
 #include "intel/dev/intel_wa.h"
 
 #ifdef __cplusplus