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=-17.4 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT,USER_IN_DEF_DKIM_WL 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 31B2CC3F2D1 for ; Thu, 5 Mar 2020 01:23:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 01BFE20866 for ; Thu, 5 Mar 2020 01:23:53 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="uo/C8yMH" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725912AbgCEBXv (ORCPT ); Wed, 4 Mar 2020 20:23:51 -0500 Received: from mail-pl1-f201.google.com ([209.85.214.201]:54879 "EHLO mail-pl1-f201.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725308AbgCEBXu (ORCPT ); Wed, 4 Mar 2020 20:23:50 -0500 Received: by mail-pl1-f201.google.com with SMTP id s13so2017558plr.21 for ; Wed, 04 Mar 2020 17:23:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=mCF91NKean3cZSjdJ9yCVdLO2tsfZeI0WmZfI6eVTDk=; b=uo/C8yMHGcAiUAXPbnXBhbG4jnjT5y+s6oGDa7K/0z30wofFkGYcvZv6k2R5y+axle /PkoxfUS8dZgydEpwQYaaLoX4H20nhMuC/cl2W4sqSPCjTYhhpxtHYnp1la3qfFpBvsV j6x9VrsBWz5Q189GyQRCn8UEfnZQHy2JJcmQMfNNwd/Atbw0R2d1F8RVxXTvTwYXt7iv 8lsjJfKAcpxcUFXKP7cCxyI4f9t0J9kLsiNHNtsgMyDE76xEAXu7SopNG9CgHdR5p6v2 QrH7fwWPRKRDKjXN/I8zUIczzdedY7CqjBEN685sFDwdnzdlyzw8wQ9PF9EImUmOiuTB cg3g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=mCF91NKean3cZSjdJ9yCVdLO2tsfZeI0WmZfI6eVTDk=; b=sPhnqRBGLBRqyOxdG6uAuVQiDj/uS9wG45zFdq8YAScfxy7/iKiAise9XRkflCmEz+ BwuN5uJ9IwLu0BoqJF4VD7PNB01+p+bwidxuhRqNSnysYveo7fwv4gPGTZaZyZ5jolJb sErnpLdWaoGcyZ8lK0iZIsCJ78bh1A6aQXTXxeYbEFhLYrljXhp64bdF02yMFSxwE6Ry vqKEpYtX7uDtIZgpL1ASJF45P+yZrxOPx9gEoIvpGtWfDAlC+u12BpFec+psRx/iCRNe 50oRRK2R3pvIHJGKUFIsJMq6tLp+ErUv14JSy+5l6tEl56boSe0Rvv83x2slCNimEAiC OVJQ== X-Gm-Message-State: ANhLgQ1LyutWqokz6rYqFFALfS2cmrGxWb6cFLY09+LG0ad4YyqbLtEH EmqvvI1nsn1t5Zt+0WNdwFnSNdufPwXq X-Google-Smtp-Source: ADFU+vsdGdUM+5sgueLuCR2fxyGeMboRJDKDOW+jbRDCwCPSHE+kvEQbamlCPTI20P2VPL0QIhsmAJzMsKBR X-Received: by 2002:a65:5846:: with SMTP id s6mr5041932pgr.179.1583371429163; Wed, 04 Mar 2020 17:23:49 -0800 (PST) Date: Wed, 4 Mar 2020 17:23:37 -0800 In-Reply-To: <20200305012338.219746-1-rajatja@google.com> Message-Id: <20200305012338.219746-3-rajatja@google.com> Mime-Version: 1.0 References: <20200305012338.219746-1-rajatja@google.com> X-Mailer: git-send-email 2.25.0.265.gbab2e86ba0-goog Subject: [PATCH v6 2/3] drm/i915: Lookup and attach ACPI device node for connectors From: Rajat Jain To: Maarten Lankhorst , Maxime Ripard , Sean Paul , David Airlie , Daniel Vetter , Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , "=?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?=" , Chris Wilson , Imre Deak , "=?UTF-8?q?Jos=C3=A9=20Roberto=20de=20Souza?=" , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, gregkh@linuxfoundation.org, mathewk@google.com, Daniel Thompson , Jonathan Corbet , Pavel Machek , seanpaul@google.com, Duncan Laurie , jsbarnes@google.com, Thierry Reding , mpearson@lenovo.com, Nitin Joshi1 , Sugumaran Lacshiminarayanan , Tomoki Maruichi Cc: Rajat Jain , rajatxjain@gmail.com Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Lookup and attach ACPI nodes for intel connectors. The lookup is done in compliance with ACPI Spec 6.3 https://uefi.org/sites/default/files/resources/ACPI_6_3_final_Jan30.pdf (Ref: Pages 1119 - 1123). This can be useful for any connector specific platform properties. (This will be used for privacy screen in next patch). Signed-off-by: Rajat Jain --- v6: Addressed minor comments from Jani at https://lkml.org/lkml/2020/1/24/1143 - local variable renamed. - used drm_dbg_kms() - used acpi_device_handle() - Used opaque type acpi_handle instead of void* v5: same as v4 v4: Same as v3 v3: fold the code into existing acpi_device_id_update() function v2: formed by splitting the original patch into ACPI lookup, and privacy screen property. Also move it into i915 now that I found existing code in i915 that can be re-used. drivers/gpu/drm/i915/display/intel_acpi.c | 24 +++++++++++++++++++ .../drm/i915/display/intel_display_types.h | 5 ++++ drivers/gpu/drm/i915/display/intel_dp.c | 3 +++ 3 files changed, 32 insertions(+) diff --git a/drivers/gpu/drm/i915/display/intel_acpi.c b/drivers/gpu/drm/i915/display/intel_acpi.c index 3e6831cca4ac1..870c1ad98df92 100644 --- a/drivers/gpu/drm/i915/display/intel_acpi.c +++ b/drivers/gpu/drm/i915/display/intel_acpi.c @@ -222,11 +222,22 @@ static u32 acpi_display_type(struct intel_connector *connector) return display_type; } +/* + * Ref: ACPI Spec 6.3 + * https://uefi.org/sites/default/files/resources/ACPI_6_3_final_Jan30.pdf + * Pages 1119 - 1123 describe, what I believe, a standard way of + * identifying / addressing "display panels" in the ACPI. It provides + * a way for the ACPI to define devices for the display panels attached + * to the system. It thus provides a way for the BIOS to export any panel + * specific properties to the system via ACPI (like device trees). + */ void intel_acpi_device_id_update(struct drm_i915_private *dev_priv) { struct drm_device *dev = &dev_priv->drm; struct intel_connector *connector; struct drm_connector_list_iter conn_iter; + struct acpi_device *conn_dev; + u64 conn_addr; u8 display_index[16] = {}; /* Populate the ACPI IDs for all connectors for a given drm_device */ @@ -242,6 +253,19 @@ void intel_acpi_device_id_update(struct drm_i915_private *dev_priv) device_id |= display_index[type]++ << ACPI_DISPLAY_INDEX_SHIFT; connector->acpi_device_id = device_id; + + /* Build the _ADR to look for */ + conn_addr = device_id | ACPI_DEVICE_ID_SCHEME | + ACPI_BIOS_CAN_DETECT; + + drm_dbg_kms(dev, "Checking connector ACPI node at _ADR=%llX\n", + conn_addr); + + /* Look up the connector device, under the PCI device */ + conn_dev = acpi_find_child_device( + ACPI_COMPANION(&dev->pdev->dev), + conn_addr, false); + connector->acpi_handle = acpi_device_handle(conn_dev); } drm_connector_list_iter_end(&conn_iter); } diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h index 5e00e611f077f..d70612cc1ba2a 100644 --- a/drivers/gpu/drm/i915/display/intel_display_types.h +++ b/drivers/gpu/drm/i915/display/intel_display_types.h @@ -411,9 +411,14 @@ struct intel_connector { */ struct intel_encoder *encoder; +#ifdef CONFIG_ACPI /* ACPI device id for ACPI and driver cooperation */ u32 acpi_device_id; + /* ACPI handle corresponding to this connector display, if found */ + acpi_handle acpi_handle; +#endif + /* Reads out the current hw, returning true if the connector is enabled * and active (i.e. dpms ON state). */ bool (*get_hw_state)(struct intel_connector *); diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c index 0a417cd2af2bc..171821113d362 100644 --- a/drivers/gpu/drm/i915/display/intel_dp.c +++ b/drivers/gpu/drm/i915/display/intel_dp.c @@ -44,6 +44,7 @@ #include "i915_debugfs.h" #include "i915_drv.h" #include "i915_trace.h" +#include "intel_acpi.h" #include "intel_atomic.h" #include "intel_audio.h" #include "intel_connector.h" @@ -6868,6 +6869,8 @@ intel_dp_add_properties(struct intel_dp *intel_dp, struct drm_connector *connect connector->state->scaling_mode = DRM_MODE_SCALE_ASPECT; + /* Lookup the ACPI node corresponding to the connector */ + intel_acpi_device_id_update(dev_priv); } } -- 2.25.0.265.gbab2e86ba0-goog