aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/nouveau/nvkm/engine/device
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2021-02-04 08:34:38 +1000
committerBen Skeggs <bskeggs@redhat.com>2021-02-11 11:49:56 +1000
commit0b26ca68c97d1673fe644092b05cdd64ad612711 (patch)
tree24a328474bfc079da55a94484ffee78a9ebd2989 /drivers/gpu/drm/nouveau/nvkm/engine/device
parentdrm/nouveau/ce: make use of nvkm_subdev.inst (diff)
downloadlinux-dev-0b26ca68c97d1673fe644092b05cdd64ad612711.tar.xz
linux-dev-0b26ca68c97d1673fe644092b05cdd64ad612711.zip
drm/nouveau/cipher: switch to instanced constructor
Signed-off-by: Ben Skeggs <bskeggs@redhat.com> Reviewed-by: Lyude Paul <lyude@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/engine/device')
-rw-r--r--drivers/gpu/drm/nouveau/nvkm/engine/device/base.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
index 14636df82630..159d048fd7a6 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
@@ -935,7 +935,7 @@ nv84_chipset = {
.timer = { 0x00000001, nv41_timer_new },
.volt = { 0x00000001, nv40_volt_new },
.bsp = { 0x00000001, g84_bsp_new },
- .cipher = g84_cipher_new,
+ .cipher = { 0x00000001, g84_cipher_new },
.disp = g84_disp_new,
.dma = nv50_dma_new,
.fifo = g84_fifo_new,
@@ -967,7 +967,7 @@ nv86_chipset = {
.timer = { 0x00000001, nv41_timer_new },
.volt = { 0x00000001, nv40_volt_new },
.bsp = { 0x00000001, g84_bsp_new },
- .cipher = g84_cipher_new,
+ .cipher = { 0x00000001, g84_cipher_new },
.disp = g84_disp_new,
.dma = nv50_dma_new,
.fifo = g84_fifo_new,
@@ -999,7 +999,7 @@ nv92_chipset = {
.timer = { 0x00000001, nv41_timer_new },
.volt = { 0x00000001, nv40_volt_new },
.bsp = { 0x00000001, g84_bsp_new },
- .cipher = g84_cipher_new,
+ .cipher = { 0x00000001, g84_cipher_new },
.disp = g84_disp_new,
.dma = nv50_dma_new,
.fifo = g84_fifo_new,
@@ -1031,7 +1031,7 @@ nv94_chipset = {
.timer = { 0x00000001, nv41_timer_new },
.volt = { 0x00000001, nv40_volt_new },
.bsp = { 0x00000001, g84_bsp_new },
- .cipher = g84_cipher_new,
+ .cipher = { 0x00000001, g84_cipher_new },
.disp = g94_disp_new,
.dma = nv50_dma_new,
.fifo = g84_fifo_new,
@@ -1063,7 +1063,7 @@ nv96_chipset = {
.timer = { 0x00000001, nv41_timer_new },
.volt = { 0x00000001, nv40_volt_new },
.bsp = { 0x00000001, g84_bsp_new },
- .cipher = g84_cipher_new,
+ .cipher = { 0x00000001, g84_cipher_new },
.disp = g94_disp_new,
.dma = nv50_dma_new,
.fifo = g84_fifo_new,
@@ -1127,7 +1127,7 @@ nva0_chipset = {
.timer = { 0x00000001, nv41_timer_new },
.volt = { 0x00000001, nv40_volt_new },
.bsp = { 0x00000001, g84_bsp_new },
- .cipher = g84_cipher_new,
+ .cipher = { 0x00000001, g84_cipher_new },
.disp = gt200_disp_new,
.dma = nv50_dma_new,
.fifo = g84_fifo_new,
@@ -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_CIPHER , cipher);
_(NVKM_ENGINE_DISP , disp);
_(NVKM_ENGINE_DMAOBJ , dma);
_(NVKM_ENGINE_FIFO , fifo);