[PATCH 2/6] drm/i915/dmc: define firmware URL locally

[Lucas De Marchi]

On Fri, Apr 05, 2024 at 10:37:39PM +0300, Jani Nikula wrote:
>Avoid the dependency on intel_uc_fw.h, and allow removal of xe compat
>intel_uc_fw.h. If there needs to be duplication of the URL, at least
>have the duplication in a sensible way.
>
>Cc: Lucas De Marchi <lucas.demarchi at intel.com>
>Signed-off-by: Jani Nikula <jani.nikula at intel.com>


Reviewed-by: Lucas De Marchi <lucas.demarchi at intel.com>

but see below. +Josh

>---
> drivers/gpu/drm/i915/display/intel_dmc.c             |  4 +++-
> drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h    |  1 -
> drivers/gpu/drm/xe/compat-i915-headers/intel_uc_fw.h | 11 -----------
> 3 files changed, 3 insertions(+), 13 deletions(-)
> delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/intel_uc_fw.h
>
>diff --git a/drivers/gpu/drm/i915/display/intel_dmc.c b/drivers/gpu/drm/i915/display/intel_dmc.c
>index 3fa851b5c7a6..e61e9c1b8947 100644
>--- a/drivers/gpu/drm/i915/display/intel_dmc.c
>+++ b/drivers/gpu/drm/i915/display/intel_dmc.c
>@@ -38,6 +38,8 @@
>  * low-power state and comes back to normal.
>  */
>
>+#define INTEL_DMC_FIRMWARE_URL "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git"

repo recently moved to gitlab, but as far as I know the one on
kernel.org will still work. Do we want to change it?

https://gitlab.com/kernel-firmware/linux-firmware

thanks
Lucas De Marchi

>+
> enum intel_dmc_id {
> 	DMC_FW_MAIN = 0,
> 	DMC_FW_PIPEA,
>@@ -953,7 +955,7 @@ static void dmc_load_work_fn(struct work_struct *work)
> 			   " Disabling runtime power management.\n",
> 			   dmc->fw_path);
> 		drm_notice(&i915->drm, "DMC firmware homepage: %s",
>-			   INTEL_UC_FIRMWARE_URL);
>+			   INTEL_DMC_FIRMWARE_URL);
> 	}
>
> 	release_firmware(fw);
>diff --git a/drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h b/drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h
>index a01d1b869c2d..837e95e3604e 100644
>--- a/drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h
>+++ b/drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h
>@@ -26,7 +26,6 @@
> #include "i915_utils.h"
> #include "intel_gt_types.h"
> #include "intel_step.h"
>-#include "intel_uc_fw.h"
> #include "intel_uncore.h"
> #include "intel_runtime_pm.h"
> #include <linux/pm_runtime.h>
>diff --git a/drivers/gpu/drm/xe/compat-i915-headers/intel_uc_fw.h b/drivers/gpu/drm/xe/compat-i915-headers/intel_uc_fw.h
>deleted file mode 100644
>index 009745328992..000000000000
>--- a/drivers/gpu/drm/xe/compat-i915-headers/intel_uc_fw.h
>+++ /dev/null
>@@ -1,11 +0,0 @@
>-/* SPDX-License-Identifier: MIT */
>-/*
>- * Copyright © 2023 Intel Corporation
>- */
>-
>-#ifndef _INTEL_UC_FW_H_
>-#define _INTEL_UC_FW_H_
>-
>-#define INTEL_UC_FIRMWARE_URL "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git"
>-
>-#endif
>-- 
>2.39.2
>