Sync with 1.1.3

acidanthera · Nov 11, 2017 · e75690a · e75690a
1 parent c56db4d
commit e75690a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -1,5 +1,9 @@
 WhateverGreen Changelog
 =======================
+#### v1.1.3
+- Added more GPU models to automatic detection
+- Added `-rad4200` option to fix freezes and possibly improve the performance of Radeon Pro 560 on 10.13
+
 #### v1.1.2
 - Enabled the kext in installer and recovery by default
 - Improved controller start debugging

diff --git a/README.md b/README.md
@@ -31,8 +31,9 @@ Add `-radoff` to disable WhateverGreen.
 Add `-radbeta` to enable WhateverGreen on unsupported os versions (10.13 and below are enabled by default).  
 Add `-rad24` to enforce 24-bit display mode.  
 Add `-radlogo` to patch boot logo distortion.  
-Add `-raddvi` to enable DVI transmitter correction (required for 290X, 370, etc.)  
-Add `-radnoaudio` to disable DP/HDMI audio autoenabling (you may also use `no-audio-autofix` GFX0 property)  
+Add `-raddvi` to enable DVI transmitter correction (required for 290X, 370, etc.).  
+Add `-radnoaudio` to disable DP/HDMI audio autoenabling (you may also use `no-audio-autofix` GFX0 property).  
+Add `-rad4200` to choose 4200 driver over 4250 for 0x67DF, 0x67EF, 0x67FF (you may also use `prefer-4200-driver` GFX0 property).  
 Add `radpg=15` to disable several power-gating modes (see FAQ, required for Cape Verde GPUs).
 
 #### Credits

diff --git a/WhateverGreen/kern_model.cpp b/WhateverGreen/kern_model.cpp
@@ -173,12 +173,12 @@ static constexpr Model dev6758[] {
 	{Model::DetectSub, 0x1028, 0x0b0e, 0x0000, "AMD Radeon HD 6670"},
 	{Model::DetectSub, 0x103c, 0x6882, 0x0000, "AMD Radeon HD 6670"},
 	{Model::DetectSub, 0x174b, 0xe181, 0x0000, "AMD Radeon HD 6670"},
-    {Model::DetectSub, 0x174b, 0xe198, 0x0000, "AMD Radeon HD 6670"},
+	{Model::DetectSub, 0x174b, 0xe198, 0x0000, "AMD Radeon HD 6670"},
 	{Model::DetectSub, 0x1787, 0x2309, 0x0000, "AMD Radeon HD 6670"},
 	{Model::DetectSub, 0x1043, 0x0443, 0x0000, "AMD Radeon HD 6670"},
 	{Model::DetectSub, 0x1458, 0x2205, 0x0000, "AMD Radeon HD 6670"},
 	{Model::DetectSub, 0x1043, 0x03ea, 0x0000, "AMD Radeon HD 6670"},
-    {Model::DetectSub, 0x1458, 0x2545, 0x0000, "AMD Radeon HD 6670"},
+	{Model::DetectSub, 0x1458, 0x2545, 0x0000, "AMD Radeon HD 6670"},
 	{Model::DetectDef, 0x0000, 0x0000, 0x0000, "AMD Radeon HD 7670"}
 };
 
@@ -429,7 +429,7 @@ static constexpr Model dev6810[] {
 	{Model::DetectSub, 0x1458, 0x2272, 0x0000, "AMD Radeon R9 270X"},
 	{Model::DetectSub, 0x1462, 0x3033, 0x0000, "AMD Radeon R9 270X"},
 	{Model::DetectSub, 0x174b, 0xe271, 0x0000, "AMD Radeon R9 270X"},
-    {Model::DetectSub, 0x1787, 0x201c, 0x0000, "AMD Radeon R9 270X"},
+	{Model::DetectSub, 0x1787, 0x201c, 0x0000, "AMD Radeon R9 270X"},
 	{Model::DetectSub, 0x148c, 0x0908, 0x0000, "AMD Radeon R9 370"},
 	{Model::DetectSub, 0x1682, 0x7370, 0x0000, "AMD Radeon R7 370"},
 	{Model::DetectDef, 0x0000, 0x0000, 0x0000, "AMD Radeon R9 370X"}