Commit f4053509 authored by Ben Skeggs's avatar Ben Skeggs

drm/nouveau: add module option to disable TV detection

Intended to be used as a workaround in cases where we falsely detect
that a TV is connected when it's not.
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 965cf68e
...@@ -302,7 +302,7 @@ nouveau_connector_detect(struct drm_connector *connector) ...@@ -302,7 +302,7 @@ nouveau_connector_detect(struct drm_connector *connector)
detect_analog: detect_analog:
nv_encoder = find_encoder_by_type(connector, OUTPUT_ANALOG); nv_encoder = find_encoder_by_type(connector, OUTPUT_ANALOG);
if (!nv_encoder) if (!nv_encoder && !nouveau_tv_disable)
nv_encoder = find_encoder_by_type(connector, OUTPUT_TV); nv_encoder = find_encoder_by_type(connector, OUTPUT_TV);
if (nv_encoder) { if (nv_encoder) {
struct drm_encoder *encoder = to_drm_encoder(nv_encoder); struct drm_encoder *encoder = to_drm_encoder(nv_encoder);
......
...@@ -87,6 +87,10 @@ MODULE_PARM_DESC(override_conntype, "Ignore DCB connector type"); ...@@ -87,6 +87,10 @@ MODULE_PARM_DESC(override_conntype, "Ignore DCB connector type");
int nouveau_override_conntype = 0; int nouveau_override_conntype = 0;
module_param_named(override_conntype, nouveau_override_conntype, int, 0400); module_param_named(override_conntype, nouveau_override_conntype, int, 0400);
MODULE_PARM_DESC(tv_disable, "Disable TV-out detection\n");
int nouveau_tv_disable = 0;
module_param_named(tv_disable, nouveau_tv_disable, int, 0400);
MODULE_PARM_DESC(tv_norm, "Default TV norm.\n" MODULE_PARM_DESC(tv_norm, "Default TV norm.\n"
"\t\tSupported: PAL, PAL-M, PAL-N, PAL-Nc, NTSC-M, NTSC-J,\n" "\t\tSupported: PAL, PAL-M, PAL-N, PAL-Nc, NTSC-M, NTSC-J,\n"
"\t\t\thd480i, hd480p, hd576i, hd576p, hd720p, hd1080i.\n" "\t\t\thd480i, hd480p, hd576i, hd576p, hd720p, hd1080i.\n"
......
...@@ -682,6 +682,7 @@ extern int nouveau_uscript_tmds; ...@@ -682,6 +682,7 @@ extern int nouveau_uscript_tmds;
extern int nouveau_vram_pushbuf; extern int nouveau_vram_pushbuf;
extern int nouveau_vram_notify; extern int nouveau_vram_notify;
extern int nouveau_fbpercrtc; extern int nouveau_fbpercrtc;
extern int nouveau_tv_disable;
extern char *nouveau_tv_norm; extern char *nouveau_tv_norm;
extern int nouveau_reg_debug; extern int nouveau_reg_debug;
extern char *nouveau_vbios; extern char *nouveau_vbios;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment