diff options
| author |   Dave Airlie <airlied@redhat.com> | 2019-06-07 17:14:19 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2019-06-07 17:16:00 +1000 |
| commit | 671e2ee5ee2127179ca884b439ab6001a623edd6 (patch) | |
| tree | e0820264d31fe6bf7a6f6daa9beae6ab1f4d4f9b /drivers/gpu/drm/nouveau/include/nvkm/core/firmware.h | |
| parent | Merge tag 'drm-intel-fixes-2019-06-06' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes (diff) | |
| parent | drm/nouveau/secboot/gp10[2467]: support newer FW to fix SEC2 failures on some boards (diff) | |
| download | linux-dev-671e2ee5ee2127179ca884b439ab6001a623edd6.tar.xz linux-dev-671e2ee5ee2127179ca884b439ab6001a623edd6.zip | |
Merge branch 'linux-5.2' of git://github.com/skeggsb/linux into drm-fixes
" This is a bit more than I'd like to be pushing at this point in a
cycle, but it's a fairly important issue. There's been numerous
reports of more recent GP10[2467] boards failing to load, and I've
worked with NVIDIA FW engineers and tracked this down to the FW we've
been using not properly supporting the boards in question.
I've pushed an update to linux-firmware with the new FW version, which
unfortunately contains API changes vs the older firmware.
This series teaches the ACR subsystem inside nouveau enough to be able
to deal with supporting multiple incompatible FW revisions, and adds
support to the relevant chipsets for loading the newer FW revision, if
it's available."
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Ben Skeggs <skeggsb@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/CACAvsv7pG+vur0Kn_TyU3ainnkvJVw07upnnaQNOToF+kzQtDQ@mail.gmail.com
Diffstat (limited to 'drivers/gpu/drm/nouveau/include/nvkm/core/firmware.h')
| -rw-r--r-- | drivers/gpu/drm/nouveau/include/nvkm/core/firmware.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/core/firmware.h b/drivers/gpu/drm/nouveau/include/nvkm/core/firmware.h index ff0fa38aee72..54da9c6bc8d5 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/core/firmware.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/core/firmware.h @@ -1,12 +1,12 @@ /* SPDX-License-Identifier: GPL-2.0 */ #ifndef __NVKM_FIRMWARE_H__ #define __NVKM_FIRMWARE_H__ - -#include <core/device.h> - -int nvkm_firmware_get(struct nvkm_device *device, const char *fwname, - const struct firmware **fw); - -void nvkm_firmware_put(const struct firmware *fw); - +#include <core/subdev.h> + +int nvkm_firmware_get_version(const struct nvkm_subdev *, const char *fwname, + int min_version, int max_version, + const struct firmware **); +int nvkm_firmware_get(const struct nvkm_subdev *, const char *fwname, + const struct firmware **); +void nvkm_firmware_put(const struct firmware *); #endif |