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

drm/nouveau/pci: switch to instanced constructor 



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

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_pci *pci;

	struct nvkm_pmu *pmu;

	struct nvkm_therm *therm;

	struct nvkm_timer *timer;
@@ -129,7 +128,6 @@ struct nvkm_device_chip { 
#include <core/layout.h>

#undef NVKM_LAYOUT_INST

#undef NVKM_LAYOUT_ONCE

	int (*pci     )(struct nvkm_device *, int idx, struct nvkm_pci **);

	int (*pmu     )(struct nvkm_device *, int idx, struct nvkm_pmu **);

	int (*therm   )(struct nvkm_device *, int idx, struct nvkm_therm **);

	int (*timer   )(struct nvkm_device *, int idx, struct nvkm_timer **);

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_PCI     , struct nvkm_pci     ,      pci)

NVKM_LAYOUT_ONCE(NVKM_SUBDEV_VBIOS   , struct nvkm_bios    ,     bios)

NVKM_LAYOUT_ONCE(NVKM_SUBDEV_DEVINIT , struct nvkm_devinit ,  devinit)

NVKM_LAYOUT_ONCE(NVKM_SUBDEV_IBUS    , struct nvkm_subdev  ,     ibus)

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

+11 −11
Original line number Diff line number Diff line
@@ -39,17 +39,17 @@ void nvkm_pci_wr32(struct nvkm_pci *, u16 addr, u32 data); 
u32 nvkm_pci_mask(struct nvkm_pci *, u16 addr, u32 mask, u32 value);

void nvkm_pci_rom_shadow(struct nvkm_pci *, bool shadow);



int nv04_pci_new(struct nvkm_device *, int, struct nvkm_pci **);

int nv40_pci_new(struct nvkm_device *, int, struct nvkm_pci **);

int nv46_pci_new(struct nvkm_device *, int, struct nvkm_pci **);

int nv4c_pci_new(struct nvkm_device *, int, struct nvkm_pci **);

int g84_pci_new(struct nvkm_device *, int, struct nvkm_pci **);

int g92_pci_new(struct nvkm_device *, int, struct nvkm_pci **);

int g94_pci_new(struct nvkm_device *, int, struct nvkm_pci **);

int gf100_pci_new(struct nvkm_device *, int, struct nvkm_pci **);

int gf106_pci_new(struct nvkm_device *, int, struct nvkm_pci **);

int gk104_pci_new(struct nvkm_device *, int, struct nvkm_pci **);

int gp100_pci_new(struct nvkm_device *, int, struct nvkm_pci **);

int nv04_pci_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_pci **);

int nv40_pci_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_pci **);

int nv46_pci_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_pci **);

int nv4c_pci_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_pci **);

int g84_pci_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_pci **);

int g92_pci_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_pci **);

int g94_pci_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_pci **);

int gf100_pci_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_pci **);

int gf106_pci_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_pci **);

int gk104_pci_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_pci **);

int gp100_pci_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_pci **);



/* pcie functions */

int nvkm_pcie_set_link(struct nvkm_pci *, enum nvkm_pcie_speed, u8 width);

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_PCI     ] = "pci",

	[NVKM_SUBDEV_PMU     ] = "pmu",

	[NVKM_SUBDEV_THERM   ] = "therm",

	[NVKM_SUBDEV_TIMER   ] = "tmr",

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

+84 −85

File changed.

Preview size limit exceeded, changes collapsed.