From d0cf79b28faa3b6be9564c3bbd3bd711687bf02b Mon Sep 17 00:00:00 2001
From: "Thomas H.P. Andersen" <phomes@gmail.com>
Date: Wed, 25 Jan 2023 22:53:15 +0100
Subject: [PATCH] nvk: add warning on non-nouveau drm driver

Check that the drm kernel driver in use is nouveau, and
add a short description of the issue.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24326>
---
 src/nouveau/winsys/nouveau_device.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/nouveau/winsys/nouveau_device.c b/src/nouveau/winsys/nouveau_device.c
index 1a26f55096f..2cc9ad5a377 100644
--- a/src/nouveau/winsys/nouveau_device.c
+++ b/src/nouveau/winsys/nouveau_device.c
@@ -195,11 +195,19 @@ nouveau_ws_device_new(drmDevicePtr drm_device)
    if (!ver)
       goto out_err;
 
+   if (strncmp("nouveau", ver->name, ver->name_len) != 0) {
+      fprintf(stderr,
+              "DRM kernel driver '%.*s' in use. NVK requires nouveau.\n",
+              ver->name_len, ver->name);
+      goto out_err;
+   }
+
    uint32_t version =
       ver->version_major << 24 |
       ver->version_minor << 8  |
       ver->version_patchlevel;
    drmFreeVersion(ver);
+   ver = NULL;
 
    if (version < 0x01000301)
       goto out_err;
@@ -260,6 +268,8 @@ nouveau_ws_device_new(drmDevicePtr drm_device)
    return device;
 
 out_err:
+   if (ver)
+      drmFreeVersion(ver);
    FREE(device);
    close(fd);
    return NULL;