drm/i915/step: Add macro magic for handling steps
Subsystems (3)
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
@@ -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
@@ -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
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
@@ -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
Patchwork
CI[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/92732/
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/i915_drv.o
In file included from ./drivers/gpu/drm/i915/intel_device_info.h:30,
from ./drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h:11,
from ./drivers/gpu/drm/i915/gt/uc/intel_guc.h:15,
from ./drivers/gpu/drm/i915/gt/uc/intel_uc.h:9,
from ./drivers/gpu/drm/i915/gt/intel_gt_types.h:18,
from ./drivers/gpu/drm/i915/gt/intel_engine.h:17,
from ./drivers/gpu/drm/i915/i915_drv.h:84,
from drivers/gpu/drm/i915/display/intel_cdclk.h:11,
from drivers/gpu/drm/i915/i915_drv.c:50:./drivers/gpu/drm/i915/intel_step.h:21:2: error: expected identifier before ‘(’ token
(func(A0) \
^./drivers/gpu/drm/i915/intel_step.h:45:2: note: in expansion of macro ‘STEP_NAME_LIST’
STEP_NAME_LIST(STEP_ENUM_VAL)
^~~~~~~~~~~~~~scripts/Makefile.build:271: recipe for target 'drivers/gpu/drm/i915/i915_drv.o' failed make[4]: *** [drivers/gpu/drm/i915/i915_drv.o] Error 1 scripts/Makefile.build:514: recipe for target 'drivers/gpu/drm/i915' failed make[3]: *** [drivers/gpu/drm/i915] Error 2scripts/Makefile.build:514: recipe for target 'drivers/gpu/drm' failed make[2]: *** [drivers/gpu/drm] Error 2scripts/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