Commit 7b165105 authored by Jani Nikula's avatar Jani Nikula
Browse files

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: default avatarLucas De Marchi <lucas.demarchi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/15935837a0c15f861bb2a688cc53514f47153ef3.1712345787.git.jani.nikula@intel.com


Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parent 58387e83

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

+3 −1
Original line number Diff line number Diff line
@@ -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"



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);

drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h

+0 −1
Original line number Diff line number Diff line
@@ -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>

drivers/gpu/drm/xe/compat-i915-headers/intel_uc_fw.h

deleted100644 → 0
+0 −11
Original line number Diff line number Diff line 
/* 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