From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BFACAC433ED for ; Tue, 11 May 2021 18:19:20 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 67B2B617ED for ; Tue, 11 May 2021 18:19:19 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 67B2B617ED Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 334496EAB2; Tue, 11 May 2021 18:19:18 +0000 (UTC) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTPS id E21CA6EAB1; Tue, 11 May 2021 18:19:16 +0000 (UTC) IronPort-SDR: uJkLrPBbvFQf3FEF6TR8TpSSWOYJ4TUc3C3zlpUOp+z3B3yPRSBZz0uyinsUX8N/27LVvbk4wu jFHCvvGPV84g== X-IronPort-AV: E=McAfee;i="6200,9189,9981"; a="196417351" X-IronPort-AV: E=Sophos;i="5.82,291,1613462400"; d="scan'208";a="196417351" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 May 2021 11:19:15 -0700 IronPort-SDR: iN+f4I11Q/hkuc8yNaysellLHlMpvGwmVCLubF8s0hsWp6D/va/93j/M+XpPocnyMwSgBXne1y UhUYa0yVAONA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.82,291,1613462400"; d="scan'208";a="399484513" Received: from stinkbox.fi.intel.com (HELO stinkbox) ([10.237.72.171]) by fmsmga007.fm.intel.com with SMTP; 11 May 2021 11:19:09 -0700 Received: by stinkbox (sSMTP sendmail emulation); Tue, 11 May 2021 21:19:08 +0300 Date: Tue, 11 May 2021 21:19:08 +0300 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= To: Kai-Heng Feng Message-ID: References: <20210426152420.359402-1-kai.heng.feng@canonical.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20210426152420.359402-1-kai.heng.feng@canonical.com> X-Patchwork-Hint: comment Subject: Re: [Intel-gfx] [PATCH v3] drm/i915: Invoke another _DSM to enable MUX on HP Workstation laptops X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "open list:DRM DRIVERS" , David Airlie , open list , Chris Wilson , Takashi Iwai , Dave Airlie , intel-gfx@lists.freedesktop.org Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Mon, Apr 26, 2021 at 11:24:10PM +0800, Kai-Heng Feng wrote: > 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. > = > 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 > --- > drivers/gpu/drm/i915/display/intel_acpi.c | 18 ++++++++++++++++++ > drivers/gpu/drm/i915/display/intel_acpi.h | 3 +++ > drivers/gpu/drm/i915/display/intel_display.c | 2 ++ > 3 files changed, 23 insertions(+) > = > diff --git a/drivers/gpu/drm/i915/display/intel_acpi.c b/drivers/gpu/drm/= i915/display/intel_acpi.c > index 833d0c1be4f1..d008d3976261 100644 > --- a/drivers/gpu/drm/i915/display/intel_acpi.c > +++ b/drivers/gpu/drm/i915/display/intel_acpi.c > @@ -13,12 +13,17 @@ > #include "intel_display_types.h" > = > #define INTEL_DSM_REVISION_ID 1 /* For Calpella anyway... */ > +#define INTEL_DSM_FN_PLATFORM_MUX_ENABLE 0 /* No args */ This block of defines is for the other DSM. We don't want to mix these up. We also want to name it according to the spec, so something like GET_BIOS_DATA_FUNCS_SUPPORTED. Similarly for the intel_dsm_enable_mux() wrapper function. + it needs a comment to document that some BIOSes abuse it to do MUX initialization and whatnot. We should perhaps rename all the old DSM stuff to something a bit less generic as well... > #define INTEL_DSM_FN_PLATFORM_MUX_INFO 1 /* No args */ > = > static const guid_t intel_dsm_guid =3D > GUID_INIT(0x7ed873d3, 0xc2d0, 0x4e4f, > 0xa8, 0x54, 0x0f, 0x13, 0x17, 0xb0, 0x1c, 0x2c); > = > +static const guid_t intel_dsm_guid2 =3D > + 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 +181,19 @@ void intel_unregister_dsm_handler(void) > { > } > = > +void intel_dsm_enable_mux(struct drm_i915_private *i915) > +{ > + struct pci_dev *pdev =3D i915->drm.pdev; > + acpi_handle dhandle; > + > + dhandle =3D ACPI_HANDLE(&pdev->dev); > + if (!dhandle) > + return; > + > + acpi_evaluate_dsm(dhandle, &intel_dsm_guid2, INTEL_DSM_REVISION_ID, > + INTEL_DSM_FN_PLATFORM_MUX_ENABLE, NULL); > +} > + > /* > * ACPI Specification, Revision 5.0, Appendix B.3.2 _DOD (Enumerate All = Devices > * Attached to the Display Adapter). > diff --git a/drivers/gpu/drm/i915/display/intel_acpi.h b/drivers/gpu/drm/= i915/display/intel_acpi.h > index e8b068661d22..def013cf6308 100644 > --- a/drivers/gpu/drm/i915/display/intel_acpi.h > +++ b/drivers/gpu/drm/i915/display/intel_acpi.h > @@ -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_enable_mux(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_enable_mux(struct drm_i915_private *i915) { return; } > +static inline > void intel_acpi_device_id_update(struct drm_i915_private *i915) { return= ; } > #endif /* CONFIG_ACPI */ > = > diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/d= rm/i915/display/intel_display.c > index a10e26380ef3..d79dae370b20 100644 > --- a/drivers/gpu/drm/i915/display/intel_display.c > +++ b/drivers/gpu/drm/i915/display/intel_display.c > @@ -11472,6 +11472,8 @@ void intel_modeset_init_hw(struct drm_i915_privat= e *i915) > { > struct intel_cdclk_state *cdclk_state; > = > + intel_dsm_enable_mux(i915); > + This should probably be somewhere around where we do all the other semi ACPI related init (OpRegion/etc.). > if (!HAS_DISPLAY(i915)) > return; > = > -- = > 2.30.2 -- = Ville Syrj=E4l=E4 Intel _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx