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

drm/nouveau/tmr: switch to instanced constructor 



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

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_timer *timer;

	struct nvkm_top *top;

	struct nvkm_volt *volt;
@@ -126,7 +125,6 @@ struct nvkm_device_chip { 
#include <core/layout.h>

#undef NVKM_LAYOUT_INST

#undef NVKM_LAYOUT_ONCE

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

	int (*top     )(struct nvkm_device *, int idx, struct nvkm_top **);

	int (*volt    )(struct nvkm_device *, int idx, struct nvkm_volt **);

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

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ NVKM_LAYOUT_ONCE(NVKM_SUBDEV_FUSE , struct nvkm_fuse , fuse) 
NVKM_LAYOUT_ONCE(NVKM_SUBDEV_MXM     , struct nvkm_subdev  ,      mxm)

NVKM_LAYOUT_ONCE(NVKM_SUBDEV_MC      , struct nvkm_mc      ,       mc)

NVKM_LAYOUT_ONCE(NVKM_SUBDEV_BUS     , struct nvkm_bus     ,      bus)

NVKM_LAYOUT_ONCE(NVKM_SUBDEV_TIMER   , struct nvkm_timer   ,    timer)

NVKM_LAYOUT_ONCE(NVKM_SUBDEV_INSTMEM , struct nvkm_instmem ,     imem)

NVKM_LAYOUT_ONCE(NVKM_SUBDEV_FB      , struct nvkm_fb      ,       fb)

NVKM_LAYOUT_ONCE(NVKM_SUBDEV_LTC     , struct nvkm_ltc     ,      ltc)

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

+4 −4
Original line number Diff line number Diff line
@@ -76,8 +76,8 @@ s64 nvkm_timer_wait_test(struct nvkm_timer_wait *); 
#define nvkm_wait_msec(d,m,addr,mask,data)                                     \

	nvkm_wait_usec((d), (m) * 1000, (addr), (mask), (data))



int nv04_timer_new(struct nvkm_device *, int, struct nvkm_timer **);

int nv40_timer_new(struct nvkm_device *, int, struct nvkm_timer **);

int nv41_timer_new(struct nvkm_device *, int, struct nvkm_timer **);

int gk20a_timer_new(struct nvkm_device *, int, struct nvkm_timer **);

int nv04_timer_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_timer **);

int nv40_timer_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_timer **);

int nv41_timer_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_timer **);

int gk20a_timer_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_timer **);

#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_TIMER   ] = "tmr",

	[NVKM_SUBDEV_TOP     ] = "top",

	[NVKM_SUBDEV_VOLT    ] = "volt",

	[NVKM_ENGINE_BSP     ] = "bsp",

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

+87 −88

File changed.

Preview size limit exceeded, changes collapsed.