aboutsummaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/nouveau/nvkm/engine/pm
diff options
context:
space:
mode:
authorSamuel Pitoiset <samuel.pitoiset@gmail.com>2015-08-04 23:58:14 +0200
committerBen Skeggs <bskeggs@redhat.com>2015-08-28 12:40:04 +1000
commit8feece04db884e04c31c008b76a7610849757720 (patch)
tree77392a69767310079840508ef5fa17abf0d6ac5a /drivers/gpu/drm/nouveau/nvkm/engine/pm
parent9b4dc66d4772a432f271e1ebafd70aafe2b9bb27 (diff)
drm/nouveau/pm/gf100: remove multiple definitions of GPC_DOM signal 0x0e
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')
-rw-r--r--drivers/gpu/drm/nouveau/nvkm/engine/pm/gf100.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/pm/gf100.c b/drivers/gpu/drm/nouveau/nvkm/engine/pm/gf100.c
index 37b1636d0f29..ab463898b437 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/pm/gf100.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/pm/gf100.c
@@ -93,11 +93,10 @@ gf100_pm_gpc[] = {
{ 0x0c, "gpc00_tex_02", gf100_tex_sources },
{ 0x0d, "gpc00_tex_03", gf100_tex_sources },
{ 0x0e, "gpc00_tex_04", gf100_tex_sources },
- { 0x0e, "gpc00_tex_05", gf100_tex_sources },
- { 0x0f, "gpc00_tex_06", gf100_tex_sources },
- { 0x10, "gpc00_tex_07", gf100_tex_sources },
- { 0x11, "gpc00_tex_08", gf100_tex_sources },
- { 0x12, "gpc00_tex_09", gf100_tex_sources },
+ { 0x0f, "gpc00_tex_05", gf100_tex_sources },
+ { 0x10, "gpc00_tex_06", gf100_tex_sources },
+ { 0x11, "gpc00_tex_07", gf100_tex_sources },
+ { 0x12, "gpc00_tex_08", gf100_tex_sources },
{ 0x26, "gpc00_unk400_00", gf100_unk400_sources },
{}
}, &gf100_perfctr_func },