bybrooklyn/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-04-18 14:53:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

drm/amdgpu: enhance amdgpu_ucode_request() function flexibility

Browse Source 
v1:
Adding formatting string feature to improve function flexibility.

v2:
modify macro name to ADMGPU_UCODE_MAX_NAME.

Signed-off-by: Yang Wang <kevinyang.wang@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Yang Wang
2024-05-30 22:11:01 +08:00
committed by Alex Deucher
parent 37f432481d
commit 1bfe5e7746
2 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c
View File

@@ -28,6 +28,8 @@
#include "amdgpu.h"
#include "amdgpu_ucode.h"
#define AMDGPU_UCODE_NAME_MAX (128)
static void amdgpu_ucode_print_common_hdr(const struct common_firmware_header *hdr)
{
DRM_DEBUG("size_bytes: %u\n", le32_to_cpu(hdr->size_bytes));
@@ -1427,28 +1429,40 @@ void amdgpu_ucode_ip_version_decode(struct amdgpu_device *adev, int block_type,
*
* @adev: amdgpu device
* @fw: pointer to load firmware to
* @fw_name: firmware to load
* @fmt: firmware name format string
* @...: variable arguments
*
* This is a helper that will use request_firmware and amdgpu_ucode_validate
* to load and run basic validation on firmware. If the load fails, remap
* the error code to -ENODEV, so that early_init functions will fail to load.
*/
int amdgpu_ucode_request(struct amdgpu_device *adev, const struct firmware **fw,
const char *fw_name)
const char *fmt, ...)
{
int err = request_firmware(fw, fw_name, adev->dev);
char fname[AMDGPU_UCODE_NAME_MAX];
va_list ap;
int r;
if (err)
va_start(ap, fmt);
r = vsnprintf(fname, sizeof(fname), fmt, ap);
va_end(ap);
if (r == sizeof(fname)) {
dev_warn(adev->dev, "amdgpu firmware name buffer overflow\n");
return -EOVERFLOW;
}
r = request_firmware(fw, fname, adev->dev);
if (r)
return -ENODEV;
err = amdgpu_ucode_validate(*fw);
if (err) {
dev_dbg(adev->dev, "\"%s\" failed to validate\n", fw_name);
r = amdgpu_ucode_validate(*fw);
if (r) {
dev_dbg(adev->dev, "\"%s\" failed to validate\n", fname);
release_firmware(*fw);
*fw = NULL;
}
return err;
return r;
}
/*