leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/nouveau/core: pass subdev into nvkm_firmware_get, rather than device

Browse Source 
It'd be nice to have FW loading debug messages to appear for the relevant
subsystem, when enabled.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Ben Skeggs 2019-06-06 17:08:12 +10:00
parent c4a52d6696
commit 8854eed1a4
6 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/gpu/drm/nouveau/include/nvkm/core/firmware.h
View File

@ -1,12 +1,9 @@
/* SPDX-License-Identifier: GPL-2.0 */ /* SPDX-License-Identifier: GPL-2.0 */
#ifndef __NVKM_FIRMWARE_H__ #ifndef __NVKM_FIRMWARE_H__
#define __NVKM_FIRMWARE_H__ #define __NVKM_FIRMWARE_H__
#include <core/subdev.h>
#include <core/device.h> int nvkm_firmware_get(const struct nvkm_subdev *, const char *fwname,
int nvkm_firmware_get(struct nvkm_device *device, const char *fwname,
const struct firmware **fw); const struct firmware **fw);
void nvkm_firmware_put(const struct firmware *fw); void nvkm_firmware_put(const struct firmware *fw);
#endif #endif

5
drivers/gpu/drm/nouveau/nvkm/core/firmware.c
View File

@ -24,7 +24,7 @@
/** /**
* nvkm_firmware_get - load firmware from the official nvidia/chip/ directory * nvkm_firmware_get - load firmware from the official nvidia/chip/ directory
* @device device that will use that firmware * @subdev subdevice that will use that firmware
* @fwname name of firmware file to load * @fwname name of firmware file to load
* @fw firmware structure to load to * @fw firmware structure to load to
* *
@ -32,9 +32,10 @@
* Firmware files released by NVIDIA will always follow this format. * Firmware files released by NVIDIA will always follow this format.
*/ */
int int
nvkm_firmware_get(struct nvkm_device *device, const char *fwname, nvkm_firmware_get(const struct nvkm_subdev *subdev, const char *fwname,
const struct firmware **fw) const struct firmware **fw)
{ {
struct nvkm_device *device = subdev->device;
char f[64]; char f[64];
char cname[16]; char cname[16];
int i; int i;

4
drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c
View File

@ -2115,12 +2115,10 @@ int
gf100_gr_ctor_fw(struct gf100_gr *gr, const char *fwname, gf100_gr_ctor_fw(struct gf100_gr *gr, const char *fwname,
struct gf100_gr_fuc *fuc) struct gf100_gr_fuc *fuc)
{ {
struct nvkm_subdev *subdev = &gr->base.engine.subdev;
struct nvkm_device *device = subdev->device;
const struct firmware *fw; const struct firmware *fw;
int ret; int ret;
ret = nvkm_firmware_get(device, fwname, &fw); ret = nvkm_firmware_get(&gr->base.engine.subdev, fwname, &fw);
if (ret) { if (ret) {
ret = gf100_gr_ctor_fw_legacy(gr, fwname, fuc, ret); ret = gf100_gr_ctor_fw_legacy(gr, fwname, fuc, ret);
if (ret) if (ret)

2
drivers/gpu/drm/nouveau/nvkm/subdev/secboot/acr.c
View File

@ -36,7 +36,7 @@ nvkm_acr_load_firmware(const struct nvkm_subdev *subdev, const char *name,
void *blob; void *blob;
int ret; int ret;
ret = nvkm_firmware_get(subdev->device, name, &fw); ret = nvkm_firmware_get(subdev, name, &fw);
if (ret) if (ret)
return ERR_PTR(ret); return ERR_PTR(ret);
if (fw->size < min_size) { if (fw->size < min_size) {

8
drivers/gpu/drm/nouveau/nvkm/subdev/secboot/ls_ucode_gr.c
View File

@ -98,22 +98,22 @@ ls_ucode_img_load_gr(const struct nvkm_subdev *subdev, struct ls_ucode_img *img,
int ret; int ret;
snprintf(f, sizeof(f), "gr/%s_bl", falcon_name); snprintf(f, sizeof(f), "gr/%s_bl", falcon_name);
ret = nvkm_firmware_get(subdev->device, f, &bl); ret = nvkm_firmware_get(subdev, f, &bl);
if (ret) if (ret)
goto error; goto error;
snprintf(f, sizeof(f), "gr/%s_inst", falcon_name); snprintf(f, sizeof(f), "gr/%s_inst", falcon_name);
ret = nvkm_firmware_get(subdev->device, f, &code); ret = nvkm_firmware_get(subdev, f, &code);
if (ret) if (ret)
goto free_bl; goto free_bl;
snprintf(f, sizeof(f), "gr/%s_data", falcon_name); snprintf(f, sizeof(f), "gr/%s_data", falcon_name);
ret = nvkm_firmware_get(subdev->device, f, &data); ret = nvkm_firmware_get(subdev, f, &data);
if (ret) if (ret)
goto free_inst; goto free_inst;
snprintf(f, sizeof(f), "gr/%s_sig", falcon_name); snprintf(f, sizeof(f), "gr/%s_sig", falcon_name);
ret = nvkm_firmware_get(subdev->device, f, &sig); ret = nvkm_firmware_get(subdev, f, &sig);
if (ret) if (ret)
goto free_data; goto free_data;

6
drivers/gpu/drm/nouveau/nvkm/subdev/secboot/ls_ucode_msgqueue.c
View File

@ -46,7 +46,7 @@ acr_ls_ucode_load_msgqueue(const struct nvkm_subdev *subdev, const char *name,
int ret; int ret;
snprintf(f, sizeof(f), "%s/image", name); snprintf(f, sizeof(f), "%s/image", name);
ret = nvkm_firmware_get(subdev->device, f, &image); ret = nvkm_firmware_get(subdev, f, &image);
if (ret) if (ret)
return ret; return ret;
img->ucode_data = kmemdup(image->data, image->size, GFP_KERNEL); img->ucode_data = kmemdup(image->data, image->size, GFP_KERNEL);
@ -55,7 +55,7 @@ acr_ls_ucode_load_msgqueue(const struct nvkm_subdev *subdev, const char *name,
return -ENOMEM; return -ENOMEM;
snprintf(f, sizeof(f), "%s/desc", name); snprintf(f, sizeof(f), "%s/desc", name);
ret = nvkm_firmware_get(subdev->device, f, &desc); ret = nvkm_firmware_get(subdev, f, &desc);
if (ret) if (ret)
return ret; return ret;
memcpy(&img->ucode_desc, desc->data, sizeof(img->ucode_desc)); memcpy(&img->ucode_desc, desc->data, sizeof(img->ucode_desc));
@ -63,7 +63,7 @@ acr_ls_ucode_load_msgqueue(const struct nvkm_subdev *subdev, const char *name,
nvkm_firmware_put(desc); nvkm_firmware_put(desc);
snprintf(f, sizeof(f), "%s/sig", name); snprintf(f, sizeof(f), "%s/sig", name);
ret = nvkm_firmware_get(subdev->device, f, &sig); ret = nvkm_firmware_get(subdev, f, &sig);
if (ret) if (ret)
return ret; return ret;
img->sig_size = sig->size; img->sig_size = sig->size;