Commit 073bde45 authored Sep 19, 2023 by Ben Skeggs Committed by Lyude Paul Sep 19, 2023

drm/nouveau/kms/nv50-: disable dcb parsing



- nvkm should provide all this info now
- preparation for GSP-RM

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
Acked-by: Danilo Krummrich <me@dakr.org>
Signed-off-by: Lyude Paul <lyude@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230919220442.202488-45-lyude@redhat.com

parent 0a4410a7

drivers/gpu/drm/nouveau/nouveau_bios.c

+5 −3

Original line number	Diff line number	Diff line
		@@ -2093,9 +2093,11 @@ nouveau_bios_init(struct drm_device *dev)
		if (!NVInitVBIOS(dev))
		return -ENODEV;

		if (drm->client.device.info.family < NV_DEVICE_INFO_V0_TESLA) {
		ret = parse_dcb_table(dev, bios);
		if (ret)
		return ret;
		}

		if (!bios->major_version) /* we don't run version 0 bios */
		return 0;

drivers/gpu/drm/nouveau/nouveau_display.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -724,10 +724,10 @@ nouveau_display_create(struct drm_device *dev)
		drm_kms_helper_poll_init(dev);
		drm_kms_helper_poll_disable(dev);

		if (nouveau_modeset != 2 && drm->vbios.dcb.entries) {
		ret = nvif_disp_ctor(&drm->client.device, "kmsDisp", 0,
		&disp->disp);
		if (ret == 0) {
		if (nouveau_modeset != 2) {
		ret = nvif_disp_ctor(&drm->client.device, "kmsDisp", 0, &disp->disp);

		if (!ret && (disp->disp.outp_mask \|\| drm->vbios.dcb.entries)) {
		nouveau_display_create_properties(dev);
		if (disp->disp.object.oclass < NV50_DISP) {
		dev->mode_config.fb_modifiers_not_supported = true;

drivers/gpu/drm/nouveau/nvif/disp.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -60,7 +60,7 @@ nvif_disp_ctor(struct nvif_device device, const char name, s32 oclass, struct
		cid = nvif_sclass(&device->object, disps, oclass);
		disp->object.client = NULL;
		if (cid < 0) {
		NVIF_ERRON(cid, &device->object, "[NEW disp%04x] not supported", oclass);
		NVIF_DEBUG(&device->object, "[NEW disp%04x] not supported", oclass);
		return cid;
		}