From patchwork Fri Oct 1 18:00:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Andersson X-Patchwork-Id: 515108 Delivered-To: patch@linaro.org Received: by 2002:a02:606e:0:0:0:0:0 with SMTP id d46csp1032622jaf; Fri, 1 Oct 2021 10:59:17 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzFAGwksQnf2zLXzTDzGR5ZzlKRFzn4/6cx+Ww05PViTlhvcJtfnXlbN2pYJjVt4Bd9dXf6 X-Received: by 2002:a62:1ac3:0:b0:44b:b424:b49c with SMTP id a186-20020a621ac3000000b0044bb424b49cmr11428787pfa.86.1633111156924; Fri, 01 Oct 2021 10:59:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633111156; cv=none; d=google.com; s=arc-20160816; b=YN9mFg3otbjpCoVCeEUuTgYMnk5xIjQgKjAoH58RS9oIrPcbBOYZpa6MEqpUmuIDrL wuelvvcSqJVRm8RiL63XEzzswn8C6dzMlSLIEUimcwNyxqEmhsGV981jpf7BJY6YTBa5 14zrjbIyk/obJ1uevDJcOz3m34dR+giEDbTbim4om9CvzpqkCol6LDIZaWv9iATLmBE7 Gdeyom/IyMZiLpsRnRUSNtaJxrPxQkjE3INhG0Tp2v201Ca8NfzCUiVmuhB8AwECz2TW ivejrLi+3aXvFw//ei5P4ICEKs8gcMg3tuEX+GqvjEG8862RMH7ntQCFuuZj9OwICk03 vCfA== 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=8jGVwsV27e5G+2lgCCsaslyi5w/V/6kg5N6xFIrsoZg=; b=hk4uKqopHCdSjhvk9whZbZpt7h6NIMqgvMpYABvK+m2E3CiKrptLJ6nvsOn6skxkSi i954Gd03KdnQmA1QdPeai114zfTe7oa9kVpdsg+0ov553WawrsDaykngP5+v/gPvkDK0 hA+61V7Pw88WA/SLyPn9v54+GwT+BTWuAHQSTK1qcZTYHb34I1tIOwVeIfjSiD9hXRFH SOOFRGPSr2RLatJMXi/AaxEaf/WYV/47szeUliFGPY6KNTluitpfZSd+4Yx74+CyiYL9 5sFjGs4KoYsLkMUoh9a5EoJxSGOYzi5IYPiAwuntRX204qEBcYew30yBrbD35XYCnzbA d5SA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=EGIbdefG; 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 t4si9751881pgv.226.2021.10.01.10.59.16; Fri, 01 Oct 2021 10:59:16 -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=EGIbdefG; 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 S1355628AbhJASA7 (ORCPT + 17 others); Fri, 1 Oct 2021 14:00:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47050 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1355623AbhJASA6 (ORCPT ); Fri, 1 Oct 2021 14:00:58 -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 3DA02C061775 for ; Fri, 1 Oct 2021 10:59:14 -0700 (PDT) Received: by mail-ot1-x32f.google.com with SMTP id c6-20020a9d2786000000b005471981d559so12496603otb.5 for ; Fri, 01 Oct 2021 10:59:14 -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=8jGVwsV27e5G+2lgCCsaslyi5w/V/6kg5N6xFIrsoZg=; b=EGIbdefGp4R9Z0HnjM6MGC0UpiG4tF1EKpC4OqzbWkcivAcehDVDzyiD6CwF8R7ILO wM6zuTB2newHK89Yjbyc6yfOAjvNPNFU1YXv+kg0ypGs7lP2MTac381HDm+Ik+DIwbus /IOdqC98zTAnHuvysnLXfmSSoTdoZ9/WnwmFgAQacECw+CSokldVnQPcP+uYDdzET+Wp 2pBZLrfBZoiIghbt7m+gvS4oDmyseoProA4ZDqAl24xAh54Wdcvc5oorlFrGC0oOXs5s 3Ff7xmOfbuU4fIStkRZctlnT6+CRpm1jlw+OcuZ1p1A4qIz/5izfb/OOMq2JQhigIZZX YG8g== 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=8jGVwsV27e5G+2lgCCsaslyi5w/V/6kg5N6xFIrsoZg=; b=2RQPcmaODMz1b3Jct7hfnIdHOB1XeRmZqe6Bo5QlF7pm9roYX3+9CMgbQMjqRmVJqK 8M9vyj7PWOAm6pwU8PddIbFQ87G/R6FJxFTi34zhZ+MTj+1rIDQEaItbjwyIu0TCc6qb kRB30Bj1QqHaetpcKuCrtMM6rlerWC2uzsV2ALOWsVYFEJuuW6vdj/7J0qYGmRwr+fzW /r4gvC1r3kQv9dkG4+nDAG6N8GM8O6EjjGEZY4maPJjfAtXlDrrjv8o7iAyGqqd3ca6t fc7p+YHlEtaAF+3c7kjimXOBwYy/C2X73HxQcOARUlolBmLzIunvsNQWMKdPuhWd6eZu 5Ftw== X-Gm-Message-State: AOAM532DwHkLUxslA4K1XunPS59TUbhmmsWT8IKWZB1HS7KnJqyXmb7R BaamuSNmu0S4VcXtdhac/+zkSA== X-Received: by 2002:a9d:7f89:: with SMTP id t9mr11495008otp.143.1633111153600; Fri, 01 Oct 2021 10:59:13 -0700 (PDT) Received: from localhost.localdomain ([2600:1700:a0:3dc8:205:1bff:fec0:b9b3]) by smtp.gmail.com with ESMTPSA id w2sm1284798oof.23.2021.10.01.10.59.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Oct 2021 10:59:13 -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 v3 2/5] drm/msm/dp: Modify prototype of encoder based API Date: Fri, 1 Oct 2021 11:00:55 -0700 Message-Id: <20211001180058.1021913-3-bjorn.andersson@linaro.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20211001180058.1021913-1-bjorn.andersson@linaro.org> References: <20211001180058.1021913-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: Stephen Boyd Signed-off-by: Bjorn Andersson --- Changes since v2: - None drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 23 ++++++++++++--------- 1 file changed, 13 insertions(+), 10 deletions(-) -- 2.29.2 Reviewed-by: Abhinav Kumar 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);