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 B546CC4708F for ; Fri, 4 Jun 2021 15:57:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9E96A613F1 for ; Fri, 4 Jun 2021 15:57:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231347AbhFDP7V (ORCPT ); Fri, 4 Jun 2021 11:59:21 -0400 Received: from youngberry.canonical.com ([91.189.89.112]:51712 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229809AbhFDP7V (ORCPT ); Fri, 4 Jun 2021 11:59:21 -0400 Received: from mail-lf1-f69.google.com ([209.85.167.69]) by youngberry.canonical.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1lpCCT-0003gk-LB for linux-kernel@vger.kernel.org; Fri, 04 Jun 2021 15:57:33 +0000 Received: by mail-lf1-f69.google.com with SMTP id k10-20020a05651239cab02902cf19c03142so3878769lfu.8 for ; Fri, 04 Jun 2021 08:57:33 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=iGq4avvIVWegafatbNa6UBi514qHC/jm/FZxbji4fuY=; b=HqRu7ykbT9XkQbiSgoMwZv90k36U38vHvYVtl4ARMlvYv1yBalfvgEjaw+fmFnpGD+ dauT/cmZRvS4m5dB8y97xKZLQhljAulDa8Ev67vZYbNa/g7mX4+Lret/pL0gP2YRjq4v ygKmXUZ+pA7VSRFQEJC8lj2T8NKjcxTTY4rjFvuAOQRBupCRzIftbLSfh7hq09R/15LG 4+hArZ6dr3j5C1gSqv60T7u8dKmY2K/JsvZdhEXR3xDDn+oSiG0SQQd3mf1RlRBqxaOj maAy8vAdsx4ltq/ZOhKkvLJKmN0Et96Qq+UXvIhRAPYVTQ2M+RDyt1H49vJmyyx0EjFu lVaA== X-Gm-Message-State: AOAM530EaXllxQr1EZTXtpyRerkIwCbkh1pa1teksJUgPYLYarrTmfFL 4F72lZSEDc61JXmz8rv/8V75EGFt4jhZiofSGReI2SImPZQFFwFgBzbSYDbG3DPjFTtFl3numRp +Tv8yV55OabAgGK9+wAUUBKUQ+xluBc0q9jAEfvytRcPFGMx6R+uPgqDmfQ== X-Received: by 2002:a05:6512:783:: with SMTP id x3mr3249720lfr.194.1622822253095; Fri, 04 Jun 2021 08:57:33 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxf0pbNJN8s9JVcukdsXoJlzXZmyZwtjQMbAKvrUvXdWu38bAzXJdYOwhloCK39lZ2Fv1wTcmDi+ZQOT9keKpQ= X-Received: by 2002:a05:6512:783:: with SMTP id x3mr3249703lfr.194.1622822252817; Fri, 04 Jun 2021 08:57:32 -0700 (PDT) MIME-Version: 1.0 References: <20210520065832.614245-1-kai.heng.feng@canonical.com> In-Reply-To: <20210520065832.614245-1-kai.heng.feng@canonical.com> From: Kai-Heng Feng Date: Fri, 4 Jun 2021 23:57:20 +0800 Message-ID: Subject: Re: [PATCH v4] drm/i915: Invoke another _DSM to enable MUX on HP Workstation laptops To: Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , =?UTF-8?B?VmlsbGUgU3lyasOkbMOk?= Cc: David Airlie , Daniel Vetter , Takashi Iwai , Chris Wilson , Lucas De Marchi , Thomas Zimmermann , intel-gfx , "open list:DRM DRIVERS" , open list Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, May 20, 2021 at 2:58 PM 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. > > 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 A gentle ping... > --- > drivers/gpu/drm/i915/display/intel_acpi.c | 19 +++++++++++++++++++ > drivers/gpu/drm/i915/display/intel_acpi.h | 3 +++ > drivers/gpu/drm/i915/display/intel_opregion.c | 3 +++ > 3 files changed, 25 insertions(+) > > diff --git a/drivers/gpu/drm/i915/display/intel_acpi.c b/drivers/gpu/drm/i915/display/intel_acpi.c > index 833d0c1be4f1..7cfe91fc05f2 100644 > --- a/drivers/gpu/drm/i915/display/intel_acpi.c > +++ b/drivers/gpu/drm/i915/display/intel_acpi.c > @@ -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). > diff --git a/drivers/gpu/drm/i915/display/intel_acpi.h b/drivers/gpu/drm/i915/display/intel_acpi.h > index e8b068661d22..9f197401c313 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_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 */ > > diff --git a/drivers/gpu/drm/i915/display/intel_opregion.c b/drivers/gpu/drm/i915/display/intel_opregion.c > index dfd724e506b5..3855fba70980 100644 > --- a/drivers/gpu/drm/i915/display/intel_opregion.c > +++ b/drivers/gpu/drm/i915/display/intel_opregion.c > @@ -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); > } > > -- > 2.31.1 > 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=unavailable 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 8559EC07E94 for ; Fri, 4 Jun 2021 15:57:39 +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 5532E613E9 for ; Fri, 4 Jun 2021 15:57:39 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5532E613E9 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=canonical.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 903FA6E9F8; Fri, 4 Jun 2021 15:57:37 +0000 (UTC) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by gabe.freedesktop.org (Postfix) with ESMTPS id 95F316E11E for ; Fri, 4 Jun 2021 15:57:35 +0000 (UTC) Received: from mail-lj1-f197.google.com ([209.85.208.197]) by youngberry.canonical.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1lpCCT-0003go-MG for dri-devel@lists.freedesktop.org; Fri, 04 Jun 2021 15:57:33 +0000 Received: by mail-lj1-f197.google.com with SMTP id y10-20020a05651c154ab02901337d2c58f3so4273108ljp.9 for ; Fri, 04 Jun 2021 08:57:33 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=iGq4avvIVWegafatbNa6UBi514qHC/jm/FZxbji4fuY=; b=F5detC75lWJqoslTsmpHS1y4ZuVhYLunZwzP3HqR11wU0eAXW6WFjd23dSZ8lAEPJs MYiYBWsf65MJNoov6qZmxY72Y3ezi4t71RFwTtAphOpvxv5sLhXq2/3FIx8NWo0sn8bd 2w2zZWPEItDuUu2VMt8MtBSzAtdSyAzi+g+seW0iVFobUX+aZ2boLtm4WS+t5ak/rUQj UE93jjMkJI4WKRbSAkjOa86XI9RE7BJDpkkzdDfl899ZYIEAjCO2OviQUdWbH5A1ONO3 iRbgQ6ZhmPgQfTQS04rk2PF5GdO+jxGG7Ww1vfCDML8TNceMEYNW8zFt+eBR6PfMrpjr ZBaw== X-Gm-Message-State: AOAM531GnQPt+/rFEnzqIRJF1f57R3+qKpdZ37oZepTyG4rqFjc5seVc QlbUg65YmNFS61KLw95ap1Vke4Jc6AWZzNEMv+EfM0axtdzh0t6Rfu7Mn+sD/XMIojnz9alCL/W XGMDRav5A1y+aLi/RfTLCU3BlxLPIb60MB09TM0blLMs3BdXPz5/jk29IO6/Dog== X-Received: by 2002:a05:6512:783:: with SMTP id x3mr3249714lfr.194.1622822253095; Fri, 04 Jun 2021 08:57:33 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxf0pbNJN8s9JVcukdsXoJlzXZmyZwtjQMbAKvrUvXdWu38bAzXJdYOwhloCK39lZ2Fv1wTcmDi+ZQOT9keKpQ= X-Received: by 2002:a05:6512:783:: with SMTP id x3mr3249703lfr.194.1622822252817; Fri, 04 Jun 2021 08:57:32 -0700 (PDT) MIME-Version: 1.0 References: <20210520065832.614245-1-kai.heng.feng@canonical.com> In-Reply-To: <20210520065832.614245-1-kai.heng.feng@canonical.com> From: Kai-Heng Feng Date: Fri, 4 Jun 2021 23:57:20 +0800 Message-ID: Subject: Re: [PATCH v4] drm/i915: Invoke another _DSM to enable MUX on HP Workstation laptops To: Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , =?UTF-8?B?VmlsbGUgU3lyasOkbMOk?= Content-Type: text/plain; charset="UTF-8" X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Airlie , intel-gfx , Lucas De Marchi , open list , "open list:DRM DRIVERS" , Chris Wilson , Thomas Zimmermann Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On Thu, May 20, 2021 at 2:58 PM 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. > > 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 A gentle ping... > --- > drivers/gpu/drm/i915/display/intel_acpi.c | 19 +++++++++++++++++++ > drivers/gpu/drm/i915/display/intel_acpi.h | 3 +++ > drivers/gpu/drm/i915/display/intel_opregion.c | 3 +++ > 3 files changed, 25 insertions(+) > > diff --git a/drivers/gpu/drm/i915/display/intel_acpi.c b/drivers/gpu/drm/i915/display/intel_acpi.c > index 833d0c1be4f1..7cfe91fc05f2 100644 > --- a/drivers/gpu/drm/i915/display/intel_acpi.c > +++ b/drivers/gpu/drm/i915/display/intel_acpi.c > @@ -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). > diff --git a/drivers/gpu/drm/i915/display/intel_acpi.h b/drivers/gpu/drm/i915/display/intel_acpi.h > index e8b068661d22..9f197401c313 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_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 */ > > diff --git a/drivers/gpu/drm/i915/display/intel_opregion.c b/drivers/gpu/drm/i915/display/intel_opregion.c > index dfd724e506b5..3855fba70980 100644 > --- a/drivers/gpu/drm/i915/display/intel_opregion.c > +++ b/drivers/gpu/drm/i915/display/intel_opregion.c > @@ -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); > } > > -- > 2.31.1 > 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=unavailable 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 7A446C47083 for ; Fri, 4 Jun 2021 15:57:37 +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 49DAE613E9 for ; Fri, 4 Jun 2021 15:57:37 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 49DAE613E9 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=canonical.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 DFA9E6E11E; Fri, 4 Jun 2021 15:57:36 +0000 (UTC) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by gabe.freedesktop.org (Postfix) with ESMTPS id 963486E125 for ; Fri, 4 Jun 2021 15:57:35 +0000 (UTC) Received: from mail-lj1-f197.google.com ([209.85.208.197]) by youngberry.canonical.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1lpCCT-0003gm-Ld for intel-gfx@lists.freedesktop.org; Fri, 04 Jun 2021 15:57:33 +0000 Received: by mail-lj1-f197.google.com with SMTP id z19-20020a2eb5330000b02900eeda415d13so4350566ljm.23 for ; Fri, 04 Jun 2021 08:57:33 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=iGq4avvIVWegafatbNa6UBi514qHC/jm/FZxbji4fuY=; b=uEbCSMQtqM/jtbVTNpojKgA1/WBxepqkdg7zvGa3ffya+W9f8c9uB4q7q+HPnDd4K1 bcpT1k4ez52bn8xBdex94yIcPND0oOTN7KZ21wdJgE6BQZ/CcUFKNzjGC01TqorQ8gwb Rpdhctg6Ew+ESObfHBAZkREoS9d2fR6tY12/qBjWaXpc5UxqxiMxyWWOi2yPF1CSvZhV 1BadNy53z9Ch9o8Ca2KvAcNhLLyLJCbIBU6yfLSthNKf8nTiRZiW94+7vsOWEIOWKUVN zhpNb22wTvNbJx6G14DOtf2mpDZ0mzw92re7FCwUNd0ZzZT0IUm20Lqb2/33IsiTcgvb bMnw== X-Gm-Message-State: AOAM53346+r6V8i/FjDWTvrR6nPtL+BWIkBCMj2s5zDsodNv6pZyfnn1 wgLV1x7eA5dIOwAulC5F7VAPkNSZgOmdSavmpBpiAl9oWORYOwGgxLd9c1+Tz1gl9WthBgDJ1Oy TZfGe79bQ3RZPlRC0HlOLfIO92OrqvdBQDEubZypBSLq1LUtYXJqJ1bLnoSSlzA== X-Received: by 2002:a05:6512:783:: with SMTP id x3mr3249718lfr.194.1622822253095; Fri, 04 Jun 2021 08:57:33 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxf0pbNJN8s9JVcukdsXoJlzXZmyZwtjQMbAKvrUvXdWu38bAzXJdYOwhloCK39lZ2Fv1wTcmDi+ZQOT9keKpQ= X-Received: by 2002:a05:6512:783:: with SMTP id x3mr3249703lfr.194.1622822252817; Fri, 04 Jun 2021 08:57:32 -0700 (PDT) MIME-Version: 1.0 References: <20210520065832.614245-1-kai.heng.feng@canonical.com> In-Reply-To: <20210520065832.614245-1-kai.heng.feng@canonical.com> From: Kai-Heng Feng Date: Fri, 4 Jun 2021 23:57:20 +0800 Message-ID: To: Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , =?UTF-8?B?VmlsbGUgU3lyasOkbMOk?= Subject: Re: [Intel-gfx] [PATCH v4] 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: David Airlie , intel-gfx , Lucas De Marchi , open list , "open list:DRM DRIVERS" , Chris Wilson , Takashi Iwai , Thomas Zimmermann Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Thu, May 20, 2021 at 2:58 PM 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. > > 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 A gentle ping... > --- > drivers/gpu/drm/i915/display/intel_acpi.c | 19 +++++++++++++++++++ > drivers/gpu/drm/i915/display/intel_acpi.h | 3 +++ > drivers/gpu/drm/i915/display/intel_opregion.c | 3 +++ > 3 files changed, 25 insertions(+) > > diff --git a/drivers/gpu/drm/i915/display/intel_acpi.c b/drivers/gpu/drm/i915/display/intel_acpi.c > index 833d0c1be4f1..7cfe91fc05f2 100644 > --- a/drivers/gpu/drm/i915/display/intel_acpi.c > +++ b/drivers/gpu/drm/i915/display/intel_acpi.c > @@ -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). > diff --git a/drivers/gpu/drm/i915/display/intel_acpi.h b/drivers/gpu/drm/i915/display/intel_acpi.h > index e8b068661d22..9f197401c313 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_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 */ > > diff --git a/drivers/gpu/drm/i915/display/intel_opregion.c b/drivers/gpu/drm/i915/display/intel_opregion.c > index dfd724e506b5..3855fba70980 100644 > --- a/drivers/gpu/drm/i915/display/intel_opregion.c > +++ b/drivers/gpu/drm/i915/display/intel_opregion.c > @@ -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); > } > > -- > 2.31.1 > _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx