diff options
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/engine')
8 files changed, 39 insertions, 40 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c index cabf6dc3234d..d18a24a61698 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c @@ -1100,7 +1100,7 @@ nv98_chipset = { .gr = { 0x00000001, g84_gr_new }, .mspdec = { 0x00000001, g98_mspdec_new }, .msppp = { 0x00000001, g98_msppp_new }, - .msvld = g98_msvld_new, + .msvld = { 0x00000001, g98_msvld_new }, .pm = g84_pm_new, .sec = g98_sec_new, .sw = nv50_sw_new, @@ -1167,7 +1167,7 @@ nva3_chipset = { .mpeg = { 0x00000001, g84_mpeg_new }, .mspdec = { 0x00000001, gt215_mspdec_new }, .msppp = { 0x00000001, gt215_msppp_new }, - .msvld = gt215_msvld_new, + .msvld = { 0x00000001, gt215_msvld_new }, .pm = gt215_pm_new, .sw = nv50_sw_new, }; @@ -1200,7 +1200,7 @@ nva5_chipset = { .gr = { 0x00000001, gt215_gr_new }, .mspdec = { 0x00000001, gt215_mspdec_new }, .msppp = { 0x00000001, gt215_msppp_new }, - .msvld = gt215_msvld_new, + .msvld = { 0x00000001, gt215_msvld_new }, .pm = gt215_pm_new, .sw = nv50_sw_new, }; @@ -1233,7 +1233,7 @@ nva8_chipset = { .gr = { 0x00000001, gt215_gr_new }, .mspdec = { 0x00000001, gt215_mspdec_new }, .msppp = { 0x00000001, gt215_msppp_new }, - .msvld = gt215_msvld_new, + .msvld = { 0x00000001, gt215_msvld_new }, .pm = gt215_pm_new, .sw = nv50_sw_new, }; @@ -1264,7 +1264,7 @@ nvaa_chipset = { .gr = { 0x00000001, gt200_gr_new }, .mspdec = { 0x00000001, g98_mspdec_new }, .msppp = { 0x00000001, g98_msppp_new }, - .msvld = g98_msvld_new, + .msvld = { 0x00000001, g98_msvld_new }, .pm = g84_pm_new, .sec = g98_sec_new, .sw = nv50_sw_new, @@ -1296,7 +1296,7 @@ nvac_chipset = { .gr = { 0x00000001, mcp79_gr_new }, .mspdec = { 0x00000001, g98_mspdec_new }, .msppp = { 0x00000001, g98_msppp_new }, - .msvld = g98_msvld_new, + .msvld = { 0x00000001, g98_msvld_new }, .pm = g84_pm_new, .sec = g98_sec_new, .sw = nv50_sw_new, @@ -1330,7 +1330,7 @@ nvaf_chipset = { .gr = { 0x00000001, mcp89_gr_new }, .mspdec = { 0x00000001, gt215_mspdec_new }, .msppp = { 0x00000001, gt215_msppp_new }, - .msvld = mcp89_msvld_new, + .msvld = { 0x00000001, mcp89_msvld_new }, .pm = gt215_pm_new, .sw = nv50_sw_new, }; @@ -1366,7 +1366,7 @@ nvc0_chipset = { .gr = { 0x00000001, gf100_gr_new }, .mspdec = { 0x00000001, gf100_mspdec_new }, .msppp = { 0x00000001, gf100_msppp_new }, - .msvld = gf100_msvld_new, + .msvld = { 0x00000001, gf100_msvld_new }, .pm = gf100_pm_new, .sw = gf100_sw_new, }; @@ -1402,7 +1402,7 @@ nvc1_chipset = { .gr = { 0x00000001, gf108_gr_new }, .mspdec = { 0x00000001, gf100_mspdec_new }, .msppp = { 0x00000001, gf100_msppp_new }, - .msvld = gf100_msvld_new, + .msvld = { 0x00000001, gf100_msvld_new }, .pm = gf108_pm_new, .sw = gf100_sw_new, }; @@ -1438,7 +1438,7 @@ nvc3_chipset = { .gr = { 0x00000001, gf104_gr_new }, .mspdec = { 0x00000001, gf100_mspdec_new }, .msppp = { 0x00000001, gf100_msppp_new }, - .msvld = gf100_msvld_new, + .msvld = { 0x00000001, gf100_msvld_new }, .pm = gf100_pm_new, .sw = gf100_sw_new, }; @@ -1474,7 +1474,7 @@ nvc4_chipset = { .gr = { 0x00000001, gf104_gr_new }, .mspdec = { 0x00000001, gf100_mspdec_new }, .msppp = { 0x00000001, gf100_msppp_new }, - .msvld = gf100_msvld_new, + .msvld = { 0x00000001, gf100_msvld_new }, .pm = gf100_pm_new, .sw = gf100_sw_new, }; @@ -1510,7 +1510,7 @@ nvc8_chipset = { .gr = { 0x00000001, gf110_gr_new }, .mspdec = { 0x00000001, gf100_mspdec_new }, .msppp = { 0x00000001, gf100_msppp_new }, - .msvld = gf100_msvld_new, + .msvld = { 0x00000001, gf100_msvld_new }, .pm = gf100_pm_new, .sw = gf100_sw_new, }; @@ -1546,7 +1546,7 @@ nvce_chipset = { .gr = { 0x00000001, gf104_gr_new }, .mspdec = { 0x00000001, gf100_mspdec_new }, .msppp = { 0x00000001, gf100_msppp_new }, - .msvld = gf100_msvld_new, + .msvld = { 0x00000001, gf100_msvld_new }, .pm = gf100_pm_new, .sw = gf100_sw_new, }; @@ -1582,7 +1582,7 @@ nvcf_chipset = { .gr = { 0x00000001, gf104_gr_new }, .mspdec = { 0x00000001, gf100_mspdec_new }, .msppp = { 0x00000001, gf100_msppp_new }, - .msvld = gf100_msvld_new, + .msvld = { 0x00000001, gf100_msvld_new }, .pm = gf100_pm_new, .sw = gf100_sw_new, }; @@ -1617,7 +1617,7 @@ nvd7_chipset = { .gr = { 0x00000001, gf117_gr_new }, .mspdec = { 0x00000001, gf100_mspdec_new }, .msppp = { 0x00000001, gf100_msppp_new }, - .msvld = gf100_msvld_new, + .msvld = { 0x00000001, gf100_msvld_new }, .pm = gf117_pm_new, .sw = gf100_sw_new, }; @@ -1653,7 +1653,7 @@ nvd9_chipset = { .gr = { 0x00000001, gf119_gr_new }, .mspdec = { 0x00000001, gf100_mspdec_new }, .msppp = { 0x00000001, gf100_msppp_new }, - .msvld = gf100_msvld_new, + .msvld = { 0x00000001, gf100_msvld_new }, .pm = gf117_pm_new, .sw = gf100_sw_new, }; @@ -1690,7 +1690,7 @@ nve4_chipset = { .gr = { 0x00000001, gk104_gr_new }, .mspdec = { 0x00000001, gk104_mspdec_new }, .msppp = { 0x00000001, gf100_msppp_new }, - .msvld = gk104_msvld_new, + .msvld = { 0x00000001, gk104_msvld_new }, .pm = gk104_pm_new, .sw = gf100_sw_new, }; @@ -1727,7 +1727,7 @@ nve6_chipset = { .gr = { 0x00000001, gk104_gr_new }, .mspdec = { 0x00000001, gk104_mspdec_new }, .msppp = { 0x00000001, gf100_msppp_new }, - .msvld = gk104_msvld_new, + .msvld = { 0x00000001, gk104_msvld_new }, .pm = gk104_pm_new, .sw = gf100_sw_new, }; @@ -1764,7 +1764,7 @@ nve7_chipset = { .gr = { 0x00000001, gk104_gr_new }, .mspdec = { 0x00000001, gk104_mspdec_new }, .msppp = { 0x00000001, gf100_msppp_new }, - .msvld = gk104_msvld_new, + .msvld = { 0x00000001, gk104_msvld_new }, .pm = gk104_pm_new, .sw = gf100_sw_new, }; @@ -1826,7 +1826,7 @@ nvf0_chipset = { .gr = { 0x00000001, gk110_gr_new }, .mspdec = { 0x00000001, gk104_mspdec_new }, .msppp = { 0x00000001, gf100_msppp_new }, - .msvld = gk104_msvld_new, + .msvld = { 0x00000001, gk104_msvld_new }, .sw = gf100_sw_new, }; @@ -1862,7 +1862,7 @@ nvf1_chipset = { .gr = { 0x00000001, gk110b_gr_new }, .mspdec = { 0x00000001, gk104_mspdec_new }, .msppp = { 0x00000001, gf100_msppp_new }, - .msvld = gk104_msvld_new, + .msvld = { 0x00000001, gk104_msvld_new }, .sw = gf100_sw_new, }; @@ -1898,7 +1898,7 @@ nv106_chipset = { .gr = { 0x00000001, gk208_gr_new }, .mspdec = { 0x00000001, gk104_mspdec_new }, .msppp = { 0x00000001, gf100_msppp_new }, - .msvld = gk104_msvld_new, + .msvld = { 0x00000001, gk104_msvld_new }, .sw = gf100_sw_new, }; @@ -1934,7 +1934,7 @@ nv108_chipset = { .gr = { 0x00000001, gk208_gr_new }, .mspdec = { 0x00000001, gk104_mspdec_new }, .msppp = { 0x00000001, gf100_msppp_new }, - .msvld = gk104_msvld_new, + .msvld = { 0x00000001, gk104_msvld_new }, .sw = gf100_sw_new, }; @@ -3174,7 +3174,6 @@ nvkm_device_ctor(const struct nvkm_device_func *func, #include <core/layout.h> #undef NVKM_LAYOUT_INST #undef NVKM_LAYOUT_ONCE - _(NVKM_ENGINE_MSVLD , msvld); _(NVKM_ENGINE_NVENC0 , nvenc[0]); _(NVKM_ENGINE_NVENC1 , nvenc[1]); _(NVKM_ENGINE_NVENC2 , nvenc[2]); diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/msvld/base.c b/drivers/gpu/drm/nouveau/nvkm/engine/msvld/base.c index 745bbb653dc0..7be42b980e57 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/msvld/base.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/msvld/base.c @@ -25,7 +25,7 @@ int nvkm_msvld_new_(const struct nvkm_falcon_func *func, struct nvkm_device *device, - int index, struct nvkm_engine **pengine) + enum nvkm_subdev_type type, int inst, struct nvkm_engine **pengine) { - return nvkm_falcon_new_(func, device, index, true, 0x084000, pengine); + return nvkm_falcon_new_(func, device, type, inst, true, 0x084000, pengine); } diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/msvld/g98.c b/drivers/gpu/drm/nouveau/nvkm/engine/msvld/g98.c index 4a2a9f0494af..cfa2065319a6 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/msvld/g98.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/msvld/g98.c @@ -43,8 +43,8 @@ g98_msvld = { }; int -g98_msvld_new(struct nvkm_device *device, int index, +g98_msvld_new(struct nvkm_device *device, enum nvkm_subdev_type type, int inst, struct nvkm_engine **pengine) { - return nvkm_msvld_new_(&g98_msvld, device, index, pengine); + return nvkm_msvld_new_(&g98_msvld, device, type, inst, pengine); } diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/msvld/gf100.c b/drivers/gpu/drm/nouveau/nvkm/engine/msvld/gf100.c index 1695e532c081..8d58ad8e04d3 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/msvld/gf100.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/msvld/gf100.c @@ -43,8 +43,8 @@ gf100_msvld = { }; int -gf100_msvld_new(struct nvkm_device *device, int index, +gf100_msvld_new(struct nvkm_device *device, enum nvkm_subdev_type type, int inst, struct nvkm_engine **pengine) { - return nvkm_msvld_new_(&gf100_msvld, device, index, pengine); + return nvkm_msvld_new_(&gf100_msvld, device, type, inst, pengine); } diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/msvld/gk104.c b/drivers/gpu/drm/nouveau/nvkm/engine/msvld/gk104.c index b640cd63ebe8..b28be28046f1 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/msvld/gk104.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/msvld/gk104.c @@ -35,8 +35,8 @@ gk104_msvld = { }; int -gk104_msvld_new(struct nvkm_device *device, int index, +gk104_msvld_new(struct nvkm_device *device, enum nvkm_subdev_type type, int inst, struct nvkm_engine **pengine) { - return nvkm_msvld_new_(&gk104_msvld, device, index, pengine); + return nvkm_msvld_new_(&gk104_msvld, device, type, inst, pengine); } diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/msvld/gt215.c b/drivers/gpu/drm/nouveau/nvkm/engine/msvld/gt215.c index 201e8ef3519e..d7489f972c99 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/msvld/gt215.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/msvld/gt215.c @@ -35,8 +35,8 @@ gt215_msvld = { }; int -gt215_msvld_new(struct nvkm_device *device, int index, - struct nvkm_engine **pengine) +gt215_msvld_new(struct nvkm_device *device, enum nvkm_subdev_type type, int inst, + struct nvkm_engine **pengine) { - return nvkm_msvld_new_(>215_msvld, device, index, pengine); + return nvkm_msvld_new_(>215_msvld, device, type, inst, pengine); } diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/msvld/mcp89.c b/drivers/gpu/drm/nouveau/nvkm/engine/msvld/mcp89.c index a0f540ef257b..16c30b62ab09 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/msvld/mcp89.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/msvld/mcp89.c @@ -35,8 +35,8 @@ mcp89_msvld = { }; int -mcp89_msvld_new(struct nvkm_device *device, int index, - struct nvkm_engine **pengine) +mcp89_msvld_new(struct nvkm_device *device, enum nvkm_subdev_type type, int inst, + struct nvkm_engine **pengine) { - return nvkm_msvld_new_(&mcp89_msvld, device, index, pengine); + return nvkm_msvld_new_(&mcp89_msvld, device, type, inst, pengine); } diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/msvld/priv.h b/drivers/gpu/drm/nouveau/nvkm/engine/msvld/priv.h index 5cd1e83badbb..f729d919b054 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/msvld/priv.h +++ b/drivers/gpu/drm/nouveau/nvkm/engine/msvld/priv.h @@ -3,8 +3,8 @@ #define __NVKM_MSVLD_PRIV_H__ #include <engine/msvld.h> -int nvkm_msvld_new_(const struct nvkm_falcon_func *, struct nvkm_device *, - int index, struct nvkm_engine **); +int nvkm_msvld_new_(const struct nvkm_falcon_func *, struct nvkm_device *, enum nvkm_subdev_type, + int, struct nvkm_engine **); void g98_msvld_init(struct nvkm_falcon *); |