From 30ed49b55b6e44e004c3095671e74fea93ee84cb Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Tue, 8 May 2018 20:39:47 +1000 Subject: [PATCH] drm/nouveau/kms/nv50-: move code underneath dispnv50/ The code is about to be split up, and this matches dispnv04. Signed-off-by: Ben Skeggs --- drivers/gpu/drm/nouveau/Kbuild | 8 +++----- drivers/gpu/drm/nouveau/dispnv50/Kbuild | 1 + .../gpu/drm/nouveau/{nv50_display.c => dispnv50/disp.c} | 0 3 files changed, 4 insertions(+), 5 deletions(-) create mode 100644 drivers/gpu/drm/nouveau/dispnv50/Kbuild rename drivers/gpu/drm/nouveau/{nv50_display.c => dispnv50/disp.c} (100%) diff --git a/drivers/gpu/drm/nouveau/Kbuild b/drivers/gpu/drm/nouveau/Kbuild index 9c0c650655e9..b17843dd050d 100644 --- a/drivers/gpu/drm/nouveau/Kbuild +++ b/drivers/gpu/drm/nouveau/Kbuild @@ -38,14 +38,16 @@ nouveau-y += nouveau_vmm.o # DRM - modesetting nouveau-$(CONFIG_DRM_NOUVEAU_BACKLIGHT) += nouveau_backlight.o +nouveau-y += nouveau_bios.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 +include $(src)/dispnv04/Kbuild +include $(src)/dispnv50/Kbuild # DRM - command submission nouveau-y += nouveau_abi16.o @@ -59,8 +61,4 @@ 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 diff --git a/drivers/gpu/drm/nouveau/dispnv50/Kbuild b/drivers/gpu/drm/nouveau/dispnv50/Kbuild new file mode 100644 index 000000000000..43fc8be49391 --- /dev/null +++ b/drivers/gpu/drm/nouveau/dispnv50/Kbuild @@ -0,0 +1 @@ +nouveau-y += dispnv50/disp.o diff --git a/drivers/gpu/drm/nouveau/nv50_display.c b/drivers/gpu/drm/nouveau/dispnv50/disp.c similarity index 100% rename from drivers/gpu/drm/nouveau/nv50_display.c rename to drivers/gpu/drm/nouveau/dispnv50/disp.c -- 2.20.1