From: jsg <jsg@openbsd.org>
Date: Thu, 20 Jul 2023 08:56:48 +0000 (+0000)
Subject: drm/i915/guc/slpc: Apply min softlimit correctly
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=98879e44efd9bb9e56ce5a65dd0953c784ac8883;p=openbsd

drm/i915/guc/slpc: Apply min softlimit correctly

From Vinay Belgaumkar
dcb526d768359095a438336f3aca5e8d98b7d2e6 in linux-6.1.y/6.1.39
3e49de73fb89272dea01ba420c7ccbcf6b96aed7 in mainline linux
---

diff --git a/sys/dev/pci/drm/i915/gt/uc/intel_guc_slpc.c b/sys/dev/pci/drm/i915/gt/uc/intel_guc_slpc.c
index ebd2893d2d7..c0cb06faae9 100644
--- a/sys/dev/pci/drm/i915/gt/uc/intel_guc_slpc.c
+++ b/sys/dev/pci/drm/i915/gt/uc/intel_guc_slpc.c
@@ -580,7 +580,7 @@ static int slpc_set_softlimits(struct intel_guc_slpc *slpc)
 		if (unlikely(ret))
 			return ret;
 		slpc_to_gt(slpc)->defaults.min_freq = slpc->min_freq_softlimit;
-	} else if (slpc->min_freq_softlimit != slpc->min_freq) {
+	} else {
 		return intel_guc_slpc_set_min_freq(slpc,
 						   slpc->min_freq_softlimit);
 	}