This patch series changes DMC loading to be backwards-compatible by removing
version checking and loading blobs from unversioned filenames.
Should this be accepted, the next step would be to update linux-firmware to
start using the unversioned filenames. That said, this change still allows to
use the previously versioned paths as fallback, allowing DMC loading to still
work with the current state of linux-firmware.
Signed-off-by: Gustavo Sousa <gustavo.sousa@xxxxxxxxx>
Gustavo Sousa (2):
drm/i915/dmc: Do not require specific versions
drm/i915/dmc: Use unversioned firmware paths
drivers/gpu/drm/i915/display/intel_dmc.c | 133 ++++++++++++++---------
drivers/gpu/drm/i915/display/intel_dmc.h | 1 -
2 files changed, 82 insertions(+), 52 deletions(-)
Interdiff against v1:
diff --git a/drivers/gpu/drm/i915/display/intel_dmc.c b/drivers/gpu/drm/i915/display/intel_dmc.c
index b11f0f451dd7..1e4cd58671d7 100644
--- a/drivers/gpu/drm/i915/display/intel_dmc.c
+++ b/drivers/gpu/drm/i915/display/intel_dmc.c
@@ -882,7 +882,7 @@ static void dmc_load_work_fn(struct work_struct *work)
dev_priv = container_of(work, typeof(*dev_priv), display.dmc.work);
dmc = &dev_priv->display.dmc;
- err = firmware_request_nowarn(&fw, dev_priv->display.dmc.fw_path, dev_priv->drm.dev);
+ err = request_firmware(&fw, dev_priv->display.dmc.fw_path, dev_priv->drm.dev);
if (err == -ENOENT && !dev_priv->params.dmc_firmware_path) {
legacy_path = dmc_legacy_path(dev_priv);
@@ -891,7 +891,7 @@ static void dmc_load_work_fn(struct work_struct *work)
"%s not found, falling back to %s\n",
dmc->fw_path,
legacy_path);
- err = firmware_request_nowarn(&fw, legacy_path, dev_priv->drm.dev);
+ err = request_firmware(&fw, legacy_path, dev_priv->drm.dev);
if (err == 0)
dev_priv->display.dmc.fw_path = legacy_path;
}
--
2.38.1
