aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/nouveau/nvkm/engine/nvdec
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2020-01-15 06:34:21 +1000
committerBen Skeggs <bskeggs@redhat.com>2020-01-15 10:50:27 +1000
commit68f02444946be707ee3beefabf5e4d5e6374f13a (patch)
tree82cd3aa17bc4be8ea85c05714fbe6e2ef3956019 /drivers/gpu/drm/nouveau/nvkm/engine/nvdec
parentdrm/nouveau/nvdec: initialise SW state for falcon from constructor (diff)
downloadlinux-dev-68f02444946be707ee3beefabf5e4d5e6374f13a.tar.xz
linux-dev-68f02444946be707ee3beefabf5e4d5e6374f13a.zip
drm/nouveau/nvdec/gm107: rename from gp102 implementation
NVDEC is available from GM107, and we currently only have a stub implementation anyway, let's make it explicit. Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/engine/nvdec')
-rw-r--r--drivers/gpu/drm/nouveau/nvkm/engine/nvdec/Kbuild2
-rw-r--r--drivers/gpu/drm/nouveau/nvkm/engine/nvdec/gm107.c (renamed from drivers/gpu/drm/nouveau/nvkm/engine/nvdec/gp102.c)16
2 files changed, 9 insertions, 9 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/nvdec/Kbuild b/drivers/gpu/drm/nouveau/nvkm/engine/nvdec/Kbuild
index cdf631822282..9a0fd9812750 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/nvdec/Kbuild
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/nvdec/Kbuild
@@ -1,3 +1,3 @@
# SPDX-License-Identifier: MIT
nvkm-y += nvkm/engine/nvdec/base.o
-nvkm-y += nvkm/engine/nvdec/gp102.o
+nvkm-y += nvkm/engine/nvdec/gm107.o
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/nvdec/gp102.c b/drivers/gpu/drm/nouveau/nvkm/engine/nvdec/gm107.c
index bd520c77b206..2cc9172bd1ad 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/nvdec/gp102.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/nvdec/gm107.c
@@ -22,7 +22,7 @@
#include "priv.h"
static const struct nvkm_falcon_func
-gp102_nvdec_flcn = {
+gm107_nvdec_flcn = {
.load_imem = nvkm_falcon_v1_load_imem,
.load_dmem = nvkm_falcon_v1_load_dmem,
.read_dmem = nvkm_falcon_v1_read_dmem,
@@ -36,26 +36,26 @@ gp102_nvdec_flcn = {
};
static const struct nvkm_nvdec_func
-gp102_nvdec = {
- .flcn = &gp102_nvdec_flcn,
+gm107_nvdec = {
+ .flcn = &gm107_nvdec_flcn,
};
static int
-gp102_nvdec_nofw(struct nvkm_nvdec *nvdec, int ver,
+gm107_nvdec_nofw(struct nvkm_nvdec *nvdec, int ver,
const struct nvkm_nvdec_fwif *fwif)
{
return 0;
}
static const struct nvkm_nvdec_fwif
-gp102_nvdec_fwif[] = {
- { -1, gp102_nvdec_nofw, &gp102_nvdec },
+gm107_nvdec_fwif[] = {
+ { -1, gm107_nvdec_nofw, &gm107_nvdec },
{}
};
int
-gp102_nvdec_new(struct nvkm_device *device, int index,
+gm107_nvdec_new(struct nvkm_device *device, int index,
struct nvkm_nvdec **pnvdec)
{
- return nvkm_nvdec_new_(gp102_nvdec_fwif, device, index, pnvdec);
+ return nvkm_nvdec_new_(gm107_nvdec_fwif, device, index, pnvdec);
}