diff options
| author | Samuel Pitoiset <samuel.pitoiset@gmail.com> | 2015-06-14 13:50:05 +0200 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2015-08-28 12:40:00 +1000 |
| commit | eb94345a93204f0d7d7e0809dde329977522aec0 (patch) | |
| tree | db49e9f81affefa0c31ac88f44f4675aef7985e4 /drivers/gpu/drm | |
| parent | 94a2ef69aa0c3612577ab1a6f5c248b206118e68 (diff) | |
drm/nouveau/pm: fix signals/sources for GT200+
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/engine/pm/gt200.c | 8 | ||||
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/engine/pm/gt215.c | 3 |
2 files changed, 5 insertions, 6 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/pm/gt200.c b/drivers/gpu/drm/nouveau/nvkm/engine/pm/gt200.c index 220a027534ef..e92f9c711bcc 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/pm/gt200.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/pm/gt200.c @@ -26,7 +26,7 @@ const struct nvkm_specsrc gt200_crop_sources[] = { { 0x407008, (const struct nvkm_specmux[]) { - { 0x7, 0, "sel0", true }, + { 0xf, 0, "sel0", true }, { 0x1f, 16, "sel1", true }, {} }, "pgraph_rop0_crop_pm_mux" }, @@ -45,7 +45,7 @@ gt200_prop_sources[] = { const struct nvkm_specsrc gt200_tex_sources[] = { { 0x408508, (const struct nvkm_specmux[]) { - { 0x3fff, 0, "unk0" }, + { 0xfffff, 0, "unk0" }, {} }, "pgraph_tpc0_tex_unk08" }, {} @@ -94,7 +94,7 @@ gt200_pm[] = { { 0x5d, "pc01_vfetch_17", g84_vfetch_sources }, { 0x5e, "pc01_vfetch_18", g84_vfetch_sources }, { 0x5f, "pc01_vfetch_19", g84_vfetch_sources }, - { 0x07, "pc01_zcull_00", nv50_zcull_sources }, + { 0x07, "pc01_zcull_00", nv50_zcull_sources }, { 0x08, "pc01_zcull_01", nv50_zcull_sources }, { 0x09, "pc01_zcull_02", nv50_zcull_sources }, { 0x0a, "pc01_zcull_03", nv50_zcull_sources }, @@ -105,7 +105,7 @@ gt200_pm[] = { { 0xec, "pc01_trailer" }, {} }, &nv40_perfctr_func }, - { 0xe0, (const struct nvkm_specsig[]) { + { 0xf0, (const struct nvkm_specsig[]) { { 0x55, "pc02_crop_00", gt200_crop_sources }, { 0x56, "pc02_crop_01", gt200_crop_sources }, { 0x57, "pc02_crop_02", gt200_crop_sources }, diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/pm/gt215.c b/drivers/gpu/drm/nouveau/nvkm/engine/pm/gt215.c index b5542dc0d9dd..f5eae63d9f48 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/pm/gt215.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/pm/gt215.c @@ -23,10 +23,9 @@ */ #include "nv40.h" -// TODO: check for GT200 static const struct nvkm_specsrc gt215_zcull_sources[] = { - { 0x4002ca4, (const struct nvkm_specmux[]) { + { 0x402ca4, (const struct nvkm_specmux[]) { { 0x7fff, 0, "unk0" }, { 0xff, 24, "unk24" }, {} |