diff options
author | Ben Skeggs <bskeggs@redhat.com> | 2011-07-06 19:51:29 -0400 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2011-09-20 02:06:57 -0400 |
commit | b6d8e7ec38843edfc4a4491b746a17ff517ab4be (patch) | |
tree | 73ed45f7aa37e62b5b4bd91828d422d3a26a1a59 | |
parent | 8eaa9669f8dc7fec6c7eb5b42c3093114eae9a08 (diff) |
drm/nvd0/disp: stub dac load detect, prevents oops
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
-rw-r--r-- | drivers/gpu/drm/nouveau/nvd0_display.c | 7 |
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 7b3efff17239..08a54b7b6efc 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) | |||
637 | } | 637 | } |
638 | } | 638 | } |
639 | 639 | ||
640 | static enum drm_connector_status | ||
641 | nvd0_dac_detect(struct drm_encoder *encoder, struct drm_connector *connector) | ||
642 | { | ||
643 | return connector_status_disconnected; | ||
644 | } | ||
645 | |||
640 | static void | 646 | static void |
641 | nvd0_dac_destroy(struct drm_encoder *encoder) | 647 | nvd0_dac_destroy(struct drm_encoder *encoder) |
642 | { | 648 | { |
@@ -652,6 +658,7 @@ static const struct drm_encoder_helper_funcs nvd0_dac_hfunc = { | |||
652 | .mode_set = nvd0_dac_mode_set, | 658 | .mode_set = nvd0_dac_mode_set, |
653 | .disable = nvd0_dac_disconnect, | 659 | .disable = nvd0_dac_disconnect, |
654 | .get_crtc = nvd0_display_crtc_get, | 660 | .get_crtc = nvd0_display_crtc_get, |
661 | .detect = nvd0_dac_detect | ||
655 | }; | 662 | }; |
656 | 663 | ||
657 | static const struct drm_encoder_funcs nvd0_dac_func = { | 664 | static const struct drm_encoder_funcs nvd0_dac_func = { |