Commit da647d5b authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau: add option to allow override of dcb connector table types 



Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 304424e1

drivers/gpu/drm/nouveau/nouveau_bios.c

+7 −1
Original line number Diff line number Diff line
@@ -5287,10 +5287,16 @@ parse_dcb_connector_table(struct nvbios *bios) 
			break;

		default:

			cte->type = divine_connector_type(bios, cte->index);

			NV_WARN(dev, "unknown type, using 0x%02x", cte->type);

			NV_WARN(dev, "unknown type, using 0x%02x\n", cte->type);

			break;

		}



		if (nouveau_override_conntype) {

			int type = divine_connector_type(bios, cte->index);

			if (type != cte->type)

				NV_WARN(dev, " -> type 0x%02x\n", cte->type);

		}



	}

}

drivers/gpu/drm/nouveau/nouveau_drv.c

+4 −0
Original line number Diff line number Diff line
@@ -83,6 +83,10 @@ MODULE_PARM_DESC(nofbaccel, "Disable fbcon acceleration"); 
int nouveau_nofbaccel = 0;

module_param_named(nofbaccel, nouveau_nofbaccel, int, 0400);



MODULE_PARM_DESC(override_conntype, "Ignore DCB connector type");

int nouveau_override_conntype = 0;

module_param_named(override_conntype, nouveau_override_conntype, int, 0400);



MODULE_PARM_DESC(tv_norm, "Default TV norm.\n"

		 "\t\tSupported: PAL, PAL-M, PAL-N, PAL-Nc, NTSC-M, NTSC-J,\n"

		 "\t\t\thd480i, hd480p, hd576i, hd576p, hd720p, hd1080i.\n"

drivers/gpu/drm/nouveau/nouveau_drv.h

+1 −0
Original line number Diff line number Diff line
@@ -689,6 +689,7 @@ extern int nouveau_ctxfw; 
extern int nouveau_ignorelid;

extern int nouveau_nofbaccel;

extern int nouveau_noaccel;

extern int nouveau_override_conntype;



/* nouveau_state.c */

extern void nouveau_preclose(struct drm_device *dev, struct drm_file *);