EDID override for HDR screens to fix HDMI hotplug and overclock refresh rate

EFI-OpenCore/EFI/OC/config.plist

@@ -994,25 +994,13 @@
 				<data>
 				FlkAAA==
 				</data>
-				<key>disable-external-gpu</key>
-				<data>
-				AQAAAA==
-				</data>
-				<key>framebuffer-con1-alldata</key>
-				<data>
-				AQUJAAAIAADHAwAA
-				</data>
 				<key>framebuffer-con1-enable</key>
 				<data>
 				AQAAAA==
 				</data>
-				<key>framebuffer-con2-alldata</key>
+				<key>framebuffer-con1-type</key>
 				<data>
-				AgQKAAAEAADHAwAA
+				AAgAAA==
-				</data>
-				<key>framebuffer-con2-enable</key>
-				<data>
-				AQAAAA==
 				</data>
 				<key>framebuffer-patch-enable</key>
 				<data>

EFI-OpenCore/README.md

@@ -30,6 +30,11 @@ It is important to keep your OpenCore config.plist properly up-to-spec, as OpenC
 * Intel iGPU and HDMI patches:
 `Device Properties` > `PciRoot(0x0)/Pci(0x2,0x0)` >  
     * `device-id` = `16590000` per [WhateverGreen/IntelHD.en.md](https://github.com/acidanthera/WhateverGreen/blob/master/Manual/FAQ.IntelHD.en.md)
+    * `AAPL,ig-platform-id` = This is negotiable. In the future, I will test different variables for optimization. For now, `04002759` works well enough. 
+    * `framebuffer-con1-enable` to enable framebuffer patching by WEG on connector 1.
+    * `framebuffer-con1-type` to set connector 1 type to HDMI (per IOReg)
+    * `framebuffer-patch-enable` tells WEG to patch framebuffer.
+    * `AAPL00,override-no-connect` to override EDID (dependent on display models). See `patches/Internal Displays/`. This is necessary to fix HDMI hotplug. To create your own, see [Issue #60](https://github.com/tylernguyen/x1c6-hackintosh/issues/60)
 * FileVault compatibility:
     * Misc -> Boot
         * `PollAppleHotKeys` set to YES(While not needed can be helpful)

EFI-install_USB/EFI/OC/config.plist

@@ -85,10 +85,6 @@
 				<data>
 				FlkAAA==
 				</data>
-				<key>enable-hdmi20</key>
-				<data>
-				AQAAAA==
-				</data>
 				<key>framebuffer-con1-enable</key>
 				<data>
 				AQAAAA==

README.md

@@ -25,27 +25,21 @@
 
 ##### Recent | [Changelog Archive](https://github.com/tylernguyen/x1c6-hackintosh/blob/master/docs/CHANGELOG.md)
 
-> ### 2020-6-26
+> ### 2020-6-29
 
 #### Added
 
-- `VoodooRMI` as alternative trackpad option. **Enabled by default, feel free to revert back to `VoodooPS2Mouse` and `VoodooPS2Trackpad` if you prefer**. *Note, there's currently a bug with RMI where the touchpad would not load once in a while. The RMI kext uploaded in this repo has a temp fix by me (See [VoodooSMBUS/PR](https://github.com/VoodooSMBus/VoodooSMBus/pull/41)). However, the issue is still ongoing and the dev team is aware of it. I'm switching this repo to VoodooRMI because I believe it's the future and I want to possible bugs to be reported to be fixed for the kext's first stable release.  
+- X1 6th Gen Hardware Maintenance Guide pdf.
-- Kernel patches to enable 4K external graphics, thank you so much [@benbender](https://github.com/benbender)
+- Display Patches in `patches/Internal Displays/` for the WQHD HDR Screen:
-- `XQ74` patch in `SSDT-Keyboard` to support `FnLock` HUD per ThinkpadAssistant 1.8.0
+    - Color profile as calibrated by notebookcheck
-- In [EFI-OpenCore/README.md](https://github.com/tylernguyen/x1c6-hackintosh/blob/master/EFI-OpenCore/README.md), I've added a short section explaining why certain variables are the way they are in my `config.plist`. I will continue to update this section with more details as time goes on.  
+    - EDID override to patch HDMI hotplug and overclock refresh rate. Thank you @veelar
+- Please follow instructions on [Issue #60](https://github.com/tylernguyen/x1c6-hackintosh/issues/60) to create an EDID override for your own display. Make sure to create a pull request!
+- Repo issue template to deter low effort issues and better diagnosing and support.
+- More documentation in `EFI-OpenCore/README.md` about decisions on `config.plist`
 
 #### Changed
 
-- iGPU Framebuffer patching for HDMI issue in Catalina. 
+- Reverted to previous, simpler iGPU framebuffer patches.
-    - In Catalina/WhateverGreen version, for some reasons my previous framebuffer patches for HDMI no longer worked. So I re-did the patch in mode details but eventually the property that fixed it was `disable-external-gpu` or `-wegnoegpu`. For some strange reasons, that variable activated on-board HDMI. See [similar reports here](https://www.tonymacx86.com/threads/guide-general-framebuffer-patching-guide-hdmi-black-screen-problem.269149/page-123). I'm going to create an issue on acidanthera/bugtracker soon to report to the dev team. In the mean time, keep this property if you rely on HDMI and do not have an eGPU. Delete this property if you have an eGPU (You're likely using the HDMI on the eGPU anyway).
-- Fixed `VoodooPS2` kexts loading order.
-- Various reference docs to dortania.
-- `HibernateMode` to `Auto`
-
-#### Removed
-
-- Unnecessary Mutex OpenCore patches, all Mutex are already 0 in stock `DSDT`.
-- `SSDT-MCHC` and `SSDT-SBUS` for `VoodooRMI` compatibility.
 
 > ## SUMMARY:
 
@@ -58,7 +52,7 @@
 | iCloud suite: App Store, iMessage, FaceTime, iCloud Drive, etc... ✅                                                                                                                | Hibernation mode 25 ❌ CMOS error, see [Issue #44](https://github.com/tylernguyen/x1c6-hackintosh/issues/44) |                                                                                                                                              |
 | Multimedia Fn keys ✅ \*need [ThinkpadAssistant](https://github.com/MSzturc/ThinkpadAssistant)                                                                                      |                                                                                                              |                                                                                                                                              |
 | PM981 installation. ✅ See [Issue #43](https://github.com/tylernguyen/x1c6-hackintosh/issues/43)                                                                                    |                                                                                                              |                                                                                                                                              |
-| 4K UHD via HDMI/DisplayPort. ✅ \*one minor quirk with Recovery and macOS updates, See [Issue #28](https://github.com/tylernguyen/x1c6-hackintosh/issues/28#issuecomment-649107190) |                                                                                                              |                                                                                                                                              |
+| 4K UHD via HDMI/DisplayPort. ✅ \*one minor quirk with Recovery and macOS updates, See [Issue #28](https://github.com/tylernguyen/x1c6-hackintosh/issues/28#issuecomment-649107190). HDMI hotplug will require a custom EDID override. See [Issue #60](https://github.com/tylernguyen/x1c6-hackintosh/issues/60)|                                                                                                              |                                                                                                                                              |
 
 **For more information regarding certain features, please refer to [`docs/3_README-POSTinstallation.md`](https://github.com/tylernguyen/x1c6-hackintosh/blob/master/docs/3_README-POSTinstallation.md)**
 

docs/5_README-other.md

@@ -18,6 +18,11 @@
 - Do not disable `hibernatefile`.
 - `sudo pmset -a tcpkeepalive 0` to disable Network while sleeping.
 
+> ## EDDI Override:
+- This is necessary to fix HDMI hotplug.
+- See current available patches in `patches/Internal Displays/`
+- If a patch is not yet created for your display model. Please see [Issue #60](https://github.com/tylernguyen/x1c6-hackintosh/issues/60) to create your own EDID override. Please create a pull request to add your EDID override for different displays.
+
 > ## Multimedia Fn Key Patching:
 
 Since macOS doesn't not natively support some multimedia Fn key actions. [ThinkpadAssistant](https://github.com/MSzturc/ThinkpadAssistant) is required for the Fn actions to be implemented. Additionally, my settings are:

docs/CHANGELOG.md

@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.  
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
+> ### 2020-6-29
+
+#### Added
+
+- X1 6th Gen Hardware Maintenance Guide pdf.
+- Display Patches in `patches/Internal Displays/` for the WQHD HDR Screen:
+    - Color profile as calibrated by notebookcheck
+    - EDID override to patch HDMI hotplug and overclock refresh rate. Thank you @veelar
+- Please follow instructions on [Issue #60](https://github.com/tylernguyen/x1c6-hackintosh/issues/60) to create an EDID override for your own display. Make sure to create a pull request!
+- Repo issue template to deter low effort issues and better diagnosing and support.
+- More documentation in `EFI-OpenCore/README.md` about decisions on `config.plist`
+
+#### Changed
+
+- Reverted to previous, simpler iGPU framebuffer patches.
+
 > ### 2020-6-26
 
 #### Added

patches/Internal Displays/WQHD-HDR-EDID.plist

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>DeviceProperties</key>
+	<dict>
+		<key>Add</key>
+		<dict>
+			<key>PciRoot(0x0)/Pci(0x2,0x0)</key>
+			<dict>
+				<key>AAPL00,override-no-connect</key>
+				<data>
+				AP///////wAwrq5AAAAAAAAbAQSQHxF44vvVplM0tiUO
+				UFQAAAABAQEBAQEBAQEBAQEBAQEB5l8AoKCgQFAwIDUA
+				gGghAAAYj2YAoKCgLVAwIDUAgGghAAAY22cAoKCgKVAw
+				IDUAgGghAAAYMGUAoKCgMFAwIDUAgGghAAAYADc=
+				</data>
+				<key>DELETE ME</key>
+				<string>64Hz is stable.</string>
+				<key>DELETE ME 2</key>
+				<string>65Hz causes minor artifacts.</string>
+				<key>DELETE ME 3</key>
+				<string>66Hz makes display goes crazy.</string>
+				<key>DELETE ME 4</key>
+				<string>You be more/less lucky with your specific display.</string>
+			</dict>
+		</dict>
+	</dict>
+</dict>
+</plist>