From patchwork Wed Jun 9 21:17:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 456931 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=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT 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 3CB67C48BCF for ; Wed, 9 Jun 2021 21:17:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 268C1613BC for ; Wed, 9 Jun 2021 21:17:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229638AbhFIVTk (ORCPT ); Wed, 9 Jun 2021 17:19:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44582 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229578AbhFIVTk (ORCPT ); Wed, 9 Jun 2021 17:19:40 -0400 Received: from mail-lj1-x229.google.com (mail-lj1-x229.google.com [IPv6:2a00:1450:4864:20::229]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6545EC061574 for ; Wed, 9 Jun 2021 14:17:28 -0700 (PDT) Received: by mail-lj1-x229.google.com with SMTP id n17so1712676ljg.2 for ; Wed, 09 Jun 2021 14:17:28 -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=wBxdJF/+Ft9FymkNGM9uBBfcCj1CPncbr5qPBFszgJY=; b=hDmJ8HmgPEknfk4ccDkBJQv1nQvjBwuUNTWk5dXY7lKuoyZCREFblE9hQXix7r2ZfV nl1szLHJcGu2K8e7CJsMyK9ThAAiKOaRBWHGllSJ6jXPrKArz+ZfjszO8VQpvsJH8m7n axACv4LPzUvl2yXAxiGRfMqGmE0t3MQkAIBjFTdU6i4THaPgCEtYmf+KVIWtQyjlxQoO kZo9teu/kLUbsgx9ckNpyQP4AlJvoG085Iyex76ppFnDClxMPiLugcQMwJvFCnFqzKkz mi3M3tgRtsQLT56mPRQtr7U1KGczsn1cRRTQSVAT4lmYUfBv5Ue+GQkS6egt4j7/94Sp fbJg== 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=wBxdJF/+Ft9FymkNGM9uBBfcCj1CPncbr5qPBFszgJY=; b=alKeqyN36jiMo/KdtZhxY1Sx2By3O68Jb8EzVGpAqg2nV2e+BereFAYHVxACDwLAnp oAGAXvTu7oxHIvs2s3XTV8mU0KaBQPfhIi0z8fsLvLZNNpFaAYzItc8C2+ugFsNZ7rEb SpaJAa4ON3fNj3r4j1kun91+BrxAguCuDomigfTLkTIHXTsquZfesSELF+2c2ZeaabLq gaz2Y671VEMyKP8JxDbPf0UOheUCdg+YhSuAqbXlArbI9Rkqx73ZwjBMi+sr9jKBcwK2 sn+GRuAXB4oYp0X1dZekjXVbmTYHdbPxqXw+UXgT9wNtOorPuAegQU9+UDTB/VL0gumW c1rw== X-Gm-Message-State: AOAM533juVN9/paE4mCFEy4ndfdhO1uW0j6+x8tq6boZLlY4LCXUKyHY BTcEFdjiGbDjbCkKUJxBk4W4ZQ== X-Google-Smtp-Source: ABdhPJwC41U2qVCEa5iYrM9mgMy9meQC/OT71IOAGSwT9QlfgFEymuUsGZrYpZHMU+oYBMWZovY5LQ== X-Received: by 2002:a2e:a78c:: with SMTP id c12mr1253878ljf.421.1623273446710; Wed, 09 Jun 2021 14:17:26 -0700 (PDT) Received: from eriador.lan ([37.153.55.125]) by smtp.gmail.com with ESMTPSA id z20sm95329ljk.50.2021.06.09.14.17.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Jun 2021 14:17:26 -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: [RFC 1/6] drm/msm/dsi: add two helper functions Date: Thu, 10 Jun 2021 00:17:18 +0300 Message-Id: <20210609211723.2565105-2-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210609211723.2565105-1-dmitry.baryshkov@linaro.org> References: <20210609211723.2565105-1-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Add two helper functions to be used by display drivers for setting up encoders. Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/dsi/dsi.c | 6 ++++++ drivers/gpu/drm/msm/dsi/dsi_manager.c | 14 ++++++-------- drivers/gpu/drm/msm/msm_drv.h | 12 ++++++++++-- 3 files changed, 22 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/msm/dsi/dsi.c b/drivers/gpu/drm/msm/dsi/dsi.c index 75afc12a7b25..874c1527d300 100644 --- a/drivers/gpu/drm/msm/dsi/dsi.c +++ b/drivers/gpu/drm/msm/dsi/dsi.c @@ -13,6 +13,12 @@ struct drm_encoder *msm_dsi_get_encoder(struct msm_dsi *msm_dsi) return msm_dsi->encoder; } +bool msm_dsi_is_cmd_mode(struct msm_dsi *msm_dsi) +{ + unsigned long host_flags = msm_dsi_host_get_mode_flags(msm_dsi->host); + return !(host_flags & MIPI_DSI_MODE_VIDEO); +} + static int dsi_get_phy(struct msm_dsi *msm_dsi) { struct platform_device *pdev = msm_dsi->pdev; diff --git a/drivers/gpu/drm/msm/dsi/dsi_manager.c b/drivers/gpu/drm/msm/dsi/dsi_manager.c index cd016576e8c5..7d4f6fae1ab0 100644 --- a/drivers/gpu/drm/msm/dsi/dsi_manager.c +++ b/drivers/gpu/drm/msm/dsi/dsi_manager.c @@ -217,12 +217,6 @@ static int dsi_mgr_bridge_get_id(struct drm_bridge *bridge) return dsi_bridge->id; } -static bool dsi_mgr_is_cmd_mode(struct msm_dsi *msm_dsi) -{ - unsigned long host_flags = msm_dsi_host_get_mode_flags(msm_dsi->host); - return !(host_flags & MIPI_DSI_MODE_VIDEO); -} - void msm_dsi_manager_setup_encoder(int id) { struct msm_dsi *msm_dsi = dsi_mgr_get_dsi(id); @@ -232,7 +226,7 @@ void msm_dsi_manager_setup_encoder(int id) if (encoder && kms->funcs->set_encoder_mode) kms->funcs->set_encoder_mode(kms, encoder, - dsi_mgr_is_cmd_mode(msm_dsi)); + msm_dsi_is_cmd_mode(msm_dsi)); } static int msm_dsi_manager_panel_init(struct drm_connector *conn, u8 id) @@ -277,7 +271,7 @@ static int msm_dsi_manager_panel_init(struct drm_connector *conn, u8 id) if (other_dsi && other_dsi->panel && kms->funcs->set_split_display) { kms->funcs->set_split_display(kms, master_dsi->encoder, slave_dsi->encoder, - dsi_mgr_is_cmd_mode(msm_dsi)); + msm_dsi_is_cmd_mode(msm_dsi)); } out: @@ -840,3 +834,7 @@ void msm_dsi_manager_unregister(struct msm_dsi *msm_dsi) msm_dsim->dsi[msm_dsi->id] = NULL; } +bool msm_dsi_is_dual_dsi(struct msm_dsi *msm_dsi) +{ + return IS_DUAL_DSI(); +} diff --git a/drivers/gpu/drm/msm/msm_drv.h b/drivers/gpu/drm/msm/msm_drv.h index 3352125ce428..826cc5e25bcb 100644 --- a/drivers/gpu/drm/msm/msm_drv.h +++ b/drivers/gpu/drm/msm/msm_drv.h @@ -343,7 +343,8 @@ void __exit msm_dsi_unregister(void); int msm_dsi_modeset_init(struct msm_dsi *msm_dsi, struct drm_device *dev, struct drm_encoder *encoder); void msm_dsi_snapshot(struct msm_disp_state *disp_state, struct msm_dsi *msm_dsi); - +bool msm_dsi_is_cmd_mode(struct msm_dsi *msm_dsi); +bool msm_dsi_is_dual_dsi(struct msm_dsi *msm_dsi); #else static inline void __init msm_dsi_register(void) { @@ -360,7 +361,14 @@ static inline int msm_dsi_modeset_init(struct msm_dsi *msm_dsi, static inline void msm_dsi_snapshot(struct msm_disp_state *disp_state, struct msm_dsi *msm_dsi) { } - +static inline bool msm_dsi_is_cmd_mode(struct msm_dsi *msm_dsi) +{ + return false; +} +static bool msm_dsi_is_dual_dsi(struct msm_dsi *msm_dsi) +{ + return false; +} #endif #ifdef CONFIG_DRM_MSM_DP From patchwork Wed Jun 9 21:17:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 456829 Delivered-To: patch@linaro.org Received: by 2002:a02:735a:0:0:0:0:0 with SMTP id a26csp5675272jae; Wed, 9 Jun 2021 14:17:33 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw+9/bha0lWiNTxIWN7lgRoSGg1rdkZZfgutlUsLV+AfaSUGa4URGXc6vu4DITWtgEgFPiV X-Received: by 2002:a05:6402:11d3:: with SMTP id j19mr1312394edw.247.1623273453385; Wed, 09 Jun 2021 14:17:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1623273453; cv=none; d=google.com; s=arc-20160816; b=kKD+C3YqpCsDtVLdBUdNMbWRh62clvDUmIMDy8MCCtgwNdjkl1e4xb+TY7lUAk3gUH ju8yhaBFSFzNWvv1pjYdvJTYaOodLF8qJHVoiqXH6ZliR7jyqeg+Gdp4Bl4TbocyZaUy gPM+e8GAYqus/5Tnr5Iei/vYm5TJTIrB+HlKDZxLToNbHNyX5m1V23piowsNQnGoboNX TbWtLTtemjbHez2KMFutAQoVLqldvASixVA0OW/yplZTs9pqS06lh0yjm5wtR3tRRKsn ZeyStuFuEtJG7gCzBfiTf4Q2/XG1mYZmIT9uXUe1AgdRMD140e5u4h3Yo6B2+Daxan3z OuCg== 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=2NpJ7aO+Jt+ovnuoQ4df+eCNMUKTUxxJ0ApMITBvevY=; b=Qn3+cJjfiFr8W/aTIEl521BlZuzCLJzN6TmKJtDIzm7hxtaB429WxnuUiOF2Rjxm2r oNO5gwtp6VCp8T92hSFWC/n7+cIu2yzo3MA9ll9Q2e13lYmrnWgEFZuc6xG1S6PWTbF8 Wl3ltBBFOL6geChg74t1iZQOzxAI0aTyPWrPqIDzANAOMJSvO1wQ3NUiM6Nf/kQLyCfv u+qTSUWHc5bF8E+wYo3lLSeER+jT/uvSZ3iCLi4hgRKSVWzsysJclTdMQy2myaAv+/en ZfZgEnvRkTCi4yR5HJ4mKSHDJFciz0+Ms/a3cYTBKGKhgXGAZRMfFI4vpR0k+XoRbUui c0vQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=veUbKvFu; 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 28si606832ejk.601.2021.06.09.14.17.33; Wed, 09 Jun 2021 14:17:33 -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=veUbKvFu; 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 S229743AbhFIVT1 (ORCPT + 17 others); Wed, 9 Jun 2021 17:19:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44586 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229536AbhFIVT0 (ORCPT ); Wed, 9 Jun 2021 17:19:26 -0400 Received: from mail-lf1-x12a.google.com (mail-lf1-x12a.google.com [IPv6:2a00:1450:4864:20::12a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2B1C5C061760 for ; Wed, 9 Jun 2021 14:17:30 -0700 (PDT) Received: by mail-lf1-x12a.google.com with SMTP id r198so36935389lff.11 for ; Wed, 09 Jun 2021 14:17:30 -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=2NpJ7aO+Jt+ovnuoQ4df+eCNMUKTUxxJ0ApMITBvevY=; b=veUbKvFuP+oeRBedT0sA1vDhr4e4ydtyhtT3/h7V+gSmDwiyvxR6zHy3SMEQMoXoMW AK1RfF4RGMC9Uzgk6KOOJW+9P2pHXupJrfbdYU22wah55kA7pFU2VhQMtgpc+4kaaBmz I8wg8lepdj50/CpnLfAYxgp0C5ERqGNQUzaAKIjj5WDo0k0lQndM9RBREnHDGwnSHsUd 0VL7eN8NZYseDCmb3V3Z2qob5Z2/Q484J83/lMXNR8fXjaWKvY0oK6KpiM1Asj+R0tQ1 1H3wkdotJlWItvokNG0gcd81i/ZQwq1HgST2YBxnH1TR+xvptHf1PAkP5VsElPAsPWZv wEIQ== 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=2NpJ7aO+Jt+ovnuoQ4df+eCNMUKTUxxJ0ApMITBvevY=; b=Od9Uzad3EakVZ0nA5/+y4mOqHOjI2M4MiMhCO9p2IAQATrxGWYgNnBYJcqBBDET2e2 cHY8fz1bD6C2BeZNF7vUyHpxvOWc7AF8jhxXpn6sNx8yC2jpDVaFiVxjkeDSkiIss6u6 TUqSHgP9mKkhPgMxGHsmBfaHn2/Vs3Lhzt6sfIvNRWk6l1FCCgiOYxX3i4yANlCgMDEC UBftU2F8k+9e+O7nYWpo8RRwRGDNsttM7UGFAB0RjDEBEqFvdAPjJX8+CchEBRpBsb5n 5vlPT+qVuN4XQpx0fhXmWkli+HHWQS2zfLTKoVp27HEiem5OO9dKS0xn6jSTpuithVCO bjLQ== X-Gm-Message-State: AOAM532jznI1hsgiCNNVdlKunf3jRWaBz6enJZzz4TPoBmbAHOF5DCUV SeJNJ9Z/HqrgEaXPPeVK4Zg10Q== X-Received: by 2002:a19:7d82:: with SMTP id y124mr906597lfc.76.1623273449059; Wed, 09 Jun 2021 14:17:29 -0700 (PDT) Received: from eriador.lan ([37.153.55.125]) by smtp.gmail.com with ESMTPSA id z20sm95329ljk.50.2021.06.09.14.17.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Jun 2021 14:17:28 -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: [RFC 4/6] drm/msm/dp: stop calling set_encoder_mode callback Date: Thu, 10 Jun 2021 00:17:21 +0300 Message-Id: <20210609211723.2565105-5-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210609211723.2565105-1-dmitry.baryshkov@linaro.org> References: <20210609211723.2565105-1-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org None of the display drivers now implement set_encoder_mode callback. Stop calling it from the modeset init code. Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/dp/dp_display.c | 18 ------------------ 1 file changed, 18 deletions(-) -- 2.30.2 diff --git a/drivers/gpu/drm/msm/dp/dp_display.c b/drivers/gpu/drm/msm/dp/dp_display.c index 051c1be1de7e..70b319a8fe83 100644 --- a/drivers/gpu/drm/msm/dp/dp_display.c +++ b/drivers/gpu/drm/msm/dp/dp_display.c @@ -102,8 +102,6 @@ struct dp_display_private { struct dp_display_mode dp_mode; struct msm_dp dp_display; - bool encoder_mode_set; - /* wait for audio signaling */ struct completion audio_comp; @@ -283,20 +281,6 @@ static void dp_display_send_hpd_event(struct msm_dp *dp_display) } -static void dp_display_set_encoder_mode(struct dp_display_private *dp) -{ - struct msm_drm_private *priv = dp->dp_display.drm_dev->dev_private; - struct msm_kms *kms = priv->kms; - - if (!dp->encoder_mode_set && dp->dp_display.encoder && - kms->funcs->set_encoder_mode) { - kms->funcs->set_encoder_mode(kms, - dp->dp_display.encoder, false); - - dp->encoder_mode_set = true; - } -} - static int dp_display_send_hpd_notification(struct dp_display_private *dp, bool hpd) { @@ -369,8 +353,6 @@ static void dp_display_host_init(struct dp_display_private *dp, int reset) if (dp->usbpd->orientation == ORIENTATION_CC2) flip = true; - dp_display_set_encoder_mode(dp); - dp_power_init(dp->power, flip); dp_ctrl_host_init(dp->ctrl, flip, reset); dp_aux_init(dp->aux); From patchwork Wed Jun 9 21:17:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 456830 Delivered-To: patch@linaro.org Received: by 2002:a02:735a:0:0:0:0:0 with SMTP id a26csp5675280jae; Wed, 9 Jun 2021 14:17:34 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx3btKcywQHgQt/UfdyItGY/CVuCmPNBPqPgzmbUz9iP41ktmHEZLTIRFCMyLNZQWWf7sUN X-Received: by 2002:a17:906:4d04:: with SMTP id r4mr1633026eju.76.1623273453824; Wed, 09 Jun 2021 14:17:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1623273453; cv=none; d=google.com; s=arc-20160816; b=arWrUgQfu8+Qv2SKVpf4uqlY/1by8xFXa47xaIVUwm0GPvQyw2MOE12XuIEwDfctR8 6JcJt6oHHBpoYGP6jPX3avzesuzfiJrc5U+FoE5AmCuKMUaJSFqv+AH48LmbNmcSXvz0 hg7BkRt3isXLkqqmJ9B2/dxa4bC/N4bXs8ddjfd1ghD4zro8NvGobU0fwgSH6zo4Q6e6 rdUpcCTTBGk3YWMgjM+jbK85u/aI4PBN4BY2uBXDU1KQKjN/pwYQwkq0CLmR+hG8NJNR iGsRTP31klVbzuAQ+z2c0NSj7Mq1VKuusln04Xz04Ta66UEusuAAQo05f3QM2kyI9tdn L4gg== 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=/V8KGR606fRo3VbCDDBvoYkWIJ1I7tpl4I/Xf0Z+Ze8=; b=FeJ2R5BhfDwukxPorBFG7dj1KMWd9HfuvtjvjAm/cyiZ4mnV+kGKs/oiDsEcc6Uqoj Cy7r9VNe6FTONeMtnhgQwVo72LwIKFhgYfWEEzBEhsSSQMXdsR1+ZgNbEp66bgWeqcIS FZtC+9rTPUkSBM6q/jsieoBLfxO6Nz8xN1o7LRNnpBGiJP+K5jaCjkS6NC0D891dxqTj GZPxcjb4SnsjQYObanc2JFQiHjubwlyjT9EzXi1OEiD4XZgdEbU8SelaF716TfMPAWlQ 2rCjfqq3+QoXJs7Ui0+FCXrIVDqMlcJWPOx8OZobxgXCx42M8ItWx9hFskAFRtAb+zSf 9tTA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=iusOuU9A; 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 28si606832ejk.601.2021.06.09.14.17.33; Wed, 09 Jun 2021 14:17:33 -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=iusOuU9A; 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 S229536AbhFIVT1 (ORCPT + 17 others); Wed, 9 Jun 2021 17:19:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44588 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229638AbhFIVT0 (ORCPT ); Wed, 9 Jun 2021 17:19:26 -0400 Received: from mail-lj1-x234.google.com (mail-lj1-x234.google.com [IPv6:2a00:1450:4864:20::234]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 75397C0617A6 for ; Wed, 9 Jun 2021 14:17:31 -0700 (PDT) Received: by mail-lj1-x234.google.com with SMTP id 131so1717023ljj.3 for ; Wed, 09 Jun 2021 14:17:31 -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=/V8KGR606fRo3VbCDDBvoYkWIJ1I7tpl4I/Xf0Z+Ze8=; b=iusOuU9APX/gERLJ2zgM206VROoXn6L21ms88HAtY8lF5tirDi7rBY6jwQJ9eh2oVT is+nZRpXoIVG3Eumhk1ttvSGHjHMl6PQgw4Ql26UFJM4QarHxwZhOqpyltj/d1dgHtD5 SmoPdt5Sb9eGdA8jYueg6x1eJ6FZuPILCLKgSvESoALob5GDv5QrpXuzI8vqlhYtt2Qz xTNvhaKqa3YsdDEzCMHt+0sA/VmpSLyzH6iGgRc7nJImfzYP13pomyfoRn+UsVamnzu5 bJj9JHFV2E3kmUf1qg0bVdPoMAV9rISJfUJhFSYBLgvu7qm3Q3FzOpL9Opi4775l44hE NUhg== 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=/V8KGR606fRo3VbCDDBvoYkWIJ1I7tpl4I/Xf0Z+Ze8=; b=XXEsMSdJ2MHC7QQyzxBmtakcmTybbWFfHlG71Y1OH0/48H7jU1emoUp+kO7j+LblLF PHVJL3TKJJm/FVAMRmtDXbcka99DGdLCXffRrmoQzLuYRQlLFLdko915QiN/hWZj/jhn fKXpBqREBSNpLLPCJhfk+tqSqzXmauA7etcxdL2BGXzVELQlTIhJIyCt79deqerD2f8U crd5fyIjI+RLTRWvzeH5I+a+Vx2auN0shHa2wEp7q8rw+29tVHopNzAH6GdZtqs32PzX zKpNxcmuCPZWQ569YBbQFRAm2e6HuwMPfovQA+FUQJq9XcsrOFpejMsWqrbt6BZFZe+I wGkw== X-Gm-Message-State: AOAM530EJx8zGIvPsl3+U0kIKBoN8HqQso2MIpJwSrslpRfAztXtF4qK WVBzSqeiPcMnf1wCUrnLu74EWQ== X-Received: by 2002:a2e:8817:: with SMTP id x23mr1298976ljh.17.1623273449753; Wed, 09 Jun 2021 14:17:29 -0700 (PDT) Received: from eriador.lan ([37.153.55.125]) by smtp.gmail.com with ESMTPSA id z20sm95329ljk.50.2021.06.09.14.17.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Jun 2021 14:17:29 -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: [RFC 5/6] drm/msm/dsi: stop calling set_encoder_mode callback Date: Thu, 10 Jun 2021 00:17:22 +0300 Message-Id: <20210609211723.2565105-6-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210609211723.2565105-1-dmitry.baryshkov@linaro.org> References: <20210609211723.2565105-1-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org None of the display drivers now implement set_encoder_mode callback. Stop calling it from the modeset init code. Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/dsi/dsi.c | 2 -- drivers/gpu/drm/msm/dsi/dsi.h | 1 - drivers/gpu/drm/msm/dsi/dsi_manager.c | 12 ------------ 3 files changed, 15 deletions(-) -- 2.30.2 diff --git a/drivers/gpu/drm/msm/dsi/dsi.c b/drivers/gpu/drm/msm/dsi/dsi.c index 874c1527d300..881f14bc022d 100644 --- a/drivers/gpu/drm/msm/dsi/dsi.c +++ b/drivers/gpu/drm/msm/dsi/dsi.c @@ -250,8 +250,6 @@ int msm_dsi_modeset_init(struct msm_dsi *msm_dsi, struct drm_device *dev, goto fail; } - msm_dsi_manager_setup_encoder(msm_dsi->id); - priv->bridges[priv->num_bridges++] = msm_dsi->bridge; priv->connectors[priv->num_connectors++] = msm_dsi->connector; diff --git a/drivers/gpu/drm/msm/dsi/dsi.h b/drivers/gpu/drm/msm/dsi/dsi.h index 9b8e9b07eced..c0bdbe63050a 100644 --- a/drivers/gpu/drm/msm/dsi/dsi.h +++ b/drivers/gpu/drm/msm/dsi/dsi.h @@ -80,7 +80,6 @@ struct drm_connector *msm_dsi_manager_connector_init(u8 id); struct drm_connector *msm_dsi_manager_ext_bridge_init(u8 id); int msm_dsi_manager_cmd_xfer(int id, const struct mipi_dsi_msg *msg); bool msm_dsi_manager_cmd_xfer_trigger(int id, u32 dma_base, u32 len); -void msm_dsi_manager_setup_encoder(int id); int msm_dsi_manager_register(struct msm_dsi *msm_dsi); void msm_dsi_manager_unregister(struct msm_dsi *msm_dsi); bool msm_dsi_manager_validate_current_config(u8 id); diff --git a/drivers/gpu/drm/msm/dsi/dsi_manager.c b/drivers/gpu/drm/msm/dsi/dsi_manager.c index 7d4f6fae1ab0..1996b40d2ae9 100644 --- a/drivers/gpu/drm/msm/dsi/dsi_manager.c +++ b/drivers/gpu/drm/msm/dsi/dsi_manager.c @@ -217,18 +217,6 @@ static int dsi_mgr_bridge_get_id(struct drm_bridge *bridge) return dsi_bridge->id; } -void msm_dsi_manager_setup_encoder(int id) -{ - struct msm_dsi *msm_dsi = dsi_mgr_get_dsi(id); - struct msm_drm_private *priv = msm_dsi->dev->dev_private; - struct msm_kms *kms = priv->kms; - struct drm_encoder *encoder = msm_dsi_get_encoder(msm_dsi); - - if (encoder && kms->funcs->set_encoder_mode) - kms->funcs->set_encoder_mode(kms, encoder, - msm_dsi_is_cmd_mode(msm_dsi)); -} - static int msm_dsi_manager_panel_init(struct drm_connector *conn, u8 id) { struct msm_drm_private *priv = conn->dev->dev_private; From patchwork Wed Jun 9 21:17:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 456930 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=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT 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 23C19C48BCF for ; Wed, 9 Jun 2021 21:18:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 06C0A613BC for ; Wed, 9 Jun 2021 21:18:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229536AbhFIVU2 (ORCPT ); Wed, 9 Jun 2021 17:20:28 -0400 Received: from mail-lf1-f52.google.com ([209.85.167.52]:36680 "EHLO mail-lf1-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229578AbhFIVU2 (ORCPT ); Wed, 9 Jun 2021 17:20:28 -0400 Received: by mail-lf1-f52.google.com with SMTP id v22so38933709lfa.3 for ; Wed, 09 Jun 2021 14:18:32 -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=7I80h9aVhqiz7KKnY4LfQ8riY+ihQMK3yCgtkJKzH/0=; b=fv1cLJSI3524YDZiumnkJfXc6sFqc6WWnUb1zi0ZoQ6nZx8UbjsJRkvdH4d0t52wAU RkQ/tclAVDbWuPCy+RcYD3+7hvMy9LWZgGEREbMEmL29hRg6J+j5DyOPjr7CUZgfGAZC fXiTMeGeEKjOWpvz2dhFDlOEfPDTKXNC1naJ8DBq8/NyhLOeIy2ePURzarCgMa7QpGG6 KfWRWePz5EN1EV7OTWXV1nxNRjdfCFezqlI72OoRxfj1qNBfV4zKIEgHm9GKMkr2tkPL OgbGUun88yDH+/Ml9C5z2iF1J0yn73tKmMPfYZWR4LZCH6aZ9iJD83+WQ6frZ+BHomzV 7DOw== 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=7I80h9aVhqiz7KKnY4LfQ8riY+ihQMK3yCgtkJKzH/0=; b=DSOdnO1BHzR0z6MfCwfMp3nH8axHp2yxszDN5qsGqEqmL4nPpk3T6GyMAzDggJnkBn Qs86GKjbCUAcbtzxna/fBLeFxfkmhE2gBf9UWeGYGWnDDneg/7QwOBweqGRoXLaE2Ba3 HdFrrsRRSwXW+CFfh08udxVQewakW7JqlCfjvfW8ldLUwB+ymNapjFR/nwyE9qmFr+Gm hnCN3x034asH6ASmwRgRgFGkc+l3CjkcRaYxU+3kv0xt6Nzb8vJBsyKMw/1axB6zNSSw NAxlFdVBPXIG2tmvUAg//suFpB2mGrKjxOX1GDRSZwPkjUGicSB5oj1zqIUSUBTi8ipX kGoQ== X-Gm-Message-State: AOAM531BKhgJpuAdqtuAX+RbYYryIWR2riPgSVJLZt7+jcYqANjG25My a2zsB8PSJBwfTXkKg6R5IhEqFg== X-Google-Smtp-Source: ABdhPJzljl9x2hLLYMZTN0snwVTcfT0Bx/Khf4JdiNZLWRQ15EdGWpJs3mYvySS2N7/VnbAZfH4JXQ== X-Received: by 2002:a05:6512:20d9:: with SMTP id u25mr866893lfr.452.1623273450612; Wed, 09 Jun 2021 14:17:30 -0700 (PDT) Received: from eriador.lan ([37.153.55.125]) by smtp.gmail.com with ESMTPSA id z20sm95329ljk.50.2021.06.09.14.17.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Jun 2021 14:17:30 -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: [RFC 6/6] drm/msm/kms: drop set_encoder_mode callback Date: Thu, 10 Jun 2021 00:17:23 +0300 Message-Id: <20210609211723.2565105-7-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210609211723.2565105-1-dmitry.baryshkov@linaro.org> References: <20210609211723.2565105-1-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org set_encoder_mode callback is completely unused now. Drop it from msm_kms_func(). Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/msm_kms.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/gpu/drm/msm/msm_kms.h b/drivers/gpu/drm/msm/msm_kms.h index 086a2d59b8c8..9484e8b62630 100644 --- a/drivers/gpu/drm/msm/msm_kms.h +++ b/drivers/gpu/drm/msm/msm_kms.h @@ -117,9 +117,6 @@ struct msm_kms_funcs { struct drm_encoder *encoder, struct drm_encoder *slave_encoder, bool is_cmd_mode); - void (*set_encoder_mode)(struct msm_kms *kms, - struct drm_encoder *encoder, - bool cmd_mode); /* cleanup: */ void (*destroy)(struct msm_kms *kms);