[Intel-xe] [PATCH 1/6] Revert "FIXME: drm/i915/dmc: xe way of getting at stepping"

Chaitanya Kumar Borah chaitanya.kumar.borah at intel.com
Thu Oct 12 05:06:40 UTC 2023


This reverts commit a0cdbefc3aea03c1d3f30460c1d89678705d57bb.

Signed-off-by: Chaitanya Kumar Borah <chaitanya.kumar.borah at intel.com>
---
 drivers/gpu/drm/i915/display/intel_dmc.c | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_dmc.c b/drivers/gpu/drm/i915/display/intel_dmc.c
index 51e0463518fb..1623c0c5e8a1 100644
--- a/drivers/gpu/drm/i915/display/intel_dmc.c
+++ b/drivers/gpu/drm/i915/display/intel_dmc.c
@@ -30,18 +30,6 @@
 #include "intel_dmc.h"
 #include "intel_dmc_regs.h"
 
-#ifndef I915
-#include "xe_uc_fw.h"
-
-#define INTEL_UC_FIRMWARE_URL XE_UC_FIRMWARE_URL
-
-__printf(2, 3)
-static inline void
-i915_error_printf(struct drm_i915_error_state_buf *e, const char *f, ...)
-{
-}
-#endif
-
 /**
  * DOC: DMC Firmware Support
  *
@@ -321,11 +309,8 @@ static const struct stepping_info *
 intel_get_stepping_info(struct drm_i915_private *i915,
 			struct stepping_info *si)
 {
-#ifdef I915
 	const char *step_name = intel_step_name(RUNTIME_INFO(i915)->step.display_step);
-#else
-	const char *step_name = xe_step_name(i915->info.step.display);
-#endif
+
 	si->stepping = step_name[0];
 	si->substepping = step_name[1];
 	return si;
-- 
2.25.1



More information about the Intel-xe mailing list