Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/i915/dmc: define firmware URL locally

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@intel.com>
Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/15935837a0c15f861bb2a688cc53514f47153ef3.1712345787.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

+3 -13
+3 -1
drivers/gpu/drm/i915/display/intel_dmc.c
··· 38 38 * low-power state and comes back to normal. 39 39 */ 40 40 41 + #define INTEL_DMC_FIRMWARE_URL "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git" 42 + 41 43 enum intel_dmc_id { 42 44 DMC_FW_MAIN = 0, 43 45 DMC_FW_PIPEA, ··· 955 953 " Disabling runtime power management.\n", 956 954 dmc->fw_path); 957 955 drm_notice(&i915->drm, "DMC firmware homepage: %s", 958 - INTEL_UC_FIRMWARE_URL); 956 + INTEL_DMC_FIRMWARE_URL); 959 957 } 960 958 961 959 release_firmware(fw);
-1
drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h
··· 26 26 #include "i915_utils.h" 27 27 #include "intel_gt_types.h" 28 28 #include "intel_step.h" 29 - #include "intel_uc_fw.h" 30 29 #include "intel_uncore.h" 31 30 #include "intel_runtime_pm.h" 32 31 #include <linux/pm_runtime.h>
-11
drivers/gpu/drm/xe/compat-i915-headers/intel_uc_fw.h
··· 1 - /* SPDX-License-Identifier: MIT */ 2 - /* 3 - * Copyright © 2023 Intel Corporation 4 - */ 5 - 6 - #ifndef _INTEL_UC_FW_H_ 7 - #define _INTEL_UC_FW_H_ 8 - 9 - #define INTEL_UC_FIRMWARE_URL "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git" 10 - 11 - #endif