diff options
-rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_bios.c | 8 | ||||
-rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_drv.c | 4 | ||||
-rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_drv.h | 1 |
3 files changed, 12 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c index 71247da17da..75388f73cd2 100644 --- a/drivers/gpu/drm/nouveau/nouveau_bios.c +++ b/drivers/gpu/drm/nouveau/nouveau_bios.c | |||
@@ -5287,10 +5287,16 @@ parse_dcb_connector_table(struct nvbios *bios) | |||
5287 | break; | 5287 | break; |
5288 | default: | 5288 | default: |
5289 | cte->type = divine_connector_type(bios, cte->index); | 5289 | cte->type = divine_connector_type(bios, cte->index); |
5290 | NV_WARN(dev, "unknown type, using 0x%02x", cte->type); | 5290 | NV_WARN(dev, "unknown type, using 0x%02x\n", cte->type); |
5291 | break; | 5291 | break; |
5292 | } | 5292 | } |
5293 | 5293 | ||
5294 | if (nouveau_override_conntype) { | ||
5295 | int type = divine_connector_type(bios, cte->index); | ||
5296 | if (type != cte->type) | ||
5297 | NV_WARN(dev, " -> type 0x%02x\n", cte->type); | ||
5298 | } | ||
5299 | |||
5294 | } | 5300 | } |
5295 | } | 5301 | } |
5296 | 5302 | ||
diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.c b/drivers/gpu/drm/nouveau/nouveau_drv.c index 874adf55a43..f7f28f2f864 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drv.c +++ b/drivers/gpu/drm/nouveau/nouveau_drv.c | |||
@@ -83,6 +83,10 @@ MODULE_PARM_DESC(nofbaccel, "Disable fbcon acceleration"); | |||
83 | int nouveau_nofbaccel = 0; | 83 | int nouveau_nofbaccel = 0; |
84 | module_param_named(nofbaccel, nouveau_nofbaccel, int, 0400); | 84 | module_param_named(nofbaccel, nouveau_nofbaccel, int, 0400); |
85 | 85 | ||
86 | MODULE_PARM_DESC(override_conntype, "Ignore DCB connector type"); | ||
87 | int nouveau_override_conntype = 0; | ||
88 | module_param_named(override_conntype, nouveau_override_conntype, int, 0400); | ||
89 | |||
86 | MODULE_PARM_DESC(tv_norm, "Default TV norm.\n" | 90 | MODULE_PARM_DESC(tv_norm, "Default TV norm.\n" |
87 | "\t\tSupported: PAL, PAL-M, PAL-N, PAL-Nc, NTSC-M, NTSC-J,\n" | 91 | "\t\tSupported: PAL, PAL-M, PAL-N, PAL-Nc, NTSC-M, NTSC-J,\n" |
88 | "\t\t\thd480i, hd480p, hd576i, hd576p, hd720p, hd1080i.\n" | 92 | "\t\t\thd480i, hd480p, hd576i, hd576p, hd720p, hd1080i.\n" |
diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h index ad2d75d5dd9..6238e25a0c6 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drv.h +++ b/drivers/gpu/drm/nouveau/nouveau_drv.h | |||
@@ -689,6 +689,7 @@ extern int nouveau_ctxfw; | |||
689 | extern int nouveau_ignorelid; | 689 | extern int nouveau_ignorelid; |
690 | extern int nouveau_nofbaccel; | 690 | extern int nouveau_nofbaccel; |
691 | extern int nouveau_noaccel; | 691 | extern int nouveau_noaccel; |
692 | extern int nouveau_override_conntype; | ||
692 | 693 | ||
693 | /* nouveau_state.c */ | 694 | /* nouveau_state.c */ |
694 | extern void nouveau_preclose(struct drm_device *dev, struct drm_file *); | 695 | extern void nouveau_preclose(struct drm_device *dev, struct drm_file *); |