Commit c39f472e authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau: remove symlinks, move core/ to nvkm/ (no code changes) 



The symlinks were annoying some people, and they're not used anywhere
else in the kernel tree.  The include directory structure has been
changed so that symlinks aren't needed anymore.

NVKM has been moved from core/ to nvkm/ to make it more obvious as to
what the directory is for, and as some minor prep for when NVKM gets
split out into its own module (virt) at a later date.

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

drivers/gpu/drm/nouveau/Kbuild

0 → 100644
+66 −0
Original line number Diff line number Diff line 
ccflags-y := -Iinclude/drm

ccflags-y += -I$(src)/include

ccflags-y += -I$(src)/include/nvkm

ccflags-y += -I$(src)/nvkm

ccflags-y += -I$(src)



# NVKM - HW resource manager

#- code also used by various userspace tools/tests

include $(src)/nvif/Kbuild

nouveau-y := $(nvif-y)



# NVIF - NVKM interface library (NVKM user interface also defined here)

#- code also used by various userspace tools/tests

include $(src)/nvkm/Kbuild

nouveau-y += $(nvkm-y)



# DRM - general

ifdef CONFIG_X86

nouveau-$(CONFIG_ACPI) += nouveau_acpi.o

endif

nouveau-y += nouveau_agp.o

nouveau-$(CONFIG_DEBUG_FS) += nouveau_debugfs.o

nouveau-y += nouveau_drm.o

nouveau-y += nouveau_hwmon.o

nouveau-$(CONFIG_COMPAT) += nouveau_ioc32.o

nouveau-y += nouveau_nvif.o

nouveau-$(CONFIG_NOUVEAU_PLATFORM_DRIVER) += nouveau_platform.o

nouveau-y += nouveau_sysfs.o

nouveau-y += nouveau_usif.o # userspace <-> nvif

nouveau-y += nouveau_vga.o



# DRM - memory management

nouveau-y += nouveau_bo.o

nouveau-y += nouveau_gem.o

nouveau-y += nouveau_prime.o

nouveau-y += nouveau_sgdma.o

nouveau-y += nouveau_ttm.o



# DRM - modesetting

nouveau-$(CONFIG_DRM_NOUVEAU_BACKLIGHT) += nouveau_backlight.o

nouveau-y += nouveau_connector.o

nouveau-y += nouveau_display.o

nouveau-y += nv50_display.o

nouveau-y += nouveau_dp.o

nouveau-y += nouveau_fbcon.o

nouveau-y += nv04_fbcon.o

nouveau-y += nv50_fbcon.o

nouveau-y += nvc0_fbcon.o



# DRM - command submission

nouveau-y += nouveau_abi16.o

nouveau-y += nouveau_chan.o

nouveau-y += nouveau_dma.o

nouveau-y += nouveau_fence.o

nouveau-y += nv04_fence.o

nouveau-y += nv10_fence.o

nouveau-y += nv17_fence.o

nouveau-y += nv50_fence.o

nouveau-y += nv84_fence.o

nouveau-y += nvc0_fence.o



# DRM - prehistoric modesetting (NV04-G7x)

nouveau-y += nouveau_bios.o

include $(src)/dispnv04/Kbuild



obj-$(CONFIG_DRM_NOUVEAU) += nouveau.o

drivers/gpu/drm/nouveau/Makefile

deleted100644 → 0
+0 −400
Original line number Diff line number Diff line 
#

# Makefile for the drm device driver.  This driver provides support for the

# Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.



ccflags-y := -Iinclude/drm

ccflags-y += -I$(src)/core/include

ccflags-y += -I$(src)/core

ccflags-y += -I$(src)



nouveau-y := core/core/client.o

nouveau-y += core/core/engctx.o

nouveau-y += core/core/engine.o

nouveau-y += core/core/enum.o

nouveau-y += core/core/event.o

nouveau-y += core/core/gpuobj.o

nouveau-y += core/core/handle.o

nouveau-y += core/core/ioctl.o

nouveau-y += core/core/mm.o

nouveau-y += core/core/namedb.o

nouveau-y += core/core/notify.o

nouveau-y += core/core/object.o

nouveau-y += core/core/option.o

nouveau-y += core/core/parent.o

nouveau-y += core/core/printk.o

nouveau-y += core/core/ramht.o

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



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

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

nouveau-y += core/subdev/bar/nvc0.o

nouveau-y += core/subdev/bar/gk20a.o

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

nouveau-y += core/subdev/bios/bit.o

nouveau-y += core/subdev/bios/boost.o

nouveau-y += core/subdev/bios/conn.o

nouveau-y += core/subdev/bios/cstep.o

nouveau-y += core/subdev/bios/dcb.o

nouveau-y += core/subdev/bios/disp.o

nouveau-y += core/subdev/bios/dp.o

nouveau-y += core/subdev/bios/extdev.o

nouveau-y += core/subdev/bios/fan.o

nouveau-y += core/subdev/bios/gpio.o

nouveau-y += core/subdev/bios/i2c.o

nouveau-y += core/subdev/bios/image.o

nouveau-y += core/subdev/bios/init.o

nouveau-y += core/subdev/bios/mxm.o

nouveau-y += core/subdev/bios/npde.o

nouveau-y += core/subdev/bios/pcir.o

nouveau-y += core/subdev/bios/perf.o

nouveau-y += core/subdev/bios/pll.o

nouveau-y += core/subdev/bios/pmu.o

nouveau-y += core/subdev/bios/ramcfg.o

nouveau-y += core/subdev/bios/rammap.o

nouveau-y += core/subdev/bios/shadow.o

nouveau-y += core/subdev/bios/shadowacpi.o

nouveau-y += core/subdev/bios/shadowof.o

nouveau-y += core/subdev/bios/shadowpci.o

nouveau-y += core/subdev/bios/shadowramin.o

nouveau-y += core/subdev/bios/shadowrom.o

nouveau-y += core/subdev/bios/timing.o

nouveau-y += core/subdev/bios/therm.o

nouveau-y += core/subdev/bios/vmap.o

nouveau-y += core/subdev/bios/volt.o

nouveau-y += core/subdev/bios/xpio.o

nouveau-y += core/subdev/bios/M0203.o

nouveau-y += core/subdev/bios/M0205.o

nouveau-y += core/subdev/bios/M0209.o

nouveau-y += core/subdev/bios/P0260.o

nouveau-y += core/subdev/bus/hwsq.o

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

nouveau-y += core/subdev/bus/nv31.o

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

nouveau-y += core/subdev/bus/nv94.o

nouveau-y += core/subdev/bus/nvc0.o

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

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

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

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

nouveau-y += core/subdev/clock/nv84.o

nouveau-y += core/subdev/clock/nva3.o

nouveau-y += core/subdev/clock/nvaa.o

nouveau-y += core/subdev/clock/nvc0.o

nouveau-y += core/subdev/clock/nve0.o

nouveau-y += core/subdev/clock/gk20a.o

nouveau-y += core/subdev/clock/pllnv04.o

nouveau-y += core/subdev/clock/pllnva3.o

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

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

nouveau-y += core/subdev/devinit/nv05.o

nouveau-y += core/subdev/devinit/nv10.o

nouveau-y += core/subdev/devinit/nv1a.o

nouveau-y += core/subdev/devinit/nv20.o

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

nouveau-y += core/subdev/devinit/nv84.o

nouveau-y += core/subdev/devinit/nv98.o

nouveau-y += core/subdev/devinit/nva3.o

nouveau-y += core/subdev/devinit/nvaf.o

nouveau-y += core/subdev/devinit/nvc0.o

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

nouveau-y += core/subdev/devinit/gm204.o

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

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

nouveau-y += core/subdev/fb/nv10.o

nouveau-y += core/subdev/fb/nv1a.o

nouveau-y += core/subdev/fb/nv20.o

nouveau-y += core/subdev/fb/nv25.o

nouveau-y += core/subdev/fb/nv30.o

nouveau-y += core/subdev/fb/nv35.o

nouveau-y += core/subdev/fb/nv36.o

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

nouveau-y += core/subdev/fb/nv41.o

nouveau-y += core/subdev/fb/nv44.o

nouveau-y += core/subdev/fb/nv46.o

nouveau-y += core/subdev/fb/nv47.o

nouveau-y += core/subdev/fb/nv49.o

nouveau-y += core/subdev/fb/nv4e.o

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

nouveau-y += core/subdev/fb/nv84.o

nouveau-y += core/subdev/fb/nva3.o

nouveau-y += core/subdev/fb/nvaa.o

nouveau-y += core/subdev/fb/nvaf.o

nouveau-y += core/subdev/fb/nvc0.o

nouveau-y += core/subdev/fb/nve0.o

nouveau-y += core/subdev/fb/gk20a.o

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

nouveau-y += core/subdev/fb/ramnv04.o

nouveau-y += core/subdev/fb/ramnv10.o

nouveau-y += core/subdev/fb/ramnv1a.o

nouveau-y += core/subdev/fb/ramnv20.o

nouveau-y += core/subdev/fb/ramnv40.o

nouveau-y += core/subdev/fb/ramnv41.o

nouveau-y += core/subdev/fb/ramnv44.o

nouveau-y += core/subdev/fb/ramnv49.o

nouveau-y += core/subdev/fb/ramnv4e.o

nouveau-y += core/subdev/fb/ramnv50.o

nouveau-y += core/subdev/fb/ramnva3.o

nouveau-y += core/subdev/fb/ramnvaa.o

nouveau-y += core/subdev/fb/ramnvc0.o

nouveau-y += core/subdev/fb/ramnve0.o

nouveau-y += core/subdev/fb/ramgk20a.o

nouveau-y += core/subdev/fb/ramgm107.o

nouveau-y += core/subdev/fb/sddr2.o

nouveau-y += core/subdev/fb/sddr3.o

nouveau-y += core/subdev/fb/gddr3.o

nouveau-y += core/subdev/fb/gddr5.o

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

nouveau-y += core/subdev/fuse/g80.o

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

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

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

nouveau-y += core/subdev/gpio/nv10.o

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

nouveau-y += core/subdev/gpio/nv94.o

nouveau-y += core/subdev/gpio/nvd0.o

nouveau-y += core/subdev/gpio/nve0.o

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

nouveau-y += core/subdev/i2c/anx9805.o

nouveau-y += core/subdev/i2c/aux.o

nouveau-y += core/subdev/i2c/bit.o

nouveau-y += core/subdev/i2c/pad.o

nouveau-y += core/subdev/i2c/padnv04.o

nouveau-y += core/subdev/i2c/padnv94.o

nouveau-y += core/subdev/i2c/padgm204.o

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

nouveau-y += core/subdev/i2c/nv4e.o

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

nouveau-y += core/subdev/i2c/nv94.o

nouveau-y += core/subdev/i2c/nvd0.o

nouveau-y += core/subdev/i2c/gf117.o

nouveau-y += core/subdev/i2c/nve0.o

nouveau-y += core/subdev/i2c/gm204.o

nouveau-y += core/subdev/ibus/nvc0.o

nouveau-y += core/subdev/ibus/nve0.o

nouveau-y += core/subdev/ibus/gk20a.o

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/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

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

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

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

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

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

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

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

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

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

nouveau-y += core/subdev/mxm/mxms.o

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

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

nouveau-y += core/subdev/pwr/memx.o

nouveau-y += core/subdev/pwr/nva3.o

nouveau-y += core/subdev/pwr/nvc0.o

nouveau-y += core/subdev/pwr/nvd0.o

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

nouveau-y += core/subdev/pwr/nv108.o

nouveau-y += core/subdev/pwr/gk20a.o

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

nouveau-y += core/subdev/therm/fan.o

nouveau-y += core/subdev/therm/fannil.o

nouveau-y += core/subdev/therm/fanpwm.o

nouveau-y += core/subdev/therm/fantog.o

nouveau-y += core/subdev/therm/ic.o

nouveau-y += core/subdev/therm/temp.o

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

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

nouveau-y += core/subdev/therm/nv84.o

nouveau-y += core/subdev/therm/nva3.o

nouveau-y += core/subdev/therm/nvd0.o

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

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

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

nouveau-y += core/subdev/timer/gk20a.o

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

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

nouveau-y += core/subdev/vm/nv41.o

nouveau-y += core/subdev/vm/nv44.o

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

nouveau-y += core/subdev/vm/nvc0.o

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

nouveau-y += core/subdev/volt/gpio.o

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

nouveau-y += core/subdev/volt/gk20a.o



nouveau-y += core/engine/falcon.o

nouveau-y += core/engine/xtensa.o

nouveau-y += core/engine/dmaobj/base.o

nouveau-y += core/engine/dmaobj/nv04.o

nouveau-y += core/engine/dmaobj/nv50.o

nouveau-y += core/engine/dmaobj/nvc0.o

nouveau-y += core/engine/dmaobj/nvd0.o

nouveau-y += core/engine/bsp/nv84.o

nouveau-y += core/engine/bsp/nv98.o

nouveau-y += core/engine/bsp/nvc0.o

nouveau-y += core/engine/bsp/nve0.o

nouveau-y += core/engine/copy/nva3.o

nouveau-y += core/engine/copy/nvc0.o

nouveau-y += core/engine/copy/nve0.o

nouveau-y += core/engine/crypt/nv84.o

nouveau-y += core/engine/crypt/nv98.o

nouveau-y += core/engine/device/acpi.o

nouveau-y += core/engine/device/base.o

nouveau-y += core/engine/device/ctrl.o

nouveau-y += core/engine/device/nv04.o

nouveau-y += core/engine/device/nv10.o

nouveau-y += core/engine/device/nv20.o

nouveau-y += core/engine/device/nv30.o

nouveau-y += core/engine/device/nv40.o

nouveau-y += core/engine/device/nv50.o

nouveau-y += core/engine/device/nvc0.o

nouveau-y += core/engine/device/nve0.o

nouveau-y += core/engine/device/gm100.o

nouveau-y += core/engine/disp/base.o

nouveau-y += core/engine/disp/conn.o

nouveau-y += core/engine/disp/outp.o

nouveau-y += core/engine/disp/outpdp.o

nouveau-y += core/engine/disp/nv04.o

nouveau-y += core/engine/disp/nv50.o

nouveau-y += core/engine/disp/nv84.o

nouveau-y += core/engine/disp/nv94.o

nouveau-y += core/engine/disp/nva0.o

nouveau-y += core/engine/disp/nva3.o

nouveau-y += core/engine/disp/nvd0.o

nouveau-y += core/engine/disp/nve0.o

nouveau-y += core/engine/disp/nvf0.o

nouveau-y += core/engine/disp/gm107.o

nouveau-y += core/engine/disp/gm204.o

nouveau-y += core/engine/disp/dacnv50.o

nouveau-y += core/engine/disp/dport.o

nouveau-y += core/engine/disp/hdanva3.o

nouveau-y += core/engine/disp/hdanvd0.o

nouveau-y += core/engine/disp/hdminv84.o

nouveau-y += core/engine/disp/hdminva3.o

nouveau-y += core/engine/disp/hdminvd0.o

nouveau-y += core/engine/disp/hdminve0.o

nouveau-y += core/engine/disp/piornv50.o

nouveau-y += core/engine/disp/sornv50.o

nouveau-y += core/engine/disp/sornv94.o

nouveau-y += core/engine/disp/sornvd0.o

nouveau-y += core/engine/disp/sorgm204.o

nouveau-y += core/engine/disp/vga.o

nouveau-y += core/engine/fifo/base.o

nouveau-y += core/engine/fifo/nv04.o

nouveau-y += core/engine/fifo/nv10.o

nouveau-y += core/engine/fifo/nv17.o

nouveau-y += core/engine/fifo/nv40.o

nouveau-y += core/engine/fifo/nv50.o

nouveau-y += core/engine/fifo/nv84.o

nouveau-y += core/engine/fifo/nvc0.o

nouveau-y += core/engine/fifo/nve0.o

nouveau-y += core/engine/fifo/gk20a.o

nouveau-y += core/engine/fifo/nv108.o

nouveau-y += core/engine/graph/ctxnv40.o

nouveau-y += core/engine/graph/ctxnv50.o

nouveau-y += core/engine/graph/ctxnvc0.o

nouveau-y += core/engine/graph/ctxnvc1.o

nouveau-y += core/engine/graph/ctxnvc4.o

nouveau-y += core/engine/graph/ctxnvc8.o

nouveau-y += core/engine/graph/ctxnvd7.o

nouveau-y += core/engine/graph/ctxnvd9.o

nouveau-y += core/engine/graph/ctxnve4.o

nouveau-y += core/engine/graph/ctxgk20a.o

nouveau-y += core/engine/graph/ctxnvf0.o

nouveau-y += core/engine/graph/ctxgk110b.o

nouveau-y += core/engine/graph/ctxnv108.o

nouveau-y += core/engine/graph/ctxgm107.o

nouveau-y += core/engine/graph/nv04.o

nouveau-y += core/engine/graph/nv10.o

nouveau-y += core/engine/graph/nv20.o

nouveau-y += core/engine/graph/nv25.o

nouveau-y += core/engine/graph/nv2a.o

nouveau-y += core/engine/graph/nv30.o

nouveau-y += core/engine/graph/nv34.o

nouveau-y += core/engine/graph/nv35.o

nouveau-y += core/engine/graph/nv40.o

nouveau-y += core/engine/graph/nv50.o

nouveau-y += core/engine/graph/nvc0.o

nouveau-y += core/engine/graph/nvc1.o

nouveau-y += core/engine/graph/nvc4.o

nouveau-y += core/engine/graph/nvc8.o

nouveau-y += core/engine/graph/nvd7.o

nouveau-y += core/engine/graph/nvd9.o

nouveau-y += core/engine/graph/nve4.o

nouveau-y += core/engine/graph/gk20a.o

nouveau-y += core/engine/graph/nvf0.o

nouveau-y += core/engine/graph/gk110b.o

nouveau-y += core/engine/graph/nv108.o

nouveau-y += core/engine/graph/gm107.o

nouveau-y += core/engine/mpeg/nv31.o

nouveau-y += core/engine/mpeg/nv40.o

nouveau-y += core/engine/mpeg/nv44.o

nouveau-y += core/engine/mpeg/nv50.o

nouveau-y += core/engine/mpeg/nv84.o

nouveau-y += core/engine/perfmon/base.o

nouveau-y += core/engine/perfmon/daemon.o

nouveau-y += core/engine/perfmon/nv40.o

nouveau-y += core/engine/perfmon/nv50.o

nouveau-y += core/engine/perfmon/nv84.o

nouveau-y += core/engine/perfmon/nva3.o

nouveau-y += core/engine/perfmon/nvc0.o

nouveau-y += core/engine/perfmon/nve0.o

nouveau-y += core/engine/perfmon/nvf0.o

nouveau-y += core/engine/ppp/nv98.o

nouveau-y += core/engine/ppp/nvc0.o

nouveau-y += core/engine/software/nv04.o

nouveau-y += core/engine/software/nv10.o

nouveau-y += core/engine/software/nv50.o

nouveau-y += core/engine/software/nvc0.o

nouveau-y += core/engine/vp/nv84.o

nouveau-y += core/engine/vp/nv98.o

nouveau-y += core/engine/vp/nvc0.o

nouveau-y += core/engine/vp/nve0.o



# nvif

nouveau-y += nvif/object.o

nouveau-y += nvif/client.o

nouveau-y += nvif/device.o

nouveau-y += nvif/notify.o



# drm/core

nouveau-y += nouveau_drm.o nouveau_chan.o nouveau_dma.o nouveau_fence.o

nouveau-y += nouveau_vga.o nouveau_agp.o

nouveau-y += nouveau_ttm.o nouveau_sgdma.o nouveau_bo.o nouveau_gem.o

nouveau-y += nouveau_prime.o nouveau_abi16.o

nouveau-y += nouveau_nvif.o nouveau_usif.o

nouveau-y += nv04_fence.o nv10_fence.o nv17_fence.o

nouveau-y += nv50_fence.o nv84_fence.o nvc0_fence.o



# drm/kms

nouveau-y += nouveau_bios.o nouveau_fbcon.o nouveau_display.o

nouveau-y += nouveau_connector.o nouveau_dp.o

nouveau-y += nv04_fbcon.o nv50_fbcon.o nvc0_fbcon.o



# drm/kms/nv04:nv50

include $(src)/dispnv04/Makefile



# drm/kms/nv50-

nouveau-y += nv50_display.o



# drm/pm

nouveau-y += nouveau_hwmon.o nouveau_sysfs.o



# other random bits

nouveau-$(CONFIG_COMPAT) += nouveau_ioc32.o

ifdef CONFIG_X86

nouveau-$(CONFIG_ACPI) += nouveau_acpi.o

endif

nouveau-$(CONFIG_DRM_NOUVEAU_BACKLIGHT) += nouveau_backlight.o

nouveau-$(CONFIG_DEBUG_FS) += nouveau_debugfs.o

nouveau-$(CONFIG_NOUVEAU_PLATFORM_DRIVER) += nouveau_platform.o



obj-$(CONFIG_DRM_NOUVEAU)+= nouveau.o

drivers/gpu/drm/nouveau/core/include/nvif/class.h

deleted120000 → 0
+0 −1
Original line number Diff line number Diff line 
../../../nvif/class.h
 
 No newline at end of file

drivers/gpu/drm/nouveau/core/include/nvif/event.h

deleted120000 → 0
+0 −1
Original line number Diff line number Diff line 
../../../nvif/event.h
 
 No newline at end of file

drivers/gpu/drm/nouveau/core/include/nvif/ioctl.h

deleted120000 → 0
+0 −1
Original line number Diff line number Diff line 
../../../nvif/ioctl.h
 
 No newline at end of file

CRA Git | Maintained and supported by SUSTech CRA and CCSE