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

drm/nouveau/gr: rename from graph (no binary change) 



Shorter device name, match Tegra and our existing enums.

The namespace of NVKM is being changed to nvkm_ instead of nouveau_,
which will be used for the DRM part of the driver.  This is being
done in order to make it very clear as to what part of the driver a
given symbol belongs to, and as a minor step towards splitting the
DRM driver out to be able to stand on its own (for virt).

Because there's already a large amount of churn here anyway, this is
as good a time as any to also switch to NVIDIA's device and chipset
naming to ease collaboration with them.

A comparison of objdump disassemblies proves no code changes.

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

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

+1 −1
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ struct nv_device_v0 { 
#define NV_DEVICE_V0_DISABLE_CORE                         0x0000000000000008ULL

#define NV_DEVICE_V0_DISABLE_DISP                         0x0000000000010000ULL

#define NV_DEVICE_V0_DISABLE_FIFO                         0x0000000000020000ULL

#define NV_DEVICE_V0_DISABLE_GRAPH                        0x0000000100000000ULL

#define NV_DEVICE_V0_DISABLE_GR                           0x0000000100000000ULL

#define NV_DEVICE_V0_DISABLE_MPEG                         0x0000000200000000ULL

#define NV_DEVICE_V0_DISABLE_ME                           0x0000000400000000ULL

#define NV_DEVICE_V0_DISABLE_VP                           0x0000000800000000ULL

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

+2 −2
Original line number Diff line number Diff line
@@ -52,11 +52,11 @@ void nvif_device_ref(struct nvif_device *, struct nvif_device **); 


#include <engine/device.h>

#include <engine/fifo.h>

#include <engine/graph.h>

#include <engine/gr.h>

#include <engine/software.h>



#define nvkm_fifo(a) nouveau_fifo(nvkm_device(a))

#define nvkm_fifo_chan(a) ((struct nouveau_fifo_chan *)nvkm_object(a))

#define nvkm_gr(a) ((struct nouveau_graph *)nouveau_engine(nvkm_object(a), NVDEV_ENGINE_GR))

#define nvkm_gr(a) ((struct nouveau_gr *)nouveau_engine(nvkm_object(a), NVDEV_ENGINE_GR))



#endif

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

0 → 100644
+86 −0
Original line number Diff line number Diff line 
#ifndef __NOUVEAU_GR_H__

#define __NOUVEAU_GR_H__



#include <core/engine.h>

#include <core/engctx.h>

#include <core/enum.h>



struct nouveau_gr_chan {

	struct nouveau_engctx base;

};



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

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

#define nouveau_gr_context_destroy(d)                                       \

	nouveau_engctx_destroy(&(d)->base)

#define nouveau_gr_context_init(d)                                          \

	nouveau_engctx_init(&(d)->base)

#define nouveau_gr_context_fini(d,s)                                        \

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



#define _nouveau_gr_context_dtor _nouveau_engctx_dtor

#define _nouveau_gr_context_init _nouveau_engctx_init

#define _nouveau_gr_context_fini _nouveau_engctx_fini

#define _nouveau_gr_context_rd32 _nouveau_engctx_rd32

#define _nouveau_gr_context_wr32 _nouveau_engctx_wr32



struct nouveau_gr {

	struct nouveau_engine base;



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

	 */

	u64 (*units)(struct nouveau_gr *);

};



static inline struct nouveau_gr *

nouveau_gr(void *obj)

{

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

}



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

	nouveau_engine_create((p), (e), (c), (y), "PGR", "graphics", (d))

#define nouveau_gr_destroy(d)                                               \

	nouveau_engine_destroy(&(d)->base)

#define nouveau_gr_init(d)                                                  \

	nouveau_engine_init(&(d)->base)

#define nouveau_gr_fini(d,s)                                                \

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



#define _nouveau_gr_dtor _nouveau_engine_dtor

#define _nouveau_gr_init _nouveau_engine_init

#define _nouveau_gr_fini _nouveau_engine_fini



extern struct nouveau_oclass nv04_gr_oclass;

extern struct nouveau_oclass nv10_gr_oclass;

extern struct nouveau_oclass nv20_gr_oclass;

extern struct nouveau_oclass nv25_gr_oclass;

extern struct nouveau_oclass nv2a_gr_oclass;

extern struct nouveau_oclass nv30_gr_oclass;

extern struct nouveau_oclass nv34_gr_oclass;

extern struct nouveau_oclass nv35_gr_oclass;

extern struct nouveau_oclass nv40_gr_oclass;

extern struct nouveau_oclass nv50_gr_oclass;

extern struct nouveau_oclass *nvc0_gr_oclass;

extern struct nouveau_oclass *nvc1_gr_oclass;

extern struct nouveau_oclass *nvc4_gr_oclass;

extern struct nouveau_oclass *nvc8_gr_oclass;

extern struct nouveau_oclass *nvd7_gr_oclass;

extern struct nouveau_oclass *nvd9_gr_oclass;

extern struct nouveau_oclass *nve4_gr_oclass;

extern struct nouveau_oclass *gk20a_gr_oclass;

extern struct nouveau_oclass *nvf0_gr_oclass;

extern struct nouveau_oclass *gk110b_gr_oclass;

extern struct nouveau_oclass *nv108_gr_oclass;

extern struct nouveau_oclass *gm107_gr_oclass;



extern const struct nouveau_bitfield nv04_gr_nsource[];

extern struct nouveau_ofuncs nv04_gr_ofuncs;

bool nv04_gr_idle(void *obj);



extern const struct nouveau_bitfield nv10_gr_intr_name[];

extern const struct nouveau_bitfield nv10_gr_nstatus[];



extern const struct nouveau_enum nv50_data_error_names[];



#endif

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

deleted100644 → 0
+0 −86
Original line number Diff line number Diff line 
#ifndef __NOUVEAU_GRAPH_H__

#define __NOUVEAU_GRAPH_H__



#include <core/engine.h>

#include <core/engctx.h>

#include <core/enum.h>



struct nouveau_graph_chan {

	struct nouveau_engctx base;

};



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

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

#define nouveau_graph_context_destroy(d)                                       \

	nouveau_engctx_destroy(&(d)->base)

#define nouveau_graph_context_init(d)                                          \

	nouveau_engctx_init(&(d)->base)

#define nouveau_graph_context_fini(d,s)                                        \

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



#define _nouveau_graph_context_dtor _nouveau_engctx_dtor

#define _nouveau_graph_context_init _nouveau_engctx_init

#define _nouveau_graph_context_fini _nouveau_engctx_fini

#define _nouveau_graph_context_rd32 _nouveau_engctx_rd32

#define _nouveau_graph_context_wr32 _nouveau_engctx_wr32



struct nouveau_graph {

	struct nouveau_engine base;



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

	 */

	u64 (*units)(struct nouveau_graph *);

};



static inline struct nouveau_graph *

nouveau_graph(void *obj)

{

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

}



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

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

#define nouveau_graph_destroy(d)                                               \

	nouveau_engine_destroy(&(d)->base)

#define nouveau_graph_init(d)                                                  \

	nouveau_engine_init(&(d)->base)

#define nouveau_graph_fini(d,s)                                                \

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



#define _nouveau_graph_dtor _nouveau_engine_dtor

#define _nouveau_graph_init _nouveau_engine_init

#define _nouveau_graph_fini _nouveau_engine_fini



extern struct nouveau_oclass nv04_graph_oclass;

extern struct nouveau_oclass nv10_graph_oclass;

extern struct nouveau_oclass nv20_graph_oclass;

extern struct nouveau_oclass nv25_graph_oclass;

extern struct nouveau_oclass nv2a_graph_oclass;

extern struct nouveau_oclass nv30_graph_oclass;

extern struct nouveau_oclass nv34_graph_oclass;

extern struct nouveau_oclass nv35_graph_oclass;

extern struct nouveau_oclass nv40_graph_oclass;

extern struct nouveau_oclass nv50_graph_oclass;

extern struct nouveau_oclass *nvc0_graph_oclass;

extern struct nouveau_oclass *nvc1_graph_oclass;

extern struct nouveau_oclass *nvc4_graph_oclass;

extern struct nouveau_oclass *nvc8_graph_oclass;

extern struct nouveau_oclass *nvd7_graph_oclass;

extern struct nouveau_oclass *nvd9_graph_oclass;

extern struct nouveau_oclass *nve4_graph_oclass;

extern struct nouveau_oclass *gk20a_graph_oclass;

extern struct nouveau_oclass *nvf0_graph_oclass;

extern struct nouveau_oclass *gk110b_graph_oclass;

extern struct nouveau_oclass *nv108_graph_oclass;

extern struct nouveau_oclass *gm107_graph_oclass;



extern const struct nouveau_bitfield nv04_graph_nsource[];

extern struct nouveau_ofuncs nv04_graph_ofuncs;

bool nv04_graph_idle(void *obj);



extern const struct nouveau_bitfield nv10_graph_intr_name[];

extern const struct nouveau_bitfield nv10_graph_nstatus[];



extern const struct nouveau_enum nv50_data_error_names[];



#endif

drivers/gpu/drm/nouveau/nouveau_abi16.c

+2 −2
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ nouveau_abi16_ioctl_getparam(ABI16_IOCTL_ARGS) 
	struct nouveau_drm *drm = nouveau_drm(dev);

	struct nvif_device *device = &drm->device;

	struct nouveau_timer *ptimer = nvkm_timer(device);

	struct nouveau_graph *graph = nvkm_gr(device);

	struct nouveau_gr *gr = nvkm_gr(device);

	struct drm_nouveau_getparam *getparam = data;



	switch (getparam->param) {
@@ -215,7 +215,7 @@ nouveau_abi16_ioctl_getparam(ABI16_IOCTL_ARGS) 
		getparam->value = 1;

		break;

	case NOUVEAU_GETPARAM_GRAPH_UNITS:

		getparam->value = graph->units ? graph->units(graph) : 0;

		getparam->value = gr->units ? gr->units(gr) : 0;

		break;

	default:

		NV_PRINTK(debug, cli, "unknown parameter %lld\n", getparam->param);

CRA Git | Maintained and supported by SUSTech CRA and CCSE