[Nouveau] [PATCH] Revert "nouveau: enable use of new kernel interfaces"

[Ilia Mirkin]

This reverts commit a8c474760268f2ebdddd655cea06dbef4500236a, and allows
the new kernel interfaces to be optionally enabled, but still off by
default. Some people are having issues while others aren't, need to
investigate.

Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
Cc: Ben Skeggs <bskeggs at redhat.com>
---
 src/gallium/winsys/nouveau/drm/nouveau_drm_winsys.c | 2 ++
 src/mesa/drivers/dri/nouveau/nouveau_screen.c       | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/src/gallium/winsys/nouveau/drm/nouveau_drm_winsys.c b/src/gallium/winsys/nouveau/drm/nouveau_drm_winsys.c
index c44424f..fa04c25 100644
--- a/src/gallium/winsys/nouveau/drm/nouveau_drm_winsys.c
+++ b/src/gallium/winsys/nouveau/drm/nouveau_drm_winsys.c
@@ -97,6 +97,8 @@ nouveau_drm_screen_create(int fd)
 	if (ret)
 		goto err;
 
+	drm->nvif = debug_get_bool_option("NOUVEAU_NVIF", false);
+
 	ret = nouveau_device_new(&drm->client, NV_DEVICE,
 				 &(struct nv_device_v0) {
 					.device = ~0ULL,
diff --git a/src/mesa/drivers/dri/nouveau/nouveau_screen.c b/src/mesa/drivers/dri/nouveau/nouveau_screen.c
index 6f61f66..1a74ae2 100644
--- a/src/mesa/drivers/dri/nouveau/nouveau_screen.c
+++ b/src/mesa/drivers/dri/nouveau/nouveau_screen.c
@@ -108,6 +108,8 @@ nouveau_init_screen2(__DRIscreen *dri_screen)
 		goto fail;
 	}
 
+	screen->drm->nvif = false;
+
 	ret = nouveau_device_new(&screen->drm->client, NV_DEVICE,
 				 &(struct nv_device_v0) {
 					.device = ~0ULL,
-- 
2.4.10