drm/i915/dmc: use step name from runtime info

Now that the step name is in runtime info, switch to using it instead of
intel_step_name().

The ** are only relevant for DMC, so make their use explicit.

Reviewed-by: Luca Coelho <luciano.coelho@intel.com>
Link: https://patch.msgid.link/395906e52e76bc726b9dac69a453583cc6e3f6c1.1773663208.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

diff --git a/drivers/gpu/drm/i915/display/intel_dmc.c b/drivers/gpu/drm/i915/display/intel_dmc.c
index 41842ff7d90f80ee6bd92388db6230aaa9ef7f1b..1667a829e708af6e72937a57e8cf79ac35a13c87 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_dmc.c
+++ b/drivers/gpu/drm/i915/display/intel_dmc.c
@@ -39,7 +39,6 @@
 #include "intel_dmc.h"
 #include "intel_dmc_regs.h"
 #include "intel_flipq.h"
-#include "intel_step.h"
 
 /**
  * DOC: DMC Firmware Support
@@ -420,10 +419,10 @@ bool intel_dmc_has_payload(struct intel_display *display)
 
 static void initialize_stepping_info(struct intel_display *display, struct stepping_info *si)
 {
-       const char *step_name = intel_step_name(INTEL_DISPLAY_STEP(display));
+       const char *step_name = DISPLAY_RUNTIME_INFO(display)->step_name;
 
-       si->stepping = step_name[0];
-       si->substepping = step_name[1];
+       si->stepping = step_name[0] ?: '*';
+       si->substepping = step_name[1] ?: '*';
 }
 
 static void gen9_set_dc_state_debugmask(struct intel_display *display)