diff options
| author | Alexandre Courbot <acourbot@nvidia.com> | 2015-11-20 17:32:40 +0900 |
|---|---|---|
| committer | Alexandre Courbot <acourbot@nvidia.com> | 2015-12-11 17:42:26 +0900 |
| commit | 9891ad2da7fde203c66ce820a0e36bf3c33daf11 (patch) | |
| tree | bada63087148b3bd63f04e1f58a210fc765e345f | |
| parent | 8115f72340fc561259bd2e0775e6b2c0fdf5995a (diff) | |
| download | nouveau-9891ad2da7fde203c66ce820a0e36bf3c33daf11.tar.gz | |
secureboot: move to device init so VRAM is available
| -rw-r--r-- | drm/nouveau/nvkm/engine/device/base.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drm/nouveau/nvkm/engine/device/base.c b/drm/nouveau/nvkm/engine/device/base.c index 94ffc005c..4072ed418 100644 --- a/drm/nouveau/nvkm/engine/device/base.c +++ b/drm/nouveau/nvkm/engine/device/base.c @@ -2255,6 +2255,11 @@ nvkm_device_init(struct nvkm_device *device) nvkm_acpi_init(device); + ret = 0; + + if (nvkm_need_secure_boot(device)) + ret = nvkm_secure_boot_init(device); + time = ktime_to_us(ktime_get()) - time; nvdev_trace(device, "init completed in %lldus\n", time); return 0; @@ -2575,11 +2580,6 @@ nvkm_device_ctor(const struct nvkm_device_func *func, #undef _ } - ret = 0; - - if (nvkm_need_secure_boot(device)) - ret = nvkm_secure_boot_init(device); - done: mutex_unlock(&nv_devices_mutex); return ret; |