Merge ~alextu/pc-enablement/+git/oem-fix-misc-cnl-oem-image-helper:let-ubuntu-drivers-install-decide-default-mode into ~oem-solutions-engineers/pc-enablement/+git/oem-fix-misc-cnl-oem-image-helper:master

[Alex Tu]

Unmerged commits

954e0c6... by Alex Tu on 2021-08-18

Obsolete the default mode and counting on ubuntu-drivers install

diff --git a/usr/sbin/auto-prime-select b/usr/sbin/auto-prime-select
index 7e94d29..b86268f 100755
--- a/usr/sbin/auto-prime-select
+++ b/usr/sbin/auto-prime-select
@@ -56,15 +56,24 @@ if [ -n "$BIOS_ID" ]; then
         grep -iq "$BIOS_ID" "$old_conf" && prime-select nvidia && exit 0
     fi
 fi
-if [ -e "/run/nvidia_runtimepm_supported" ]; then
-    prime-select on-demand
-else
-    if [ "$chassis_type" = "Desktop" ] || [ "$chassis_type" = "Mini_Tower" ] ||
-       [ "$chassis_type" = "Tower" ] || [ "$chassis_type" = "Main_Server_Chassis" ] ||
-       [ "$chassis_type" = "Rack_Mount_Chassis" ]; then
-        prime-select nvidia
-    else
-        prime-select intel
-    fi
-fi
+# After Nvidia supported runtimepm.
+# And Nvidia is commiting that all new Nvidia dgpu will support runtimepm.
+# We are counting on `ubuntu-drivers install` which executed before this script
+# to select the default mode so that we can close OEM gap.
+# Another important reason counting on `ubuntu-drivers install` to select default mode is because
+# the maintainer will always implement the logic with the detail requirement from Nvidia release note.
+# refer to: http://us.download.nvidia.com/XFree86/Linux-x86_64/470.57.02/README/dynamicpowermanagement.html
+# "This feature is supported only on notebooks. "
 
+# Obsoleted logic:
+#if [ -e "/run/nvidia_runtimepm_supported" ]; then
+#    prime-select on-demand
+#else
+#    if [ "$chassis_type" = "Desktop" ] || [ "$chassis_type" = "Mini_Tower" ] ||
+#       [ "$chassis_type" = "Tower" ] || [ "$chassis_type" = "Main_Server_Chassis" ] ||
+#       [ "$chassis_type" = "Rack_Mount_Chassis" ]; then
+#        prime-select nvidia
+#    else
+#        prime-select intel
+#    fi
+#fi