Backport #372743 to release 24.11 (#374560)

NixOS · Jan 17, 2025 · d875b07 · d875b07
2 parents 335b761 + 92a5805
commit d875b07
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 14 deletions.
diff --git a/nixos/modules/virtualisation/hyperv-guest.nix b/nixos/modules/virtualisation/hyperv-guest.nix
@@ -6,22 +6,15 @@ let
   cfg = config.virtualisation.hypervGuest;
 
 in {
+  imports = [
+    (mkRemovedOptionModule [ "virtualisation" "hypervGuest" "videoMode" ]
+      "The video mode can now be configured via standard tools, or in Hyper-V VM settings."
+    )
+  ];
+
   options = {
     virtualisation.hypervGuest = {
       enable = mkEnableOption "Hyper-V Guest Support";
-
-      videoMode = mkOption {
-        type = types.str;
-        default = "1152x864";
-        example = "1024x768";
-        description = ''
-          Resolution at which to initialize the video adapter.
-
-          Supports screen resolution up to Full HD 1920x1080 with 32 bit color
-          on Windows Server 2012, and 1600x1200 with 16 bit color on Windows
-          Server 2008 R2 or earlier.
-        '';
-      };
     };
   };
 
@@ -34,7 +27,7 @@ in {
       initrd.availableKernelModules = [ "hyperv_keyboard" ];
 
       kernelParams = [
-        "video=hyperv_fb:${cfg.videoMode}" "elevator=noop"
+        "elevator=noop"
       ];
     };
 

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -519,6 +519,8 @@ let
         DRM_I915_GVT_KVMGT = module;
         # Enable Hyper-V Synthetic DRM Driver
         DRM_HYPERV = whenAtLeast "5.14" module;
+        # And disable the legacy framebuffer driver when we have the new one
+        FB_HYPERV = whenAtLeast "5.14" no;
       }
       // lib.optionalAttrs (stdenv.hostPlatform.system == "aarch64-linux") {
         # enable HDMI-CEC on RPi boards