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

drm/nouveau/msenc: switch to instanced constructor 



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

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_engine *msenc;

	struct nvkm_engine *mspdec;

	struct nvkm_engine *msppp;

	struct nvkm_engine *msvld;
@@ -112,7 +111,6 @@ struct nvkm_device_chip { 
#undef NVKM_LAYOUT_INST

#undef NVKM_LAYOUT_ONCE



	int (*msenc   )(struct nvkm_device *, int idx, struct nvkm_engine **);

	int (*mspdec  )(struct nvkm_device *, int idx, struct nvkm_engine **);

	int (*msppp   )(struct nvkm_device *, int idx, struct nvkm_engine **);

	int (*msvld   )(struct nvkm_device *, int idx, struct nvkm_engine **);

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

+1 −0
Original line number Diff line number Diff line
@@ -35,4 +35,5 @@ NVKM_LAYOUT_ONCE(NVKM_ENGINE_GR , struct nvkm_gr , gr) 
NVKM_LAYOUT_ONCE(NVKM_ENGINE_IFB     , struct nvkm_engine  ,      ifb)

NVKM_LAYOUT_ONCE(NVKM_ENGINE_ME      , struct nvkm_engine  ,       me)

NVKM_LAYOUT_ONCE(NVKM_ENGINE_MPEG    , struct nvkm_engine  ,     mpeg)

NVKM_LAYOUT_ONCE(NVKM_ENGINE_MSENC   , struct nvkm_engine  ,    msenc)

NVKM_LAYOUT_ONCE(NVKM_ENGINE_VP      , struct nvkm_engine  ,       vp)

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_ENGINE_MSENC   ] = "msenc",

	[NVKM_ENGINE_MSPDEC  ] = "mspdec",

	[NVKM_ENGINE_MSPPP   ] = "msppp",

	[NVKM_ENGINE_MSVLD   ] = "msvld",

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

+0 −1
Original line number Diff line number Diff line
@@ -3174,7 +3174,6 @@ nvkm_device_ctor(const struct nvkm_device_func *func, 
#include <core/layout.h>

#undef NVKM_LAYOUT_INST

#undef NVKM_LAYOUT_ONCE

		_(NVKM_ENGINE_MSENC   ,    msenc);

		_(NVKM_ENGINE_MSPDEC  ,   mspdec);

		_(NVKM_ENGINE_MSPPP   ,    msppp);

		_(NVKM_ENGINE_MSVLD   ,    msvld);

drivers/gpu/drm/nouveau/nvkm/subdev/devinit/gf100.c

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ gf100_devinit_disable(struct nvkm_devinit *init) 
	if (r022500 & 0x00000004)

		disable |= (1ULL << NVKM_ENGINE_MSVLD);

	if (r022500 & 0x00000008)

		disable |= (1ULL << NVKM_ENGINE_MSENC);

		nvkm_subdev_disable(device, NVKM_ENGINE_MSENC, 0);

	if (r022500 & 0x00000100)

		nvkm_subdev_disable(device, NVKM_ENGINE_CE, 0);

	if (r022500 & 0x00000200)