Commit 27f3d6cf authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/gr: convert user classes to new-style nvkm_object 



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

drivers/gpu/drm/nouveau/include/nvif/device.h

+1 −1
Original line number Diff line number Diff line
@@ -65,5 +65,5 @@ u64 nvif_device_time(struct nvif_device *); 
#include <engine/sw.h>



#define nvxx_fifo(a) nvxx_device(a)->fifo

#define nvxx_gr(a) nvkm_gr(nvxx_device(a))

#define nvxx_gr(a) nvxx_device(a)->gr

#endif

drivers/gpu/drm/nouveau/include/nvkm/core/client.h

+0 −1
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ int nvkm_client_new(const char *name, u64 device, const char *cfg, 
void nvkm_client_del(struct nvkm_client **);

int  nvkm_client_init(struct nvkm_client *);

int  nvkm_client_fini(struct nvkm_client *, bool suspend);

const char *nvkm_client_name(void *obj);



static inline struct nvkm_client *

nvkm_client(struct nvkm_object *object)

drivers/gpu/drm/nouveau/include/nvkm/engine/gr.h

+7 −30
Original line number Diff line number Diff line 
#ifndef __NVKM_GR_H__

#define __NVKM_GR_H__

#include <core/engctx.h>



struct nvkm_gr_chan {

	struct nvkm_engctx base;

};



#define nvkm_gr_context_create(p,e,c,g,s,a,f,d)                          \

	nvkm_engctx_create((p), (e), (c), (g), (s), (a), (f), (d))

#define nvkm_gr_context_destroy(d)                                       \

	nvkm_engctx_destroy(&(d)->base)

#define nvkm_gr_context_init(d)                                          \

	nvkm_engctx_init(&(d)->base)

#define nvkm_gr_context_fini(d,s)                                        \

	nvkm_engctx_fini(&(d)->base, (s))



#define _nvkm_gr_context_dtor _nvkm_engctx_dtor

#define _nvkm_gr_context_init _nvkm_engctx_init

#define _nvkm_gr_context_fini _nvkm_engctx_fini

#define _nvkm_gr_context_rd32 _nvkm_engctx_rd32

#define _nvkm_gr_context_wr32 _nvkm_engctx_wr32



#include <core/engine.h>



struct nvkm_gr {

	struct nvkm_engine engine;

	const struct nvkm_gr_func *func;



	/* Returns chipset-specific counts of units packed into an u64.

	 */

	u64 (*units)(struct nvkm_gr *);

};



static inline struct nvkm_gr *

nvkm_gr(void *obj)

{

	return (void *)nvkm_engine(obj, NVDEV_ENGINE_GR);

}



#define nvkm_gr_create(p,e,c,y,d)                                        \

	nvkm_engine_create((p), (e), (c), (y), "PGRAPH", "graphics", (d))

	nvkm_gr_create_((p), (e), (c), (y), sizeof(**d), (void **)(d))

int

nvkm_gr_create_(struct nvkm_object *parent, struct nvkm_object *engine,

		struct nvkm_oclass *oclass, bool enable,

		int length, void **pobject);

#define nvkm_gr_destroy(d)                                               \

	nvkm_engine_destroy(&(d)->engine)

#define nvkm_gr_init(d)                                                  \
@@ -79,8 +57,7 @@ extern struct nvkm_oclass *gm20b_gr_oclass; 
#include <core/enum.h>



extern const struct nvkm_bitfield nv04_gr_nsource[];

extern struct nvkm_ofuncs nv04_gr_ofuncs;

bool nv04_gr_idle(void *obj);

bool nv04_gr_idle(struct nvkm_gr *);



extern const struct nvkm_bitfield nv10_gr_intr_name[];

extern const struct nvkm_bitfield nv10_gr_nstatus[];

drivers/gpu/drm/nouveau/nvkm/core/client.c

+0 −10
Original line number Diff line number Diff line
@@ -321,13 +321,3 @@ nvkm_client_new(const char *name, u64 device, const char *cfg, 
		nvkm_client_del(pclient);

	return ret;

}
 


const char *

nvkm_client_name(void *obj)

{

	const char *client_name = "unknown";

	struct nvkm_client *client = nvkm_client(obj);

	if (client)

		client_name = client->name;

	return client_name;

}

drivers/gpu/drm/nouveau/nvkm/engine/gr/Kbuild

+1 −0
Original line number Diff line number Diff line 
nvkm-y += nvkm/engine/gr/base.o

nvkm-y += nvkm/engine/gr/nv04.o

nvkm-y += nvkm/engine/gr/nv10.o

nvkm-y += nvkm/engine/gr/nv20.o