diff --git a/drivers/gpu/drm/nouveau/nv04_dac.c b/drivers/gpu/drm/nouveau/nv04_dac.c
index 6a1db41..ed57492 100644
--- a/drivers/gpu/drm/nouveau/nv04_dac.c
+++ b/drivers/gpu/drm/nouveau/nv04_dac.c
@@ -248,12 +248,14 @@ enum drm_connector_status nv17_dac_detect(struct drm_encoder *encoder,
 		nvWriteMC(dev, NV_PBUS_POWERCTRL_4, saved_powerctrl_4 & 0xffffffcf);
 	}
 
+#if 0
 	if (nv_arch(dev) >= NV_30) {
 		saved_gpio_ext = NVReadCRTC(dev, 0, NV_PCRTC_GPIO_EXT);
 
 		NVWriteCRTC(dev, 0, NV_PCRTC_GPIO_EXT, (saved_gpio_ext & ~(3 << 20)) |
 			    (dcb->type == OUTPUT_TV ? (1 << 20) : 0));
 	}
+#endif
 
 	msleep(4);
 
@@ -308,8 +310,10 @@ enum drm_connector_status nv17_dac_detect(struct drm_encoder *encoder,
 		nvWriteMC(dev, NV_PBUS_POWERCTRL_4, saved_powerctrl_4);
 	nvWriteMC(dev, NV_PBUS_POWERCTRL_2, saved_powerctrl_2);
 
+#if 0
 	if (nv_arch(dev) >= NV_30)
 		NVWriteRAMDAC(dev, 0, NV_PCRTC_GPIO_EXT, saved_gpio_ext);
+#endif
 
 	if (present) {
 		NV_INFO(dev, "Load detected on output %c\n", '@' + ffs(dcb->or));
diff --git a/drivers/gpu/drm/nouveau/nv17_tv.c b/drivers/gpu/drm/nouveau/nv17_tv.c
index a9a33e9..b110d33 100644
--- a/drivers/gpu/drm/nouveau/nv17_tv.c
+++ b/drivers/gpu/drm/nouveau/nv17_tv.c
@@ -223,6 +223,7 @@ static void  nv17_tv_dpms(struct drm_encoder *encoder, int mode)
 	NV_TRACE(dev, "Setting dpms mode %d on TV encoder (output %d)\n",
 		 mode, nouveau_encoder(encoder)->dcb->index);
 
+#if 0
 	regs->ptv_200 &= ~1;
 
 	if (tv_norm->kind == CTV_ENC_MODE) {
@@ -248,6 +249,7 @@ static void  nv17_tv_dpms(struct drm_encoder *encoder, int mode)
 	}
 
 	nv04_dac_update_dacclk(encoder, mode == DRM_MODE_DPMS_ON);
+#endif
 }
 
 static void nv17_tv_prepare(struct drm_encoder *encoder)