Skip to content

Commit 81f6650

Browse files
guludorodrigovivi
authored andcommitted
drm/i915/dmc: Use unversioned path for ADLP
The new DMC release for ADLP (v2.18) in linux-firmware adopted the new convention of using unversioned filenames, so update the driver code for that new release. Keep the latest versioned path as fallback so we do not cause regressions. Signed-off-by: Gustavo Sousa <[email protected]> Reviewed-by: Rodrigo Vivi <[email protected]> Signed-off-by: Rodrigo Vivi <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
1 parent ff6f11a commit 81f6650

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

drivers/gpu/drm/i915/display/intel_dmc.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,10 @@
6363
#define DG2_DMC_PATH DMC_LEGACY_PATH(dg2, 2, 08)
6464
MODULE_FIRMWARE(DG2_DMC_PATH);
6565

66-
#define ADLP_DMC_PATH DMC_LEGACY_PATH(adlp, 2, 16)
66+
#define ADLP_DMC_PATH DMC_PATH(adlp)
67+
#define ADLP_DMC_FALLBACK_PATH DMC_LEGACY_PATH(adlp, 2, 16)
6768
MODULE_FIRMWARE(ADLP_DMC_PATH);
69+
MODULE_FIRMWARE(ADLP_DMC_FALLBACK_PATH);
6870

6971
#define ADLS_DMC_PATH DMC_LEGACY_PATH(adls, 2, 01)
7072
MODULE_FIRMWARE(ADLS_DMC_PATH);
@@ -855,7 +857,9 @@ static void intel_dmc_runtime_pm_put(struct drm_i915_private *dev_priv)
855857

856858
static const char *dmc_fallback_path(struct drm_i915_private *i915)
857859
{
858-
/* No fallback paths for now. */
860+
if (IS_ALDERLAKE_P(i915))
861+
return ADLP_DMC_FALLBACK_PATH;
862+
859863
return NULL;
860864
}
861865

0 commit comments

Comments
 (0)