Commit 0b26ca68 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/cipher: switch to instanced constructor 



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

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

	struct nvkm_disp *disp;

	struct nvkm_dma *dma;

	struct nvkm_fifo *fifo;
@@ -120,7 +119,6 @@ struct nvkm_device_chip { 
#undef NVKM_LAYOUT_INST

#undef NVKM_LAYOUT_ONCE



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

	int (*disp    )(struct nvkm_device *, int idx, struct nvkm_disp **);

	int (*dma     )(struct nvkm_device *, int idx, struct nvkm_dma **);

	int (*fifo    )(struct nvkm_device *, int idx, struct nvkm_fifo **);

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

+1 −0
Original line number Diff line number Diff line
@@ -27,4 +27,5 @@ NVKM_LAYOUT_ONCE(NVKM_SUBDEV_GSP , struct nvkm_gsp , gsp) 


NVKM_LAYOUT_ONCE(NVKM_ENGINE_BSP     , struct nvkm_engine  ,      bsp)

NVKM_LAYOUT_INST(NVKM_ENGINE_CE      , struct nvkm_engine  ,       ce, 9)

NVKM_LAYOUT_ONCE(NVKM_ENGINE_CIPHER  , struct nvkm_engine  ,   cipher)

NVKM_LAYOUT_ONCE(NVKM_ENGINE_VP      , struct nvkm_engine  ,       vp)

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

+1 −1
Original line number Diff line number Diff line
@@ -2,5 +2,5 @@ 
#ifndef __NVKM_CIPHER_H__

#define __NVKM_CIPHER_H__

#include <core/engine.h>

int g84_cipher_new(struct nvkm_device *, int, struct nvkm_engine **);

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

#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_ENGINE_CIPHER  ] = "cipher",

	[NVKM_ENGINE_DISP    ] = "disp",

	[NVKM_ENGINE_DMAOBJ  ] = "dma",

	[NVKM_ENGINE_FIFO    ] = "fifo",

drivers/gpu/drm/nouveau/nvkm/engine/cipher/g84.c

+2 −2
Original line number Diff line number Diff line
@@ -127,8 +127,8 @@ g84_cipher = { 
};



int

g84_cipher_new(struct nvkm_device *device, int index,

g84_cipher_new(struct nvkm_device *device, enum nvkm_subdev_type type, int inst,

	       struct nvkm_engine **pengine)

{

	return nvkm_engine_new_(&g84_cipher, device, index, true, pengine);

	return nvkm_engine_new_(&g84_cipher, device, type, inst, true, pengine);

}