Prefer upstream CPU limits for some titles

gamefixes-gog/umu-20920.py

@@ -0,0 +1 @@
+../gamefixes-steam/20920.py

gamefixes-steam/19900.py

@@ -1,12 +1,9 @@
 """ Far Cry 2
 """
-#pylint: disable=C0103
-
-from protonfixes import util
-
-
 def main():
-    """ chokes on more than 31 cores
-    """
+    """ Set CPU limit to upstream core count
+    See https://github.com/ValveSoftware/Proton/blob/proton_9.0/proton#L1154
 
-    util.set_cpu_topology_limit(31)
+    Code block is intentionally empty because this game exists in EGS and
+    Ubisoft (umu-19900)
+    """

gamefixes-steam/20920.py

@@ -1,12 +1,6 @@
-""" Witcher 2
+""" The Witcher 2: Assassins of Kings Enhanced Edition
 """
-#pylint: disable=C0103
-
-from protonfixes import util
-
-
 def main():
-    """ Witcher 2 chokes on more than 31 cores
+    """ Witcher 2 chokes on more than 16 cores
+    Code block is intentionally empty because this game exists in GOG (umu-20920)
     """
-
-    util.set_cpu_topology_limit(31)

gamefixes-steam/298110.py

@@ -11,4 +11,3 @@ def main():
 
     util.protontricks('d3dcompiler_43')
     util.protontricks('d3dcompiler_47')
-    util.set_cpu_topology_limit(24)