Attachment 63122 Details for Bug 50571 – drm/nvd0/disp: disconnect encoders before reprogramming them

[patch] drm/nvd0/disp: disconnect encoders before reprogramming them

0001-drm-nvd0-disp-disconnect-encoders-before-reprogrammi.patch (text/plain), 2.21 KB, created by Jonathan Nieder on 2012-06-16 17:54:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Nieder

Created: 2012-06-16 17:54:10 UTC

Size: 2.21 KB

patch

obsolete

>From: Ben Skeggs <bskeggs@redhat.com>
>Date: Mon, 12 Mar 2012 15:23:44 +1000
>Subject: drm/nvd0/disp: disconnect encoders before reprogramming them
>
>commit 4cbb0f8d2b06c72aae3552ff1a0a57814c6ce7d2 upstream.
>
>[jn: using forward declaration instead of reordering functions
> to simplify patch]
>
>Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
>Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
>---
> drivers/gpu/drm/nouveau/nvd0_display.c | 16 +++++++++-------
> 1 file changed, 9 insertions(+), 7 deletions(-)
>
>diff --git a/drivers/gpu/drm/nouveau/nvd0_display.c b/drivers/gpu/drm/nouveau/nvd0_display.c
>index d2ba2f07400b..0eaa81cd72fb 100644
>--- a/drivers/gpu/drm/nouveau/nvd0_display.c
>+++ b/drivers/gpu/drm/nouveau/nvd0_display.c
>@@ -284,6 +284,8 @@ nvd0_display_flip_next(struct drm_crtc *crtc, struct drm_framebuffer *fb,
> 	u32 *push;
> 	int ret;
> 
>+	evo_sync(crtc->dev, EVO_MASTER);
>+
> 	swap_interval <<= 4;
> 	if (swap_interval == 0)
> 		swap_interval |= 0x100;
>@@ -593,7 +595,7 @@ nvd0_crtc_commit(struct drm_crtc *crtc)
> 		evo_kick(push, crtc->dev, EVO_MASTER);
> 	}
> 
>-	nvd0_crtc_cursor_show(nv_crtc, nv_crtc->cursor.visible, false);
>+	nvd0_crtc_cursor_show(nv_crtc, nv_crtc->cursor.visible, true);
> 	nvd0_display_flip_next(crtc, crtc->fb, NULL, 1);
> }
> 
>@@ -959,11 +961,6 @@ nvd0_dac_mode_fixup(struct drm_encoder *encoder, struct drm_display_mode *mode,
> }
> 
> static void
>-nvd0_dac_prepare(struct drm_encoder *encoder)
>-{
>-}
>-
>-static void
> nvd0_dac_commit(struct drm_encoder *encoder)
> {
> }
>@@ -1043,7 +1040,7 @@ nvd0_dac_destroy(struct drm_encoder *encoder)
> static const struct drm_encoder_helper_funcs nvd0_dac_hfunc = {
> 	.dpms = nvd0_dac_dpms,
> 	.mode_fixup = nvd0_dac_mode_fixup,
>-	.prepare = nvd0_dac_prepare,
>+	.prepare = nvd0_dac_disconnect,
> 	.commit = nvd0_dac_commit,
> 	.mode_set = nvd0_dac_mode_set,
> 	.disable = nvd0_dac_disconnect,
>@@ -1236,9 +1233,14 @@ nvd0_sor_mode_fixup(struct drm_encoder *encoder, struct drm_display_mode *mode,
> 	return true;
> }
> 
>+static void nvd0_sor_disconnect(struct drm_encoder *encoder);
>+
> static void
> nvd0_sor_prepare(struct drm_encoder *encoder)
> {
>+	nvd0_sor_disconnect(encoder);
>+	if (nouveau_encoder(encoder)->dcb->type == OUTPUT_DP)
>+		evo_sync(encoder->dev, EVO_MASTER);
> }
> 
> static void
>-- 
>1.7.11.rc3
>

Actions: View | Splinter Review

Attachments on bug 50571: 62357 | 62358 | 62981 | 62998 | 62999 | 63122

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.