From 1c48b3294c0efe6b28ef84139eb838725bb34ccc Mon Sep 17 00:00:00 2001

From: Ben Skeggs <bskeggs@redhat.com>

Date: Tue, 8 Sep 2009 13:57:50 +1000

Subject: [PATCH 4/6] drm/nouveau: disable tv-out by default for the moment

---

 drivers/gpu/drm/nouveau/nouveau_drv.c  |    4 ++++

 drivers/gpu/drm/nouveau/nouveau_drv.h  |    1 +

 drivers/gpu/drm/nouveau/nv04_display.c |    5 +++++

 3 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.c b/drivers/gpu/drm/nouveau/nouveau_drv.c

index 06eb993..d117ab5 100644

--- a/drivers/gpu/drm/nouveau/nouveau_drv.c

+++ b/drivers/gpu/drm/nouveau/nouveau_drv.c

@@ -71,6 +71,10 @@ MODULE_PARM_DESC(uscript_tmds, "TMDS output script table ID (>=GeForce 8)");

 int nouveau_nofbaccel = 0;

 module_param_named(nofbaccel, nouveau_nofbaccel, int, 0400);

+MODULE_PARM_DESC(tv, "Enable TV-out support (

+int nouveau_tv = 0;

+module_param_named(tv, nouveau_tv, 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"

diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h

index bf9acc6..0941725 100644

--- a/drivers/gpu/drm/nouveau/nouveau_drv.h

+++ b/drivers/gpu/drm/nouveau/nouveau_drv.h

@@ -648,6 +648,7 @@ extern int nouveau_uscript_tmds;

 extern int nouveau_vram_pushbuf;

 extern int nouveau_vram_notify;

 extern int nouveau_fbpercrtc;

+extern int nouveau_tv;

 extern char *nouveau_tv_norm;

 extern int nouveau_reg_debug;

 extern char *nouveau_vbios;

diff --git a/drivers/gpu/drm/nouveau/nv04_display.c b/drivers/gpu/drm/nouveau/nv04_display.c

index ef77215..dfae228 100644

--- a/drivers/gpu/drm/nouveau/nv04_display.c

+++ b/drivers/gpu/drm/nouveau/nv04_display.c

@@ -142,6 +142,11 @@ nv04_display_create(struct drm_device *dev)

 			ret = nv04_dfp_create(dev, dcbent);

 			break;

 		case OUTPUT_TV:

+			if (!nouveau_tv) {

+				NV_INFO(dev, "Enable TV-Out with tv module option\n");

+				continue;

+			}

+

 			if (dcbent->location == DCB_LOC_ON_CHIP)

 				ret = nv17_tv_create(dev, dcbent);

 			else

-- 

1.6.5.2