From patchwork Wed Dec 29 22:21:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Anisse Astier X-Patchwork-Id: 12701129 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 0D382C433EF for ; Wed, 29 Dec 2021 22:22:14 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3198D89AE6; Wed, 29 Dec 2021 22:22:09 +0000 (UTC) Received: from mail-wr1-x42a.google.com (mail-wr1-x42a.google.com [IPv6:2a00:1450:4864:20::42a]) by gabe.freedesktop.org (Postfix) with ESMTPS id 61A0689ACC for ; Wed, 29 Dec 2021 22:22:07 +0000 (UTC) Received: by mail-wr1-x42a.google.com with SMTP id s1so46991760wrg.1 for ; Wed, 29 Dec 2021 14:22:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=astier-eu.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=CRirTIC64zX+nVgdNaolbbIV5fTdBDvqdQlw6uamJTA=; b=AbrUEhOlrGgEZQTb7meP04algDvkmsmmHdBRR0/dYKxFIlZD9nEjDuZBdDuzU/C90O h2g8Ss+aSSW9TSz4eXJWVEPVw1osFzZGGSQLPPULEUz+7TT+QnpNHdPJhvhkNVzuCJ73 8apLYsSi+zJOYF7cXwkpjV6oF5C6rCa4oBAHshfTaXoeRhceu2vNfJPgD8UEfOmaBe4Q +8aOhn9CTxgNveI4+kP6WncrFlNaxcnjFORLWqHam0JJUSPbl/r0VdnMLNM7yZV5rF+z 0XrnQyVE25a4v6+ifwdzL2abLUGM73j6IvV3KDTjaXt/YOllX8KhwaY/La5zD8CjPw/E 4JMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=CRirTIC64zX+nVgdNaolbbIV5fTdBDvqdQlw6uamJTA=; b=J0F5TywXrOyz8LX/HSZFsxCwivPEpFbbWyG+59KSwDaKBF8sXbqNmKC5rsqao1Q4MR SHzlzXEQAkF5lSChtQByUUMc+K2OpplQ+6Ewue8BnfDfmJeFRr0+HI35He911gZTdayj JWwebnx/amCc4UKDm94q8KvRQTrqu+Y5vTOBoasyIjgxybyudM5IM9bOuFPrjgFxJFqc rh0NSTE+yHLJ26OxyWC4Ba4wBjIOhafK2KJTBlZZMaGv9lHdEKxqJ92sGJpcuYnOCzAr Rbjzb+1d4dl9yC0MwUIKPWecX/PaU43pAewM/ZBsW4n5XEcSFYMZXjGLdv0pLQVppscU fOfw== X-Gm-Message-State: AOAM530HUerDygAQLrFtV/JUY2i3BOalml/oCN7FB8/cLhfEY9zmLHZg 1sLU1IOzrBs/gcWWCPfh0mjbiB6ll50GIg== X-Google-Smtp-Source: ABdhPJwQk+JEVFitL5M0hmrMORhutdfIUJW9+FhQNTnjrdhO9ZIVJgh3/htEOtbleucUFdp23XPovw== X-Received: by 2002:a05:6000:23a:: with SMTP id l26mr21784641wrz.666.1640816525679; Wed, 29 Dec 2021 14:22:05 -0800 (PST) Received: from gpdmax.. ([2a01:e0a:28f:75b0:cf6:c90f:f3b1:89c1]) by smtp.gmail.com with ESMTPSA id m5sm19700686wml.14.2021.12.29.14.22.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Dec 2021 14:22:05 -0800 (PST) From: Anisse Astier To: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Date: Wed, 29 Dec 2021 23:21:59 +0100 Message-Id: <20211229222200.53128-2-anisse@astier.eu> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211229222200.53128-1-anisse@astier.eu> References: <20211229222200.53128-1-anisse@astier.eu> MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH v5 1/2] drm/i915/opregion: add support for mailbox #5 EDID 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: Daniel Dadap , Jani Nikula Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" The ACPI OpRegion Mailbox #5 ASLE extension may contain an EDID to be used for the embedded display. Add support for using it via by adding the EDID to the list of available modes on the connector, and use it for eDP when available. If a panel's EDID is broken, there may be an override EDID set in the ACPI OpRegion mailbox #5. Use it if available. Fixes the GPD Win Max display. Based on original patch series by: Jani Nikula https://patchwork.kernel.org/project/intel-gfx/patch/20200828061941.17051-1-jani.nikula@intel.com/ Changes: - EDID is copied and validated with drm_edid_is_valid - EDID is now only used as a fallback. - squashed the two patches Cc: Jani Nikula Cc: Uma Shankar Cc: Ville Syrjälä Co-developed-by: Jani Nikula Signed-off-by: Anisse Astier --- drivers/gpu/drm/i915/display/intel_dp.c | 8 +++ drivers/gpu/drm/i915/display/intel_opregion.c | 55 ++++++++++++++++++- drivers/gpu/drm/i915/display/intel_opregion.h | 10 ++++ 3 files changed, 72 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c index b5e2508db1cf..d6d8c9922feb 100644 --- a/drivers/gpu/drm/i915/display/intel_dp.c +++ b/drivers/gpu/drm/i915/display/intel_dp.c @@ -4974,6 +4974,14 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp, mutex_lock(&dev->mode_config.mutex); edid = drm_get_edid(connector, &intel_dp->aux.ddc); + if (!edid) { + /* Fallback to EDID from ACPI OpRegion, if any */ + edid = intel_opregion_get_edid(intel_connector); + if (edid) + drm_dbg_kms(&dev_priv->drm, + "[CONNECTOR:%d:%s] Using OpRegion EDID\n", + connector->base.id, connector->name); + } if (edid) { if (drm_add_edid_modes(connector, edid)) { drm_connector_update_edid_property(connector, edid); diff --git a/drivers/gpu/drm/i915/display/intel_opregion.c b/drivers/gpu/drm/i915/display/intel_opregion.c index 0065111593a6..985790a66a4d 100644 --- a/drivers/gpu/drm/i915/display/intel_opregion.c +++ b/drivers/gpu/drm/i915/display/intel_opregion.c @@ -195,6 +195,8 @@ struct opregion_asle_ext { #define ASLE_IUER_WINDOWS_BTN (1 << 1) #define ASLE_IUER_POWER_BTN (1 << 0) +#define ASLE_PHED_EDID_VALID_MASK 0x3 + /* Software System Control Interrupt (SWSCI) */ #define SWSCI_SCIC_INDICATOR (1 << 0) #define SWSCI_SCIC_MAIN_FUNCTION_SHIFT 1 @@ -908,8 +910,10 @@ int intel_opregion_setup(struct drm_i915_private *dev_priv) opregion->asle->ardy = ASLE_ARDY_NOT_READY; } - if (mboxes & MBOX_ASLE_EXT) + if (mboxes & MBOX_ASLE_EXT) { drm_dbg(&dev_priv->drm, "ASLE extension supported\n"); + opregion->asle_ext = base + OPREGION_ASLE_EXT_OFFSET; + } if (intel_load_vbt_firmware(dev_priv) == 0) goto out; @@ -1036,6 +1040,54 @@ intel_opregion_get_panel_type(struct drm_i915_private *dev_priv) return ret - 1; } +/** + * intel_opregion_get_edid - Fetch EDID from ACPI OpRegion mailbox #5 + * @intel_connector: eDP connector + * + * This reads the ACPI Opregion mailbox #5 to extract the EDID that is passed + * to it. + * + * Returns: + * The EDID in the OpRegion, or NULL if there is none or it's invalid. + * + */ +struct edid *intel_opregion_get_edid(struct intel_connector *intel_connector) +{ + struct drm_connector *connector = &intel_connector->base; + struct drm_i915_private *i915 = to_i915(connector->dev); + struct intel_opregion *opregion = &i915->opregion; + const void *in_edid; + const struct edid *edid; + struct edid *new_edid; + int len; + + if (!opregion->asle_ext) + return NULL; + + in_edid = opregion->asle_ext->bddc; + + /* Validity corresponds to number of 128-byte blocks */ + len = (opregion->asle_ext->phed & ASLE_PHED_EDID_VALID_MASK) * 128; + if (!len || !memchr_inv(in_edid, 0, len)) + return NULL; + + edid = in_edid; + + if (len < EDID_LENGTH * (1 + edid->extensions)) { + drm_dbg_kms(&i915->drm, "Invalid EDID in ACPI OpRegion (Mailbox #5): too short\n"); + return NULL; + } + new_edid = drm_edid_duplicate(edid); + if (!new_edid) + return NULL; + if (!drm_edid_is_valid(new_edid)) { + kfree(new_edid); + drm_dbg_kms(&i915->drm, "Invalid EDID in ACPI OpRegion (Mailbox #5)\n"); + return NULL; + } + return new_edid; +} + void intel_opregion_register(struct drm_i915_private *i915) { struct intel_opregion *opregion = &i915->opregion; @@ -1129,6 +1181,7 @@ void intel_opregion_unregister(struct drm_i915_private *i915) opregion->acpi = NULL; opregion->swsci = NULL; opregion->asle = NULL; + opregion->asle_ext = NULL; opregion->vbt = NULL; opregion->lid_state = NULL; } diff --git a/drivers/gpu/drm/i915/display/intel_opregion.h b/drivers/gpu/drm/i915/display/intel_opregion.h index 4aa68ffbd30e..82cc0ba34af7 100644 --- a/drivers/gpu/drm/i915/display/intel_opregion.h +++ b/drivers/gpu/drm/i915/display/intel_opregion.h @@ -29,12 +29,14 @@ #include struct drm_i915_private; +struct intel_connector; struct intel_encoder; struct opregion_header; struct opregion_acpi; struct opregion_swsci; struct opregion_asle; +struct opregion_asle_ext; struct intel_opregion { struct opregion_header *header; @@ -43,6 +45,7 @@ struct intel_opregion { u32 swsci_gbda_sub_functions; u32 swsci_sbcb_sub_functions; struct opregion_asle *asle; + struct opregion_asle_ext *asle_ext; void *rvda; void *vbt_firmware; const void *vbt; @@ -71,6 +74,7 @@ int intel_opregion_notify_encoder(struct intel_encoder *intel_encoder, int intel_opregion_notify_adapter(struct drm_i915_private *dev_priv, pci_power_t state); int intel_opregion_get_panel_type(struct drm_i915_private *dev_priv); +struct edid *intel_opregion_get_edid(struct intel_connector *connector); #else /* CONFIG_ACPI*/ @@ -117,6 +121,12 @@ static inline int intel_opregion_get_panel_type(struct drm_i915_private *dev) return -ENODEV; } +static inline struct edid * +intel_opregion_get_edid(struct intel_connector *connector) +{ + return NULL; +} + #endif /* CONFIG_ACPI */ #endif From patchwork Wed Dec 29 22:22:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anisse Astier X-Patchwork-Id: 12701128 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 8EEDDC433F5 for ; Wed, 29 Dec 2021 22:22:12 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id DCB7389B01; Wed, 29 Dec 2021 22:22:08 +0000 (UTC) Received: from mail-wr1-x434.google.com (mail-wr1-x434.google.com [IPv6:2a00:1450:4864:20::434]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4385789ACD for ; Wed, 29 Dec 2021 22:22:08 +0000 (UTC) Received: by mail-wr1-x434.google.com with SMTP id i22so46847027wrb.13 for ; Wed, 29 Dec 2021 14:22:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=astier-eu.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=1Etcfx2vmjUNZXxo6uDLTR9v67H3OM7/KpAb6Ygdbd4=; b=xUYc7H5drDU+Q3+VMT+BCXdA4iCgJoUwwqP33aW1l1jFhRYkzmzyA1lj+C/1VFVLeB ha956sSINdK2Xb+njByR0fNGtA6M2e3USUV3nbyKRIpd8kqub3La38cHgM3ZIoqP6isv lYcMz2y8qjTP9q3nXu7rfchZ3DTaNlW08ilFVgH637avmfYOelc7RO0+sldzYU5k2TEF 5ifPFQa2Un+Riw5Js9IZDVnJ0YojESbcVZZusLvbBASESMoCsPOp7gNBUxBzG+uwiAy3 dr/huIS/Dx461epBeXaPQ90mAFHcHiXjNIZ4EwNPpddyv4a8jsEvsQ1cWqwAYFg0oaDQ wRCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=1Etcfx2vmjUNZXxo6uDLTR9v67H3OM7/KpAb6Ygdbd4=; b=vwW9x9n77tHLjnaNZTeosoEf63b0o9QTjuS0+ioYWt18dsbaLORgA+7LVRClt2a4gi vi//6+m6VI/98XaJl+T6qVYJoUXrDylwu32V2fRwKf6TPw+mHqMZ8dkBUxtL41L6Waqk MjitCAL9bOg9DEjyYl6CJrNBayObQ2AShsEJ/+fNc5GnIW01hgUCzRTGZvPf/tysK5Di iH9YEKigRj3fMv+unEcV13TnxEJafRlbNVWwpuil5qU0zilwsXe3a7nXU+Gh8vF3IjJt hRXAZYBo6y6dwkAx1vdh7czN0Je4I5Pd/rzbJRVr+ZgXiKArsM/J2+UJFXaI9l7thWkX gPBg== X-Gm-Message-State: AOAM533NFS4xXoHBQBw5Qv2IEvSdYBMiNYGHAnHfFCJ3YAgovHrWaMIT m6PCC4G3LUPuA7QZPW00NzqqaFe9GbySRw== X-Google-Smtp-Source: ABdhPJwQx0dAWhN0s82Rj/V59WvzhWufUdUP3dhUtEpz8weacw59e7fXQtRABTSQi/e7nDHna+ncwA== X-Received: by 2002:adf:f70f:: with SMTP id r15mr21836192wrp.552.1640816526510; Wed, 29 Dec 2021 14:22:06 -0800 (PST) Received: from gpdmax.. ([2a01:e0a:28f:75b0:cf6:c90f:f3b1:89c1]) by smtp.gmail.com with ESMTPSA id m5sm19700686wml.14.2021.12.29.14.22.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Dec 2021 14:22:05 -0800 (PST) From: Anisse Astier To: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Date: Wed, 29 Dec 2021 23:22:00 +0100 Message-Id: <20211229222200.53128-3-anisse@astier.eu> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211229222200.53128-1-anisse@astier.eu> References: <20211229222200.53128-1-anisse@astier.eu> MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH v5 2/2] drm: Add orientation quirk for GPD Win Max 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: Daniel Dadap , Jani Nikula Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Panel is 800x1280, but mounted on a laptop form factor, sideways. Signed-off-by: Anisse Astier Reviewed-by: Hans de Goede --- drivers/gpu/drm/drm_panel_orientation_quirks.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/gpu/drm/drm_panel_orientation_quirks.c b/drivers/gpu/drm/drm_panel_orientation_quirks.c index 042bb80383c9..3dc383b1e2ba 100644 --- a/drivers/gpu/drm/drm_panel_orientation_quirks.c +++ b/drivers/gpu/drm/drm_panel_orientation_quirks.c @@ -174,6 +174,12 @@ static const struct dmi_system_id orientation_data[] = { DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "MicroPC"), }, .driver_data = (void *)&lcd720x1280_rightside_up, + }, { /* GPD Win Max */ + .matches = { + DMI_EXACT_MATCH(DMI_SYS_VENDOR, "GPD"), + DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "G1619-01"), + }, + .driver_data = (void *)&lcd800x1280_rightside_up, }, { /* * GPD Pocket, note that the the DMI data is less generic then * it seems, devices with a board-vendor of "AMI Corporation"