Merge tag 'mac80211-for-davem-2016-06-29-v2' of git://git.kernel.org/pub/scm/linux...

[mirror_ubuntu-focal-kernel.git] / drivers / gpu / drm / nouveau / nvkm / subdev / devinit / base.c

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/base.c b/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/base.c
index 5f25402f6b096f0e7ff67c39b4f8bef6ff8f57f8..4756019ddf3fba74bf69795a7fd567e38241d813 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/base.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/base.c
@@ -83,6 +83,12 @@ nvkm_devinit_preinit(struct nvkm_subdev *subdev)
        if (init->func->preinit)
                init->func->preinit(init);
 
+       /* Override the post flag during the first call if NvForcePost is set */
+       if (init->force_post) {
+               init->post = init->force_post;
+               init->force_post = false;
+       }
+
        /* unlock the extended vga crtc regs */
        nvkm_lockvgac(subdev->device, false);
        return 0;
@@ -124,7 +130,7 @@ nvkm_devinit_ctor(const struct nvkm_devinit_func *func,
                  struct nvkm_device *device, int index,
                  struct nvkm_devinit *init)
 {
-       nvkm_subdev_ctor(&nvkm_devinit, device, index, 0, &init->subdev);
+       nvkm_subdev_ctor(&nvkm_devinit, device, index, &init->subdev);
        init->func = func;
-       init->post = nvkm_boolopt(device->cfgopt, "NvForcePost", false);
+       init->force_post = nvkm_boolopt(device->cfgopt, "NvForcePost", false);
 }