From: Ben Skeggs <bskeggs@redhat.com>
Date: Wed, 6 Jul 2011 23:51:29 +0000 (+1000)
Subject: drm/nvd0/disp: stub dac load detect, prevents oops
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=b6d8e7ec38843edfc4a4491b746a17ff517ab4be;p=~shefty%2Frdma-dev.git

drm/nvd0/disp: stub dac load detect, prevents oops

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
---

diff --git a/drivers/gpu/drm/nouveau/nvd0_display.c b/drivers/gpu/drm/nouveau/nvd0_display.c
index 7b3efff1723..08a54b7b6ef 100644
--- a/drivers/gpu/drm/nouveau/nvd0_display.c
+++ b/drivers/gpu/drm/nouveau/nvd0_display.c
@@ -637,6 +637,12 @@ nvd0_dac_disconnect(struct drm_encoder *encoder)
 	}
 }
 
+static enum drm_connector_status
+nvd0_dac_detect(struct drm_encoder *encoder, struct drm_connector *connector)
+{
+	return connector_status_disconnected;
+}
+
 static void
 nvd0_dac_destroy(struct drm_encoder *encoder)
 {
@@ -652,6 +658,7 @@ static const struct drm_encoder_helper_funcs nvd0_dac_hfunc = {
 	.mode_set = nvd0_dac_mode_set,
 	.disable = nvd0_dac_disconnect,
 	.get_crtc = nvd0_display_crtc_get,
+	.detect = nvd0_dac_detect
 };
 
 static const struct drm_encoder_funcs nvd0_dac_func = {