From d288c1c11d93d1129c3660b3580ae80626174275 Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Fri, 14 Oct 2011 14:43:20 +1000 Subject: [PATCH] --- yaml --- r: 282585 b: refs/heads/master c: 7ae494e80c8bbad71a968a816d06cf83da4e9b93 h: refs/heads/master i: 282583: f15a6d9fc3874fcbcd76966556fd8fb536294a84 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/nouveau/nv50_dac.c | 7 +------ trunk/drivers/gpu/drm/nouveau/nv50_sor.c | 1 + 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 349007b49ab1..e521e00af3d4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0f6ea564dec79271878b03884a978062bf86eb2a +refs/heads/master: 7ae494e80c8bbad71a968a816d06cf83da4e9b93 diff --git a/trunk/drivers/gpu/drm/nouveau/nv50_dac.c b/trunk/drivers/gpu/drm/nouveau/nv50_dac.c index 808f3ec8f827..a0f2bebf49e3 100644 --- a/trunk/drivers/gpu/drm/nouveau/nv50_dac.c +++ b/trunk/drivers/gpu/drm/nouveau/nv50_dac.c @@ -199,11 +199,6 @@ nv50_dac_mode_fixup(struct drm_encoder *encoder, struct drm_display_mode *mode, return true; } -static void -nv50_dac_prepare(struct drm_encoder *encoder) -{ -} - static void nv50_dac_commit(struct drm_encoder *encoder) { @@ -266,7 +261,7 @@ static const struct drm_encoder_helper_funcs nv50_dac_helper_funcs = { .save = nv50_dac_save, .restore = nv50_dac_restore, .mode_fixup = nv50_dac_mode_fixup, - .prepare = nv50_dac_prepare, + .prepare = nv50_dac_disconnect, .commit = nv50_dac_commit, .mode_set = nv50_dac_mode_set, .get_crtc = nv50_dac_crtc_get, diff --git a/trunk/drivers/gpu/drm/nouveau/nv50_sor.c b/trunk/drivers/gpu/drm/nouveau/nv50_sor.c index da603b1d8e3f..3fab98a2f959 100644 --- a/trunk/drivers/gpu/drm/nouveau/nv50_sor.c +++ b/trunk/drivers/gpu/drm/nouveau/nv50_sor.c @@ -174,6 +174,7 @@ nv50_sor_mode_fixup(struct drm_encoder *encoder, struct drm_display_mode *mode, static void nv50_sor_prepare(struct drm_encoder *encoder) { + nv50_sor_disconnect(encoder); } static void