drm/xe/step: switch to the shared step definitions with i915

Use the shared stepping enums from include/drm/intel/step.h.

For now, define xe_step as intel_step to avoid mass renames at the same
time. For compat, we can remove the reverse macro.

Reviewed-by: Luca Coelho <luciano.coelho@intel.com>
Reviewed-by: Gustavo Sousa <gustavo.sousa@intel.com>
Link: https://patch.msgid.link/8173d9d753b343ba127d86277344248a6b1d0c3f.1774875688.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

diff --git a/drivers/gpu/drm/xe/compat-i915-headers/intel_step.h b/drivers/gpu/drm/xe/compat-i915-headers/intel_step.h
index 0eabe2866f5fd4dac62c9e2129cab53833b1ba0d..cb55a659856bb95dca2e6782c69905d04eba5f72 100644 (file)
--- a/drivers/gpu/drm/xe/compat-i915-headers/intel_step.h
+++ b/drivers/gpu/drm/xe/compat-i915-headers/intel_step.h
@@ -6,8 +6,6 @@
 #ifndef __INTEL_STEP_H__
 #define __INTEL_STEP_H__
 
-#include "xe_step_types.h"
-
-#define intel_step xe_step
+#include <drm/intel/step.h>
 
 #endif /* __INTEL_STEP_H__ */

diff --git a/drivers/gpu/drm/xe/xe_step_types.h b/drivers/gpu/drm/xe/xe_step_types.h
index 43ca7385073960feb7bc395d668b017ee27c115d..808385f8180445e2043f530af8552aa221503440 100644 (file)
--- a/drivers/gpu/drm/xe/xe_step_types.h
+++ b/drivers/gpu/drm/xe/xe_step_types.h
@@ -8,6 +8,10 @@
 
 #include <linux/types.h>
 
+#include <drm/intel/step.h>
+
+#define xe_step intel_step
+
 struct xe_step_info {
        u8 platform;
        u8 graphics;
@@ -15,63 +19,4 @@ struct xe_step_info {
        u8 basedie;
 };
 
-#define STEP_ENUM_VAL(name)  STEP_##name,
-
-/*
- * Always define four minor steppings 0-3 for each stepping to match GMD ID
- * spacing of values. See xe_step_gmdid_get().
- */
-#define STEP_NAME_LIST(func)           \
-       func(A0)                        \
-       func(A1)                        \
-       func(A2)                        \
-       func(A3)                        \
-       func(B0)                        \
-       func(B1)                        \
-       func(B2)                        \
-       func(B3)                        \
-       func(C0)                        \
-       func(C1)                        \
-       func(C2)                        \
-       func(C3)                        \
-       func(D0)                        \
-       func(D1)                        \
-       func(D2)                        \
-       func(D3)                        \
-       func(E0)                        \
-       func(E1)                        \
-       func(E2)                        \
-       func(E3)                        \
-       func(F0)                        \
-       func(F1)                        \
-       func(F2)                        \
-       func(F3)                        \
-       func(G0)                        \
-       func(G1)                        \
-       func(G2)                        \
-       func(G3)                        \
-       func(H0)                        \
-       func(H1)                        \
-       func(H2)                        \
-       func(H3)                        \
-       func(I0)                        \
-       func(I1)                        \
-       func(I2)                        \
-       func(I3)                        \
-       func(J0)                        \
-       func(J1)                        \
-       func(J2)                        \
-       func(J3)
-
-/*
- * Symbolic steppings that do not match the hardware. These are valid both as gt
- * and display steppings as symbolic names.
- */
-enum xe_step {
-       STEP_NONE = 0,
-       STEP_NAME_LIST(STEP_ENUM_VAL)
-       STEP_FUTURE,
-       STEP_FOREVER,
-};
-
 #endif