From aa2db1be425159dd4fb071960ab6be2506acd600 Mon Sep 17 00:00:00 2001
From: Jeremy Szu <jeremy.szu@canonical.com>
Date: Tue, 17 May 2022 03:57:22 +0000
Subject: [PATCH] Skip to wait nvidia-drm for nvidia-340

nvidia-340 doesn't have nvidia-drm module.
Thus, it will unconditionally wait 10 seconds during booting (LP: #1973604)
---
 share/hybrid/gpu-manager.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/share/hybrid/gpu-manager.c b/share/hybrid/gpu-manager.c
index da5559a..4e9534f 100644
--- a/share/hybrid/gpu-manager.c
+++ b/share/hybrid/gpu-manager.c
@@ -2529,6 +2529,8 @@ int main(int argc, char *argv[]) {
     /* Device information (discrete) */
     struct device discrete_device = { 0 };
 
+    /* Get nvidia driver version */
+    int major, minor, extra;
 
     while (1) {
         static struct option long_options[] =
@@ -3047,6 +3049,13 @@ int main(int argc, char *argv[]) {
         for (i = 0; i < 500; i++, usleep(20000)) {
             if (is_file(UDEV_NVIDIA_COMPLETED))
                 break;
+            /* Get nvidia driver version inside loop because sometime nvidia
+             * driver take longer time to load.
+             */
+            if (get_nvidia_driver_version(&major, &minor, &extra) &&
+                major < 390) {
+                break;
+            }
         }
         fprintf(log_handle, "Takes %dms to wait for nvidia udev rules completed.\n", i * 20);
     }