diff options
author | Ben Skeggs <bskeggs@redhat.com> | 2010-07-06 21:05:48 -0400 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2010-07-12 20:13:38 -0400 |
commit | 2107cce3056dccf37ae5cbfc95df348959b2c717 (patch) | |
tree | 7b4368abbd242eeca77cf6dd2d6fdaf483b768bb | |
parent | b6d3d8717855c72e541bace5edd0460f2eed6dde (diff) |
drm/nv50: implement DAC disconnect fix missed in earlier commit
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
-rw-r--r-- | drivers/gpu/drm/nouveau/nv50_dac.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nv50_dac.c b/drivers/gpu/drm/nouveau/nv50_dac.c index 71e0d5f21f93..1bc085962945 100644 --- a/drivers/gpu/drm/nouveau/nv50_dac.c +++ b/drivers/gpu/drm/nouveau/nv50_dac.c | |||
@@ -257,6 +257,12 @@ nv50_dac_mode_set(struct drm_encoder *encoder, struct drm_display_mode *mode, | |||
257 | nv_encoder->crtc = encoder->crtc; | 257 | nv_encoder->crtc = encoder->crtc; |
258 | } | 258 | } |
259 | 259 | ||
260 | static struct drm_crtc * | ||
261 | nv50_dac_crtc_get(struct drm_encoder *encoder) | ||
262 | { | ||
263 | return nouveau_encoder(encoder)->crtc; | ||
264 | } | ||
265 | |||
260 | static const struct drm_encoder_helper_funcs nv50_dac_helper_funcs = { | 266 | static const struct drm_encoder_helper_funcs nv50_dac_helper_funcs = { |
261 | .dpms = nv50_dac_dpms, | 267 | .dpms = nv50_dac_dpms, |
262 | .save = nv50_dac_save, | 268 | .save = nv50_dac_save, |
@@ -265,6 +271,7 @@ static const struct drm_encoder_helper_funcs nv50_dac_helper_funcs = { | |||
265 | .prepare = nv50_dac_prepare, | 271 | .prepare = nv50_dac_prepare, |
266 | .commit = nv50_dac_commit, | 272 | .commit = nv50_dac_commit, |
267 | .mode_set = nv50_dac_mode_set, | 273 | .mode_set = nv50_dac_mode_set, |
274 | .get_crtc = nv50_dac_crtc_get, | ||
268 | .detect = nv50_dac_detect, | 275 | .detect = nv50_dac_detect, |
269 | .disable = nv50_dac_disconnect | 276 | .disable = nv50_dac_disconnect |
270 | }; | 277 | }; |