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

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

drm/nouveau: implement module init functions in nouveau_drm.c 



These currently just call the existing ones in nouveau_drv.c, but will be
extended in upcoming commits.  This needed to be separated from the current
code as there will be some header clashes until things are ported.

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

drivers/gpu/drm/nouveau/Makefile

+2 −1
Original line number Original line Diff line number Diff line
@@ -80,7 +80,8 @@ nouveau-y += core/engine/mpeg/nv50.o 
nouveau-y += core/engine/ppp/nv98.o

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

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

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





nouveau-y += nouveau_drv.o nouveau_state.o nouveau_channel.o nouveau_mem.o \

nouveau-y += nouveau_drm.o \

	     nouveau_drv.o nouveau_state.o nouveau_channel.o nouveau_mem.o \

             nouveau_gpuobj.o nouveau_irq.o nouveau_notifier.o \

             nouveau_gpuobj.o nouveau_irq.o nouveau_notifier.o \

             nouveau_sgdma.o nouveau_dma.o nouveau_util.o \

             nouveau_sgdma.o nouveau_dma.o nouveau_util.o \

             nouveau_bo.o nouveau_fence.o nouveau_gem.o nouveau_ttm.o \

             nouveau_bo.o nouveau_fence.o nouveau_gem.o nouveau_ttm.o \

drivers/gpu/drm/nouveau/core/engine/graph/nv04.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -24,7 +24,7 @@ 




#include "drmP.h"

#include "drmP.h"

#include "drm.h"

#include "drm.h"

#include "nouveau_drm.h"

#include <nouveau_drm.h>

#include "nouveau_drv.h"

#include "nouveau_drv.h"

#include "nouveau_hw.h"

#include "nouveau_hw.h"

#include "nouveau_util.h"

#include "nouveau_util.h"

drivers/gpu/drm/nouveau/core/engine/graph/nv10.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -24,7 +24,7 @@ 




#include "drmP.h"

#include "drmP.h"

#include "drm.h"

#include "drm.h"

#include "nouveau_drm.h"

#include <nouveau_drm.h>

#include "nouveau_drv.h"

#include "nouveau_drv.h"

#include "nouveau_util.h"

#include "nouveau_util.h"

drivers/gpu/drm/nouveau/core/engine/graph/nv20.c

+1 −1
Original line number Original line Diff line number Diff line 
#include "drmP.h"

#include "drmP.h"

#include "drm.h"

#include "drm.h"

#include "nouveau_drv.h"

#include "nouveau_drv.h"

#include "nouveau_drm.h"

#include <nouveau_drm.h>





/*

/*

 * NV20

 * NV20

drivers/gpu/drm/nouveau/core/subdev/fb/nv04.c

+1 −1
Original line number Original line Diff line number Diff line 
#include "drmP.h"

#include "drmP.h"

#include "drm.h"

#include "drm.h"

#include "nouveau_drv.h"

#include "nouveau_drv.h"

#include "nouveau_drm.h"

#include <nouveau_drm.h>





int

int

nv04_fb_vram_init(struct drm_device *dev)

nv04_fb_vram_init(struct drm_device *dev)