summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/nouveau/nvkm/engine/pm/gf108.c
diff options
context:
space:
mode:
authorSamuel Pitoiset <samuel.pitoiset@gmail.com>2015-08-04 23:58:15 +0200
committerBen Skeggs <bskeggs@redhat.com>2015-08-28 12:40:04 +1000
commit2df0bf57f89cfa6e6adafb44d666ecc4a228a731 (patch)
treed0677b4a3e1c90e681ded28edabbfd666307bba0 /drivers/gpu/drm/nouveau/nvkm/engine/pm/gf108.c
parent8feece04db884e04c31c008b76a7610849757720 (diff)
drm/nouveau/pm/gf100: only use PBFB_BROADCAST.PM_UNK100 for PBFB signals
High level hardware events related to PBFB will monitor all partitions. While we are at it, fix bitfield for this mux. Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com> Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/engine/pm/gf108.c')
-rw-r--r--drivers/gpu/drm/nouveau/nvkm/engine/pm/gf108.c25
1 files changed, 4 insertions, 21 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/pm/gf108.c b/drivers/gpu/drm/nouveau/nvkm/engine/pm/gf108.c
index a74c68520ea7..a4d86d1ab1b0 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/pm/gf108.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/pm/gf108.c
@@ -23,23 +23,6 @@
*/
#include "gf100.h"
-static const struct nvkm_specsrc
-gf108_pbfb_sources[] = {
- { 0x110100, (const struct nvkm_specmux[]) {
- { 0x1, 0, "unk0" },
- { 0xf, 4, "unk4" },
- { 0x3, 8, "unk8" },
- {}
- }, "pbfb0_pm_unk100" },
- { 0x111100, (const struct nvkm_specmux[]) {
- { 0x1, 0, "unk0" },
- { 0xf, 4, "unk4" },
- { 0x3, 8, "unk8" },
- {}
- }, "pbfb1_pm_unk100" },
- {}
-};
-
static const struct nvkm_specdom
gf108_pm_hub[] = {
{}
@@ -48,10 +31,10 @@ gf108_pm_hub[] = {
static const struct nvkm_specdom
gf108_pm_part[] = {
{ 0xe0, (const struct nvkm_specsig[]) {
- { 0x14, "part00_pbfb_00", gf108_pbfb_sources },
- { 0x15, "part00_pbfb_01", gf108_pbfb_sources },
- { 0x20, "part00_pbfb_02", gf108_pbfb_sources },
- { 0x21, "part00_pbfb_03", gf108_pbfb_sources },
+ { 0x14, "part00_pbfb_00", gf100_pbfb_sources },
+ { 0x15, "part00_pbfb_01", gf100_pbfb_sources },
+ { 0x20, "part00_pbfb_02", gf100_pbfb_sources },
+ { 0x21, "part00_pbfb_03", gf100_pbfb_sources },
{ 0x01, "part00_pmfb_00", gf100_pmfb_sources },
{ 0x04, "part00_pmfb_01", gf100_pmfb_sources },
{ 0x05, "part00_pmfb_02", gf100_pmfb_sources},