disable FB

hc

2024-01-04 1543e317f1da31b75942316931e8f491a8920811

 kernel/drivers/gpu/drm/nouveau/nvkm/engine/nvdec/base.c
..
..
@@ -20,40 +20,42 @@
20
20
  * DEALINGS IN THE SOFTWARE.
21
21
  */
22
22
 #include "priv.h"
23
-
24
-#include <engine/falcon.h>
25
-
26
-static int
27
-nvkm_nvdec_oneinit(struct nvkm_engine *engine)
28
-{
29
-	struct nvkm_nvdec *nvdec = nvkm_nvdec(engine);
30
-	return nvkm_falcon_v1_new(&nvdec->engine.subdev, "NVDEC", 0x84000,
31
-				  &nvdec->falcon);
32
-}
23
+#include <core/firmware.h>
33
24
 
34
25
 static void *
35
26
 nvkm_nvdec_dtor(struct nvkm_engine *engine)
36
27
 {
37
28
 	struct nvkm_nvdec *nvdec = nvkm_nvdec(engine);
38
-	nvkm_falcon_del(&nvdec->falcon);
29
+	nvkm_falcon_dtor(&nvdec->falcon);
39
30
 	return nvdec;
40
31
 }
41
32
 
42
33
 static const struct nvkm_engine_func
43
34
 nvkm_nvdec = {
44
35
 	.dtor = nvkm_nvdec_dtor,
45
-	.oneinit = nvkm_nvdec_oneinit,
46
36
 };
47
37
 
48
38
 int
49
-nvkm_nvdec_new_(struct nvkm_device *device, int index,
50
-		struct nvkm_nvdec **pnvdec)
39
+nvkm_nvdec_new_(const struct nvkm_nvdec_fwif *fwif, struct nvkm_device *device,
40
+		int index, struct nvkm_nvdec **pnvdec)
51
41
 {
52
42
 	struct nvkm_nvdec *nvdec;
43
+	int ret;
53
44
 
54
45
 	if (!(nvdec = *pnvdec = kzalloc(sizeof(*nvdec), GFP_KERNEL)))
55
46
 		return -ENOMEM;
56
47
 
57
-	return nvkm_engine_ctor(&nvkm_nvdec, device, index, true,
58
-				&nvdec->engine);
48
+	ret = nvkm_engine_ctor(&nvkm_nvdec, device, index, true,
49
+			       &nvdec->engine);
50
+	if (ret)
51
+		return ret;
52
+
53
+	fwif = nvkm_firmware_load(&nvdec->engine.subdev, fwif, "Nvdec", nvdec);
54
+	if (IS_ERR(fwif))
55
+		return -ENODEV;
56
+
57
+	nvdec->func = fwif->func;
58
+
59
+	return nvkm_falcon_ctor(nvdec->func->flcn, &nvdec->engine.subdev,
60
+				nvkm_subdev_name[index], 0, &nvdec->falcon);
59
61
 };