Attachment 81808 Details for Bug 66129 – Use output specific mask

[patch] Use output specific mask

0001-xxx-use-output-specific-mask.patch (text/plain), 1.75 KB, created by Emil Velikov on 2013-07-01 14:28:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Emil Velikov

Created: 2013-07-01 14:28:23 UTC

Size: 1.75 KB

patch

obsolete

>From 6dabe60ea8de2f508284b0446f15e4f0325bff07 Mon Sep 17 00:00:00 2001
>From: Emil Velikov <emil.l.velikov@gmail.com>
>Date: Mon, 1 Jul 2013 15:14:49 +0100
>Subject: [PATCH 1/3] xxx: use output specific mask
>
>Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
>---
> drivers/gpu/drm/nouveau/core/engine/disp/nv50.c | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
>diff --git a/drivers/gpu/drm/nouveau/core/engine/disp/nv50.c b/drivers/gpu/drm/nouveau/core/engine/disp/nv50.c
>index 314dda6..0d1822c 100644
>--- a/drivers/gpu/drm/nouveau/core/engine/disp/nv50.c
>+++ b/drivers/gpu/drm/nouveau/core/engine/disp/nv50.c
>@@ -1118,6 +1118,7 @@ nv50_disp_intr_unk20(struct nv50_disp_priv *priv, u32 super)
> 		u32 pclk = nv_rd32(priv, 0x610ad0 + (head * 0x540)) & 0x3fffff;
> 		u32 hval, hreg = 0x614200 + (head * 0x800);
> 		u32 oval, oreg;
>+		u32 mast;
> 		u32 conf = exec_clkcmp(priv, head, 0xff, pclk, &outp);
> 		if (conf != ~0) {
> 			if (outp.location == 0 && outp.type == DCB_OUTPUT_DP) {
>@@ -1144,6 +1145,7 @@ nv50_disp_intr_unk20(struct nv50_disp_priv *priv, u32 super)
> 				oreg = 0x614280 + (ffs(outp.or) - 1) * 0x800;
> 				oval = 0x00000000;
> 				hval = 0x00000000;
>+				mask = 0xffffffff;
> 			} else
> 			if (!outp.location) {
> 				if (outp.type == DCB_OUTPUT_DP)
>@@ -1151,14 +1153,16 @@ nv50_disp_intr_unk20(struct nv50_disp_priv *priv, u32 super)
> 				oreg = 0x614300 + (ffs(outp.or) - 1) * 0x800;
> 				oval = (conf & 0x0100) ? 0x0101 : 0x0000;
> 				hval = 0x00000000;
>+				mask = 0x00000707;
> 			} else {
> 				oreg = 0x614380 + (ffs(outp.or) - 1) * 0x800;
> 				oval = 0x00000001;
> 				hval = 0x00000001;
>+				mask = 0x00000707;
> 			}
> 
> 			nv_mask(priv, hreg, 0x0000000f, hval);
>-			nv_mask(priv, oreg, 0x00000707, oval);
>+			nv_mask(priv, oreg, mask, oval);
> 		}
> 	}
> 
>-- 
>1.8.3.2
>

Actions: View | Splinter Review

Attachments on bug 66129: 81508 | 81509 | 81530 | 81536 | 81537 | 81580 | 81581 | 81641 | 81643 | 81705 | 81784 | 81808 | 81809

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.