diff options
| author | Mark Zhang <markz@nvidia.com> | 2015-05-08 11:10:51 -0700 |
|---|---|---|
| committer | Alexandre Courbot <acourbot@nvidia.com> | 2015-08-06 13:26:23 +0900 |
| commit | 71868ded463fef839ca58cf97e2b3fa8e7de0ae9 (patch) | |
| tree | 196a0832c06e7596be79b53a97652727f7ce9018 | |
| parent | 01674822fa5f031a78393e70f3f6c49e09fe785b (diff) | |
| download | nouveau-71868ded463fef839ca58cf97e2b3fa8e7de0ae9.tar.gz | |
gr/gm20b: add MaxwellDmaCopyA class
This patch adds class MaxwellDmaCopyA which makes GR init gets called during
nouveau probing which makes secure boot works.
[alex] Looks like a hack rather than an actual fix. Secure boot should
just work.
Signed-off-by: Mark Zhang <markz@nvidia.com>
Signed-off-by: Alexandre Courbot <acourbot@nvidia.com>
| -rw-r--r-- | drm/nouveau/include/nvif/class.h | 1 | ||||
| -rw-r--r-- | drm/nouveau/nvkm/engine/gr/gm20b.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/drm/nouveau/include/nvif/class.h b/drm/nouveau/include/nvif/class.h index 59d598357..d90e207d1 100644 --- a/drm/nouveau/include/nvif/class.h +++ b/drm/nouveau/include/nvif/class.h @@ -103,6 +103,7 @@ #define MAXWELL_COMPUTE_A 0x0000b0c0 #define MAXWELL_COMPUTE_B 0x0000b1c0 +#define MAXWELL_DMA_COPY_A 0x0000b0b5 /******************************************************************************* * client diff --git a/drm/nouveau/nvkm/engine/gr/gm20b.c b/drm/nouveau/nvkm/engine/gr/gm20b.c index 897628062..f540eb8e6 100644 --- a/drm/nouveau/nvkm/engine/gr/gm20b.c +++ b/drm/nouveau/nvkm/engine/gr/gm20b.c @@ -29,6 +29,7 @@ static struct nvkm_oclass gm20b_gr_sclass[] = { { FERMI_TWOD_A, &nvkm_object_ofuncs }, { KEPLER_INLINE_TO_MEMORY_B, &nvkm_object_ofuncs }, + { MAXWELL_DMA_COPY_A, &nvkm_object_ofuncs }, { MAXWELL_B, &gf100_fermi_ofuncs, gf100_gr_9097_omthds }, { MAXWELL_COMPUTE_B, &nvkm_object_ofuncs, gf100_gr_90c0_omthds }, {} |