Skip to content

Commit

Permalink
drm/xe/xe_uc_fw: Use firmware files from standard locations
Browse files Browse the repository at this point in the history
The GuC/HuC firmware files used by Xe drivers are the same as
used by i915. Use the already-known location to find those
firmware files, for a couple of reasons:

1. Avoid having the same firmware placed on two different
   places on MODULE_FIRMWARE(), if both 915 and xe drivers
   are compiled;

2. Having firmware files located on different locations may end
   creating bigger initramfs, as the same files will be copied
   twice my mkinitrd/dracut/...;

3. this is the place where those firmware files are located at
   https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git
   Upstream doesn't expect them to have on other places;

4. When built with display support, DMC firmware will be
   loaded from i915/ directory. It is very confusing to have
   some firmware files on a different place for the same driver.

Cc: Matthew Brost <[email protected]>
Cc: Lucas de Marchi <[email protected]>
Cc: Rodrigo Vivi <[email protected]>
Cc: Thomas Hellstrom <[email protected]>
Cc: Daniel Vetter <[email protected]>
Cc: David Airlie <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
[ Mostly agree with the direction of "use the firmware blobs from
  upstream at their current location for these platforms". Previous
  directory was not wrong as the plan was to have it handled in the
  upstream firmware repo. For future platforms the location can be
  changed if the support is only in xe ]
Signed-off-by: Lucas De Marchi <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Rodrigo Vivi <[email protected]>
  • Loading branch information
mchehab authored and rodrigovivi committed Dec 19, 2023
1 parent 5fd92bd commit 8eb7ad9
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions drivers/gpu/drm/xe/xe_uc_fw.c
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,12 @@ static struct xe_device *uc_fw_to_xe(struct xe_uc_fw *uc_fw)
fw_def(TIGERLAKE, 0, huc_def(tgl, 7, 9, 3))

#define __MAKE_UC_FW_PATH_MAJOR(prefix_, name_, major_) \
"xe/" \
"i915/" \
__stringify(prefix_) "_" name_ "_" \
__stringify(major_) ".bin"

#define __MAKE_UC_FW_PATH(prefix_, name_, major_, minor_, patch_) \
"xe/" \
"i915/" \
__stringify(prefix_) name_ \
__stringify(major_) "." \
__stringify(minor_) "." \
Expand Down
2 changes: 1 addition & 1 deletion drivers/gpu/drm/xe/xe_uc_fw.h
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,6 @@ static inline u32 xe_uc_fw_get_upload_size(struct xe_uc_fw *uc_fw)
return __xe_uc_fw_get_upload_size(uc_fw);
}

#define XE_UC_FIRMWARE_URL "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/tree/xe"
#define XE_UC_FIRMWARE_URL "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/tree/i915"

#endif

0 comments on commit 8eb7ad9

Please sign in to comment.