From 341b1869f6e6cd17cf3e2634009232013bfa7227 Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Wed, 7 Jul 2010 11:05:48 +1000 Subject: [PATCH] --- yaml --- r: 205067 b: refs/heads/master c: 2107cce3056dccf37ae5cbfc95df348959b2c717 h: refs/heads/master i: 205065: 7e11cd9526a147e13e59ef1952764fe4f6131f9c 205063: 81f1f9a8b627919273084eaf44170077ef792670 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/nouveau/nv50_dac.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 932f92f7533f..209fe9527478 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b6d3d8717855c72e541bace5edd0460f2eed6dde +refs/heads/master: 2107cce3056dccf37ae5cbfc95df348959b2c717 diff --git a/trunk/drivers/gpu/drm/nouveau/nv50_dac.c b/trunk/drivers/gpu/drm/nouveau/nv50_dac.c index 71e0d5f21f93..1bc085962945 100644 --- a/trunk/drivers/gpu/drm/nouveau/nv50_dac.c +++ b/trunk/drivers/gpu/drm/nouveau/nv50_dac.c @@ -257,6 +257,12 @@ nv50_dac_mode_set(struct drm_encoder *encoder, struct drm_display_mode *mode, nv_encoder->crtc = encoder->crtc; } +static struct drm_crtc * +nv50_dac_crtc_get(struct drm_encoder *encoder) +{ + return nouveau_encoder(encoder)->crtc; +} + static const struct drm_encoder_helper_funcs nv50_dac_helper_funcs = { .dpms = nv50_dac_dpms, .save = nv50_dac_save, @@ -265,6 +271,7 @@ static const struct drm_encoder_helper_funcs nv50_dac_helper_funcs = { .prepare = nv50_dac_prepare, .commit = nv50_dac_commit, .mode_set = nv50_dac_mode_set, + .get_crtc = nv50_dac_crtc_get, .detect = nv50_dac_detect, .disable = nv50_dac_disconnect };