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

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

drm/nouveau/bios: 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 245dcfe9

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

+8 −0
Original line number Diff line number Diff line
@@ -193,5 +193,13 @@ 
#define _nouveau_xtensa_context_rd32 _nvkm_xtensa_context_rd32

#define _nouveau_xtensa_context_wr32 _nvkm_xtensa_context_wr32

#define nouveau_xtensa_intr nvkm_xtensa_intr

#define nouveau_gpio nvkm_gpio

#define nouveau_i2c nvkm_i2c

#define nouveau_i2c_port nvkm_i2c_port

#define nouveau_devinit nvkm_devinit

#define nouveau_bios nvkm_bios

#define nouveau_bios_oclass nvkm_bios_oclass

#define nouveau_pll_vals nvkm_pll_vals

#define nouveau_therm_trip_point nvkm_therm_trip_point



#endif

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

+8 −11
Original line number Diff line number Diff line 
#ifndef __NOUVEAU_BIOS_H__

#define __NOUVEAU_BIOS_H__



#ifndef __NVKM_BIOS_H__

#define __NVKM_BIOS_H__

#include <core/subdev.h>

#include <core/device.h>



struct nouveau_bios {

	struct nouveau_subdev base;

struct nvkm_bios {

	struct nvkm_subdev base;

	u32 size;

	u8 *data;
@@ -21,15 +19,14 @@ struct nouveau_bios { 
	} version;

};



static inline struct nouveau_bios *

nouveau_bios(void *obj)

static inline struct nvkm_bios *

nvkm_bios(void *obj)

{

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

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

}



u8  nvbios_checksum(const u8 *data, int size);

u16 nvbios_findstr(const u8 *data, int size, const char *str, int len);



extern struct nouveau_oclass nouveau_bios_oclass;



extern struct nvkm_oclass nvkm_bios_oclass;

#endif

drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/M0203.h

+5 −7
Original line number Diff line number Diff line 
#ifndef __NVBIOS_M0203_H__

#define __NVBIOS_M0203_H__



struct nvbios_M0203T {

#define M0203T_TYPE_RAMCFG 0x00

	u8  type;

	u16 pointer;

};



u32 nvbios_M0203Te(struct nouveau_bios *, u8 *ver, u8 *hdr, u8 *cnt, u8 *len);

u32 nvbios_M0203Tp(struct nouveau_bios *, u8 *ver, u8 *hdr, u8 *cnt, u8 *len,

u32 nvbios_M0203Te(struct nvkm_bios *, u8 *ver, u8 *hdr, u8 *cnt, u8 *len);

u32 nvbios_M0203Tp(struct nvkm_bios *, u8 *ver, u8 *hdr, u8 *cnt, u8 *len,

		   struct nvbios_M0203T *);



struct nvbios_M0203E {
@@ -22,10 +21,9 @@ struct nvbios_M0203E { 
	u8 group;

};



u32 nvbios_M0203Ee(struct nouveau_bios *, int idx, u8 *ver, u8 *hdr);

u32 nvbios_M0203Ep(struct nouveau_bios *, int idx, u8 *ver, u8 *hdr,

u32 nvbios_M0203Ee(struct nvkm_bios *, int idx, u8 *ver, u8 *hdr);

u32 nvbios_M0203Ep(struct nvkm_bios *, int idx, u8 *ver, u8 *hdr,

		   struct nvbios_M0203E *);

u32 nvbios_M0203Em(struct nouveau_bios *, u8 ramcfg, u8 *ver, u8 *hdr,

u32 nvbios_M0203Em(struct nvkm_bios *, u8 ramcfg, u8 *ver, u8 *hdr,

		   struct nvbios_M0203E *);



#endif

drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/M0205.h

+7 −10
Original line number Diff line number Diff line 
#ifndef __NVBIOS_M0205_H__

#define __NVBIOS_M0205_H__



struct nvbios_M0205T {

	u16 freq;

};



u32 nvbios_M0205Te(struct nouveau_bios *,

u32 nvbios_M0205Te(struct nvkm_bios *,

		   u8 *ver, u8 *hdr, u8 *cnt, u8 *len, u8 *snr, u8 *ssz);

u32 nvbios_M0205Tp(struct nouveau_bios *,

u32 nvbios_M0205Tp(struct nvkm_bios *,

		   u8 *ver, u8 *hdr, u8 *cnt, u8 *len, u8 *snr, u8 *ssz,

		   struct nvbios_M0205T *);
@@ -15,18 +14,16 @@ struct nvbios_M0205E { 
	u8 type;

};



u32 nvbios_M0205Ee(struct nouveau_bios *, int idx,

u32 nvbios_M0205Ee(struct nvkm_bios *, int idx,

		   u8 *ver, u8 *hdr, u8 *cnt, u8 *len);

u32 nvbios_M0205Ep(struct nouveau_bios *, int idx,

		   u8 *ver, u8 *hdr, u8 *cnt, u8 *len,

		   struct nvbios_M0205E *);

u32 nvbios_M0205Ep(struct nvkm_bios *, int idx,

		   u8 *ver, u8 *hdr, u8 *cnt, u8 *len, struct nvbios_M0205E *);



struct nvbios_M0205S {

	u8 data;

};



u32 nvbios_M0205Se(struct nouveau_bios *, int ent, int idx, u8 *ver, u8 *hdr);

u32 nvbios_M0205Sp(struct nouveau_bios *, int ent, int idx, u8 *ver, u8 *hdr,

u32 nvbios_M0205Se(struct nvkm_bios *, int ent, int idx, u8 *ver, u8 *hdr);

u32 nvbios_M0205Sp(struct nvkm_bios *, int ent, int idx, u8 *ver, u8 *hdr,

		   struct nvbios_M0205S *);



#endif

drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/M0209.h

+6 −9
Original line number Diff line number Diff line 
#ifndef __NVBIOS_M0209_H__

#define __NVBIOS_M0209_H__



u32 nvbios_M0209Te(struct nouveau_bios *,

u32 nvbios_M0209Te(struct nvkm_bios *,

		   u8 *ver, u8 *hdr, u8 *cnt, u8 *len, u8 *snr, u8 *ssz);



struct nvbios_M0209E {
@@ -13,18 +12,16 @@ struct nvbios_M0209E { 
	u8 v03;

};



u32 nvbios_M0209Ee(struct nouveau_bios *, int idx,

u32 nvbios_M0209Ee(struct nvkm_bios *, int idx,

		   u8 *ver, u8 *hdr, u8 *cnt, u8 *len);

u32 nvbios_M0209Ep(struct nouveau_bios *, int idx,

		   u8 *ver, u8 *hdr, u8 *cnt, u8 *len,

		   struct nvbios_M0209E *);

u32 nvbios_M0209Ep(struct nvkm_bios *, int idx,

		   u8 *ver, u8 *hdr, u8 *cnt, u8 *len, struct nvbios_M0209E *);



struct nvbios_M0209S {

	u32 data[0x200];

};



u32 nvbios_M0209Se(struct nouveau_bios *, int ent, int idx, u8 *ver, u8 *hdr);

u32 nvbios_M0209Sp(struct nouveau_bios *, int ent, int idx, u8 *ver, u8 *hdr,

u32 nvbios_M0209Se(struct nvkm_bios *, int ent, int idx, u8 *ver, u8 *hdr);

u32 nvbios_M0209Sp(struct nvkm_bios *, int ent, int idx, u8 *ver, u8 *hdr,

		   struct nvbios_M0209S *);



#endif