Attachment 119957 Details for Bug 92761 – take 2

[patch] take 2

hack.diff (text/plain), 1.50 KB, created by Ben Skeggs on 2015-11-19 23:31:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ben Skeggs

Created: 2015-11-19 23:31:14 UTC

Size: 1.50 KB

patch

obsolete

>diff --git a/drm/nouveau/nvkm/engine/gr/ctxgf117.c b/drm/nouveau/nvkm/engine/gr/ctxgf117.c
>index b5b8759..74de7a9 100644
>--- a/drm/nouveau/nvkm/engine/gr/ctxgf117.c
>+++ b/drm/nouveau/nvkm/engine/gr/ctxgf117.c
>@@ -207,6 +207,8 @@ gf117_grctx_generate_attrib(struct gf100_grctx *info)
> 			const u32 b =  beta * gr->ppc_tpc_nr[gpc][ppc];
> 			const u32 t = timeslice_mode;
> 			const u32 o = PPC_UNIT(gpc, ppc, 0);
>+			if (!(gr->ppc_mask[gpc] & (1 << ppc)))
>+				continue;
> 			mmio_skip(info, o + 0xc0, (t << 28) | (b << 16) | ++bo);
> 			mmio_wr32(info, o + 0xc0, (t << 28) | (b << 16) | --bo);
> 			bo += grctx->attrib_nr_max * gr->ppc_tpc_nr[gpc][ppc];
>diff --git a/drm/nouveau/nvkm/engine/gr/gf100.c b/drm/nouveau/nvkm/engine/gr/gf100.c
>index dda7a7d..7cdea77 100644
>--- a/drm/nouveau/nvkm/engine/gr/gf100.c
>+++ b/drm/nouveau/nvkm/engine/gr/gf100.c
>@@ -1530,6 +1530,8 @@ gf100_gr_oneinit(struct nvkm_gr *base)
> 		gr->ppc_nr[i]  = gr->func->ppc_nr;
> 		for (j = 0; j < gr->ppc_nr[i]; j++) {
> 			u8 mask = nvkm_rd32(device, GPC_UNIT(i, 0x0c30 + (j * 4)));
>+			if (mask)
>+				gr->ppc_mask[i] |= (1 << j);
> 			gr->ppc_tpc_nr[i][j] = hweight8(mask);
> 		}
> 	}
>diff --git a/drm/nouveau/nvkm/engine/gr/gf100.h b/drm/nouveau/nvkm/engine/gr/gf100.h
>index 4611961..02e78b8 100644
>--- a/drm/nouveau/nvkm/engine/gr/gf100.h
>+++ b/drm/nouveau/nvkm/engine/gr/gf100.h
>@@ -97,6 +97,7 @@ struct gf100_gr {
> 	u8 tpc_nr[GPC_MAX];
> 	u8 tpc_total;
> 	u8 ppc_nr[GPC_MAX];
>+	u8 ppc_mask[GPC_MAX];
> 	u8 ppc_tpc_nr[GPC_MAX][4];
> 
> 	struct nvkm_memory *unk4188b4;

Actions: View | Splinter Review

Attachments on bug 92761: 119321 | 119933 | 119934 | 119935 | 119937 | 119955 | 119957 | 120004 | 120025

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.