diff options
author | Dave Airlie <airlied@redhat.com> | 2019-07-19 17:28:10 +1000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2019-07-19 17:28:38 +1000 |
commit | 8ee795625665208589a97972b01790bb04ea83e3 (patch) | |
tree | b181d0952c23dbf4fe5b293e778424bad271bbfb /drivers/gpu/drm/nouveau/nvkm/engine/sec | |
parent | Merge tag 'drm-next-5.3-2019-07-18' of git://people.freedesktop.org/~agd5f/linux into drm-next (diff) | |
parent | drm/nouveau/secboot/gp102-: remove WAR for SEC2 RTOS start bug (diff) | |
download | linux-dev-8ee795625665208589a97972b01790bb04ea83e3.tar.xz linux-dev-8ee795625665208589a97972b01790bb04ea83e3.zip |
Merge branch 'linux-5.3' of git://github.com/skeggsb/linux into drm-next
nouveau fixes and TU116 enablement.
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Ben Skeggs <skeggsb@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/CACAvsv5hZ3B4S9cVTPd2-Ug7dMSasLPJrWMyoDo4MOg8cbXWkA@mail.gmail.com
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/engine/sec')
-rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/engine/sec/Kbuild | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/engine/sec/fuc/g98.fuc0s.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/sec/Kbuild b/drivers/gpu/drm/nouveau/nvkm/engine/sec/Kbuild index f72ee558f8e8..b6e02ceb1c5a 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/sec/Kbuild +++ b/drivers/gpu/drm/nouveau/nvkm/engine/sec/Kbuild @@ -1,2 +1,2 @@ -# SPDX-License-Identifier: GPL-2.0 +# SPDX-License-Identifier: MIT nvkm-y += nvkm/engine/sec/g98.o diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/sec/fuc/g98.fuc0s.h b/drivers/gpu/drm/nouveau/nvkm/engine/sec/fuc/g98.fuc0s.h index 6278a0c5fe83..fe90f2e05853 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/sec/fuc/g98.fuc0s.h +++ b/drivers/gpu/drm/nouveau/nvkm/engine/sec/fuc/g98.fuc0s.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: MIT */ static uint32_t g98_sec_data[] = { /* 0x0000: ctx_dma */ /* 0x0000: ctx_dma_query */ |