Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 95484b57 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/ltc: s/ltcg/ltc/ + cleanup 



Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent f392ec4b

drivers/gpu/drm/nouveau/Makefile

+4 −2
Original line number Diff line number Diff line
@@ -153,8 +153,10 @@ nouveau-y += core/subdev/instmem/base.o 
nouveau-y += core/subdev/instmem/nv04.o

nouveau-y += core/subdev/instmem/nv40.o

nouveau-y += core/subdev/instmem/nv50.o

nouveau-y += core/subdev/ltcg/gf100.o

nouveau-y += core/subdev/ltcg/gm107.o

nouveau-y += core/subdev/ltc/base.o

nouveau-y += core/subdev/ltc/gf100.o

nouveau-y += core/subdev/ltc/gk104.o

nouveau-y += core/subdev/ltc/gm107.o

nouveau-y += core/subdev/mc/base.o

nouveau-y += core/subdev/mc/nv04.o

nouveau-y += core/subdev/mc/nv40.o

drivers/gpu/drm/nouveau/core/engine/device/base.c

+1 −1
Original line number Diff line number Diff line
@@ -214,7 +214,7 @@ static const u64 disable_map[] = { 
	[NVDEV_SUBDEV_BUS]	= NV_DEVICE_V0_DISABLE_CORE,

	[NVDEV_SUBDEV_TIMER]	= NV_DEVICE_V0_DISABLE_CORE,

	[NVDEV_SUBDEV_FB]	= NV_DEVICE_V0_DISABLE_CORE,

	[NVDEV_SUBDEV_LTCG]	= NV_DEVICE_V0_DISABLE_CORE,

	[NVDEV_SUBDEV_LTC]	= NV_DEVICE_V0_DISABLE_CORE,

	[NVDEV_SUBDEV_IBUS]	= NV_DEVICE_V0_DISABLE_CORE,

	[NVDEV_SUBDEV_INSTMEM]	= NV_DEVICE_V0_DISABLE_CORE,

	[NVDEV_SUBDEV_VM]	= NV_DEVICE_V0_DISABLE_CORE,

drivers/gpu/drm/nouveau/core/engine/device/gm100.c

+2 −2
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 
#include <subdev/mc.h>

#include <subdev/timer.h>

#include <subdev/fb.h>

#include <subdev/ltcg.h>

#include <subdev/ltc.h>

#include <subdev/ibus.h>

#include <subdev/instmem.h>

#include <subdev/vm.h>
@@ -72,7 +72,7 @@ gm100_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_BUS    ] =  nvc0_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &gk20a_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  gm107_fb_oclass;

		device->oclass[NVDEV_SUBDEV_LTCG   ] =  gm107_ltcg_oclass;

		device->oclass[NVDEV_SUBDEV_LTC    ] =  gm107_ltc_oclass;

		device->oclass[NVDEV_SUBDEV_IBUS   ] = &nve0_ibus_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] =  nv50_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_VM     ] = &nvc0_vmmgr_oclass;

drivers/gpu/drm/nouveau/core/engine/device/nvc0.c

+10 −10
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 
#include <subdev/mc.h>

#include <subdev/timer.h>

#include <subdev/fb.h>

#include <subdev/ltcg.h>

#include <subdev/ltc.h>

#include <subdev/ibus.h>

#include <subdev/instmem.h>

#include <subdev/vm.h>
@@ -70,7 +70,7 @@ nvc0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_BUS    ] =  nvc0_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  nvc0_fb_oclass;

		device->oclass[NVDEV_SUBDEV_LTCG   ] =  gf100_ltcg_oclass;

		device->oclass[NVDEV_SUBDEV_LTC    ] =  gf100_ltc_oclass;

		device->oclass[NVDEV_SUBDEV_IBUS   ] = &nvc0_ibus_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] =  nv50_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_VM     ] = &nvc0_vmmgr_oclass;
@@ -102,7 +102,7 @@ nvc0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_BUS    ] =  nvc0_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  nvc0_fb_oclass;

		device->oclass[NVDEV_SUBDEV_LTCG   ] =  gf100_ltcg_oclass;

		device->oclass[NVDEV_SUBDEV_LTC    ] =  gf100_ltc_oclass;

		device->oclass[NVDEV_SUBDEV_IBUS   ] = &nvc0_ibus_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] =  nv50_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_VM     ] = &nvc0_vmmgr_oclass;
@@ -134,7 +134,7 @@ nvc0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_BUS    ] =  nvc0_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  nvc0_fb_oclass;

		device->oclass[NVDEV_SUBDEV_LTCG   ] =  gf100_ltcg_oclass;

		device->oclass[NVDEV_SUBDEV_LTC    ] =  gf100_ltc_oclass;

		device->oclass[NVDEV_SUBDEV_IBUS   ] = &nvc0_ibus_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] =  nv50_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_VM     ] = &nvc0_vmmgr_oclass;
@@ -165,7 +165,7 @@ nvc0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_BUS    ] =  nvc0_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  nvc0_fb_oclass;

		device->oclass[NVDEV_SUBDEV_LTCG   ] =  gf100_ltcg_oclass;

		device->oclass[NVDEV_SUBDEV_LTC    ] =  gf100_ltc_oclass;

		device->oclass[NVDEV_SUBDEV_IBUS   ] = &nvc0_ibus_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] =  nv50_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_VM     ] = &nvc0_vmmgr_oclass;
@@ -197,7 +197,7 @@ nvc0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_BUS    ] =  nvc0_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  nvc0_fb_oclass;

		device->oclass[NVDEV_SUBDEV_LTCG   ] =  gf100_ltcg_oclass;

		device->oclass[NVDEV_SUBDEV_LTC    ] =  gf100_ltc_oclass;

		device->oclass[NVDEV_SUBDEV_IBUS   ] = &nvc0_ibus_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] =  nv50_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_VM     ] = &nvc0_vmmgr_oclass;
@@ -229,7 +229,7 @@ nvc0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_BUS    ] =  nvc0_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  nvc0_fb_oclass;

		device->oclass[NVDEV_SUBDEV_LTCG   ] =  gf100_ltcg_oclass;

		device->oclass[NVDEV_SUBDEV_LTC    ] =  gf100_ltc_oclass;

		device->oclass[NVDEV_SUBDEV_IBUS   ] = &nvc0_ibus_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] =  nv50_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_VM     ] = &nvc0_vmmgr_oclass;
@@ -260,7 +260,7 @@ nvc0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_BUS    ] =  nvc0_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  nvc0_fb_oclass;

		device->oclass[NVDEV_SUBDEV_LTCG   ] =  gf100_ltcg_oclass;

		device->oclass[NVDEV_SUBDEV_LTC    ] =  gf100_ltc_oclass;

		device->oclass[NVDEV_SUBDEV_IBUS   ] = &nvc0_ibus_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] =  nv50_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_VM     ] = &nvc0_vmmgr_oclass;
@@ -292,7 +292,7 @@ nvc0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_BUS    ] =  nvc0_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  nvc0_fb_oclass;

		device->oclass[NVDEV_SUBDEV_LTCG   ] =  gf100_ltcg_oclass;

		device->oclass[NVDEV_SUBDEV_LTC    ] =  gf100_ltc_oclass;

		device->oclass[NVDEV_SUBDEV_IBUS   ] = &nvc0_ibus_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] =  nv50_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_VM     ] = &nvc0_vmmgr_oclass;
@@ -323,7 +323,7 @@ nvc0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_BUS    ] =  nvc0_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  nvc0_fb_oclass;

		device->oclass[NVDEV_SUBDEV_LTCG   ] =  gf100_ltcg_oclass;

		device->oclass[NVDEV_SUBDEV_LTC    ] =  gf100_ltc_oclass;

		device->oclass[NVDEV_SUBDEV_IBUS   ] = &nvc0_ibus_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] =  nv50_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_VM     ] = &nvc0_vmmgr_oclass;

drivers/gpu/drm/nouveau/core/engine/device/nve0.c

+7 −7
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 
#include <subdev/mc.h>

#include <subdev/timer.h>

#include <subdev/fb.h>

#include <subdev/ltcg.h>

#include <subdev/ltc.h>

#include <subdev/ibus.h>

#include <subdev/instmem.h>

#include <subdev/vm.h>
@@ -70,7 +70,7 @@ nve0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_BUS    ] =  nvc0_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  nve0_fb_oclass;

		device->oclass[NVDEV_SUBDEV_LTCG   ] =  gf100_ltcg_oclass;

		device->oclass[NVDEV_SUBDEV_LTC    ] =  gk104_ltc_oclass;

		device->oclass[NVDEV_SUBDEV_IBUS   ] = &nve0_ibus_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] =  nv50_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_VM     ] = &nvc0_vmmgr_oclass;
@@ -103,7 +103,7 @@ nve0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_BUS    ] =  nvc0_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  nve0_fb_oclass;

		device->oclass[NVDEV_SUBDEV_LTCG   ] =  gf100_ltcg_oclass;

		device->oclass[NVDEV_SUBDEV_LTC    ] =  gk104_ltc_oclass;

		device->oclass[NVDEV_SUBDEV_IBUS   ] = &nve0_ibus_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] =  nv50_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_VM     ] = &nvc0_vmmgr_oclass;
@@ -136,7 +136,7 @@ nve0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_BUS    ] =  nvc0_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  nve0_fb_oclass;

		device->oclass[NVDEV_SUBDEV_LTCG   ] =  gf100_ltcg_oclass;

		device->oclass[NVDEV_SUBDEV_LTC    ] =  gk104_ltc_oclass;

		device->oclass[NVDEV_SUBDEV_IBUS   ] = &nve0_ibus_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] =  nv50_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_VM     ] = &nvc0_vmmgr_oclass;
@@ -187,7 +187,7 @@ nve0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_BUS    ] =  nvc0_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  nve0_fb_oclass;

		device->oclass[NVDEV_SUBDEV_LTCG   ] =  gf100_ltcg_oclass;

		device->oclass[NVDEV_SUBDEV_LTC    ] =  gk104_ltc_oclass;

		device->oclass[NVDEV_SUBDEV_IBUS   ] = &nve0_ibus_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] =  nv50_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_VM     ] = &nvc0_vmmgr_oclass;
@@ -220,7 +220,7 @@ nve0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_BUS    ] =  nvc0_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  nve0_fb_oclass;

		device->oclass[NVDEV_SUBDEV_LTCG   ] =  gf100_ltcg_oclass;

		device->oclass[NVDEV_SUBDEV_LTC    ] =  gk104_ltc_oclass;

		device->oclass[NVDEV_SUBDEV_IBUS   ] = &nve0_ibus_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] =  nv50_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_VM     ] = &nvc0_vmmgr_oclass;
@@ -253,7 +253,7 @@ nve0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_BUS    ] =  nvc0_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  nve0_fb_oclass;

		device->oclass[NVDEV_SUBDEV_LTCG   ] =  gf100_ltcg_oclass;

		device->oclass[NVDEV_SUBDEV_LTC    ] =  gk104_ltc_oclass;

		device->oclass[NVDEV_SUBDEV_IBUS   ] = &nve0_ibus_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] =  nv50_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_VM     ] = &nvc0_vmmgr_oclass;