From: Samuel Pitoiset Date: Tue, 4 Aug 2015 21:58:14 +0000 (+0200) Subject: drm/nouveau/pm/gf100: remove multiple definitions of GPC_DOM signal 0x0e X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=8feece04db884e04c31c008b76a7610849757720;p=deliverable%2Flinux.git drm/nouveau/pm/gf100: remove multiple definitions of GPC_DOM signal 0x0e Signed-off-by: Samuel Pitoiset Signed-off-by: Ben Skeggs --- 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 },