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

Commit 9e79a853 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/timer: namespace + nvidia gpu names (no binary change) 



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 e1404611

drivers/gpu/drm/nouveau/include/nvkm/subdev/timer.h

+36 −39
Original line number Diff line number Diff line 
#ifndef __NOUVEAU_TIMER_H__

#define __NOUVEAU_TIMER_H__



#ifndef __NVKM_TIMER_H__

#define __NVKM_TIMER_H__

#include <core/subdev.h>

#include <core/device.h>



struct nouveau_alarm {

struct nvkm_alarm {

	struct list_head head;

	u64 timestamp;

	void (*func)(struct nouveau_alarm *);

	void (*func)(struct nvkm_alarm *);

};



static inline void

nouveau_alarm_init(struct nouveau_alarm *alarm,

		   void (*func)(struct nouveau_alarm *))

nvkm_alarm_init(struct nvkm_alarm *alarm,

		   void (*func)(struct nvkm_alarm *))

{

	INIT_LIST_HEAD(&alarm->head);

	alarm->func = func;

}



bool nouveau_timer_wait_eq(void *, u64 nsec, u32 addr, u32 mask, u32 data);

bool nouveau_timer_wait_ne(void *, u64 nsec, u32 addr, u32 mask, u32 data);

bool nouveau_timer_wait_cb(void *, u64 nsec, bool (*func)(void *), void *data);

void nouveau_timer_alarm(void *, u32 nsec, struct nouveau_alarm *);

void nouveau_timer_alarm_cancel(void *, struct nouveau_alarm *);

bool nvkm_timer_wait_eq(void *, u64 nsec, u32 addr, u32 mask, u32 data);

bool nvkm_timer_wait_ne(void *, u64 nsec, u32 addr, u32 mask, u32 data);

bool nvkm_timer_wait_cb(void *, u64 nsec, bool (*func)(void *), void *data);

void nvkm_timer_alarm(void *, u32 nsec, struct nvkm_alarm *);

void nvkm_timer_alarm_cancel(void *, struct nvkm_alarm *);



#define NV_WAIT_DEFAULT 2000000000ULL

#define nv_wait(o,a,m,v)                                                       \

	nouveau_timer_wait_eq((o), NV_WAIT_DEFAULT, (a), (m), (v))

	nvkm_timer_wait_eq((o), NV_WAIT_DEFAULT, (a), (m), (v))

#define nv_wait_ne(o,a,m,v)                                                    \

	nouveau_timer_wait_ne((o), NV_WAIT_DEFAULT, (a), (m), (v))

	nvkm_timer_wait_ne((o), NV_WAIT_DEFAULT, (a), (m), (v))

#define nv_wait_cb(o,c,d)                                                      \

	nouveau_timer_wait_cb((o), NV_WAIT_DEFAULT, (c), (d))

	nvkm_timer_wait_cb((o), NV_WAIT_DEFAULT, (c), (d))



struct nouveau_timer {

	struct nouveau_subdev base;

	u64  (*read)(struct nouveau_timer *);

	void (*alarm)(struct nouveau_timer *, u64 time, struct nouveau_alarm *);

	void (*alarm_cancel)(struct nouveau_timer *, struct nouveau_alarm *);

struct nvkm_timer {

	struct nvkm_subdev base;

	u64  (*read)(struct nvkm_timer *);

	void (*alarm)(struct nvkm_timer *, u64 time, struct nvkm_alarm *);

	void (*alarm_cancel)(struct nvkm_timer *, struct nvkm_alarm *);

};



static inline struct nouveau_timer *

nouveau_timer(void *obj)

static inline struct nvkm_timer *

nvkm_timer(void *obj)

{

	return (void *)nouveau_subdev(obj, NVDEV_SUBDEV_TIMER);

	return (void *)nvkm_subdev(obj, NVDEV_SUBDEV_TIMER);

}



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

	nouveau_subdev_create_((p), (e), (o), 0, "PTIMER", "timer",            \

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

	nvkm_subdev_create_((p), (e), (o), 0, "PTIMER", "timer",            \

			       sizeof(**d), (void **)d)

#define nouveau_timer_destroy(p)                                               \

	nouveau_subdev_destroy(&(p)->base)

#define nouveau_timer_init(p)                                                  \

	nouveau_subdev_init(&(p)->base)

#define nouveau_timer_fini(p,s)                                                \

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



int nouveau_timer_create_(struct nouveau_object *, struct nouveau_engine *,

			  struct nouveau_oclass *, int size, void **);



extern struct nouveau_oclass nv04_timer_oclass;

extern struct nouveau_oclass gk20a_timer_oclass;



#define nvkm_timer_destroy(p)                                               \

	nvkm_subdev_destroy(&(p)->base)

#define nvkm_timer_init(p)                                                  \

	nvkm_subdev_init(&(p)->base)

#define nvkm_timer_fini(p,s)                                                \

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



int nvkm_timer_create_(struct nvkm_object *, struct nvkm_engine *,

			  struct nvkm_oclass *, int size, void **);



extern struct nvkm_oclass nv04_timer_oclass;

extern struct nvkm_oclass gk20a_timer_oclass;

#endif

drivers/gpu/drm/nouveau/nvkm/engine/falcon.c

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
 */

#include <engine/falcon.h>



#include <core/device.h>

#include <subdev/timer.h>



void

drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv04.c

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
 */



#include <core/client.h>

#include <core/device.h>

#include <nvif/unpack.h>

#include <nvif/class.h>

#include <core/engctx.h>

drivers/gpu/drm/nouveau/nvkm/engine/gr/nv04.c

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
 */



#include <core/client.h>

#include <core/device.h>

#include <core/os.h>

#include <core/handle.h>

#include <core/namedb.h>

drivers/gpu/drm/nouveau/nvkm/engine/gr/nv20.c

+1 −0
Original line number Diff line number Diff line 
#include <core/client.h>

#include <core/device.h>

#include <core/os.h>

#include <core/engctx.h>

#include <core/handle.h>