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

drm/nouveau/mpeg: switch to instanced constructor 



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

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

	struct nvkm_engine *msenc;

	struct nvkm_engine *mspdec;

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

#undef NVKM_LAYOUT_ONCE



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

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

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

+1 −5
Original line number Diff line number Diff line
@@ -53,12 +53,8 @@ int nvkm_engine_ctor_(const struct nvkm_engine_func *, bool old, struct nvkm_dev 
#define nvkm_engine_ctor_n(f,d,t,i,e,s) nvkm_engine_ctor_((f), false, (d), (t), (i), (e), (s))

#define nvkm_engine_ctor__(_1,_2,_3,_4,_5,_6,IMPL,...) IMPL

#define nvkm_engine_ctor(A...) nvkm_engine_ctor__(A, nvkm_engine_ctor_n, nvkm_engine_ctor_o)(A)

int nvkm_engine_new__(const struct nvkm_engine_func *, bool old, struct nvkm_device *,

int nvkm_engine_new_(const struct nvkm_engine_func *, struct nvkm_device *,

		     enum nvkm_subdev_type, int, bool enable, struct nvkm_engine **);

#define nvkm_engine_new__o(f,d,i,  e,s) nvkm_engine_new__((f),  true, (d), (i), -1 , (e), (s))

#define nvkm_engine_new__n(f,d,t,i,e,s) nvkm_engine_new__((f), false, (d), (t), (i), (e), (s))

#define nvkm_engine_new___(_1,_2,_3,_4,_5,_6,IMPL,...) IMPL

#define nvkm_engine_new_(A...) nvkm_engine_new___(A, nvkm_engine_new__n, nvkm_engine_new__o)(A)



struct nvkm_engine *nvkm_engine_ref(struct nvkm_engine *);

void nvkm_engine_unref(struct nvkm_engine **);

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

+1 −0
Original line number Diff line number Diff line
@@ -34,4 +34,5 @@ NVKM_LAYOUT_ONCE(NVKM_ENGINE_FIFO , struct nvkm_fifo , fifo) 
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_VP      , struct nvkm_engine  ,       vp)

drivers/gpu/drm/nouveau/include/nvkm/engine/mpeg.h

+5 −5
Original line number Diff line number Diff line
@@ -2,9 +2,9 @@ 
#ifndef __NVKM_MPEG_H__

#define __NVKM_MPEG_H__

#include <core/engine.h>

int nv31_mpeg_new(struct nvkm_device *, int index, struct nvkm_engine **);

int nv40_mpeg_new(struct nvkm_device *, int index, struct nvkm_engine **);

int nv44_mpeg_new(struct nvkm_device *, int index, struct nvkm_engine **);

int nv50_mpeg_new(struct nvkm_device *, int index, struct nvkm_engine **);

int g84_mpeg_new(struct nvkm_device *, int index, struct nvkm_engine **);

int nv31_mpeg_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_engine **);

int nv40_mpeg_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_engine **);

int nv44_mpeg_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_engine **);

int nv50_mpeg_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_engine **);

int g84_mpeg_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_engine **);

#endif

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

+2 −2
Original line number Diff line number Diff line
@@ -194,11 +194,11 @@ nvkm_engine_ctor_(const struct nvkm_engine_func *func, bool old, struct nvkm_dev 
}



int

nvkm_engine_new__(const struct nvkm_engine_func *func, bool old, struct nvkm_device *device,

nvkm_engine_new_(const struct nvkm_engine_func *func, struct nvkm_device *device,

		 enum nvkm_subdev_type type, int inst, bool enable,

		 struct nvkm_engine **pengine)

{

	if (!(*pengine = kzalloc(sizeof(**pengine), GFP_KERNEL)))

		return -ENOMEM;

	return nvkm_engine_ctor_(func, old, device, type, inst, enable, *pengine);

	return nvkm_engine_ctor(func, device, type, inst, enable, *pengine);

}