drm/nvd0/disp: stub dac load detect, prevents oops
authorBen Skeggs <bskeggs@redhat.com>
Wed, 6 Jul 2011 23:51:29 +0000 (09:51 +1000)
committerBen Skeggs <bskeggs@redhat.com>
Tue, 20 Sep 2011 06:06:57 +0000 (16:06 +1000)
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
drivers/gpu/drm/nouveau/nvd0_display.c

index 7b3efff172397955886aa91d0869af2cc53ec320..08a54b7b6efcbbab9e2533206ece8e97cf65aa66 100644 (file)
@@ -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 = {