Skip to contentSkip to conversation

drm/i915/step: Add macro magic for handling steps

PATCH In review Anusha Srivatsa 3 participants 5 messages Jul 19, 2021 – Aug 12, 2021

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/2 drm/i915/step: Add macro magic for handling steps

With the addition of stepping info for
all platforms, lets use macros for handling them and autogenerating code for all steps at a time.

---
 drivers/gpu/drm/i915/intel_step.c | 14 ++++++++++++
 drivers/gpu/drm/i915/intel_step.h | 37 +++++++++++++++++++------------
 2 files changed, 37 insertions(+), 14 deletions(-)
drivers/gpu/drm/i915/intel_step.c +14 -0
index 9fcf17708cc8..d150d138e889 100644
@@ -182,3 +182,17 @@ void intel_step_init(struct drm_i915_private *i915)
 
 	RUNTIME_INFO(i915)->step = step;
 }
+
+#define STEP_NAME_CASE(name)	\
+	(case STEP_##name:	\
+		return #name)
+
+const char *intel_step_name(enum intel_step step)
+{
+	switch (step) {
+	STEP_NAME_LIST(STEP_NAME_CASE);
+
+	default:
+		return "**";
+	}
+}
drivers/gpu/drm/i915/intel_step.h +23 -14
index 88a77159703e..f6641e2a3c77 100644
@@ -15,30 +15,39 @@ struct intel_step_info {
 	u8 display_step;
 };
 
+#define STEP_ENUM_VAL(name)  STEP_##name,
+
+#define STEP_NAME_LIST(func)		\
+	func(A0)			\
+	func(A1)			\
+	func(A2)			\
+	func(B0)			\
+	func(B1)			\
+	func(B2)			\
+	func(C0)			\
+	func(C1)			\
+	func(D0)			\
+	func(D1)			\
+	func(E0)			\
+	func(F0)			\
+	func(G0)			\
+	func(H0)			\
+	func(I0)			\
+	func(I1)			\
+	func(J0)
+
 /*
  * Symbolic steppings that do not match the hardware. These are valid both as gt
  * and display steppings as symbolic names.
  */
 enum intel_step {
 	STEP_NONE = 0,
-	STEP_A0,
-	STEP_A2,
-	STEP_B0,
-	STEP_B1,
-	STEP_C0,
-	STEP_D0,
-	STEP_D1,
-	STEP_E0,
-	STEP_F0,
-	STEP_G0,
-	STEP_H0,
-	STEP_I0,
-	STEP_I1,
-	STEP_J0,
+	STEP_NAME_LIST(STEP_ENUM_VAL)
 	STEP_FUTURE,
 	STEP_FOREVER,
 };
 
 void intel_step_init(struct drm_i915_private *i915);
+const char *intel_step_name(enum intel_step step);
 
 #endif /* __INTEL_STEP_H__ */
Signature · 6 lines
2.32.0

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#1 lore raw

PATCH 2/2 drm/i915/dmc: Change intel_get_stepping_info()

Lets use RUNTIME_INFO->step since all platforms now have their stepping info in intel_step.c. This makes intel_get_stepping_info() a lot simpler.

---
 drivers/gpu/drm/i915/display/intel_dmc.c | 50 ++++--------------------
 1 file changed, 8 insertions(+), 42 deletions(-)
drivers/gpu/drm/i915/display/intel_dmc.c +8 -42
index f8789d4543bf..1f6c32932331 100644
@@ -247,50 +247,15 @@ bool intel_dmc_has_payload(struct drm_i915_private *i915)
 	return i915->dmc.dmc_info[DMC_FW_MAIN].payload;
 }
 
-static const struct stepping_info skl_stepping_info[] = {
-	{'A', '0'}, {'B', '0'}, {'C', '0'},
-	{'D', '0'}, {'E', '0'}, {'F', '0'},
-	{'G', '0'}, {'H', '0'}, {'I', '0'},
-	{'J', '0'}, {'K', '0'}
-};
-
-static const struct stepping_info bxt_stepping_info[] = {
-	{'A', '0'}, {'A', '1'}, {'A', '2'},
-	{'B', '0'}, {'B', '1'}, {'B', '2'}
-};
-
-static const struct stepping_info icl_stepping_info[] = {
-	{'A', '0'}, {'A', '1'}, {'A', '2'},
-	{'B', '0'}, {'B', '2'},
-	{'C', '0'}
-};
-
-static const struct stepping_info no_stepping_info = { '*', '*' };
-
 static const struct stepping_info *
-intel_get_stepping_info(struct drm_i915_private *dev_priv)
+intel_get_stepping_info(struct drm_i915_private *i915,
+			struct stepping_info *si)
 {
-	const struct stepping_info *si;
-	unsigned int size;
-
-	if (IS_ICELAKE(dev_priv)) {
-		size = ARRAY_SIZE(icl_stepping_info);
-		si = icl_stepping_info;
-	} else if (IS_SKYLAKE(dev_priv)) {
-		size = ARRAY_SIZE(skl_stepping_info);
-		si = skl_stepping_info;
-	} else if (IS_BROXTON(dev_priv)) {
-		size = ARRAY_SIZE(bxt_stepping_info);
-		si = bxt_stepping_info;
-	} else {
-		size = 0;
-		si = NULL;
-	}
-
-	if (INTEL_REVID(dev_priv) < size)
-		return si + INTEL_REVID(dev_priv);
+	const char *step_name = intel_step_name(RUNTIME_INFO(i915)->step.display_step);
 
-	return &no_stepping_info;
+	si->stepping = step_name[0];
+	si->substepping = step_name[1];
+	return si;
 }
 
 static void gen9_set_dc_state_debugmask(struct drm_i915_private *dev_priv)
@@ -616,7 +581,8 @@ static void parse_dmc_fw(struct drm_i915_private *dev_priv,
 	struct intel_package_header *package_header;
 	struct intel_dmc_header_base *dmc_header;
 	struct intel_dmc *dmc = &dev_priv->dmc;
-	const struct stepping_info *si = intel_get_stepping_info(dev_priv);
+	struct stepping_info display_info = { '*', '*'};
+	const struct stepping_info *si = intel_get_stepping_info(dev_priv, &display_info);
 	u32 readcount = 0;
 	u32 r, offset;
 	int id;
Signature · 6 lines
2.32.0

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#2 lore raw

[Intel-gfx] ✗ Fi.CI.BUILD: failure for series starting with [CI,1/2] drm/i915/step: Add macro magic for handling steps

In reply to Anusha Srivatsa
== Series Details ==

== Series Details ==

Series: series starting with [CI,1/2] drm/i915/step: Add macro magic for handling steps
URL : https://patchwork.freedesktop.org/series/92734/
State : failure

== Summary ==

CALL scripts/checksyscalls.sh
CALL scripts/atomic/check-atomics.sh
DESCEND objtool
CHK include/generated/compile.h
CC [M] drivers/gpu/drm/i915/intel_step.o
drivers/gpu/drm/i915/intel_step.c: In function ‘intel_step_name’:
drivers/gpu/drm/i915/intel_step.c:187:3: error: expected expression before ‘case’
(case STEP_##name: \
^~~~
./drivers/gpu/drm/i915/intel_step.h:21:2: note: in expansion of macro ‘STEP_NAME_CASE’
func(A0) \
^~~~
drivers/gpu/drm/i915/intel_step.c:193:2: note: in expansion of macro ‘STEP_NAME_LIST’
STEP_NAME_LIST(STEP_NAME_CASE);
^~~~~~~~~~~~~~
drivers/gpu/drm/i915/intel_step.c:187:3: error: expected expression before ‘case’
(case STEP_##name: \
^~~~
./drivers/gpu/drm/i915/intel_step.h:22:2: note: in expansion of macro ‘STEP_NAME_CASE’
func(A1) \
^~~~
drivers/gpu/drm/i915/intel_step.c:193:2: note: in expansion of macro ‘STEP_NAME_LIST’
STEP_NAME_LIST(STEP_NAME_CASE);
^~~~~~~~~~~~~~
drivers/gpu/drm/i915/intel_step.c:187:3: error: expected expression before ‘case’
(case STEP_##name: \
^~~~
./drivers/gpu/drm/i915/intel_step.h:23:2: note: in expansion of macro ‘STEP_NAME_CASE’
func(A2) \
^~~~
drivers/gpu/drm/i915/intel_step.c:193:2: note: in expansion of macro ‘STEP_NAME_LIST’
STEP_NAME_LIST(STEP_NAME_CASE);
^~~~~~~~~~~~~~
drivers/gpu/drm/i915/intel_step.c:187:3: error: expected expression before ‘case’
(case STEP_##name: \
^~~~
./drivers/gpu/drm/i915/intel_step.h:24:2: note: in expansion of macro ‘STEP_NAME_CASE’
func(B0) \
^~~~
drivers/gpu/drm/i915/intel_step.c:193:2: note: in expansion of macro ‘STEP_NAME_LIST’
STEP_NAME_LIST(STEP_NAME_CASE);
^~~~~~~~~~~~~~
drivers/gpu/drm/i915/intel_step.c:187:3: error: expected expression before ‘case’
(case STEP_##name: \
^~~~
./drivers/gpu/drm/i915/intel_step.h:25:2: note: in expansion of macro ‘STEP_NAME_CASE’
func(B1) \
^~~~
drivers/gpu/drm/i915/intel_step.c:193:2: note: in expansion of macro ‘STEP_NAME_LIST’
STEP_NAME_LIST(STEP_NAME_CASE);
^~~~~~~~~~~~~~
drivers/gpu/drm/i915/intel_step.c:187:3: error: expected expression before ‘case’
(case STEP_##name: \
^~~~
./drivers/gpu/drm/i915/intel_step.h:26:2: note: in expansion of macro ‘STEP_NAME_CASE’
func(B2) \
^~~~
drivers/gpu/drm/i915/intel_step.c:193:2: note: in expansion of macro ‘STEP_NAME_LIST’
STEP_NAME_LIST(STEP_NAME_CASE);
^~~~~~~~~~~~~~
drivers/gpu/drm/i915/intel_step.c:187:3: error: expected expression before ‘case’
(case STEP_##name: \
^~~~
./drivers/gpu/drm/i915/intel_step.h:27:2: note: in expansion of macro ‘STEP_NAME_CASE’
func(C0) \
^~~~
drivers/gpu/drm/i915/intel_step.c:193:2: note: in expansion of macro ‘STEP_NAME_LIST’
STEP_NAME_LIST(STEP_NAME_CASE);
^~~~~~~~~~~~~~
drivers/gpu/drm/i915/intel_step.c:187:3: error: expected expression before ‘case’
(case STEP_##name: \
^~~~
./drivers/gpu/drm/i915/intel_step.h:28:2: note: in expansion of macro ‘STEP_NAME_CASE’
func(C1) \
^~~~
drivers/gpu/drm/i915/intel_step.c:193:2: note: in expansion of macro ‘STEP_NAME_LIST’
STEP_NAME_LIST(STEP_NAME_CASE);
^~~~~~~~~~~~~~
drivers/gpu/drm/i915/intel_step.c:187:3: error: expected expression before ‘case’
(case STEP_##name: \
^~~~
./drivers/gpu/drm/i915/intel_step.h:29:2: note: in expansion of macro ‘STEP_NAME_CASE’
func(D0) \
^~~~
drivers/gpu/drm/i915/intel_step.c:193:2: note: in expansion of macro ‘STEP_NAME_LIST’
STEP_NAME_LIST(STEP_NAME_CASE);
^~~~~~~~~~~~~~
drivers/gpu/drm/i915/intel_step.c:187:3: error: expected expression before ‘case’
(case STEP_##name: \
^~~~
./drivers/gpu/drm/i915/intel_step.h:30:2: note: in expansion of macro ‘STEP_NAME_CASE’
func(D1) \
^~~~
drivers/gpu/drm/i915/intel_step.c:193:2: note: in expansion of macro ‘STEP_NAME_LIST’
STEP_NAME_LIST(STEP_NAME_CASE);
^~~~~~~~~~~~~~
drivers/gpu/drm/i915/intel_step.c:187:3: error: expected expression before ‘case’
(case STEP_##name: \
^~~~
./drivers/gpu/drm/i915/intel_step.h:31:2: note: in expansion of macro ‘STEP_NAME_CASE’
func(E0) \
^~~~
drivers/gpu/drm/i915/intel_step.c:193:2: note: in expansion of macro ‘STEP_NAME_LIST’
STEP_NAME_LIST(STEP_NAME_CASE);
^~~~~~~~~~~~~~
drivers/gpu/drm/i915/intel_step.c:187:3: error: expected expression before ‘case’
(case STEP_##name: \
^~~~
./drivers/gpu/drm/i915/intel_step.h:32:2: note: in expansion of macro ‘STEP_NAME_CASE’
func(F0) \
^~~~
drivers/gpu/drm/i915/intel_step.c:193:2: note: in expansion of macro ‘STEP_NAME_LIST’
STEP_NAME_LIST(STEP_NAME_CASE);
^~~~~~~~~~~~~~
drivers/gpu/drm/i915/intel_step.c:187:3: error: expected expression before ‘case’
(case STEP_##name: \
^~~~
./drivers/gpu/drm/i915/intel_step.h:33:2: note: in expansion of macro ‘STEP_NAME_CASE’
func(G0) \
^~~~
drivers/gpu/drm/i915/intel_step.c:193:2: note: in expansion of macro ‘STEP_NAME_LIST’
STEP_NAME_LIST(STEP_NAME_CASE);
^~~~~~~~~~~~~~
drivers/gpu/drm/i915/intel_step.c:187:3: error: expected expression before ‘case’
(case STEP_##name: \
^~~~
./drivers/gpu/drm/i915/intel_step.h:34:2: note: in expansion of macro ‘STEP_NAME_CASE’
func(H0) \
^~~~
drivers/gpu/drm/i915/intel_step.c:193:2: note: in expansion of macro ‘STEP_NAME_LIST’
STEP_NAME_LIST(STEP_NAME_CASE);
^~~~~~~~~~~~~~
drivers/gpu/drm/i915/intel_step.c:187:3: error: expected expression before ‘case’
(case STEP_##name: \
^~~~
./drivers/gpu/drm/i915/intel_step.h:35:2: note: in expansion of macro ‘STEP_NAME_CASE’
func(I0) \
^~~~
drivers/gpu/drm/i915/intel_step.c:193:2: note: in expansion of macro ‘STEP_NAME_LIST’
STEP_NAME_LIST(STEP_NAME_CASE);
^~~~~~~~~~~~~~
drivers/gpu/drm/i915/intel_step.c:187:3: error: expected expression before ‘case’
(case STEP_##name: \
^~~~
./drivers/gpu/drm/i915/intel_step.h:36:2: note: in expansion of macro ‘STEP_NAME_CASE’
func(I1) \
^~~~
drivers/gpu/drm/i915/intel_step.c:193:2: note: in expansion of macro ‘STEP_NAME_LIST’
STEP_NAME_LIST(STEP_NAME_CASE);
^~~~~~~~~~~~~~
drivers/gpu/drm/i915/intel_step.c:187:3: error: expected expression before ‘case’
(case STEP_##name: \
^~~~
./drivers/gpu/drm/i915/intel_step.h:37:2: note: in expansion of macro ‘STEP_NAME_CASE’
func(J0)
^~~~
drivers/gpu/drm/i915/intel_step.c:193:2: note: in expansion of macro ‘STEP_NAME_LIST’
STEP_NAME_LIST(STEP_NAME_CASE);
^~~~~~~~~~~~~~
scripts/Makefile.build:271: recipe for target 'drivers/gpu/drm/i915/intel_step.o' failed make[4]: *** [drivers/gpu/drm/i915/intel_step.o] Error 1 scripts/Makefile.build:514: recipe for target 'drivers/gpu/drm/i915' failed make[3]: *** [drivers/gpu/drm/i915] Error 2
scripts/Makefile.build:514: recipe for target 'drivers/gpu/drm' failed make[2]: *** [drivers/gpu/drm] Error 2
scripts/Makefile.build:514: recipe for target 'drivers/gpu' failed make[1]: *** [drivers/gpu] Error 2
Makefile:1842: recipe for target 'drivers' failed
make: *** [drivers] Error 2

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

maintainer
#3 lore raw
In reply to Anusha Srivatsa
Quoted 78 lines · Anusha Srivatsa

With the addition of stepping info for
all platforms, lets use macros for handling them and autogenerating code for all steps at a time.

---
 drivers/gpu/drm/i915/intel_step.c | 14 ++++++++++++
 drivers/gpu/drm/i915/intel_step.h | 37 +++++++++++++++++++------------
 2 files changed, 37 insertions(+), 14 deletions(-)
drivers/gpu/drm/i915/intel_step.c +14 -0
index 9fcf17708cc8..d150d138e889 100644
@@ -182,3 +182,17 @@ void intel_step_init(struct drm_i915_private *i915)
 
 	RUNTIME_INFO(i915)->step = step;
 }
+
+#define STEP_NAME_CASE(name)	\
+	(case STEP_##name:	\
+		return #name)
+
+const char *intel_step_name(enum intel_step step)
+{
+	switch (step) {
+	STEP_NAME_LIST(STEP_NAME_CASE);
+
+	default:
+		return "**";
+	}
+}
drivers/gpu/drm/i915/intel_step.h +21 -8
index 88a77159703e..f6641e2a3c77 100644
@@ -15,30 +15,39 @@ struct intel_step_info {
 	u8 display_step;
 };
 
+#define STEP_ENUM_VAL(name)  STEP_##name,
+
+#define STEP_NAME_LIST(func)		\
+	func(A0)			\
+	func(A1)			\
+	func(A2)			\
+	func(B0)			\
+	func(B1)			\
+	func(B2)			\
+	func(C0)			\
+	func(C1)			\
+	func(D0)			\
+	func(D1)			\
+	func(E0)			\
+	func(F0)			\
+	func(G0)			\
+	func(H0)			\
+	func(I0)			\
+	func(I1)			\
+	func(J0)
+
 /*
  * Symbolic steppings that do not match the hardware. These are valid both as gt
  * and display steppings as symbolic names.
  */
 enum intel_step {
 	STEP_NONE = 0,
-	STEP_A0,
-	STEP_A2,
-	STEP_B0,
-	STEP_B1,
-	STEP_C0,
-	STEP_D0,
-	STEP_D1,
-	STEP_E0,

drivers/gpu/drm/i915/intel_step.h struct intel_step_info { · line 48

Quoted 10 lines
drivers/gpu/drm/i915/intel_step.h +1 -6
-	STEP_F0,
-	STEP_G0,
-	STEP_H0,
-	STEP_I0,
-	STEP_I1,
-	STEP_J0,
+	STEP_NAME_LIST(STEP_ENUM_VAL)
 	STEP_FUTURE,
 	STEP_FOREVER,
 };

It's been merged already, and so be it.

I'll just note that the main reason I don't like adding this kind of macro abstractions is that it throws off source code tagging tools like ctags and gnu global. I can no longer navigate the definition and all the references of STEP_* using the tools, and it degenerates to git grep which is much worse as it doesn't know about C syntax or semantics. It's not always about how the code looks, it's also about how people can navigate the code base.

BR,
Jani.

Quoted 5 lines
drivers/gpu/drm/i915/intel_step.h +1 -0
 void intel_step_init(struct drm_i915_private *i915);
+const char *intel_step_name(enum intel_step step);
 
 #endif /* __INTEL_STEP_H__ */
Signature · 1 line
Jani Nikula, Intel Open Source Graphics Center
#4 lore raw
Quoted 106 lines

-----Original Message-----
From: Jani Nikula <[email protected]>
Sent: Thursday, August 12, 2021 2:59 AM
To: Srivatsa, Anusha <[email protected]>; intel- [email protected]
Cc: Roper, Matthew D <[email protected]>; De Marchi, Lucas <[email protected]>
Subject: Re: [Intel-gfx] [CI 1/2] drm/i915/step: Add macro magic for handling steps

Quoted 57 lines · Anusha Srivatsa

With the addition of stepping info for all platforms, lets use macros for handling them and autogenerating code for all steps at a time.

---
 drivers/gpu/drm/i915/intel_step.c | 14 ++++++++++++
drivers/gpu/drm/i915/intel_step.h | 37 +++++++++++++++++++------------
 2 files changed, 37 insertions(+), 14 deletions(-)
drivers/gpu/drm/i915/intel_step.c +13 -0
index 9fcf17708cc8..d150d138e889 100644
@@ -182,3 +182,17 @@ void intel_step_init(struct drm_i915_private
 *i915)
 
 	RUNTIME_INFO(i915)->step = step;
 }
+
+#define STEP_NAME_CASE(name)	\
+	(case STEP_##name:	\
+		return #name)
+
+const char *intel_step_name(enum intel_step step) {
+	switch (step) {
+	STEP_NAME_LIST(STEP_NAME_CASE);
+
+	default:
+		return "**";
+	}
+}
drivers/gpu/drm/i915/intel_step.h +13 -0
index 88a77159703e..f6641e2a3c77 100644
@@ -15,30 +15,39 @@ struct intel_step_info {
 	u8 display_step;
 };
 
+#define STEP_ENUM_VAL(name)  STEP_##name,
+
+#define STEP_NAME_LIST(func)		\
+	func(A0)			\
+	func(A1)			\
+	func(A2)			\
+	func(B0)			\
+	func(B1)			\
+	func(B2)			\
+	func(C0)			\
+	func(C1)			\
+	func(D0)			\
+	func(D1)			\

drivers/gpu/drm/i915/intel_step.h struct intel_step_info { · line 40

Quoted 10 lines
drivers/gpu/drm/i915/intel_step.h +8 -0
+	func(E0)			\
+	func(F0)			\
+	func(G0)			\
+	func(H0)			\
+	func(I0)			\
+	func(I1)			\
+	func(J0)
+
 /*
  * Symbolic steppings that do not match the hardware. These are valid

both as gt

Quoted 12 lines
drivers/gpu/drm/i915/intel_step.h +0 -8
  * and display steppings as symbolic names.
  */
 enum intel_step {
 	STEP_NONE = 0,
-	STEP_A0,
-	STEP_A2,
-	STEP_B0,
-	STEP_B1,
-	STEP_C0,
-	STEP_D0,
-	STEP_D1,
-	STEP_E0,

drivers/gpu/drm/i915/intel_step.h struct intel_step_info { · line 48

Quoted 10 lines
drivers/gpu/drm/i915/intel_step.h +1 -6
-	STEP_F0,
-	STEP_G0,
-	STEP_H0,
-	STEP_I0,
-	STEP_I1,
-	STEP_J0,
+	STEP_NAME_LIST(STEP_ENUM_VAL)
 	STEP_FUTURE,
 	STEP_FOREVER,
 };

It's been merged already, and so be it.

Quoted 6 lines

I'll just note that the main reason I don't like adding this kind of macro abstractions is that it throws off source code tagging tools like ctags and gnu global. I can no longer navigate the definition and all the references of STEP_* using the tools, and it degenerates to git grep which is much worse as it doesn't know about C syntax or semantics. It's not always about how the code looks, it's also about how people can navigate the code base.

Had not considered that :-/ will keep this in mind from now on. Thanks for the feedback.

Anusha

Quoted 12 lines

BR,
Jani.

drivers/gpu/drm/i915/intel_step.h struct intel_step_info { · line 53

Quoted 5 lines
drivers/gpu/drm/i915/intel_step.h +1 -0
 void intel_step_init(struct drm_i915_private *i915);
+const char *intel_step_name(enum intel_step step);
 
 #endif /* __INTEL_STEP_H__ */

--
Jani Nikula, Intel Open Source Graphics Center