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: 456831 Delivered-To: patch@linaro.org Received: by 2002:a02:735a:0:0:0:0:0 with SMTP id a26csp5675319jae; Wed, 9 Jun 2021 14:17:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzVOvkzqx+3ysNCZC4bJituJrUvuxDPrutlVRt/0heWF3LU+ja5ana5+kkwAEs+usz8Ykyg X-Received: by 2002:aa7:83c3:0:b029:2e8:f2ba:3979 with SMTP id j3-20020aa783c30000b02902e8f2ba3979mr1452316pfn.8.1623273457203; Wed, 09 Jun 2021 14:17:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1623273457; cv=none; d=google.com; s=arc-20160816; b=F845vPBpzXWHUmaey4RO7ZSGwXfYAKn9yiFsyb689QXAs2bnWxXYo2pkYiTOYvaW1N zLgsFs7MiTBwwQx56yIObKRDHuIlGZ3xMQHM7HAqtIBopyy1iHOWDDzYs6m3og6VBZrb uAbb6Tt9kbZiCge9l6zZgKHsdgeqjPzR9z9GRSdaVfYEwdlTnxQMB5m6whfoig3V/ynm xDXS44Oir8K5c4gPPlgw2gwy0XghrxPFjDdSzOHT0Do1ufnYBire2BrdM082lxCIoham Y59M2XfmHn9PIKaZKfdPxeqalXb5w0s/gomKpYYUVDociQgrazGolpXZSXgwqusqYq0l 9GQg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature:delivered-to; bh=wBxdJF/+Ft9FymkNGM9uBBfcCj1CPncbr5qPBFszgJY=; b=pcmfdlLPrYeVvWvOVxLO6sS55SNOrwS5zZ1yS6IIqFoPvJzv/VxdDrA64h26c1Hr0p XVSZqEpG48iza0jI1+UBMZkhZ+gPNEbbxqbRJ83jBtoH+23wTL7FC3G9jqGc7yTGb/sF qrTGvw7URzBiQ8pUHIPfE27Cc4uCz1Gbz7+I75mkvGVbvoy5pxdFJ+u/sm/LPVhdRN+M Mc/e6hm4oDfKJE75iUuQe/+Xpo+3fEmVkCG9aq4oaMdYoQQC7u7nbxghkGG8IqHbqsws lsaX+of1mZJgpSrEcuIj5XAi3eLBNop0SRmmPqJEEvVmOEeIbtXUXbJB8EulZIiZcyeh I4aQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=hDmJ8Hmg; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from gabe.freedesktop.org (gabe.freedesktop.org. [131.252.210.177]) by mx.google.com with ESMTPS id c5si311721pjs.13.2021.06.09.14.17.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Jun 2021 14:17:37 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) client-ip=131.252.210.177; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=hDmJ8Hmg; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B77DC6E4AD; Wed, 9 Jun 2021 21:17:30 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-lj1-x22d.google.com (mail-lj1-x22d.google.com [IPv6:2a00:1450:4864:20::22d]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6AAA96E405 for ; Wed, 9 Jun 2021 21:17:28 +0000 (UTC) Received: by mail-lj1-x22d.google.com with SMTP id bn21so1721408ljb.1 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=aBeCTm7gR3qztip9rKb2IEH5BeQpB8BmtyhaYfxxijvfT6tJvdP8uWypibmVUy/FyG Agvw2uMGpoMkdgKKNC14Hg2eUsgRgM8tc7Qezqy36CpxGsAXPDMSo39EJq3su47HEoGE 84JjE2DYRQLLVHhuB8ZUyHQWmWLkQ1lr3Bm7KCKhfheOxEsM2Q8ddnF8xQK91e5kjCu1 Zz+U5xpSYQyPg6h4llavKXinW312WJZdUMrWuF3fqNFoGuQEBsb6tnoveFzP8vDd6mg6 XgsCAmKotJ851ecXm2EWsInJzQaXKpkB4okMsGkqjHPHT5AnZMvgswdOvdXMIBb1Bvh9 hnNA== X-Gm-Message-State: AOAM531jO7Pw+MDS9cFSrPEdAUW6+A42x0aBCPsqNOy8DaC/WHlCpOER GiXvmj3T+H3wUk3us72OB1OTsA== 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 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 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jonathan Marek , Stephen Boyd , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, David Airlie , freedreno@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" 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(-) -- 2.30.2 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:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 456832 Delivered-To: patch@linaro.org Received: by 2002:a02:735a:0:0:0:0:0 with SMTP id a26csp5675346jae; Wed, 9 Jun 2021 14:17:39 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwsZMFpajx02Bht/FqpAQcH3inrN2D0fpipaEI2nnr10rR2CidNBJt45hpLGhCks52O4BfA X-Received: by 2002:a17:902:f1cb:b029:10c:5c6d:88b with SMTP id e11-20020a170902f1cbb029010c5c6d088bmr1716886plc.52.1623273459560; Wed, 09 Jun 2021 14:17:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1623273459; cv=none; d=google.com; s=arc-20160816; b=vi5OQHNvdsLI+I5IOilJ1J8j32jmFKpjO/GQTWDmfpWOnzoo4r8u3DbSuth9bC6lln h1oUcgdMwrqQSeVTOZtCLPDwLVV2rVM1Pvg6zrGpxsBkigDBJX9rfeqM12GGIl02K0xM 6U1IEuUpsbVQLDOug/zlnXPcEUO4XWg6eZnjMeXE6tqkAVHa+k5kmJk38Wet/sEN60cc X6KsOwU8zDFnnMIIVPdOh/2m4bllvD6OGraY458qEHns+54xZCUeI7K7XZukWufWkSkB li5npPRbmbUchi/gtr4WwEULs35PyRvndoH4apZz6puaAIR3MH0W/HtiO7uGnlnFGqoF Mp4A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature:delivered-to; bh=Rv9fpiyiqOOY/tXW9LhOOLqFYwZli4MdbRidzCqIbeE=; b=ixqs0AXmIMX1oaIlMCfWqoshdrH+/e/cmB2Rt9QUNiJes3FE0D1VYRYHBxSxw0dGwz LTjhBwHyRFgWxRq2P5AtXF+VAIPt5b3dniv15CNNfb3VxNcBRRwoM3760JhFy1BZg5CF SKPzcXAYbmmD8gCvzxHcHiWX3ef3+C9VmriD3mokKVZaLW6LzKlxDgqzl8ZtvaYXHzZo 4mT9PFnlWhWMTkLHsJkKppIdKVKe7ww6TWXxWTY0ZszlOxQCCjTyBQmYQAUDy8m3Y27e UXKm8KNwfanHtykcEjYPoJ+gZYj+DIauydcrasJwcHPK95z4UdEMJaVbIdnXHLbRBN/V LUkQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=eRohLnQN; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from gabe.freedesktop.org (gabe.freedesktop.org. [131.252.210.177]) by mx.google.com with ESMTPS id e8si1140736pgs.243.2021.06.09.14.17.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Jun 2021 14:17:39 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) client-ip=131.252.210.177; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=eRohLnQN; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 553AC6E420; Wed, 9 Jun 2021 21:17:31 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-lf1-x130.google.com (mail-lf1-x130.google.com [IPv6:2a00:1450:4864:20::130]) by gabe.freedesktop.org (Postfix) with ESMTPS id 341986E409 for ; Wed, 9 Jun 2021 21:17:29 +0000 (UTC) Received: by mail-lf1-x130.google.com with SMTP id i10so40286095lfj.2 for ; Wed, 09 Jun 2021 14:17:29 -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=Rv9fpiyiqOOY/tXW9LhOOLqFYwZli4MdbRidzCqIbeE=; b=eRohLnQNHkOYLlwDw5wuTwxDm1b1e044Zz0XTThF4Rwoh1zAcCd/53rCJD2Agg+b9j RHP6ScK4K/ceP1eY6aQFyYv9d4BiDAV2rQ2rpG4wAkZJDzCI2wDp9uG+OJxGXbe/hi+T eweK2w3Dyl1tVUPoWb2ozkIKdjE7U3Z0OoP/Ao5hkXWZOMFEF+AJsEFP6iaQU/xU5Edb 6INapMnN8vKBXH5FxD9/yK+r20CCE73t9w+iPvyvTvwMMz0qJYxLOQPzRsr1dGza1k0c 1/O8s7PE0YisYCWUD54WtE72JUiaIZTNUTfeZvvj1gkvTEB9wjd5AGbqCRCzdEwR2Pmr hS2A== 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=Rv9fpiyiqOOY/tXW9LhOOLqFYwZli4MdbRidzCqIbeE=; b=ZGi6+ktf7QhAWIY9BenG1J9DZqsvcPoHTUT9A5vR2B8GK6TycqdraTgdNAKovN5t+J 8lNc0EpwHvfhN5CJCZhSchINv0mcO1suClOoFnkxXtp2018wceuDnqZoa/GinRUl+6xF UJCSrBpgMmqBJM2U3j9G+6PPOC2c2u2ZRMYw1Y58VTAt9Ze1eqH3Y46qAynVhnvTsPOI dNgMd7nOuZ/ZEIDIrzunYuTtpJPVkUf/2ST8xccFlApDy/4gse3RHu3AxbOLDid+q+zB q1EmwpAXPaVTm7seXj1U4UT+DmUo/PIAYYK6y8MTLayKBgzBTRax2cVwiodygNIC42/7 Kyrg== X-Gm-Message-State: AOAM532S8FNBmnv2v2o6StLq7HHcKsSKYF6kx1P44CCWCkd0dNqc8mSz ckv2Q4jS9w/1AjWvFJKpujb3Vw== X-Received: by 2002:ac2:4c2c:: with SMTP id u12mr858266lfq.209.1623273447521; Wed, 09 Jun 2021 14:17:27 -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:27 -0700 (PDT) From: Dmitry Baryshkov To: Bjorn Andersson , Rob Clark , Sean Paul , Abhinav Kumar Subject: [RFC 2/6] drm/msm/dpu: support setting up two independent DSI connectors Date: Thu, 10 Jun 2021 00:17:19 +0300 Message-Id: <20210609211723.2565105-3-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 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jonathan Marek , Stephen Boyd , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, David Airlie , freedreno@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Move setting up encoders from set_encoder_mode to _dpu_kms_initialize_dsi() / _dpu_kms_initialize_displayport(). This allows us to support not only "single DSI" and "dual DSI" but also "two independent DSI" configurations. In future this would also help adding support for multiple DP connectors. Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 89 ++++++++++++------------- 1 file changed, 44 insertions(+), 45 deletions(-) -- 2.30.2 diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c index 1d3a4f395e74..b63e1c948ff2 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c @@ -471,30 +471,55 @@ static int _dpu_kms_initialize_dsi(struct drm_device *dev, struct dpu_kms *dpu_kms) { struct drm_encoder *encoder = NULL; + struct msm_display_info info; int i, rc = 0; if (!(priv->dsi[0] || priv->dsi[1])) return rc; - /*TODO: Support two independent DSI connectors */ - encoder = dpu_encoder_init(dev, DRM_MODE_ENCODER_DSI); - if (IS_ERR(encoder)) { - DPU_ERROR("encoder init failed for dsi display\n"); - return PTR_ERR(encoder); - } - - priv->encoders[priv->num_encoders++] = encoder; - for (i = 0; i < ARRAY_SIZE(priv->dsi); i++) { if (!priv->dsi[i]) continue; + if (!encoder) { + encoder = dpu_encoder_init(dev, DRM_MODE_ENCODER_DSI); + if (IS_ERR(encoder)) { + DPU_ERROR("encoder init failed for dsi display\n"); + return PTR_ERR(encoder); + } + + priv->encoders[priv->num_encoders++] = encoder; + + memset(&info, 0, sizeof(info)); + info.intf_type = encoder->encoder_type; + info.capabilities = msm_dsi_is_cmd_mode(priv->dsi[i]) ? + MSM_DISPLAY_CAP_CMD_MODE : + MSM_DISPLAY_CAP_VID_MODE; + } + rc = msm_dsi_modeset_init(priv->dsi[i], dev, encoder); if (rc) { DPU_ERROR("modeset_init failed for dsi[%d], rc = %d\n", i, rc); break; } + + info.h_tile_instance[info.num_of_h_tiles++] = i; + + if (!msm_dsi_is_dual_dsi(priv->dsi[i])) { + rc = dpu_encoder_setup(dev, encoder, &info); + if (rc) + DPU_ERROR("failed to setup DPU encoder %d: rc:%d\n", + encoder->base.id, rc); + encoder = NULL; + } + } + + if (encoder) { + 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; @@ -505,6 +530,7 @@ static int _dpu_kms_initialize_displayport(struct drm_device *dev, struct dpu_kms *dpu_kms) { struct drm_encoder *encoder = NULL; + struct msm_display_info info; int rc = 0; if (!priv->dp) @@ -516,6 +542,7 @@ static int _dpu_kms_initialize_displayport(struct drm_device *dev, 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); @@ -524,6 +551,14 @@ static int _dpu_kms_initialize_displayport(struct drm_device *dev, } 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; } @@ -726,41 +761,6 @@ static void dpu_kms_destroy(struct msm_kms *kms) msm_kms_destroy(&dpu_kms->base); } -static void _dpu_kms_set_encoder_mode(struct msm_kms *kms, - struct drm_encoder *encoder, - bool cmd_mode) -{ - struct msm_display_info info; - struct msm_drm_private *priv = encoder->dev->dev_private; - int i, rc = 0; - - memset(&info, 0, sizeof(info)); - - info.intf_type = encoder->encoder_type; - info.capabilities = cmd_mode ? MSM_DISPLAY_CAP_CMD_MODE : - MSM_DISPLAY_CAP_VID_MODE; - - switch (info.intf_type) { - case DRM_MODE_ENCODER_DSI: - /* TODO: No support for DSI swap */ - for (i = 0; i < ARRAY_SIZE(priv->dsi); i++) { - if (priv->dsi[i]) { - info.h_tile_instance[info.num_of_h_tiles] = i; - info.num_of_h_tiles++; - } - } - break; - case DRM_MODE_ENCODER_TMDS: - info.num_of_h_tiles = 1; - break; - } - - rc = dpu_encoder_setup(encoder->dev, encoder, &info); - if (rc) - DPU_ERROR("failed to setup DPU encoder %d: rc:%d\n", - encoder->base.id, rc); -} - static irqreturn_t dpu_irq(struct msm_kms *kms) { struct dpu_kms *dpu_kms = to_dpu_kms(kms); @@ -863,7 +863,6 @@ static const struct msm_kms_funcs kms_funcs = { .get_format = dpu_get_msm_format, .round_pixclk = dpu_kms_round_pixclk, .destroy = dpu_kms_destroy, - .set_encoder_mode = _dpu_kms_set_encoder_mode, .snapshot = dpu_kms_mdp_snapshot, #ifdef CONFIG_DEBUG_FS .debugfs_init = dpu_kms_debugfs_init, From patchwork Wed Jun 9 21:17:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 456833 Delivered-To: patch@linaro.org Received: by 2002:a02:735a:0:0:0:0:0 with SMTP id a26csp5675411jae; Wed, 9 Jun 2021 14:17:45 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz+zf7Cx4eYqd8ELUFV9wXOG0jvtrBlw4OxOjCsqW7JxyKQKZrA6koa5K9j3b8zaoSN2yR4 X-Received: by 2002:a17:902:d483:b029:115:3e1c:649c with SMTP id c3-20020a170902d483b02901153e1c649cmr1686502plg.44.1623273465367; Wed, 09 Jun 2021 14:17:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1623273465; cv=none; d=google.com; s=arc-20160816; b=TwMOZOAr7w+U2BRFMfk71Jg3H306LPgreaF4VWfDumXFsHAP19y3j+t+HAKGm6Xrh1 SiQFjjLjNwQbT5hMLk/ZfsHOjPBMGVx6y8enX3ZOxYgntkhQcxemRkU54Ukr4GQ2rg5f Insmft4J8GcsAlgzLZtIREZPb89BFRlvnC5TebfFulw8JYgHs4HOQP6hgpIm4Gh8KtmV ubhnX0volRdOSwWZ8ygL1PUTc6rUt4gLq7e8IZuwGTkP/KC18Lykebxv5lrfA8kPuXpM TtrzUvg42Xby1dymT+7Q1DXrRxnd2DErpU6EBwyZMjawKWAzAt4YQuc1CFGzXyM3B9/c McLA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature:delivered-to; bh=9dgs04cWZ3Msqx0W8W8q6j1oCvkBtnZBWkKinotEoUY=; b=BkeviiMeKlSNsTsW73dgi9IY8BaPN/Ljvxm2KMn4BJbHoY5cSH2rezNV40g0dyIpYH 9n/GJAy4T3QsU6O8oyGgTmCk6BY5DhLZtRsjxVw5AGTPr9Tonl9R4TdQx5X+Fy7ntph+ y7naFLVOUY/fc4V+0tonwssm4GGyiSK//Q3cWN2TPza+Ejm+ytBIq734J5/b6SGfHKFD r77ckn3g8Tu544ae6prAaPri8Uv8MP2KVkYDq4Phavg4Y9CogJOxpXygYJb28NdOXIzF jsg9r7GsSi7kmxPb3UuTzcJZn71tQQAx2lfs3b9Ed9US4fwqN+H+xzd5vbwOwoAMtEyN 2iog== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=MjSGuvkj; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from gabe.freedesktop.org (gabe.freedesktop.org. [131.252.210.177]) by mx.google.com with ESMTPS id p14si1357402pgb.45.2021.06.09.14.17.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Jun 2021 14:17:45 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) client-ip=131.252.210.177; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=MjSGuvkj; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4B9BA6EB19; Wed, 9 Jun 2021 21:17:33 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-lj1-x231.google.com (mail-lj1-x231.google.com [IPv6:2a00:1450:4864:20::231]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6248B6E420 for ; Wed, 9 Jun 2021 21:17:30 +0000 (UTC) Received: by mail-lj1-x231.google.com with SMTP id bn21so1721497ljb.1 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=9dgs04cWZ3Msqx0W8W8q6j1oCvkBtnZBWkKinotEoUY=; b=MjSGuvkj52+NlpRiGoEMHe2XcyMbHXdWIJJWE2M5Z06Lmbq34wKHLFa8JneKOyxT4T zPQnUk2WvpqaElBp2Kt++0dC3z1B0g0kZ6ivnLSHoDGpjw3MNOrdCcvR4C+O91dxKueb k7FsAycDiGW+0/StVBhfKgugAfjm+71Hhue8nXVlkxRvWfqHvZGwIyKxYq0CcSwSooMD LgZO6GseD3yq11IrONZkYunffe0mtj+x6AblEy57tb2J1N7FWnSMurP4GYaKX8GLQl6m wkv4GifRkcHPRRs+XTDFNZyxzRVSzlkMGGxfCWb8RNT7SrPMKi6xWkltr/+v6HrzIMII hfZw== 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=9dgs04cWZ3Msqx0W8W8q6j1oCvkBtnZBWkKinotEoUY=; b=GXE3Lj5qi51ghDqrZ7+1S0B5avmJefKi69G34P3P5Fpgcr9XGuJFb8p4Y652nt69aB qXh7ZQVPIudM2WxSJDyEJ45kSOplbffz71hTIn2RiWxyuibyJA0OCFr1kWF/i5yqK36p Y6XfbNcGneMp4pb0/PUZ7dUkkFI/UsrZEQPakcDpuLhBE7XGh60K+TaYgcZyox9NQLFq vraL40GXqAEizaZUDt98YaERkIIvIDKoyAI2ySC9EIAABPW8yk3vdtZ5w44gnrdGmIwt H67QN54e+4OgyyeoEKdmDGaKRoAkWyjLF9KGTo5Rb9gwxySbBX1vrSvSJfPJx2MGSGXQ 6uYw== X-Gm-Message-State: AOAM532Wb9eaza4KxrhYkScmerEvZ+Q2HF+ddCob/KNyE546ec5JJter AIjisgsbeA16D2oL5LZZaZYb6Q== X-Received: by 2002:a2e:a48f:: with SMTP id h15mr1304167lji.252.1623273448317; Wed, 09 Jun 2021 14:17:28 -0700 (PDT) Received: from eriador.lan ([37.153.55.125]) by smtp.gmail.com with ESMTPSA id z20sm95329ljk.50.2021.06.09.14.17.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Jun 2021 14:17:27 -0700 (PDT) From: Dmitry Baryshkov To: Bjorn Andersson , Rob Clark , Sean Paul , Abhinav Kumar Subject: [RFC 3/6] drm/msm/mdp5: move mdp5_encoder_set_intf_mode after msm_dsi_modeset_init Date: Thu, 10 Jun 2021 00:17:20 +0300 Message-Id: <20210609211723.2565105-4-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 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jonathan Marek , Stephen Boyd , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, David Airlie , freedreno@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Move a call to mdp5_encoder_set_intf_mode() after msm_dsi_modeset_init(), removing set_encoder_mode callback. Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) -- 2.30.2 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: 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: 456834 Delivered-To: patch@linaro.org Received: by 2002:a02:735a:0:0:0:0:0 with SMTP id a26csp5675423jae; Wed, 9 Jun 2021 14:17:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyW0mcYu/jIPoJT/2s077LZHQ+LJXwM5Opc3JCMig2AroNyJ7IVc8GHN26otd//ysOuoxiD X-Received: by 2002:a17:90a:7188:: with SMTP id i8mr12616183pjk.189.1623273466502; Wed, 09 Jun 2021 14:17:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1623273466; cv=none; d=google.com; s=arc-20160816; b=u5fZjeGi5jg+tCIRXZnledyd/AVtOldrBNlKFHKyuegj15yKejTrWUGwW3E566PU7r vr9CNBfcdSPDlyWLrt4GS7M1++8I9uucvHXSINQZ6tNTHfhGC3yBo/D7bxzOKcoOzZw0 0TbEw9iYHrq/q05kWwFYTJVZCukDqDQoe/L8N5BQ5kpJI7vucvig2u40r0Zw/4huXk0P wT3hyhD9ZjS4lxOJ46lVLc+KtuT6zl2SDLBUtszZJyuJFNn8XTidHwhk2KuZxv5b++fB HwSUNP1OI8N5UADPT1l2xUqnRZ4UfwmSawiwfETOUDmKnE0kqrh0iXMwVG/Y9JMaSu1u FNnQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature:delivered-to; bh=7I80h9aVhqiz7KKnY4LfQ8riY+ihQMK3yCgtkJKzH/0=; b=LgVPk56eNhmEpVFoD5YwuHrqiN3aGRJTJNGwqlZ7d002fNiMJBlsx5dsKBjQwIPYlB ZdT9acFb69OKzaA10hnS/0Hoxzo01yCAzfBpD6GegtHJqogZClM57aHXcs3V4QrziHPv A7Xfx8951gnSPiJ1oecV/galqRP79COz5rkVxcm9E0queHePBEbfYHWFt1cv5FGR+H8U vm9TCCMXMn/0Ygbq5qv5kTIp8eyRxqtxJiLX0Ps8e3erNsU49qA1wYEK9Dtd8MSFD0Cf jYLsE7a8Dfyr6gVn2svvRizwToBorcm0wiHFgwGA0SvEGAS9vAtGGa7i36oZAgnVhQlN TJ2Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=fv1cLJSI; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from gabe.freedesktop.org (gabe.freedesktop.org. [131.252.210.177]) by mx.google.com with ESMTPS id n186si1092313pfd.311.2021.06.09.14.17.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Jun 2021 14:17:46 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) client-ip=131.252.210.177; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=fv1cLJSI; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4AC886EA55; Wed, 9 Jun 2021 21:17:41 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-lf1-x12c.google.com (mail-lf1-x12c.google.com [IPv6:2a00:1450:4864:20::12c]) by gabe.freedesktop.org (Postfix) with ESMTPS id A465E6EB23 for ; Wed, 9 Jun 2021 21:17:33 +0000 (UTC) Received: by mail-lf1-x12c.google.com with SMTP id n12so33267814lft.10 for ; Wed, 09 Jun 2021 14:17:33 -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=DdL+NMD//8Z4bXp0wVPjnmFoFuCQ5MsDbiw20FcibECPcca9E89d/q+/ebj/zSpA4F tio+NLeDBigVnDJOZwkaiYxA/Pkw726Nlax/Y5VwmGEup7TZVQ0aXrnPCW+l0g5FrhfL CRh8dW2wo7kHGiYNL642d7QSjfHRs0+R6ERWaSCJ+OAMC6GYzGCN7POvLwq9GcvDm1XE VBjWpPXOTWy9ERkSCKbZX8yDU8rKQFCi23tpLHdZE5lbOo8vtv7+3fmRVIYwezpwuFWf Vr17ptjNxMkmfwdmSy3CBS8I4Rw2129L2iMHXw9wUbSCJvTd2CTUFyop+MrfQeKexouX 1CWw== X-Gm-Message-State: AOAM531mPXr+95MCtMfX7B1wRuUqUrgGE+AhSRimRzZ5FiM/y/vwbhXX 1ggtBHqgcYbEZ31vFrHx6OLxQQ== 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 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 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jonathan Marek , Stephen Boyd , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, David Airlie , freedreno@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" 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(-) -- 2.30.2 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);