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

drm/nouveau/bus: switch to instanced constructor 



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

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_bus *bus;

	struct nvkm_clk *clk;

	struct nvkm_devinit *devinit;

	struct nvkm_fault *fault;
@@ -145,7 +144,6 @@ struct nvkm_device_chip { 
#include <core/layout.h>

#undef NVKM_LAYOUT_INST

#undef NVKM_LAYOUT_ONCE

	int (*bus     )(struct nvkm_device *, int idx, struct nvkm_bus **);

	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 **);

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

+1 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: MIT */

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)

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

+5 −5
Original line number Diff line number Diff line
@@ -18,9 +18,9 @@ void nvkm_hwsq_wait(struct nvkm_hwsq *, u8 flag, u8 data); 
void nvkm_hwsq_wait_vblank(struct nvkm_hwsq *);

void nvkm_hwsq_nsec(struct nvkm_hwsq *, u32 nsec);



int nv04_bus_new(struct nvkm_device *, int, struct nvkm_bus **);

int nv31_bus_new(struct nvkm_device *, int, struct nvkm_bus **);

int nv50_bus_new(struct nvkm_device *, int, struct nvkm_bus **);

int g94_bus_new(struct nvkm_device *, int, struct nvkm_bus **);

int gf100_bus_new(struct nvkm_device *, int, struct nvkm_bus **);

int nv04_bus_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_bus **);

int nv31_bus_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_bus **);

int nv50_bus_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_bus **);

int g94_bus_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_bus **);

int gf100_bus_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_bus **);

#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_BUS     ] = "bus",

	[NVKM_SUBDEV_CLK     ] = "clk",

	[NVKM_SUBDEV_DEVINIT ] = "devinit",

	[NVKM_SUBDEV_FAULT   ] = "fault",

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

+84 −85

File changed.

Preview size limit exceeded, changes collapsed.