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

drm/nouveau/bar: tidy up the subdev and object class definitions 



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

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

+1 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 


#include <subdev/timer.h>

#include <subdev/bar.h>

#include <subdev/fb.h>

#include <subdev/vm.h>



#include <engine/dmaobj.h>

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

+1 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 


#include <subdev/timer.h>

#include <subdev/bar.h>

#include <subdev/fb.h>

#include <subdev/vm.h>



#include <engine/dmaobj.h>

drivers/gpu/drm/nouveau/core/include/subdev/bar.h

+1 −22
Original line number Diff line number Diff line
@@ -4,8 +4,7 @@ 
#include <core/subdev.h>

#include <core/device.h>



#include <subdev/fb.h>



struct nouveau_mem;

struct nouveau_vma;



struct nouveau_bar {
@@ -29,27 +28,7 @@ nouveau_bar(void *obj) 
	return (void *)nv_device(obj)->subdev[NVDEV_SUBDEV_BAR];

}



#define nouveau_bar_create(p,e,o,d)                                            \

	nouveau_bar_create_((p), (e), (o), sizeof(**d), (void **)d)

#define nouveau_bar_init(p)                                                    \

	nouveau_subdev_init(&(p)->base)

#define nouveau_bar_fini(p,s)                                                  \

	nouveau_subdev_fini(&(p)->base, (s))



int nouveau_bar_create_(struct nouveau_object *, struct nouveau_object *,

			struct nouveau_oclass *, int, void **);

void nouveau_bar_destroy(struct nouveau_bar *);



void _nouveau_bar_dtor(struct nouveau_object *);

#define _nouveau_bar_init _nouveau_subdev_init

#define _nouveau_bar_fini _nouveau_subdev_fini



extern struct nouveau_oclass nv50_bar_oclass;

extern struct nouveau_oclass nvc0_bar_oclass;



int nouveau_bar_alloc(struct nouveau_bar *, struct nouveau_object *,

		      struct nouveau_mem *, struct nouveau_object **);



void nv84_bar_flush(struct nouveau_bar *);



#endif

drivers/gpu/drm/nouveau/core/subdev/bar/base.c

+5 −1
Original line number Diff line number Diff line
@@ -23,7 +23,11 @@ 
 */



#include <core/object.h>

#include <subdev/bar.h>



#include <subdev/fb.h>

#include <subdev/vm.h>



#include "priv.h"



struct nouveau_barobj {

	struct nouveau_object base;

drivers/gpu/drm/nouveau/core/subdev/bar/nv50.c

+2 −1
Original line number Diff line number Diff line
@@ -25,10 +25,11 @@ 
#include <core/gpuobj.h>



#include <subdev/timer.h>

#include <subdev/bar.h>

#include <subdev/fb.h>

#include <subdev/vm.h>



#include "priv.h"



struct nv50_bar_priv {

	struct nouveau_bar base;

	spinlock_t lock;