Skip to content

Commit

Permalink
Revert "drm/i915/dmc: Use unversioned path for ADLP"
Browse files Browse the repository at this point in the history
This reverts commit 81f6650.
  • Loading branch information
jackpot51 authored and mmstick committed Mar 11, 2024
1 parent cef0f26 commit 043af89
Showing 1 changed file with 2 additions and 6 deletions.
8 changes: 2 additions & 6 deletions drivers/gpu/drm/i915/display/intel_dmc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -907,9 +905,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;
}

Expand Down

0 comments on commit 043af89

Please sign in to comment.