From 99918dfbd7a86e18071ddc72e81a2f3ffe5bcea5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erkka=20Heinil=C3=A4?= Date: Mon, 14 Oct 2024 11:53:49 +0300 Subject: [PATCH] dell-precision-5490: make force_probe conditional --- dell/precision/5490/README.md | 8 ++++---- dell/precision/5490/default.nix | 8 +++----- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/dell/precision/5490/README.md b/dell/precision/5490/README.md index 380a843..29088e5 100644 --- a/dell/precision/5490/README.md +++ b/dell/precision/5490/README.md @@ -1,15 +1,15 @@ # Dell Precision 5490 -The internal monitor needs Linux Kernel >= 6.7 so enabling hybrid graphics does not work out of the box in 24.05. Setting +Linux kernel versions prior to 6.7 may not function correctly with the internal monitor, as official support was introduced in version 6.7 (https://www.phoronix.com/news/Linux-6.7-Intel-Meteor-Lake-Gfx). You can enable experimental support by adding the following parameter: ``` boot.kernelParams = [ "i915.force_probe=7d55" ]; ``` -helped but introduced some screen tearing. +However, this may lead to some screen tearing. -Setting +If possible, you might benefit from a newer kernel, for example: ``` boot.kernelPackages = pkgs.linuxPackages_latest; ``` -in nixos-stable worked with no problems. +as it seems to work without any issues. diff --git a/dell/precision/5490/default.nix b/dell/precision/5490/default.nix index 4881de1..b2cbabe 100644 --- a/dell/precision/5490/default.nix +++ b/dell/precision/5490/default.nix @@ -1,13 +1,11 @@ -{ lib, ... }: +{ config, lib, ... }: { imports = [ - ../../../common/gpu/nvidia + ../../../common/gpu/nvidia/ada-lovelace ]; - # or even better: boot.kernelParams = pkgs.linuxPackages_latest; - boot.kernelParams = [ "i915.force_probe=7d55" ]; + boot.kernelParams = lib.mkIf (lib.versionOlder config.boot.kernelPackages.kernel.version "6.7") [ "i915.force_probe=7d55" ]; - hardware.nvidia.open = true; hardware.nvidia.prime = { intelBusId = "PCI:0:2:0"; nvidiaBusId = "PCI:1:0:0";