Commit 98fd7f83 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/clk: switch to instanced constructor 



Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
Reviewed-by: default avatarLyude Paul <lyude@redhat.com>
parent d37766e5

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

+0 −2
Original line number Diff line number Diff line
@@ -60,7 +60,6 @@ struct nvkm_device { 
		struct notifier_block nb;

	} acpi;



	struct nvkm_clk *clk;

	struct nvkm_devinit *devinit;

	struct nvkm_fault *fault;

	struct nvkm_fb *fb;
@@ -144,7 +143,6 @@ struct nvkm_device_chip { 
#include <core/layout.h>

#undef NVKM_LAYOUT_INST

#undef NVKM_LAYOUT_ONCE

	int (*clk     )(struct nvkm_device *, int idx, struct nvkm_clk **);

	int (*devinit )(struct nvkm_device *, int idx, struct nvkm_devinit **);

	int (*fault   )(struct nvkm_device *, int idx, struct nvkm_fault **);

	int (*fb      )(struct nvkm_device *, int idx, struct nvkm_fb **);

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

+1 −0
Original line number Diff line number Diff line
@@ -3,3 +3,4 @@ NVKM_LAYOUT_ONCE(NVKM_SUBDEV_VBIOS , struct nvkm_bios , bios) 
NVKM_LAYOUT_ONCE(NVKM_SUBDEV_BUS     , struct nvkm_bus     ,      bus)

NVKM_LAYOUT_ONCE(NVKM_SUBDEV_BAR     , struct nvkm_bar     ,      bar)

NVKM_LAYOUT_ONCE(NVKM_SUBDEV_ACR     , struct nvkm_acr     ,      acr)

NVKM_LAYOUT_ONCE(NVKM_SUBDEV_CLK     , struct nvkm_clk     ,      clk)

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

+10 −10
Original line number Diff line number Diff line
@@ -125,14 +125,14 @@ int nvkm_clk_astate(struct nvkm_clk *, int req, int rel, bool wait); 
int nvkm_clk_dstate(struct nvkm_clk *, int req, int rel);

int nvkm_clk_tstate(struct nvkm_clk *, u8 temperature);



int nv04_clk_new(struct nvkm_device *, int, struct nvkm_clk **);

int nv40_clk_new(struct nvkm_device *, int, struct nvkm_clk **);

int nv50_clk_new(struct nvkm_device *, int, struct nvkm_clk **);

int g84_clk_new(struct nvkm_device *, int, struct nvkm_clk **);

int mcp77_clk_new(struct nvkm_device *, int, struct nvkm_clk **);

int gt215_clk_new(struct nvkm_device *, int, struct nvkm_clk **);

int gf100_clk_new(struct nvkm_device *, int, struct nvkm_clk **);

int gk104_clk_new(struct nvkm_device *, int, struct nvkm_clk **);

int gk20a_clk_new(struct nvkm_device *, int, struct nvkm_clk **);

int gm20b_clk_new(struct nvkm_device *, int, struct nvkm_clk **);

int nv04_clk_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_clk **);

int nv40_clk_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_clk **);

int nv50_clk_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_clk **);

int g84_clk_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_clk **);

int mcp77_clk_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_clk **);

int gt215_clk_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_clk **);

int gf100_clk_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_clk **);

int gk104_clk_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_clk **);

int gk20a_clk_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_clk **);

int gm20b_clk_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_clk **);

#endif

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

+0 −1
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ nvkm_subdev_type[NVKM_SUBDEV_NR] = { 
#include <core/layout.h>

#undef NVKM_LAYOUT_ONCE

#undef NVKM_LAYOUT_INST

	[NVKM_SUBDEV_CLK     ] = "clk",

	[NVKM_SUBDEV_DEVINIT ] = "devinit",

	[NVKM_SUBDEV_FAULT   ] = "fault",

	[NVKM_SUBDEV_FB      ] = "fb",

drivers/gpu/drm/nouveau/nvkm/engine/device/base.c

+68 −69

File changed.

Preview size limit exceeded, changes collapsed.