From 4d8f3e9748d7de5f7bbf81d78c707c172c9f03c4 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Wed, 20 Sep 2023 12:15:51 -0600 Subject: [PATCH] Revert "drm/i915/dmc: Use unversioned path for ADLP" This reverts commit 81f66500f7c9e80c01bde8eb2cb78054051058e2. --- drivers/gpu/drm/i915/display/intel_dmc.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_dmc.c b/drivers/gpu/drm/i915/display/intel_dmc.c index 8a88de67ff0a98..4690b7e6603271 100644 --- a/drivers/gpu/drm/i915/display/intel_dmc.c +++ b/drivers/gpu/drm/i915/display/intel_dmc.c @@ -99,10 +99,8 @@ MODULE_FIRMWARE(MTL_DMC_PATH); #define DG2_DMC_PATH DMC_LEGACY_PATH(dg2, 2, 08) MODULE_FIRMWARE(DG2_DMC_PATH); -#define ADLP_DMC_PATH DMC_PATH(adlp) -#define ADLP_DMC_FALLBACK_PATH DMC_LEGACY_PATH(adlp, 2, 16) +#define ADLP_DMC_PATH DMC_LEGACY_PATH(adlp, 2, 16) MODULE_FIRMWARE(ADLP_DMC_PATH); -MODULE_FIRMWARE(ADLP_DMC_FALLBACK_PATH); #define ADLS_DMC_PATH DMC_LEGACY_PATH(adls, 2, 01) MODULE_FIRMWARE(ADLS_DMC_PATH); @@ -918,9 +916,7 @@ static void intel_dmc_runtime_pm_put(struct drm_i915_private *i915) static const char *dmc_fallback_path(struct drm_i915_private *i915) { - if (IS_ALDERLAKE_P(i915)) - return ADLP_DMC_FALLBACK_PATH; - + /* No fallback paths for now. */ return NULL; }