diff options
author | Alexandre Courbot <acourbot@nvidia.com> | 2014-10-02 12:27:20 +0900 |
---|---|---|
committer | Alexandre Courbot <acourbot@nvidia.com> | 2014-11-04 13:13:05 +0900 |
commit | 4d0929aa231a0c2d2b66fa1f8ea1c8fa4d872501 (patch) | |
tree | 926ec34251b37ff3d8d5219dc4c1075ef22100aa | |
parent | df30c82a7e4f5afff1c701eb846293e2bd0801cf (diff) | |
download | nouveau-baserock/jetson/gk20a.tar.gz |
Revert "ltc/gf100-: fix cbc issues on certain boards"baserock/jetson/gk20a
This reverts commit b15a810e97b8279cdbbfc90ede9e3fb51157f92b.
Causes IOMMU errors on GK20A.
-rw-r--r-- | nvkm/subdev/bar/nvc0.c | 1 | ||||
-rw-r--r-- | nvkm/subdev/fb/nvc0.c | 1 | ||||
-rw-r--r-- | nvkm/subdev/ltc/gf100.c | 2 | ||||
-rw-r--r-- | nvkm/subdev/ltc/gk104.c | 2 | ||||
-rw-r--r-- | nvkm/subdev/ltc/gm107.c | 2 |
5 files changed, 1 insertions, 7 deletions
diff --git a/nvkm/subdev/bar/nvc0.c b/nvkm/subdev/bar/nvc0.c index 05a278bab..0a4445984 100644 --- a/nvkm/subdev/bar/nvc0.c +++ b/nvkm/subdev/bar/nvc0.c @@ -200,6 +200,7 @@ nvc0_bar_init(struct nouveau_object *object) nv_mask(priv, 0x000200, 0x00000100, 0x00000000); nv_mask(priv, 0x000200, 0x00000100, 0x00000100); + nv_mask(priv, 0x100c80, 0x00000001, 0x00000000); nv_wr32(priv, 0x001704, 0x80000000 | priv->bar[1].mem->addr >> 12); if (priv->bar[0].mem) diff --git a/nvkm/subdev/fb/nvc0.c b/nvkm/subdev/fb/nvc0.c index 32f28dc73..b19a2b3c1 100644 --- a/nvkm/subdev/fb/nvc0.c +++ b/nvkm/subdev/fb/nvc0.c @@ -60,7 +60,6 @@ nvc0_fb_init(struct nouveau_object *object) if (priv->r100c10_page) nv_wr32(priv, 0x100c10, priv->r100c10 >> 8); - nv_mask(priv, 0x100c80, 0x00000001, 0x00000000); /* 128KiB lpg */ return 0; } diff --git a/nvkm/subdev/ltc/gf100.c b/nvkm/subdev/ltc/gf100.c index 2db097728..e7b787248 100644 --- a/nvkm/subdev/ltc/gf100.c +++ b/nvkm/subdev/ltc/gf100.c @@ -115,7 +115,6 @@ static int gf100_ltc_init(struct nouveau_object *object) { struct nvkm_ltc_priv *priv = (void *)object; - u32 lpg128 = !(nv_rd32(priv, 0x100c80) & 0x00000001); int ret; ret = nvkm_ltc_init(priv); @@ -125,7 +124,6 @@ gf100_ltc_init(struct nouveau_object *object) nv_mask(priv, 0x17e820, 0x00100000, 0x00000000); /* INTR_EN &= ~0x10 */ nv_wr32(priv, 0x17e8d8, priv->ltc_nr); nv_wr32(priv, 0x17e8d4, priv->tag_base); - nv_mask(priv, 0x17e8c0, 0x00000002, lpg128 ? 0x00000002 : 0x00000000); return 0; } diff --git a/nvkm/subdev/ltc/gk104.c b/nvkm/subdev/ltc/gk104.c index b39b5d0eb..ea7165697 100644 --- a/nvkm/subdev/ltc/gk104.c +++ b/nvkm/subdev/ltc/gk104.c @@ -28,7 +28,6 @@ static int gk104_ltc_init(struct nouveau_object *object) { struct nvkm_ltc_priv *priv = (void *)object; - u32 lpg128 = !(nv_rd32(priv, 0x100c80) & 0x00000001); int ret; ret = nvkm_ltc_init(priv); @@ -38,7 +37,6 @@ gk104_ltc_init(struct nouveau_object *object) nv_wr32(priv, 0x17e8d8, priv->ltc_nr); nv_wr32(priv, 0x17e000, priv->ltc_nr); nv_wr32(priv, 0x17e8d4, priv->tag_base); - nv_mask(priv, 0x17e8c0, 0x00000002, lpg128 ? 0x00000002 : 0x00000000); return 0; } diff --git a/nvkm/subdev/ltc/gm107.c b/nvkm/subdev/ltc/gm107.c index 89fc4238f..a26bed86f 100644 --- a/nvkm/subdev/ltc/gm107.c +++ b/nvkm/subdev/ltc/gm107.c @@ -93,7 +93,6 @@ static int gm107_ltc_init(struct nouveau_object *object) { struct nvkm_ltc_priv *priv = (void *)object; - u32 lpg128 = !(nv_rd32(priv, 0x100c80) & 0x00000001); int ret; ret = nvkm_ltc_init(priv); @@ -102,7 +101,6 @@ gm107_ltc_init(struct nouveau_object *object) nv_wr32(priv, 0x17e27c, priv->ltc_nr); nv_wr32(priv, 0x17e278, priv->tag_base); - nv_mask(priv, 0x17e264, 0x00000002, lpg128 ? 0x00000002 : 0x00000000); return 0; } |