From patchwork Sat Jul 17 12:40:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 479234 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp2346537jao; Sat, 17 Jul 2021 05:40:28 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzZhnoXlZDX92yCfBTih+H4860pV40A57W66rbf+v0BxuWQt/GMdONQVXFs3C36TKmCEuU5 X-Received: by 2002:a05:6602:2f09:: with SMTP id q9mr4627385iow.196.1626525628356; Sat, 17 Jul 2021 05:40:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626525628; cv=none; d=google.com; s=arc-20160816; b=x2g1IHtWOTeZzi9sknyeWO5F8p6IOEGj1pkny084OJv0YCT78WhKi0FmsUWU4KnhBt uoMvVhe45qGDaXRNRczem2XrXLyyDthf0jl7MkB4a2XCoODJVrvydsNu23Cj4KLibbxg zMFP+zKTO+IYGcdrH5t0Z2Ln/DsvpWuINxPFbIAoEQMtD9VIYyBuXVjtucWMpGBdqQF6 0z3aQ1Oq9BEaUSUA8IwkNRKexlCFxM/GfW0g/JAPccEGhx5leJtcNQvTLZm/G8BcDfnO qVUAfwVSb9LM4hu6zHY4Seun9lwi/pbE7ZS67Tmoo+uDgaWXbk4uoYKiqJFgPXxAMjhH 5wTQ== 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=hoN8ubV+NL8AcGXwOuvZXUIKfTF5XnABfb0Z79GoR78=; b=ELbtmJR1/NRs6pfAL7FfYgRdu/ZMfx3KixBGYmXoqySZsgqfF1nJmcDpMqznLFXrVH nl072eluUTRh16FaDIHpxi+f+KzzTE/AyVGe0HJCwdukWuYBGwMiiCEEP5GwtWT2OA1E QQYn20MQVyQdBYEupyfyDTXc2XZhUMTIpqYxxY1a8ZYj/wRZBDSk8bakPQidXfA4C3xe k/f7azWrZqotxkTvoKRyAlFBVddRMSN2Ysmw49198rIJjvnE1jGlMq4ZNsDKawy1aJ5S oCK/TBfeQlv80wDEj6YIcBSd/n++B+62ro3b8lfXdDXyUbfiuwgcw6Oxzw6URp5dCeIQ BAeQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=PvBXsDKy; 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 v19si3403533jat.76.2021.07.17.05.40.28; Sat, 17 Jul 2021 05:40:28 -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=PvBXsDKy; 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 S233715AbhGQMnX (ORCPT + 17 others); Sat, 17 Jul 2021 08:43:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53718 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233568AbhGQMnX (ORCPT ); Sat, 17 Jul 2021 08:43:23 -0400 Received: from mail-lj1-x22e.google.com (mail-lj1-x22e.google.com [IPv6:2a00:1450:4864:20::22e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F141EC06175F for ; Sat, 17 Jul 2021 05:40:25 -0700 (PDT) Received: by mail-lj1-x22e.google.com with SMTP id q4so17924954ljp.13 for ; Sat, 17 Jul 2021 05:40:25 -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=hoN8ubV+NL8AcGXwOuvZXUIKfTF5XnABfb0Z79GoR78=; b=PvBXsDKynPr7GGJktT7Bkhm5GSrb1FnEVgMo5OV1Y3sYC2xMN7OVRigr3nCHK+OWgQ B1LmRcEFbxPtouXGbR5DazBg1btY1ocTIgOspuuf08tSZe0oG/j9Qq/OrjUF2D7bRX8Q nPtwe3cFZtPq1VwlfsNwVDhukblJAhXK6bDfDZgqe7YKini3zh3x1eit/CfvprJ3a0Ks M2VjiaUmVaCt01K2YTgj3jHACPZH++xxGgLnJTotgVgf6IS2UBrX7rmEDRjOMArpXLaQ HJWFBs5xZ6ho/OveseZK6oBNW3Cis4+5dXN5BWdE3+Twa2SUJfuRmRRbBIcsFihUuKxh 9ZGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=hoN8ubV+NL8AcGXwOuvZXUIKfTF5XnABfb0Z79GoR78=; b=QhA9D2eA2LWS5/nEYog3N+Hi4UeYZejBmiZm2taWj1U5IFY78KUJqJQdBWy7wOvgj8 WkaL7l2U/U6lcX3E3WhGV+uJcc0KOi/m+DpPXc8SkIXVFN/aoJLN1MrWnJB50nFHverx EggDdD89AJrGbcVAIwoWQezP3TrZHv2OmSIvLkchgYnqOsDk2U6gNsNu+1U53IwhqGNk z7uabgG5pZdTrHtA/ywQ9iej2GER0qIcMZtA8iXLoRUe71IqWpehQFjAlTIYtwjEk8Ki SSKsmS6xgDBIcKGNm7+DAPCBzxEGRFCtx2pEjz1nRj0NO2opiGfTidLvX4iOqpIm+SKh AYxA== X-Gm-Message-State: AOAM5333xN/KeK7F2mzmvS1pLz+i+gX6MnoCL7nnO/jYDxt3KHql++9h 3xaFSfQ9NgSKRRxwz0ijZHhDqg== X-Received: by 2002:a05:651c:512:: with SMTP id o18mr13289143ljp.484.1626525624349; Sat, 17 Jul 2021 05:40:24 -0700 (PDT) Received: from eriador.lan ([37.153.55.125]) by smtp.gmail.com with ESMTPSA id f25sm794264ljo.126.2021.07.17.05.40.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 17 Jul 2021 05:40:23 -0700 (PDT) From: Dmitry Baryshkov To: Bjorn Andersson , Rob Clark , Sean Paul , Abhinav Kumar Cc: Jonathan Marek , Stephen Boyd , David Airlie , Daniel Vetter , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org Subject: [PATCH v4 4/7] drm/msm/mdp5: move mdp5_encoder_set_intf_mode after msm_dsi_modeset_init Date: Sat, 17 Jul 2021 15:40:13 +0300 Message-Id: <20210717124016.316020-5-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210717124016.316020-1-dmitry.baryshkov@linaro.org> References: <20210717124016.316020-1-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Move a call to mdp5_encoder_set_intf_mode() after msm_dsi_modeset_init(), removing set_encoder_mode callback. Signed-off-by: Dmitry Baryshkov Reviewed-by: Abhinav Kumar --- drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) -- 2.30.2 Reviewed-by: Bjorn Andersson diff --git a/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c b/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c index 15aed45022bc..b3b42672b2d4 100644 --- a/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c +++ b/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c @@ -209,13 +209,6 @@ static int mdp5_set_split_display(struct msm_kms *kms, slave_encoder); } -static void mdp5_set_encoder_mode(struct msm_kms *kms, - struct drm_encoder *encoder, - bool cmd_mode) -{ - mdp5_encoder_set_intf_mode(encoder, cmd_mode); -} - static void mdp5_kms_destroy(struct msm_kms *kms) { struct mdp5_kms *mdp5_kms = to_mdp5_kms(to_mdp_kms(kms)); @@ -287,7 +280,6 @@ static const struct mdp_kms_funcs kms_funcs = { .get_format = mdp_get_format, .round_pixclk = mdp5_round_pixclk, .set_split_display = mdp5_set_split_display, - .set_encoder_mode = mdp5_set_encoder_mode, .destroy = mdp5_kms_destroy, #ifdef CONFIG_DEBUG_FS .debugfs_init = mdp5_kms_debugfs_init, @@ -448,6 +440,9 @@ static int modeset_init_intf(struct mdp5_kms *mdp5_kms, } ret = msm_dsi_modeset_init(priv->dsi[dsi_id], dev, encoder); + if (!ret) + mdp5_encoder_set_intf_mode(encoder, msm_dsi_is_cmd_mode(priv->dsi[dsi_id])); + break; } default: