From patchwork Tue Oct 5 23:13:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Andersson X-Patchwork-Id: 515263 Delivered-To: patch@linaro.org Received: by 2002:ac0:890a:0:0:0:0:0 with SMTP id 10csp39670imy; Tue, 5 Oct 2021 16:11:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyKkIBeZIcspR4M6DGsDRx5GsRFhURxwxfbi8LYENkXt8/g1lCNOvnH3tookAR+S3q58Hjq X-Received: by 2002:a50:da04:: with SMTP id z4mr29802024edj.52.1633475508736; Tue, 05 Oct 2021 16:11:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633475508; cv=none; d=google.com; s=arc-20160816; b=pIkcWH9tX44OQyCwR5Aa8cGirVon73EpDrNp0j/trjABthjcwPGr539Q6ibjM0GXIB kbO6g0dkrf2Cr6Zk6zh3xj8X1mY2rkfDPZ/htU+gC0d4ga20QL9sj4QTxizlvIDvGTRq btrBOx6KY5KmJa8IalZrfcRufcxCbXPcUdkB1IqwO182TuYXfzvFDmbGyjrTDOEnvB9/ 0eTEid7TGRQEab2stXLL+/2gEowSCA5QGDxb6bnNLPD94HEMZTckQ9XXBsZ0tFwAi07G vBmix6JNhlfi5B3wnB1jLZKG9ZYcV0p5LrkasuGFjpGapBGthV8iUXPC0qMAeT0/80TO 3bFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=2pICawon058eA4UB8HcOkQdvCRqMMsaUR9GicnZohrY=; b=qxs5ja6u+C1NU30DeQUf5AWmpcf52i/s+wLJjTl0ujDiKzKXmjItd1Vn3yiKMyuGmg 2qGcJ6lTGuKXwhT9FrN/ArVL9rXmWZ+TfPNFJPD2GtbDXoFVt11hrQHOFnj2+p+tb/aR os5cyz6Q6/DOPR1WyKio9ePqpiPjfu6dsc7z1y5xk4hf6Vc4DWOxRdz1J74JSsYnIDB5 NmLRNomooWGwfYuPI8sXgPiJythjeVpncez6qFgxxzY2/eY7XjPyarKodd3NR2pukYj3 IY4xtHTLiffOPoXldQ4IilhlxQyF4/GbSYl1a/VeQDr3S+Ka+olHtf56V8Oy7Jzc7lHD Rkdg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=gDnrJ5JF; spf=pass (google.com: domain of linux-arm-msm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id ds19si24535102ejc.662.2021.10.05.16.11.48; Tue, 05 Oct 2021 16:11:48 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-arm-msm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=gDnrJ5JF; spf=pass (google.com: domain of linux-arm-msm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236986AbhJEXNg (ORCPT + 17 others); Tue, 5 Oct 2021 19:13:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54910 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236931AbhJEXNf (ORCPT ); Tue, 5 Oct 2021 19:13:35 -0400 Received: from mail-ot1-x32f.google.com (mail-ot1-x32f.google.com [IPv6:2607:f8b0:4864:20::32f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6F936C061749 for ; Tue, 5 Oct 2021 16:11:44 -0700 (PDT) Received: by mail-ot1-x32f.google.com with SMTP id r43-20020a05683044ab00b0054716b40005so884905otv.4 for ; Tue, 05 Oct 2021 16:11:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=2pICawon058eA4UB8HcOkQdvCRqMMsaUR9GicnZohrY=; b=gDnrJ5JFLbOUKCpkUvWM2yB+49MeeImDcivrMw6hANITtE/4wU0nEhJ73Egi+NKPwE zQOELXNY4rgLcSRRT+XK8WhWUjuq/qNqCYvpjaRcK56v+IZ0oNkYX667H5Na0WSAiiK8 LTeoPRNxS6spJ+ZbBkvERZMG/MJ7Q0/nx7COelZmajl9KwYUyJZHr9siSIU78Mx9nw4C kSZ2OOzbPxEkMwnR0wgGdsIN/sxy4AlJGHYUJHIYh8PpYAuXajsmPhbRmtBx/2bYHj+L nmxxdeDbvjLH27xgG59usxIPcvW/vGWe1OEQ0ExVlA0caXbiQZRK0MjXLJZab7NeZ+Ul bR3A== 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=2pICawon058eA4UB8HcOkQdvCRqMMsaUR9GicnZohrY=; b=bfiSsxBhVE729DsnQm9jlLsgOohHfpHvNAVU8GveuboMpUiGOE6Iydr5U0h6kxqC2f rqGRv2JWOMd/XVqq6kD06JX3RIsW+BRwyHhuGrlOo6WeephrEkj0S7a+ua9g3GAstlsG pKS4fK1tTpFqCA4vooDbH1lgVvcdHLL6woWpybaY68l61v4Yr8dgKsBtVBkORs1qKBJK yh2TIfaWgsMOjahDq7a7LQKhix+2q2DyQ9C47Xn/Ttuj6mK8zdTzLRRY/YA6OMEKZun7 GWckUOtNj1GGb/a5vgQCs9uNJmgx+j0mD4TFIRT2P5gIssxP6P663C98dW41+KN8ulsv GxLg== X-Gm-Message-State: AOAM531sgCw1j6HhkAYMGRGBEEsYNql+3ePJlinUGMZDMNHKWCfDul71 uSQR2zA68aeW6jQ6BADkOUii0g== X-Received: by 2002:a05:6830:1644:: with SMTP id h4mr15913882otr.199.1633475503733; Tue, 05 Oct 2021 16:11:43 -0700 (PDT) Received: from localhost.localdomain ([2600:1700:a0:3dc8:205:1bff:fec0:b9b3]) by smtp.gmail.com with ESMTPSA id v9sm1665141oth.62.2021.10.05.16.11.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Oct 2021 16:11:43 -0700 (PDT) From: Bjorn Andersson To: Rob Clark , Sean Paul , David Airlie , Daniel Vetter , Abhinav Kumar , Dmitry Baryshkov , Kalyan Thota , Kuogee Hsieh Cc: Rob Herring , Stephen Boyd , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 1/7] drm/msm/dp: Remove global g_dp_display variable Date: Tue, 5 Oct 2021 16:13:17 -0700 Message-Id: <20211005231323.2663520-2-bjorn.andersson@linaro.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20211005231323.2663520-1-bjorn.andersson@linaro.org> References: <20211005231323.2663520-1-bjorn.andersson@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org As the Qualcomm DisplayPort driver only supports a single instance of the driver the commonly used struct dp_display is kept in a global variable. As we introduce additional instances this obviously doesn't work. Replace this with a combination of existing references to adjacent objects and drvdata. Reviewed-by: Abhinav Kumar Reviewed-by: Stephen Boyd Signed-off-by: Bjorn Andersson --- Changes since v3: - None drivers/gpu/drm/msm/dp/dp_display.c | 80 ++++++++--------------------- 1 file changed, 21 insertions(+), 59 deletions(-) -- 2.29.2 diff --git a/drivers/gpu/drm/msm/dp/dp_display.c b/drivers/gpu/drm/msm/dp/dp_display.c index fbe4c2cd52a3..5d3ee5ef07c2 100644 --- a/drivers/gpu/drm/msm/dp/dp_display.c +++ b/drivers/gpu/drm/msm/dp/dp_display.c @@ -27,7 +27,6 @@ #include "dp_audio.h" #include "dp_debug.h" -static struct msm_dp *g_dp_display; #define HPD_STRING_SIZE 30 enum { @@ -121,6 +120,13 @@ static const struct of_device_id dp_dt_match[] = { {} }; +static struct dp_display_private *dev_get_dp_display_private(struct device *dev) +{ + struct msm_dp *dp = dev_get_drvdata(dev); + + return container_of(dp, struct dp_display_private, dp_display); +} + static int dp_add_event(struct dp_display_private *dp_priv, u32 event, u32 data, u32 delay) { @@ -197,15 +203,12 @@ static int dp_display_bind(struct device *dev, struct device *master, void *data) { int rc = 0; - struct dp_display_private *dp; - struct drm_device *drm; + struct dp_display_private *dp = dev_get_dp_display_private(dev); struct msm_drm_private *priv; + struct drm_device *drm; drm = dev_get_drvdata(master); - dp = container_of(g_dp_display, - struct dp_display_private, dp_display); - dp->dp_display.drm_dev = drm; priv = drm->dev_private; priv->dp = &(dp->dp_display); @@ -240,13 +243,10 @@ static int dp_display_bind(struct device *dev, struct device *master, static void dp_display_unbind(struct device *dev, struct device *master, void *data) { - struct dp_display_private *dp; + struct dp_display_private *dp = dev_get_dp_display_private(dev); struct drm_device *drm = dev_get_drvdata(master); struct msm_drm_private *priv = drm->dev_private; - dp = container_of(g_dp_display, - struct dp_display_private, dp_display); - dp_power_client_deinit(dp->power); dp_aux_unregister(dp->aux); priv->dp = NULL; @@ -379,38 +379,17 @@ static void dp_display_host_deinit(struct dp_display_private *dp) static int dp_display_usbpd_configure_cb(struct device *dev) { - int rc = 0; - struct dp_display_private *dp; - - if (!dev) { - DRM_ERROR("invalid dev\n"); - rc = -EINVAL; - goto end; - } - - dp = container_of(g_dp_display, - struct dp_display_private, dp_display); + struct dp_display_private *dp = dev_get_dp_display_private(dev); dp_display_host_init(dp, false); - rc = dp_display_process_hpd_high(dp); -end: - return rc; + return dp_display_process_hpd_high(dp); } static int dp_display_usbpd_disconnect_cb(struct device *dev) { int rc = 0; - struct dp_display_private *dp; - - if (!dev) { - DRM_ERROR("invalid dev\n"); - rc = -EINVAL; - return rc; - } - - dp = container_of(g_dp_display, - struct dp_display_private, dp_display); + struct dp_display_private *dp = dev_get_dp_display_private(dev); dp_add_event(dp, EV_USER_NOTIFICATION, false, 0); @@ -472,15 +451,7 @@ static int dp_display_usbpd_attention_cb(struct device *dev) { int rc = 0; u32 sink_request; - struct dp_display_private *dp; - - if (!dev) { - DRM_ERROR("invalid dev\n"); - return -EINVAL; - } - - dp = container_of(g_dp_display, - struct dp_display_private, dp_display); + struct dp_display_private *dp = dev_get_dp_display_private(dev); /* check for any test request issued by sink */ rc = dp_link_process_request(dp->link); @@ -647,7 +618,7 @@ static int dp_hpd_unplug_handle(struct dp_display_private *dp, u32 data) DRM_DEBUG_DP("hpd_state=%d\n", state); /* signal the disconnect event early to ensure proper teardown */ - dp_display_handle_plugged_change(g_dp_display, false); + dp_display_handle_plugged_change(&dp->dp_display, false); /* enable HDP plug interrupt to prepare for next plugin */ dp_catalog_hpd_config_intr(dp->catalog, DP_DP_HPD_PLUG_INT_MASK, true); @@ -842,9 +813,7 @@ static int dp_display_prepare(struct msm_dp *dp) static int dp_display_enable(struct dp_display_private *dp, u32 data) { int rc = 0; - struct msm_dp *dp_display; - - dp_display = g_dp_display; + struct msm_dp *dp_display = &dp->dp_display; DRM_DEBUG_DP("sink_count=%d\n", dp->link->sink_count); if (dp_display->power_on) { @@ -880,9 +849,7 @@ static int dp_display_post_enable(struct msm_dp *dp_display) static int dp_display_disable(struct dp_display_private *dp, u32 data) { - struct msm_dp *dp_display; - - dp_display = g_dp_display; + struct msm_dp *dp_display = &dp->dp_display; if (!dp_display->power_on) return 0; @@ -1237,14 +1204,13 @@ static int dp_display_probe(struct platform_device *pdev) } mutex_init(&dp->event_mutex); - g_dp_display = &dp->dp_display; /* Store DP audio handle inside DP display */ - g_dp_display->dp_audio = dp->audio; + dp->dp_display.dp_audio = dp->audio; init_completion(&dp->audio_comp); - platform_set_drvdata(pdev, g_dp_display); + platform_set_drvdata(pdev, &dp->dp_display); rc = component_add(&pdev->dev, &dp_display_comp_ops); if (rc) { @@ -1257,10 +1223,7 @@ static int dp_display_probe(struct platform_device *pdev) static int dp_display_remove(struct platform_device *pdev) { - struct dp_display_private *dp; - - dp = container_of(g_dp_display, - struct dp_display_private, dp_display); + struct dp_display_private *dp = dev_get_dp_display_private(&pdev->dev); dp_display_deinit_sub_modules(dp); @@ -1315,8 +1278,7 @@ static int dp_pm_resume(struct device *dev) else dp->dp_display.is_connected = false; - dp_display_handle_plugged_change(g_dp_display, - dp->dp_display.is_connected); + dp_display_handle_plugged_change(dp_display, dp->dp_display.is_connected); DRM_DEBUG_DP("After, sink_count=%d is_connected=%d core_inited=%d power_on=%d\n", dp->link->sink_count, dp->dp_display.is_connected, From patchwork Tue Oct 5 23:13:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Andersson X-Patchwork-Id: 515264 Delivered-To: patch@linaro.org Received: by 2002:ac0:890a:0:0:0:0:0 with SMTP id 10csp39674imy; Tue, 5 Oct 2021 16:11:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx2UxcaC0Wa65wg0qU+CYO/PlHLMCrVO9Wi5WH3oZW0VOFjPgsoP5WtzpYh4mjnk8uFbT5Y X-Received: by 2002:a17:906:4f96:: with SMTP id o22mr27897503eju.169.1633475509174; Tue, 05 Oct 2021 16:11:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633475509; cv=none; d=google.com; s=arc-20160816; b=C9kle4zUHN4hvC1nT3s5TE90dOvYs2ekLqA1nQXFpT4X2cYCta8SHZrz90tBF4y6Jl uEMrNcSn0b3V0DDGy7eN4UW8suX+UUjlh2HRHRA3ENa+nG1szlkZp6G8w5usyoippqIU SujJFqDqzGso5bH5qslIfunn/FXSq5+d9SU/Hx7Jop4RFFHbeP4sYtMDujSfTUgwKPmo G/PoPU3sRZzJzd2rsoQVdFD0n7AWEuH7NXxpSjfUkxdfPK6LJZYsyvF7/uAhhd3GguTX DXNaiKyzgdJNPrFPR/lliU0qNRYXZcgOuRa1mvvFkvYb1P5Z3WTlV0Gxr0x9+mGhB+iz Kg0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=QY6GPV7em6GbdB8QFPFMnV8IsR7GqgdiCnHVLm46JKo=; b=abwGL/a1jft9ZZoLiHoz5xWvh3Esy6+Zy5XsMz0/GjjXdL1w8oxqqnzA2AFWB9WrjT skvoOc2MFJ2iu1oXyz455pmCC2ZovHP5xH+KvAk15y9WWGaOYgoxA4HOcmiN0NrlKpIA NtpKek0nakm4Oc/CtUnC484AfvlpYZhMEf0C3xL2U6ry7LELQJp1RRgRDFkSy1z02p2z sjSI4be+iVJMX0ukIYkqt4T4KizexVKcSlhS0MRBT4wYAas3NTk4S8yhuze5woz9ukJw X818HGbsC5p0mcDyKxsJowoxjxuM8X5V/eRnR47itY0TN1RPIXRvwTiBUNDJ5UPI9lMm Jwdw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=czbLVy7V; spf=pass (google.com: domain of linux-arm-msm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id ds19si24535102ejc.662.2021.10.05.16.11.48; Tue, 05 Oct 2021 16:11:49 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-arm-msm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=czbLVy7V; spf=pass (google.com: domain of linux-arm-msm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237010AbhJEXNh (ORCPT + 17 others); Tue, 5 Oct 2021 19:13:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54918 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237004AbhJEXNg (ORCPT ); Tue, 5 Oct 2021 19:13:36 -0400 Received: from mail-ot1-x32d.google.com (mail-ot1-x32d.google.com [IPv6:2607:f8b0:4864:20::32d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 44B0AC061749 for ; Tue, 5 Oct 2021 16:11:45 -0700 (PDT) Received: by mail-ot1-x32d.google.com with SMTP id 97-20020a9d006a000000b00545420bff9eso859826ota.8 for ; Tue, 05 Oct 2021 16:11:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=QY6GPV7em6GbdB8QFPFMnV8IsR7GqgdiCnHVLm46JKo=; b=czbLVy7V4PxpBxtM39OBGKdVsp1EBS0V2rOJh687j2I5NU8BFibGHkyjzLQylrpFeS C5uWNCNC0csiCj9oKnTfmeI03B7OTz0j0Fx6sfcM+JMtC5OGccTLtV1pltTeVWHaUrX2 xiYupSUx4qNArEUiuo5oUcoG8lWYueNpcDbgc3SmZLddjfLSvOmJrXvpvATD7qMvZA6i YZfK3clTJA0UAYiWn8MOa2rkKbltJu0y/zVm07mA2+UtCOgAqX7KBjTJSs4JSi9KZHwG y4sOn2Ka9WFXrfwJTQk3CS2hdP+zWwtD6PPHHuNl/wr11qzuXeKjv2x0/7x+1DmhqLzy MGYA== 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=QY6GPV7em6GbdB8QFPFMnV8IsR7GqgdiCnHVLm46JKo=; b=rSJ09DE5YABZpRi/xpkfjbaD2OOv7wTZi+S2vMCtHwT3Tc9hAguTOEAdfo6hGbWHaK Z3cVVtVcSoki4xXVXGjtGc006PrjKhfFEq9/LSSg/SWlmvytBMmDG8m+dbH0teptl7g5 U6Q1IiuO23clwvgDbmIwD8ZNg0OmfJElaMUcYsSHcBQ3W6lyRRmXqQmzAKen6r5Fd+KF niYjXY9vumsGuxnnOcjbqC9YD7FrxFyDjpso0w0MAjiyWbnPoTp/6/j3EwyOcxhBU9IV drVizlzffplCFcVhKOgOcAwsrxn6I/9cK3kgMx9BAFjVpsLQzLRBNUUBZGbaHI4R0VF5 MvkQ== X-Gm-Message-State: AOAM531M8L5SWgXUYuKINgkug9yeHdB+0WnZDcqwWad+Ec/T9ow1vqzb niuMMlCp9Wtkp6F4gRh1XmGo9Q== X-Received: by 2002:a9d:6c52:: with SMTP id g18mr16422705otq.75.1633475504618; Tue, 05 Oct 2021 16:11:44 -0700 (PDT) Received: from localhost.localdomain ([2600:1700:a0:3dc8:205:1bff:fec0:b9b3]) by smtp.gmail.com with ESMTPSA id v9sm1665141oth.62.2021.10.05.16.11.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Oct 2021 16:11:44 -0700 (PDT) From: Bjorn Andersson To: Rob Clark , Sean Paul , David Airlie , Daniel Vetter , Abhinav Kumar , Dmitry Baryshkov , Kalyan Thota , Kuogee Hsieh Cc: Rob Herring , Stephen Boyd , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 2/7] drm/msm/dp: Modify prototype of encoder based API Date: Tue, 5 Oct 2021 16:13:18 -0700 Message-Id: <20211005231323.2663520-3-bjorn.andersson@linaro.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20211005231323.2663520-1-bjorn.andersson@linaro.org> References: <20211005231323.2663520-1-bjorn.andersson@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Functions in the DisplayPort code that relates to individual instances (encoders) are passed both the struct msm_dp and the struct drm_encoder. But in a situation where multiple DP instances would exist this means that the caller need to resolve which struct msm_dp relates to the struct drm_encoder at hand. Store a reference to the struct msm_dp associated with each dpu_encoder_virt to allow the particular instance to be associate with the encoder in the following patch. Reviewed-by: Abhinav Kumar Reviewed-by: Stephen Boyd Signed-off-by: Bjorn Andersson --- Changes since v3: - None drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 23 ++++++++++++--------- 1 file changed, 13 insertions(+), 10 deletions(-) -- 2.29.2 diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c index 0e9d3fa1544b..b7f33da2799c 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c @@ -168,6 +168,7 @@ enum dpu_enc_rc_states { * @vsync_event_work: worker to handle vsync event for autorefresh * @topology: topology of the display * @idle_timeout: idle timeout duration in milliseconds + * @dp: msm_dp pointer, for DP encoders */ struct dpu_encoder_virt { struct drm_encoder base; @@ -206,6 +207,8 @@ struct dpu_encoder_virt { struct msm_display_topology topology; u32 idle_timeout; + + struct msm_dp *dp; }; #define to_dpu_encoder_virt(x) container_of(x, struct dpu_encoder_virt, base) @@ -1000,8 +1003,8 @@ static void dpu_encoder_virt_mode_set(struct drm_encoder *drm_enc, trace_dpu_enc_mode_set(DRMID(drm_enc)); - if (drm_enc->encoder_type == DRM_MODE_ENCODER_TMDS && priv->dp) - msm_dp_display_mode_set(priv->dp, drm_enc, mode, adj_mode); + if (drm_enc->encoder_type == DRM_MODE_ENCODER_TMDS) + msm_dp_display_mode_set(dpu_enc->dp, drm_enc, mode, adj_mode); list_for_each_entry(conn_iter, connector_list, head) if (conn_iter->encoder == drm_enc) @@ -1182,9 +1185,8 @@ static void dpu_encoder_virt_enable(struct drm_encoder *drm_enc) _dpu_encoder_virt_enable_helper(drm_enc); - if (drm_enc->encoder_type == DRM_MODE_ENCODER_TMDS && priv->dp) { - ret = msm_dp_display_enable(priv->dp, - drm_enc); + if (drm_enc->encoder_type == DRM_MODE_ENCODER_TMDS) { + ret = msm_dp_display_enable(dpu_enc->dp, drm_enc); if (ret) { DPU_ERROR_ENC(dpu_enc, "dp display enable failed: %d\n", ret); @@ -1224,8 +1226,8 @@ static void dpu_encoder_virt_disable(struct drm_encoder *drm_enc) /* wait for idle */ dpu_encoder_wait_for_event(drm_enc, MSM_ENC_TX_COMPLETE); - if (drm_enc->encoder_type == DRM_MODE_ENCODER_TMDS && priv->dp) { - if (msm_dp_display_pre_disable(priv->dp, drm_enc)) + if (drm_enc->encoder_type == DRM_MODE_ENCODER_TMDS) { + if (msm_dp_display_pre_disable(dpu_enc->dp, drm_enc)) DPU_ERROR_ENC(dpu_enc, "dp display push idle failed\n"); } @@ -1253,8 +1255,8 @@ static void dpu_encoder_virt_disable(struct drm_encoder *drm_enc) DPU_DEBUG_ENC(dpu_enc, "encoder disabled\n"); - if (drm_enc->encoder_type == DRM_MODE_ENCODER_TMDS && priv->dp) { - if (msm_dp_display_disable(priv->dp, drm_enc)) + if (drm_enc->encoder_type == DRM_MODE_ENCODER_TMDS) { + if (msm_dp_display_disable(dpu_enc->dp, drm_enc)) DPU_ERROR_ENC(dpu_enc, "dp display disable failed\n"); } @@ -2170,7 +2172,8 @@ int dpu_encoder_setup(struct drm_device *dev, struct drm_encoder *enc, timer_setup(&dpu_enc->vsync_event_timer, dpu_encoder_vsync_event_handler, 0); - + else if (disp_info->intf_type == DRM_MODE_ENCODER_TMDS) + dpu_enc->dp = priv->dp; INIT_DELAYED_WORK(&dpu_enc->delayed_off_work, dpu_encoder_off_work); From patchwork Tue Oct 5 23:13:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Andersson X-Patchwork-Id: 515265 Delivered-To: patch@linaro.org Received: by 2002:ac0:890a:0:0:0:0:0 with SMTP id 10csp39677imy; Tue, 5 Oct 2021 16:11:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxIpcLOchXWdzMr164rt6kgn9wd/wSi0giXxFmqR1stZQIMSPDACL0ts7QZ10CX6mEiuOEL X-Received: by 2002:a05:6402:5146:: with SMTP id n6mr29339251edd.357.1633475509742; Tue, 05 Oct 2021 16:11:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633475509; cv=none; d=google.com; s=arc-20160816; b=xyXZOyD8bIqyExOmixxQX/F6TmGJtNetn0ZubToyQKjNRPHL4bA12XuawJJDiA4Z0C zZbhYPWP0tvC5E+4/hr84lO+pxbLzp35NTM4wC1C/7qcROGfzaZLlsQjZNcLD9yXzvUg 1Q8vGqBqL0pnzD3Xb8Yk/RYie7qiK/Gc4BXZuQTTkXmiZOJOn5N6wk2P8Gp5zIjMwgz1 JBj4abPhT66qkhAEruZ0d1ksHrLJTXmXsi36gT201Qv6HjVWQtP7pPELhqpC4180GdpN qdhe0NJLf4YH8KH5EFRFDzFwf/mskHwEXYz68QSNbJ33sMAeFafu6QMzVUo6OCMpCbmw RQGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Z0OkvfJXc9Y2w0klbpaKdGqzSv5YbDPZgzOyFtH19rk=; b=S3KMo8R8z7RiaBrs6rAyX2JrQjPiHlsBfWblvToreJNV5zcN8SBbgMmiYpSVwS9KAK sgcTUxGCcN6MMINahZ7DCxHWPkvkw8M22WyUv5fD8ZudyXRN/0fNilN9/0sTsnwo50hS gHaPo+9PZl7eqY/YMPZlLPVZJqPRX7dvfRpEsTSv64MI8BERCI1jOLEFXyzo0bt1GpQg 7B9c4KcmglvGEpWyB5b2f77Qco6P/lKTtA+all6v45njp9EU+mNOXkNSBJ1jpIamow9V ZVcD9Kp+024aFwAueio75xA+n5YJIaTXBePR9YvqI1jhDxlO4gp7ss7OCUJaRldNbsa/ nvBA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=xdg7VEEV; spf=pass (google.com: domain of linux-arm-msm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id ds19si24535102ejc.662.2021.10.05.16.11.49; Tue, 05 Oct 2021 16:11:49 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-arm-msm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=xdg7VEEV; spf=pass (google.com: domain of linux-arm-msm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236938AbhJEXNi (ORCPT + 17 others); Tue, 5 Oct 2021 19:13:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54926 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237005AbhJEXNh (ORCPT ); Tue, 5 Oct 2021 19:13:37 -0400 Received: from mail-ot1-x332.google.com (mail-ot1-x332.google.com [IPv6:2607:f8b0:4864:20::332]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 216C2C06174E for ; Tue, 5 Oct 2021 16:11:46 -0700 (PDT) Received: by mail-ot1-x332.google.com with SMTP id h9-20020a9d2f09000000b005453f95356cso840306otb.11 for ; Tue, 05 Oct 2021 16:11:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Z0OkvfJXc9Y2w0klbpaKdGqzSv5YbDPZgzOyFtH19rk=; b=xdg7VEEV7n+/U9chpgEIfjbX+7MZOdTWi/PdSHER+0MBFEPPB4jOwYMbeF1lRVbKcr cmnvspVg9VBAV95hkF30baFDqNV8BIQXsUhSy+CTWiEWtbVlt4O5gPS1idCqh6Awv09v isizy5GNkDRyfDLpbvtMDVY6EZOd02nI3EEjHIKCiqbxdGDHpp/sZgov5sj8REpWUKR4 fV/ErhBmum3+XK0fzRo93OKVWG+uFPSO0+F4UGsdp5P0cS64qApAqB/u/5FHUcuAFQkb ZVMGvjjYl+ZFmlrfRAIwuxQvuWvnOpAxSZzyer6n+HgUqkpiTi1uBNYktD6V6UZMIkrF CM3g== 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=Z0OkvfJXc9Y2w0klbpaKdGqzSv5YbDPZgzOyFtH19rk=; b=K2eR1GX9d5XDXJORMME3HZj++Dz17LxHNjLTPq3Rxd0+enV8VWH6SrLlsrGrsinaIW Zn3Ud2eUBk5IYny+nP/4kwLAK6V0iTh8ZMleOfGBgLcnFfzUoIpq0g3j+Ul/4e7Iy22R +IOeHbaBMMLfxdMe3mtdXBiNbLZdBWYlIAPMupbWnbqTFAmgzx8gAqQ21wK2HbUajWr0 ts+vAEfn/Pk3sbvMcHEJdENIjhsiZcpDvhshyCZ94sTa5a68bit8bMKTgep3KL5Nm3Ke EZGTF3+odquW/egRXNNKf+OyRc4dFf17VbgJ/K7njrNHvCvL2VH5zxrxQfizUyjV34d+ v7bw== X-Gm-Message-State: AOAM5312ej6JJ0xzooJIYyDqzg64ylKFcnxVUIWG7A5iHKzJWZqlAiSZ nq+URspp25iO/FkKkfpcSo8e0Q== X-Received: by 2002:a9d:604:: with SMTP id 4mr16885518otn.204.1633475505465; Tue, 05 Oct 2021 16:11:45 -0700 (PDT) Received: from localhost.localdomain ([2600:1700:a0:3dc8:205:1bff:fec0:b9b3]) by smtp.gmail.com with ESMTPSA id v9sm1665141oth.62.2021.10.05.16.11.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Oct 2021 16:11:45 -0700 (PDT) From: Bjorn Andersson To: Rob Clark , Sean Paul , David Airlie , Daniel Vetter , Abhinav Kumar , Dmitry Baryshkov , Kalyan Thota , Kuogee Hsieh Cc: Rob Herring , Stephen Boyd , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 3/7] drm/msm/dp: Allow specifying connector_type per controller Date: Tue, 5 Oct 2021 16:13:19 -0700 Message-Id: <20211005231323.2663520-4-bjorn.andersson@linaro.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20211005231323.2663520-1-bjorn.andersson@linaro.org> References: <20211005231323.2663520-1-bjorn.andersson@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org As the following patches introduced support for multiple DP blocks in a platform and some of those block might be eDP it becomes useful to be able to specify the connector type per block. Although there's only a single block at this point, the array of descs and the search in dp_display_get_desc() are introduced here to simplify the next patch, that does introduce support for multiple DP blocks. Signed-off-by: Bjorn Andersson --- Changes since v3: - New patch - Extended msm_dp_config with connector_type, wrapped in inner struct - Refactored out of the next patch - Pass the connector_type to drm_connector_init(), from yet another patch - Dropped double newline and unnecessary {} drivers/gpu/drm/msm/dp/dp_display.c | 43 ++++++++++++++++++++++++++++- drivers/gpu/drm/msm/dp/dp_display.h | 1 + drivers/gpu/drm/msm/dp/dp_drm.c | 2 +- 3 files changed, 44 insertions(+), 2 deletions(-) -- 2.29.2 diff --git a/drivers/gpu/drm/msm/dp/dp_display.c b/drivers/gpu/drm/msm/dp/dp_display.c index 5d3ee5ef07c2..eaf08f9e7d87 100644 --- a/drivers/gpu/drm/msm/dp/dp_display.c +++ b/drivers/gpu/drm/msm/dp/dp_display.c @@ -115,8 +115,25 @@ struct dp_display_private { struct dp_audio *audio; }; +struct msm_dp_desc { + phys_addr_t io_start; + int connector_type; +}; + +struct msm_dp_config { + struct msm_dp_desc *descs; + size_t num_descs; +}; + +static const struct msm_dp_config sc7180_dp_cfg = { + .descs = (struct msm_dp_desc[]) { + { .io_start = 0x0ae90000, .connector_type = DRM_MODE_CONNECTOR_DisplayPort }, + }, + .num_descs = 1, +}; + static const struct of_device_id dp_dt_match[] = { - {.compatible = "qcom,sc7180-dp"}, + { .compatible = "qcom,sc7180-dp", .data = &sc7180_dp_cfg }, {} }; @@ -1180,10 +1197,29 @@ int dp_display_request_irq(struct msm_dp *dp_display) return 0; } +static struct msm_dp_desc *dp_display_get_desc(struct platform_device *pdev) +{ + const struct msm_dp_config *cfg = of_device_get_match_data(&pdev->dev); + struct resource *res; + int i; + + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + if (!res) + return NULL; + + for (i = 0; i < cfg->num_descs; i++) + if (cfg->descs[i].io_start == res->start) + return &cfg->descs[i]; + + dev_err(&pdev->dev, "unknown displayport instance\n"); + return NULL; +} + static int dp_display_probe(struct platform_device *pdev) { int rc = 0; struct dp_display_private *dp; + struct msm_dp_desc *desc; if (!pdev || !pdev->dev.of_node) { DRM_ERROR("pdev not found\n"); @@ -1194,8 +1230,13 @@ static int dp_display_probe(struct platform_device *pdev) if (!dp) return -ENOMEM; + desc = dp_display_get_desc(pdev); + if (!desc) + return -EINVAL; + dp->pdev = pdev; dp->name = "drm_dp"; + dp->dp_display.connector_type = desc->connector_type; rc = dp_init_sub_modules(dp); if (rc) { diff --git a/drivers/gpu/drm/msm/dp/dp_display.h b/drivers/gpu/drm/msm/dp/dp_display.h index 8b47cdabb67e..02999408c052 100644 --- a/drivers/gpu/drm/msm/dp/dp_display.h +++ b/drivers/gpu/drm/msm/dp/dp_display.h @@ -18,6 +18,7 @@ struct msm_dp { bool is_connected; bool audio_enabled; bool power_on; + int connector_type; hdmi_codec_plugged_cb plugged_cb; diff --git a/drivers/gpu/drm/msm/dp/dp_drm.c b/drivers/gpu/drm/msm/dp/dp_drm.c index 764f4b81017e..f33e31523f56 100644 --- a/drivers/gpu/drm/msm/dp/dp_drm.c +++ b/drivers/gpu/drm/msm/dp/dp_drm.c @@ -147,7 +147,7 @@ struct drm_connector *dp_drm_connector_init(struct msm_dp *dp_display) ret = drm_connector_init(dp_display->drm_dev, connector, &dp_connector_funcs, - DRM_MODE_CONNECTOR_DisplayPort); + dp_display->connector_type); if (ret) return ERR_PTR(ret); From patchwork Tue Oct 5 23:13:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Andersson X-Patchwork-Id: 515266 Delivered-To: patch@linaro.org Received: by 2002:ac0:890a:0:0:0:0:0 with SMTP id 10csp39713imy; Tue, 5 Oct 2021 16:11:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzyUoXMA2jtVA0EibG3rK63t9RsAmC/pJtXrevc6sTMP3eQaSuZXe7ObRjb4Lq1a6pFwFln X-Received: by 2002:a17:906:d1d6:: with SMTP id bs22mr28167773ejb.554.1633475513816; Tue, 05 Oct 2021 16:11:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633475513; cv=none; d=google.com; s=arc-20160816; b=hagxVoWQsWDuZ/C10JmckahIibXy7KI30OINaQA6wqz3QrJlcfJk29vW3hBdDMIwrc NTqiET5xcu5MCCoRKGVQVcu1MRjwDNS8K5HhYkXUxGMrJ6WSwex1MmHMkkMcgJK1Ylca YsinG6yjqAH530G2XxhKToj2P4QQ0CdlTCh2eky5CUPAsFK2lJSuUsS4jlNJ8oCIHKJl tD2MMNYZSaB19K664WkqJ1tcPZ2X7w/CqnoxLjgu7hUYejusuY0fzDs12W38coZdoazF 0l1AvDyqkM9y8IEPoYCSGefFGL0VwcIj9e4eP/vdo+c7Gjb/E6SHyAiuPagxsLdrAoPX vl5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=oXBCYrJKUPOGWEc8dBm9AMnJ3AoGqh3lAsMFqG0I9WE=; b=R5nmkR2clyc7fNaM1FhfqvGrAvrc1bD2m+OaBkWbLjGydPOQ/zuq3D3toCNXzCFKss 9NOsXQgg+W2HdHEpHJYUSgj8rKGqce+TqMN5yAsCu6XnhwZIH53tkIw9OxsSKAHUSJs3 j6qES0ev4Ua0VsyL6OTGRyQBwVDSfgSNdf6ky0xCRtIDsPBXMNoXN7Fnr/O+92U8hr0D uFTPBYpD74H+H+GPRrueJdn3bAKyfNJZM5qrzaZBGPI1uiW3CSZVV2GNHCAtNsHS/1I5 YcIa86oeEWdwEwMfRbAUrlxSlyCt2lYC2/N3EuAKkxZ4hId5UPPzQcItxEAl4lmBokoW e7eA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=CYWeCmd6; spf=pass (google.com: domain of linux-arm-msm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id y28si3342104edi.537.2021.10.05.16.11.53; Tue, 05 Oct 2021 16:11:53 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-arm-msm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=CYWeCmd6; spf=pass (google.com: domain of linux-arm-msm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237047AbhJEXNj (ORCPT + 17 others); Tue, 5 Oct 2021 19:13:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54932 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237016AbhJEXNi (ORCPT ); Tue, 5 Oct 2021 19:13:38 -0400 Received: from mail-ot1-x335.google.com (mail-ot1-x335.google.com [IPv6:2607:f8b0:4864:20::335]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2673EC06174E for ; Tue, 5 Oct 2021 16:11:47 -0700 (PDT) Received: by mail-ot1-x335.google.com with SMTP id h9-20020a9d2f09000000b005453f95356cso840332otb.11 for ; Tue, 05 Oct 2021 16:11:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=oXBCYrJKUPOGWEc8dBm9AMnJ3AoGqh3lAsMFqG0I9WE=; b=CYWeCmd64U389/fJPUAQFW3gGmdlywUTbTuKQR5z7WswzXzZ9qvrAMC2uEoLHwY/WJ Ni1yyMOlSaIPGpeL25B6idvxGROpik74RD/znMIMoTi1KRJ0+laHZbFGz6CpZWKStAqd 051O/keH6dyisRy3CWZCxgnZ55/CEYP7Gyf6Pzd+1Krta/Su0ier/GawoFwAnhR6NLPF VExub2gIIrehUudA6qQ8eatYW4IDA6Cj52kwQvdT57kIMfEXkecnVpLtLcrTVS1BGo87 EJnIkGOKWb3vaTHuZsRqa3vV+0lYvSQ9FW7bhZL2/Ms7BRNIJsjxAwEzi32O+kKPe7Sf ZVDw== 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=oXBCYrJKUPOGWEc8dBm9AMnJ3AoGqh3lAsMFqG0I9WE=; b=V6HGEGtzpl3S3go+iHZhhJ4WXipRcPC0m+yS9qcOJOviZ/306eR8B/OplsGX4G2lEm hbZCmg/9rCeUi0/n9TAC/ysfSoDBjxJg8mNAtOopTXZMcV58R78oIde1CU19uWV1CAGL APpnQA6SIIq2jzLfWJKd5QvFm5x298a80cMsWDsZuo0JMqVVRPKdUv8d5/gmM9URp4IQ clo0/1e9/Xv+z17N+ssNfL92fAy5oqlDPf8IG5Bdc6HEOooOE6ktMhybcfF5v1hCvzn2 UCQ6RAQJ3fyr45Fe6BI0bgUEOoMt1eUgo7DjJ3BxksgB/biWJBzC6cLApgP+thyaZ8Z/ quMg== X-Gm-Message-State: AOAM531ME8vi1sEjUhScOxEpDCyjZcPTZroMzRBAFeFZmCD+4IBSIPFj LKz3+KZjOtAzV55igdhqD17zMg== X-Received: by 2002:a05:6830:4488:: with SMTP id r8mr9817537otv.274.1633475506329; Tue, 05 Oct 2021 16:11:46 -0700 (PDT) Received: from localhost.localdomain ([2600:1700:a0:3dc8:205:1bff:fec0:b9b3]) by smtp.gmail.com with ESMTPSA id v9sm1665141oth.62.2021.10.05.16.11.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Oct 2021 16:11:45 -0700 (PDT) From: Bjorn Andersson To: Rob Clark , Sean Paul , David Airlie , Daniel Vetter , Abhinav Kumar , Dmitry Baryshkov , Kalyan Thota , Kuogee Hsieh Cc: Rob Herring , Stephen Boyd , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 4/7] drm/msm/dp: Allow attaching a drm_panel Date: Tue, 5 Oct 2021 16:13:20 -0700 Message-Id: <20211005231323.2663520-5-bjorn.andersson@linaro.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20211005231323.2663520-1-bjorn.andersson@linaro.org> References: <20211005231323.2663520-1-bjorn.andersson@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org eDP panels might need some power sequencing and backlight management, so make it possible to associate a drm_panel with an eDP instance and prepare and enable the panel accordingly. Now that we know which hardware instance is DP and which is eDP, parser->parse() is passed the connector_type and the parser is limited to only search for a panel in the eDP case. Signed-off-by: Bjorn Andersson --- Changes since v3: - Previously posted separately, now added to series - Make the search for a panel conditional on it being an eDP connector - Move the search to of_graph port 1 (was 2 to distinguish from DP link to USB-C connector) drivers/gpu/drm/msm/dp/dp_display.c | 9 ++++++--- drivers/gpu/drm/msm/dp/dp_display.h | 1 + drivers/gpu/drm/msm/dp/dp_drm.c | 11 +++++++++++ drivers/gpu/drm/msm/dp/dp_parser.c | 30 ++++++++++++++++++++++++++++- drivers/gpu/drm/msm/dp/dp_parser.h | 3 ++- 5 files changed, 49 insertions(+), 5 deletions(-) -- 2.29.2 diff --git a/drivers/gpu/drm/msm/dp/dp_display.c b/drivers/gpu/drm/msm/dp/dp_display.c index eaf08f9e7d87..bdaf227f05dc 100644 --- a/drivers/gpu/drm/msm/dp/dp_display.c +++ b/drivers/gpu/drm/msm/dp/dp_display.c @@ -10,6 +10,7 @@ #include #include #include +#include #include "msm_drv.h" #include "msm_kms.h" @@ -230,12 +231,14 @@ static int dp_display_bind(struct device *dev, struct device *master, priv = drm->dev_private; priv->dp = &(dp->dp_display); - rc = dp->parser->parse(dp->parser); + rc = dp->parser->parse(dp->parser, dp->dp_display.connector_type); if (rc) { DRM_ERROR("device tree parsing failed\n"); goto end; } + dp->dp_display.panel_bridge = dp->parser->panel_bridge; + dp->aux->drm_dev = drm; rc = dp_aux_register(dp->aux); if (rc) { @@ -822,7 +825,7 @@ static int dp_display_set_mode(struct msm_dp *dp_display, return 0; } -static int dp_display_prepare(struct msm_dp *dp) +static int dp_display_prepare(struct msm_dp *dp_display) { return 0; } @@ -896,7 +899,7 @@ static int dp_display_disable(struct dp_display_private *dp, u32 data) return 0; } -static int dp_display_unprepare(struct msm_dp *dp) +static int dp_display_unprepare(struct msm_dp *dp_display) { return 0; } diff --git a/drivers/gpu/drm/msm/dp/dp_display.h b/drivers/gpu/drm/msm/dp/dp_display.h index 02999408c052..24aefca66029 100644 --- a/drivers/gpu/drm/msm/dp/dp_display.h +++ b/drivers/gpu/drm/msm/dp/dp_display.h @@ -15,6 +15,7 @@ struct msm_dp { struct device *codec_dev; struct drm_connector *connector; struct drm_encoder *encoder; + struct drm_bridge *panel_bridge; bool is_connected; bool audio_enabled; bool power_on; diff --git a/drivers/gpu/drm/msm/dp/dp_drm.c b/drivers/gpu/drm/msm/dp/dp_drm.c index f33e31523f56..76856c4ee1d6 100644 --- a/drivers/gpu/drm/msm/dp/dp_drm.c +++ b/drivers/gpu/drm/msm/dp/dp_drm.c @@ -5,6 +5,7 @@ #include #include +#include #include #include "msm_drv.h" @@ -160,5 +161,15 @@ struct drm_connector *dp_drm_connector_init(struct msm_dp *dp_display) drm_connector_attach_encoder(connector, dp_display->encoder); + if (dp_display->panel_bridge) { + ret = drm_bridge_attach(dp_display->encoder, + dp_display->panel_bridge, NULL, + DRM_BRIDGE_ATTACH_NO_CONNECTOR); + if (ret < 0) { + DRM_ERROR("failed to attach panel bridge: %d\n", ret); + return ERR_PTR(ret); + } + } + return connector; } diff --git a/drivers/gpu/drm/msm/dp/dp_parser.c b/drivers/gpu/drm/msm/dp/dp_parser.c index 4d6e047f803d..eb6bbfbea484 100644 --- a/drivers/gpu/drm/msm/dp/dp_parser.c +++ b/drivers/gpu/drm/msm/dp/dp_parser.c @@ -6,6 +6,7 @@ #include #include +#include #include #include "dp_parser.h" @@ -263,7 +264,28 @@ static int dp_parser_clock(struct dp_parser *parser) return 0; } -static int dp_parser_parse(struct dp_parser *parser) +static int dp_parser_find_panel(struct dp_parser *parser) +{ + struct device *dev = &parser->pdev->dev; + struct drm_panel *panel; + int rc; + + rc = drm_of_find_panel_or_bridge(dev->of_node, 1, 0, &panel, NULL); + if (rc) { + DRM_ERROR("failed to acquire DRM panel: %d\n", rc); + return rc; + } + + parser->panel_bridge = devm_drm_panel_bridge_add(dev, panel); + if (IS_ERR(parser->panel_bridge)) { + DRM_ERROR("failed to create panel bridge\n"); + return PTR_ERR(parser->panel_bridge); + } + + return 0; +} + +static int dp_parser_parse(struct dp_parser *parser, int connector_type) { int rc = 0; @@ -284,6 +306,12 @@ static int dp_parser_parse(struct dp_parser *parser) if (rc) return rc; + if (connector_type == DRM_MODE_CONNECTOR_eDP) { + rc = dp_parser_find_panel(parser); + if (rc) + return rc; + } + /* Map the corresponding regulator information according to * version. Currently, since we only have one supported platform, * mapping the regulator directly. diff --git a/drivers/gpu/drm/msm/dp/dp_parser.h b/drivers/gpu/drm/msm/dp/dp_parser.h index dac10923abde..3172da089421 100644 --- a/drivers/gpu/drm/msm/dp/dp_parser.h +++ b/drivers/gpu/drm/msm/dp/dp_parser.h @@ -123,8 +123,9 @@ struct dp_parser { struct dp_display_data disp_data; const struct dp_regulator_cfg *regulator_cfg; u32 max_dp_lanes; + struct drm_bridge *panel_bridge; - int (*parse)(struct dp_parser *parser); + int (*parse)(struct dp_parser *parser, int connector_type); }; /** From patchwork Tue Oct 5 23:13:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Andersson X-Patchwork-Id: 515267 Delivered-To: patch@linaro.org Received: by 2002:ac0:890a:0:0:0:0:0 with SMTP id 10csp39734imy; Tue, 5 Oct 2021 16:11:55 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwaq8ifoMXFpLho+H6iqvcH5EQZiCfK/6GEBx6Hn8wAGnpCSVHC97irHQkqhgq6UYOx4MlV X-Received: by 2002:a17:906:2294:: with SMTP id p20mr19809371eja.224.1633475515548; Tue, 05 Oct 2021 16:11:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633475515; cv=none; d=google.com; s=arc-20160816; b=wJXQ1D3OZg7iNaxMBDEvZL5qInDnKysOcqlrqYYLckJ0ybGlA8GGyrPVn3acQ2sCGz GdqqBzdmVLYFz4OUWFFMx2AsXqREUqZ2aOII2veWXu2/+tQHDSe+knBOJIo+JWz5Ufik LEYWPiovs4h0OJ/uvq+lBZ5mJp/ho3rz5XHp2lnmeGO7iwQABb6e+lXCs0o0PkndjwUe 3EWAPiVkZqRlr4N65QHBSuV/vFgNTjnEs3bkHT2cR3t5UCxFv/dnl1V+qWx8KCv2RRiE vmtWMTQTaZb5D8sJZOx0fBbm8K1XlGuBo2f05Dp3JyhlRn48MICTATs2b0ja0W6J0uWV GGjQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=jLvf3CXD1hhsGMYhP3WhpChbMAYmRIr6zLV8hsffsT8=; b=MZtK/wKj4iabgn3wmmTAAszy+oELOd5PHdGUBwaETIXRlqbG7FIoET8aI6yEUW+N6X I49DHvDUnNTnU3QQLvJl3Tck3R9b9ivK3RCKv2A8W+OSqvb553CR2cYp6fmHs6f56YSf uAYcgwSJgh6tS819TJWORMa/1BD/LgBdIZHbWLAX2vr1i4pi50j2ONHx7j+rUwf4tsPE lXvqFPuXggPw0n+azvBCZNTSqQ40R+Dpy/wF0MWiC7mY7rzMzKxsJejDo0wN928/c5/A zrXeO5iUP1PlSER2ciZFL/b72cHvww94pSMWSlUFgGKb2YgH+NeTLd3xhalX2zNgipjv Cr8g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="a/qA/IwV"; spf=pass (google.com: domain of linux-arm-msm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id y28si3342104edi.537.2021.10.05.16.11.55; Tue, 05 Oct 2021 16:11:55 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-arm-msm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="a/qA/IwV"; spf=pass (google.com: domain of linux-arm-msm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237059AbhJEXNl (ORCPT + 17 others); Tue, 5 Oct 2021 19:13:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54944 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237027AbhJEXNj (ORCPT ); Tue, 5 Oct 2021 19:13:39 -0400 Received: from mail-oo1-xc2a.google.com (mail-oo1-xc2a.google.com [IPv6:2607:f8b0:4864:20::c2a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CB565C061749 for ; Tue, 5 Oct 2021 16:11:47 -0700 (PDT) Received: by mail-oo1-xc2a.google.com with SMTP id b5-20020a4ac285000000b0029038344c3dso283072ooq.8 for ; Tue, 05 Oct 2021 16:11:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=jLvf3CXD1hhsGMYhP3WhpChbMAYmRIr6zLV8hsffsT8=; b=a/qA/IwV3lgAXefEwGtgdyxqNJYlGEp3EivHTe6SAslFXxYWN8FY4h+lEUAABghWvT efmF3ue31AB/He71KG5eCmhwcm0F5fihCP2L6zVhK3goP8CVUQHvWGS2+2X+9tBa4vZX vZrqWDFQP1Z/2679eEkDK/BnKrrRDR3Q32W+srifzCs01/XxLojobHb3PQNUqtAAhDe0 LUHy93zhRirQcOVnkceqks3cWhEfevOUQwYtm7mRQp1NEmX9mjvNcdMbU0wlpGTqhny8 en9YDz2EcQo10NXnqFloryv0dY2qvJBJ7GY9fw1e5TH5fCQPwFAIMZkCSzFOgny/UpIL Dgvg== 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=jLvf3CXD1hhsGMYhP3WhpChbMAYmRIr6zLV8hsffsT8=; b=4ykGsmzW3OBnci3n4wP0TXRkSCKaRuqZWhwTNUiLzIajTwEXAaWeVOryRNsOhcc2ry whiA7OurabkN1rx30MI6vc/tGmmGY5hHp+2qz4LfTUncu9b52LCmUQnOF51Rd9z2E17P TS0Sv2KY1doi5dOIMz2+SuGnWv69q0Kr1+121ilGBV06Jhiz52sCHRKT2ODVFoVzMF3r ya1fSCxBSyhnuDMxZF9Gm15+oQZFkZOuEg1jsSNpQEI2cWn9ujn98m9a/EIX929YtruC WhM7W/bq0VFxZNX3dgWKj9rX2aj8v/5X4eLiIjDhD8tfVDD1dnxiDE2RwE3cDrIpfm7O adcA== X-Gm-Message-State: AOAM530T9cZHt2iA95gpxpQrjnw20G0WkA840+FQcCLPBFAKu/1qh0XF DrpKNjPIcclWlzVor+yMySWq8Q== X-Received: by 2002:a4a:b64b:: with SMTP id f11mr15569242ooo.18.1633475507161; Tue, 05 Oct 2021 16:11:47 -0700 (PDT) Received: from localhost.localdomain ([2600:1700:a0:3dc8:205:1bff:fec0:b9b3]) by smtp.gmail.com with ESMTPSA id v9sm1665141oth.62.2021.10.05.16.11.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Oct 2021 16:11:46 -0700 (PDT) From: Bjorn Andersson To: Rob Clark , Sean Paul , David Airlie , Daniel Vetter , Abhinav Kumar , Dmitry Baryshkov , Kalyan Thota , Kuogee Hsieh Cc: Rob Herring , Stephen Boyd , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 5/7] drm/msm/dp: Support up to 3 DP controllers Date: Tue, 5 Oct 2021 16:13:21 -0700 Message-Id: <20211005231323.2663520-6-bjorn.andersson@linaro.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20211005231323.2663520-1-bjorn.andersson@linaro.org> References: <20211005231323.2663520-1-bjorn.andersson@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Based on the removal of the g_dp_display and the movement of the priv->dp lookup into the DP code it's now possible to have multiple DP instances. In line with the other controllers in the MSM driver, introduce a per-compatible list of base addresses which is used to resolve the "instance id" for the given DP controller. This instance id is used as index in the priv->dp[] array. Then extend the initialization code to initialize struct drm_encoder for each of the registered priv->dp[] and update the logic for associating each struct msm_dp with the struct dpu_encoder_virt. Lastly, bump the number of struct msm_dp instances carries by priv->dp to 3, the currently known maximum number of controllers found in a Qualcomm SoC. Signed-off-by: Bjorn Andersson --- Changes since v3: - Rebased ontop of previous patches drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 2 +- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 66 +++++++++++-------- .../gpu/drm/msm/disp/msm_disp_snapshot_util.c | 8 ++- drivers/gpu/drm/msm/dp/dp_display.c | 18 +++-- drivers/gpu/drm/msm/msm_drv.h | 2 +- 5 files changed, 59 insertions(+), 37 deletions(-) -- 2.29.2 diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c index b7f33da2799c..9cd9539a1504 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c @@ -2173,7 +2173,7 @@ int dpu_encoder_setup(struct drm_device *dev, struct drm_encoder *enc, dpu_encoder_vsync_event_handler, 0); else if (disp_info->intf_type == DRM_MODE_ENCODER_TMDS) - dpu_enc->dp = priv->dp; + dpu_enc->dp = priv->dp[disp_info->h_tile_instance[0]]; INIT_DELAYED_WORK(&dpu_enc->delayed_off_work, dpu_encoder_off_work); diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c index f655adbc2421..875b07e7183d 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c @@ -188,6 +188,7 @@ static int dpu_kms_debugfs_init(struct msm_kms *kms, struct drm_minor *minor) struct dentry *entry; struct drm_device *dev; struct msm_drm_private *priv; + int i; if (!p) return -EINVAL; @@ -203,8 +204,10 @@ static int dpu_kms_debugfs_init(struct msm_kms *kms, struct drm_minor *minor) dpu_debugfs_vbif_init(dpu_kms, entry); dpu_debugfs_core_irq_init(dpu_kms, entry); - if (priv->dp) - msm_dp_debugfs_init(priv->dp, minor); + for (i = 0; i < ARRAY_SIZE(priv->dp); i++) { + if (priv->dp[i]) + msm_dp_debugfs_init(priv->dp[i], minor); + } return dpu_core_perf_debugfs_init(dpu_kms, entry); } @@ -544,35 +547,42 @@ static int _dpu_kms_initialize_displayport(struct drm_device *dev, { struct drm_encoder *encoder = NULL; struct msm_display_info info; - int rc = 0; + int rc; + int i; - if (!priv->dp) - return rc; + for (i = 0; i < ARRAY_SIZE(priv->dp); i++) { + if (!priv->dp[i]) + continue; - encoder = dpu_encoder_init(dev, DRM_MODE_ENCODER_TMDS); - if (IS_ERR(encoder)) { - DPU_ERROR("encoder init failed for dsi display\n"); - return PTR_ERR(encoder); - } + encoder = dpu_encoder_init(dev, DRM_MODE_ENCODER_TMDS); + if (IS_ERR(encoder)) { + DPU_ERROR("encoder init failed for dsi display\n"); + return PTR_ERR(encoder); + } - memset(&info, 0, sizeof(info)); - rc = msm_dp_modeset_init(priv->dp, dev, encoder); - if (rc) { - DPU_ERROR("modeset_init failed for DP, rc = %d\n", rc); - drm_encoder_cleanup(encoder); - return rc; - } + memset(&info, 0, sizeof(info)); + rc = msm_dp_modeset_init(priv->dp[i], dev, encoder); + if (rc) { + DPU_ERROR("modeset_init failed for DP, rc = %d\n", rc); + drm_encoder_cleanup(encoder); + return rc; + } - priv->encoders[priv->num_encoders++] = encoder; + priv->encoders[priv->num_encoders++] = encoder; - info.num_of_h_tiles = 1; - info.capabilities = MSM_DISPLAY_CAP_VID_MODE; - info.intf_type = encoder->encoder_type; - rc = dpu_encoder_setup(dev, encoder, &info); - if (rc) - DPU_ERROR("failed to setup DPU encoder %d: rc:%d\n", - encoder->base.id, rc); - return rc; + info.num_of_h_tiles = 1; + info.h_tile_instance[0] = i; + info.capabilities = MSM_DISPLAY_CAP_VID_MODE; + info.intf_type = encoder->encoder_type; + rc = dpu_encoder_setup(dev, encoder, &info); + if (rc) { + DPU_ERROR("failed to setup DPU encoder %d: rc:%d\n", + encoder->base.id, rc); + return rc; + } + } + + return 0; } /** @@ -792,6 +802,7 @@ static int dpu_irq_postinstall(struct msm_kms *kms) { struct msm_drm_private *priv; struct dpu_kms *dpu_kms = to_dpu_kms(kms); + int i; if (!dpu_kms || !dpu_kms->dev) return -EINVAL; @@ -800,7 +811,8 @@ static int dpu_irq_postinstall(struct msm_kms *kms) if (!priv) return -EINVAL; - msm_dp_irq_postinstall(priv->dp); + for (i = 0; i < ARRAY_SIZE(priv->dp); i++) + msm_dp_irq_postinstall(priv->dp[i]); return 0; } diff --git a/drivers/gpu/drm/msm/disp/msm_disp_snapshot_util.c b/drivers/gpu/drm/msm/disp/msm_disp_snapshot_util.c index cabe15190ec1..2e1acb1bc390 100644 --- a/drivers/gpu/drm/msm/disp/msm_disp_snapshot_util.c +++ b/drivers/gpu/drm/msm/disp/msm_disp_snapshot_util.c @@ -126,8 +126,12 @@ void msm_disp_snapshot_capture_state(struct msm_disp_state *disp_state) priv = drm_dev->dev_private; kms = priv->kms; - if (priv->dp) - msm_dp_snapshot(disp_state, priv->dp); + for (i = 0; i < ARRAY_SIZE(priv->dp); i++) { + if (!priv->dp[i]) + continue; + + msm_dp_snapshot(disp_state, priv->dp[i]); + } for (i = 0; i < ARRAY_SIZE(priv->dsi); i++) { if (!priv->dsi[i]) diff --git a/drivers/gpu/drm/msm/dp/dp_display.c b/drivers/gpu/drm/msm/dp/dp_display.c index bdaf227f05dc..674cddfee5b0 100644 --- a/drivers/gpu/drm/msm/dp/dp_display.c +++ b/drivers/gpu/drm/msm/dp/dp_display.c @@ -79,6 +79,8 @@ struct dp_display_private { char *name; int irq; + unsigned int id; + /* state variables */ bool core_initialized; bool hpd_irq_on; @@ -229,7 +231,7 @@ static int dp_display_bind(struct device *dev, struct device *master, dp->dp_display.drm_dev = drm; priv = drm->dev_private; - priv->dp = &(dp->dp_display); + priv->dp[dp->id] = &(dp->dp_display); rc = dp->parser->parse(dp->parser, dp->dp_display.connector_type); if (rc) { @@ -269,7 +271,7 @@ static void dp_display_unbind(struct device *dev, struct device *master, dp_power_client_deinit(dp->power); dp_aux_unregister(dp->aux); - priv->dp = NULL; + priv->dp[dp->id] = NULL; } static const struct component_ops dp_display_comp_ops = { @@ -1200,7 +1202,8 @@ int dp_display_request_irq(struct msm_dp *dp_display) return 0; } -static struct msm_dp_desc *dp_display_get_desc(struct platform_device *pdev) +static struct msm_dp_desc *dp_display_get_desc(struct platform_device *pdev, + unsigned int *id) { const struct msm_dp_config *cfg = of_device_get_match_data(&pdev->dev); struct resource *res; @@ -1210,9 +1213,12 @@ static struct msm_dp_desc *dp_display_get_desc(struct platform_device *pdev) if (!res) return NULL; - for (i = 0; i < cfg->num_descs; i++) - if (cfg->descs[i].io_start == res->start) + for (i = 0; i < cfg->num_descs; i++) { + if (cfg->descs[i].io_start == res->start) { + *id = i; return &cfg->descs[i]; + } + } dev_err(&pdev->dev, "unknown displayport instance\n"); return NULL; @@ -1233,7 +1239,7 @@ static int dp_display_probe(struct platform_device *pdev) if (!dp) return -ENOMEM; - desc = dp_display_get_desc(pdev); + desc = dp_display_get_desc(pdev, &dp->id); if (!desc) return -EINVAL; diff --git a/drivers/gpu/drm/msm/msm_drv.h b/drivers/gpu/drm/msm/msm_drv.h index 8b005d1ac899..2e84dc30e12e 100644 --- a/drivers/gpu/drm/msm/msm_drv.h +++ b/drivers/gpu/drm/msm/msm_drv.h @@ -161,7 +161,7 @@ struct msm_drm_private { /* DSI is shared by mdp4 and mdp5 */ struct msm_dsi *dsi[2]; - struct msm_dp *dp; + struct msm_dp *dp[3]; /* when we have more than one 'msm_gpu' these need to be an array: */ struct msm_gpu *gpu; From patchwork Tue Oct 5 23:13:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Andersson X-Patchwork-Id: 515268 Delivered-To: patch@linaro.org Received: by 2002:ac0:890a:0:0:0:0:0 with SMTP id 10csp39769imy; Tue, 5 Oct 2021 16:11:59 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzXv8Zf4JgtRM3924UMxXk9ww95dhhKNtZQCCZoPT8FHqXYg98iviVQCov21WSZF7EMKGJq X-Received: by 2002:a50:fc86:: with SMTP id f6mr11691187edq.283.1633475519254; Tue, 05 Oct 2021 16:11:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633475519; cv=none; d=google.com; s=arc-20160816; b=FwmpW+/7035NTd0VRRkgxIuRXL4PljrEgw9e5fNxO2dBIM85YKM9WuWYztaTJVcrjr vAqwSeYN95CuCvCllpdAn0BzaFf5BpssHiP5FGX2HL46bTKISY7fVqDNzQtyM5BrqqUU E3stZkzOrB9/yGtkhTG8kzf3HkXmiuL/mNSK5Mcasl0R999Hjzohxb7+nNGoYL7d2wq8 dDgJei/T1zlxtWnhxYsf2tp/jpVC8rWFklXfyZ+pMHxOjQTngnLRzQmZu5j51Q9O7nht EH5gOKHvJ9W44Pcoq7AZ3rPzc3GCsMr8l6HkTQZKGp/lQeGDXH+cW8MD0XET+5DjM56Y UZtg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=oCnAkB79mR5AIU388UdqiAr4F0EbajvP3UTjYzPVMRg=; b=yDW9tGtevF6Yx+YKDJlGpNgAeD92im0Nnz85LxKY8LdxYYQ9Jp4SosDNQndZWW3VSt gDQaNdsx2tQRfHzPLGHe/NBEvPXMASfh2q9Uqt8YhHs32FOLJ/4K6hg0rB0cRrmpq8W3 mGrcSBhXyzf9/hV70rtz2eq9wK81/1CsLozHFjMOYZZ0dhsXK7gWMF/wNeU62eDByjZ9 qaGpNXkF36bvXTFuZpPLlh9LTYKpeCx66n2yue4G2AfgMcSJVvA1d5fOebD5IGf9iT7d klhX3cFEzzZpqAPHPWtrqZwV8QTMKO44YkJr/eCj5SBUx8wqCa1iO8N6A0sILMX3qMCz GDNw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=v4yz3RLf; spf=pass (google.com: domain of linux-arm-msm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id m4si2147299eja.677.2021.10.05.16.11.59; Tue, 05 Oct 2021 16:11:59 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-arm-msm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=v4yz3RLf; spf=pass (google.com: domain of linux-arm-msm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237088AbhJEXNs (ORCPT + 17 others); Tue, 5 Oct 2021 19:13:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54956 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237053AbhJEXNj (ORCPT ); Tue, 5 Oct 2021 19:13:39 -0400 Received: from mail-ot1-x330.google.com (mail-ot1-x330.google.com [IPv6:2607:f8b0:4864:20::330]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A84E0C061760 for ; Tue, 5 Oct 2021 16:11:48 -0700 (PDT) Received: by mail-ot1-x330.google.com with SMTP id 66-20020a9d0548000000b0054e21cd00f4so734222otw.12 for ; Tue, 05 Oct 2021 16:11:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=oCnAkB79mR5AIU388UdqiAr4F0EbajvP3UTjYzPVMRg=; b=v4yz3RLfL3PsAlLFQWT3nSDM2WuRh8pc8/8ovsW3DrLwQatbzWkmtHeLUZf9130mTV QH1RLcP6pbO3a5D1VZ6kWWtqkssfSL/OMjpDo9rWB/42fjKcBpLlUFlJUds18dmfSnoV bxC0w2r1T6iOAZWH7pRq1VSgsRkKLKNhmMj/Arvu2dNdenLGzI9kUUhlSwr8cLfQUx1S 4nzeIpkLy3u0NT2Fv0h65beNwUirlxLfIBRkH0LjeaN63BQBxdIAzbvbA0YSBRYsA6CA jx7ulieBRmhpfQA7rkDiUc2bRNCLANdfUwb03gfPgHKmLkO4Yn7atmNCnwpZfIhPTcwI f1Dw== 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=oCnAkB79mR5AIU388UdqiAr4F0EbajvP3UTjYzPVMRg=; b=XnuPeSqa3RbWbPlHNnr4O/3kq+tUVAiCTu5vAv3zqSM2V/zFY5wwQlGYiD5wO6P0S5 MaEPyKkhFIFesOpT6TYax+KPsuCaR1rlZ2YHRHoD1ZqShy9H2E5RSblNgB8zLDiEcV8Q 9rGpvADpBSMEXY6Ma7oJV7hTHVmiQAsKFR/3fTsHCX5zW5mMfB3vTnzDouRYGXOyMzuT idk+HGEkpxUDkIBmevII+AAugZEpfvdokO8qO5pH5vSPy8GDh01ddZu6xtabmFoW1NLm TwW6GNXazlBZnuUa1m60M3wLymdzzD9P3DjdkKKHPwVu0kRRXXntogj9GSDh+BFCVOUk HkBA== X-Gm-Message-State: AOAM530HA5ETRoCuj68NY1G6HTDXGXc73H7XmLUlaoizI4q6jbaRS9Uj KwywHiWfozoN9uuLoMMPTqT1zA== X-Received: by 2002:a9d:1402:: with SMTP id h2mr16374492oth.3.1633475508065; Tue, 05 Oct 2021 16:11:48 -0700 (PDT) Received: from localhost.localdomain ([2600:1700:a0:3dc8:205:1bff:fec0:b9b3]) by smtp.gmail.com with ESMTPSA id v9sm1665141oth.62.2021.10.05.16.11.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Oct 2021 16:11:47 -0700 (PDT) From: Bjorn Andersson To: Rob Clark , Sean Paul , David Airlie , Daniel Vetter , Abhinav Kumar , Dmitry Baryshkov , Kalyan Thota , Kuogee Hsieh Cc: Rob Herring , Stephen Boyd , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 6/7] dt-bindings: msm/dp: Add SC8180x compatibles Date: Tue, 5 Oct 2021 16:13:22 -0700 Message-Id: <20211005231323.2663520-7-bjorn.andersson@linaro.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20211005231323.2663520-1-bjorn.andersson@linaro.org> References: <20211005231323.2663520-1-bjorn.andersson@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org The Qualcomm SC8180x has 2 DP controllers and 1 eDP controller, add compatibles for these to the msm/dp binding. Reviewed-by: Abhinav Kumar Reviewed-by: Stephen Boyd Signed-off-by: Bjorn Andersson --- Changes since v3: - None .../devicetree/bindings/display/msm/dp-controller.yaml | 2 ++ 1 file changed, 2 insertions(+) -- 2.29.2 diff --git a/Documentation/devicetree/bindings/display/msm/dp-controller.yaml b/Documentation/devicetree/bindings/display/msm/dp-controller.yaml index 6bb424c21340..63e585f48789 100644 --- a/Documentation/devicetree/bindings/display/msm/dp-controller.yaml +++ b/Documentation/devicetree/bindings/display/msm/dp-controller.yaml @@ -17,6 +17,8 @@ properties: compatible: enum: - qcom,sc7180-dp + - qcom,sc8180x-dp + - qcom,sc8180x-edp reg: items: From patchwork Tue Oct 5 23:13:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Andersson X-Patchwork-Id: 515269 Delivered-To: patch@linaro.org Received: by 2002:ac0:890a:0:0:0:0:0 with SMTP id 10csp39786imy; Tue, 5 Oct 2021 16:12:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz7Z1aDyFFVgpSDUKh5EWObF2Izhg2UV8R0HXFVANvlwnWibsD3huyLjCrfTbjJs/DOwlDx X-Received: by 2002:a17:906:a18f:: with SMTP id s15mr29332433ejy.269.1633475520454; Tue, 05 Oct 2021 16:12:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633475520; cv=none; d=google.com; s=arc-20160816; b=AMSSwsYxPRi6qRtNiJWA/u4AfFgRZrO/BH4DnotOMHGShF5nLQ6Wnq4b9PdEtYWFcp +tnUM0zOw1Zmumplg2vWybfVheyWW+5mhsvldSxZ2GpPw+BlxpUDGFDrQeJ3JA2TutqO 5SMgZxgwgu+wKHmzVSZPBnzLDw4jFwI0dNhmR6VrEtgGzkap5l8q+qi8wkLFeSPqRmz+ hH8lSM2JfpoIOa/eted4i0jPtyKN86o/79sK9uxVA8w5EJRVi5JpI5g+PvZuJHIK6YEk 1e6QcKnxA/tBGocAeFblQCQf6+s3ey5cnPz94/EOD8pOzul9PsUK+Ivta5N+uEQ/AwaJ QKQQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=/v5p/Ve9RUFoo4IfDLEcH542gJPDz9Km3sRmpush8O0=; b=XkZPO1SsQepWE9cn8/JCAUGvsM6ZC9PPZu+j36RymA+Ov0nGT9f2T4jBqVT3x4wxn4 M/hBrMRYe3MmnRDOYTMHyrjvLc1+RcvUj3pn8OASjS4D+edtdHXPGGREdGqkVOoI60QH Th0TMbp9+rpKTbBnfa4ZoYZGVtyyF1mP+yLSr6ItASSCLIP6FTBwDkv8g1y6hnjWhbG1 fLdE222ko/gaBsdKgRx71WouYH0IzuXw9b73puaWY1gu7aaJiN6H4OFRNR2hWZgUjkpr 7wBa3U84gAi+O3CexJMGizW0Th640gZlBrM3uFKRkjsie3fElM3BGcCYL0QMKSC/KySJ XKyg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=k2ecrN8f; spf=pass (google.com: domain of linux-arm-msm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id m4si2147299eja.677.2021.10.05.16.12.00; Tue, 05 Oct 2021 16:12:00 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-arm-msm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=k2ecrN8f; spf=pass (google.com: domain of linux-arm-msm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237105AbhJEXNt (ORCPT + 17 others); Tue, 5 Oct 2021 19:13:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54962 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237016AbhJEXNk (ORCPT ); Tue, 5 Oct 2021 19:13:40 -0400 Received: from mail-oo1-xc2f.google.com (mail-oo1-xc2f.google.com [IPv6:2607:f8b0:4864:20::c2f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9A7A3C061749 for ; Tue, 5 Oct 2021 16:11:49 -0700 (PDT) Received: by mail-oo1-xc2f.google.com with SMTP id e16-20020a4ad250000000b002b5e1f1bc78so278076oos.11 for ; Tue, 05 Oct 2021 16:11:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/v5p/Ve9RUFoo4IfDLEcH542gJPDz9Km3sRmpush8O0=; b=k2ecrN8fG+oc/ePYrUrEfKSsZnF70RnwIGl0D+YFgs+/6hrQyKZ3lkQfiDiKf71Bmq xYwRZpD6bhce4lZK0kfC6K9a/CvWkohMCr6hMZfLM38IYXPfZ/JfNE+Hj0lAtcyiZfw6 HFFwpimwhjy34R5RPKn1wVx+cH4rTbBCg2SaEJeljevKMfI5ZRRvV3kwgpL3TJwP1Edr U2pKmyvSTfvWqyovSKsos5xY1DQNk2EFcevADRE/TECsRy+B6C3JRQ0OpDNr7VHXarg/ 7dO4RO8SUQAo7gOifCFEQrzcub2BArQVX6AXn9zEunjrzB/oeGjN7B5WpYpK2tqMUKhl DiSg== 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=/v5p/Ve9RUFoo4IfDLEcH542gJPDz9Km3sRmpush8O0=; b=aP4X7qnuvENu3G447D0FOkIPS4VaYF4V0kguuAztnL3LgsDWyUAvuvKSAzcFgRNyzT WecO2/9aSRkm138PtKQNgA2vxnD2TdPJAjPlZDohsJ6NaHZeKC8OFGondqa8ELHjTREb 8W3YjTlyzUodvpBGHiA9lBVeKSrvJpq9tr1u93nYAnc4YMdcUgbxeYfiwQMXoi5cKzPY a+TQdKj4HlIjQ6fYewVCfEZvIVRYeCj6EJXQAFF4KZtKGIOIBgcIvQ+nnx9XTwIHjRLg vejW4Szr2oxsaH8HZIgtWAiIWS6a5tbGPyBt6FQlRlUkFskkJKTy9BGmmY7hSmEWkY7Z ehbg== X-Gm-Message-State: AOAM533SN+HO/3r+l+txHCG+N5zu7eh8shEhX83MPJRroQ7Ujzs/+lML MvsOBZVCmIZvYqKHkEcyUOdxiA== X-Received: by 2002:a4a:ba90:: with SMTP id d16mr2504712oop.83.1633475508970; Tue, 05 Oct 2021 16:11:48 -0700 (PDT) Received: from localhost.localdomain ([2600:1700:a0:3dc8:205:1bff:fec0:b9b3]) by smtp.gmail.com with ESMTPSA id v9sm1665141oth.62.2021.10.05.16.11.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Oct 2021 16:11:48 -0700 (PDT) From: Bjorn Andersson To: Rob Clark , Sean Paul , David Airlie , Daniel Vetter , Abhinav Kumar , Dmitry Baryshkov , Kalyan Thota , Kuogee Hsieh Cc: Rob Herring , Stephen Boyd , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 7/7] drm/msm/dp: Add sc8180x DP controllers Date: Tue, 5 Oct 2021 16:13:23 -0700 Message-Id: <20211005231323.2663520-8-bjorn.andersson@linaro.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20211005231323.2663520-1-bjorn.andersson@linaro.org> References: <20211005231323.2663520-1-bjorn.andersson@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org The sc8180x has 2 DP and 1 eDP controllers, add support for these to the DP driver. Signed-off-by: Bjorn Andersson --- Changes since v3: - Rebased upon previous patches in series drivers/gpu/drm/msm/dp/dp_display.c | 11 +++++++++++ 1 file changed, 11 insertions(+) -- 2.29.2 Reviewed-by: Stephen Boyd diff --git a/drivers/gpu/drm/msm/dp/dp_display.c b/drivers/gpu/drm/msm/dp/dp_display.c index 674cddfee5b0..29c2c1c52ddb 100644 --- a/drivers/gpu/drm/msm/dp/dp_display.c +++ b/drivers/gpu/drm/msm/dp/dp_display.c @@ -135,8 +135,19 @@ static const struct msm_dp_config sc7180_dp_cfg = { .num_descs = 1, }; +static const struct msm_dp_config sc8180x_dp_cfg = { + .descs = (struct msm_dp_desc[]) { + { .io_start = 0x0ae90000, .connector_type = DRM_MODE_CONNECTOR_DisplayPort }, + { .io_start = 0x0ae98000, .connector_type = DRM_MODE_CONNECTOR_DisplayPort }, + { .io_start = 0x0ae9a000, .connector_type = DRM_MODE_CONNECTOR_eDP }, + }, + .num_descs = 3, +}; + static const struct of_device_id dp_dt_match[] = { { .compatible = "qcom,sc7180-dp", .data = &sc7180_dp_cfg }, + { .compatible = "qcom,sc8180x-dp", .data = &sc8180x_dp_cfg }, + { .compatible = "qcom,sc8180x-edp", .data = &sc8180x_dp_cfg }, {} };