drm/i915: Invoke another _DSM to enable MUX on HP Workstation laptops
authorKai-Heng Feng <kai.heng.feng@canonical.com>
Thu, 20 May 2021 06:58:20 +0000 (14:58 +0800)
committerVille Syrjälä <ville.syrjala@linux.intel.com>
Sun, 11 Jul 2021 14:09:01 +0000 (17:09 +0300)
On HP Fury G7 Workstations, graphics output is re-routed from Intel GFX
to discrete GFX after S3. This is not desirable, because userspace will
treat connected display as a new one, losing display settings.

The expected behavior is to let discrete GFX drives all external
displays.

The platform in question uses ACPI method \_SB.PCI0.HGME to enable MUX.
The method is inside the another _DSM, so add the _DSM and call it
accordingly.

I also tested some MUX-less and iGPU only laptops with that _DSM, no
regression was found.

v4:
 - Rebase.
 - Change the DSM name to avoid confusion.
 - Move the function call to intel_opregion.

v3:
 - Remove BXT from names.
 - Change the parameter type.
 - Fold the function into intel_modeset_init_hw().

v2:
 - Forward declare struct pci_dev.

Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/3113
References: https://lore.kernel.org/intel-gfx/1460040732-31417-4-git-send-email-animesh.manna@intel.com/
Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210520065832.614245-1-kai.heng.feng@canonical.com
drivers/gpu/drm/i915/display/intel_acpi.c
drivers/gpu/drm/i915/display/intel_acpi.h
drivers/gpu/drm/i915/display/intel_opregion.c

index 833d0c1be4f1d5583ffe8cdc6cb956750a3d3f8a..7cfe91fc05f2470a21133cb2f7d7d3a1bc28e1c6 100644 (file)
@@ -19,6 +19,12 @@ static const guid_t intel_dsm_guid =
        GUID_INIT(0x7ed873d3, 0xc2d0, 0x4e4f,
                  0xa8, 0x54, 0x0f, 0x13, 0x17, 0xb0, 0x1c, 0x2c);
 
+#define INTEL_DSM_FN_GET_BIOS_DATA_FUNCS_SUPPORTED 0 /* No args */
+
+static const guid_t intel_dsm_guid2 =
+       GUID_INIT(0x3e5b41c6, 0xeb1d, 0x4260,
+                 0x9d, 0x15, 0xc7, 0x1f, 0xba, 0xda, 0xe4, 0x14);
+
 static char *intel_dsm_port_name(u8 id)
 {
        switch (id) {
@@ -176,6 +182,19 @@ void intel_unregister_dsm_handler(void)
 {
 }
 
+void intel_dsm_get_bios_data_funcs_supported(struct drm_i915_private *i915)
+{
+       struct pci_dev *pdev = to_pci_dev(i915->drm.dev);
+       acpi_handle dhandle;
+
+       dhandle = ACPI_HANDLE(&pdev->dev);
+       if (!dhandle)
+               return;
+
+       acpi_evaluate_dsm(dhandle, &intel_dsm_guid2, INTEL_DSM_REVISION_ID,
+                         INTEL_DSM_FN_GET_BIOS_DATA_FUNCS_SUPPORTED, NULL);
+}
+
 /*
  * ACPI Specification, Revision 5.0, Appendix B.3.2 _DOD (Enumerate All Devices
  * Attached to the Display Adapter).
index e8b068661d22a98e000324b41ec5d1d1b259fdc1..9f197401c313cb355dc3ea958cbf5636c97597d7 100644 (file)
@@ -11,11 +11,14 @@ struct drm_i915_private;
 #ifdef CONFIG_ACPI
 void intel_register_dsm_handler(void);
 void intel_unregister_dsm_handler(void);
+void intel_dsm_get_bios_data_funcs_supported(struct drm_i915_private *i915);
 void intel_acpi_device_id_update(struct drm_i915_private *i915);
 #else
 static inline void intel_register_dsm_handler(void) { return; }
 static inline void intel_unregister_dsm_handler(void) { return; }
 static inline
+void intel_dsm_get_bios_data_funcs_supported(struct drm_i915_private *i915) { return; }
+static inline
 void intel_acpi_device_id_update(struct drm_i915_private *i915) { return; }
 #endif /* CONFIG_ACPI */
 
index dfd724e506b5248b1bd5035891ec44bd11395910..3855fba709807727d4b019e313e17d76d97f9d10 100644 (file)
@@ -1078,6 +1078,9 @@ void intel_opregion_resume(struct drm_i915_private *i915)
                opregion->asle->ardy = ASLE_ARDY_READY;
        }
 
+       /* Some platforms abuse the _DSM to enable MUX */
+       intel_dsm_get_bios_data_funcs_supported(i915);
+
        intel_opregion_notify_adapter(i915, PCI_D0);
 }