diff options
| author |   Jason Gunthorpe <jgg@nvidia.com> | 2021-01-19 10:55:19 -0400 |
|---|---|---|
| committer | Jason Gunthorpe <jgg@nvidia.com> | 2021-01-19 10:55:19 -0400 |
| commit | 02487bcc84cdec676b667096f896ba8ad254aae9 (patch) | |
| tree | df66e03b2c63f3488326357882f84b16ed532e1b /drivers/gpu/drm/nouveau/dispnv50/wimm.c | |
| parent | IB/isert: Simplify signature cap check (diff) | |
| parent | RDMA/mlx5: Use strict get/set operations for obj_id (diff) | |
| download | linux-dev-02487bcc84cdec676b667096f896ba8ad254aae9.tar.xz linux-dev-02487bcc84cdec676b667096f896ba8ad254aae9.zip | |
Merge branch 'devx_set_get' into rdma.git for-next
Leon Romanovsky says:
====================
Be more strict with DEVX get/set operations for the obj_id.
====================
Based on the mlx5-next branch at
git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux
due to dependencies.
* branch 'devx_set_get':
RDMA/mlx5: Use strict get/set operations for obj_id
RDMA/mlx5: Use the correct obj_id upon DEVX TIR creation
net/mlx5: Expose ifc bits for query modify header
Diffstat (limited to 'drivers/gpu/drm/nouveau/dispnv50/wimm.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/dispnv50/wimm.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/dispnv50/wimm.c b/drivers/gpu/drm/nouveau/dispnv50/wimm.c index a1ac153d5e98..566fbddfc8d7 100644 --- a/drivers/gpu/drm/nouveau/dispnv50/wimm.c +++ b/drivers/gpu/drm/nouveau/dispnv50/wimm.c @@ -31,6 +31,7 @@ nv50_wimm_init(struct nouveau_drm *drm, struct nv50_wndw *wndw) int version; int (*init)(struct nouveau_drm *, s32, struct nv50_wndw *); } wimms[] = { + { GA102_DISP_WINDOW_IMM_CHANNEL_DMA, 0, wimmc37b_init }, { TU102_DISP_WINDOW_IMM_CHANNEL_DMA, 0, wimmc37b_init }, { GV100_DISP_WINDOW_IMM_CHANNEL_DMA, 0, wimmc37b_init }, {} |