drm/nouveau/fb/gp102-: allow module to load even when scrubber binary is missing (c3463aed) · Commits · 戴 / test

drivers/gpu/drm/nouveau/nvkm/subdev/fb/base.c

+29 −10

Original line number	Diff line number	Diff line
		@@ -125,6 +125,34 @@ nvkm_fb_oneinit(struct nvkm_subdev *subdev)
		return nvkm_mm_init(&fb->tags, 0, 0, tags, 1);
		}

		static int
		nvkm_fb_init_scrub_vpr(struct nvkm_fb *fb)
		{
		struct nvkm_subdev *subdev = &fb->subdev;
		int ret;

		nvkm_debug(subdev, "VPR locked, running scrubber binary\n");

		if (!fb->vpr_scrubber.size) {
		nvkm_warn(subdev, "VPR locked, but no scrubber binary!\n");
		return 0;
		}

		ret = fb->func->vpr.scrub(fb);
		if (ret) {
		nvkm_error(subdev, "VPR scrubber binary failed\n");
		return ret;
		}

		if (fb->func->vpr.scrub_required(fb)) {
		nvkm_error(subdev, "VPR still locked after scrub!\n");
		return -EIO;
		}

		nvkm_debug(subdev, "VPR scrubber binary successful\n");
		return 0;
		}

		static int
		nvkm_fb_init(struct nvkm_subdev *subdev)
		{
		@@ -157,18 +185,9 @@ nvkm_fb_init(struct nvkm_subdev *subdev)

		if (fb->func->vpr.scrub_required &&
		fb->func->vpr.scrub_required(fb)) {
		nvkm_debug(subdev, "VPR locked, running scrubber binary\n");

		ret = fb->func->vpr.scrub(fb);
		ret = nvkm_fb_init_scrub_vpr(fb);
		if (ret)
		return ret;

		if (fb->func->vpr.scrub_required(fb)) {
		nvkm_error(subdev, "VPR still locked after scrub!\n");
		return -EIO;
		}

		nvkm_debug(subdev, "VPR scrubber binary successful\n");
		}

		return 0;

+3 −2

Original line number	Diff line number	Diff line
		@@ -120,8 +120,9 @@ gp102_fb_new_(const struct nvkm_fb_func func, struct nvkm_device device,
		if (ret)
		return ret;

		return nvkm_firmware_load_blob(&(*pfb)->subdev, "nvdec/scrubber", "", 0,
		nvkm_firmware_load_blob(&(*pfb)->subdev, "nvdec/scrubber", "", 0,
		&(*pfb)->vpr_scrubber);
		return 0;
		}

		int