summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2011-07-07 09:51:29 +1000
committerBen Skeggs <bskeggs@redhat.com>2011-09-20 16:06:57 +1000
commitb6d8e7ec38843edfc4a4491b746a17ff517ab4be (patch)
tree73ed45f7aa37e62b5b4bd91828d422d3a26a1a59 /drivers
parent8eaa9669f8dc7fec6c7eb5b42c3093114eae9a08 (diff)
drm/nvd0/disp: stub dac load detect, prevents oops
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/nouveau/nvd0_display.c7
1 files changed, 7 insertions, 0 deletions
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 = {