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;