From patchwork Tue Jul 28 21:43:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 247230 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp896652ilg; Tue, 28 Jul 2020 14:43:34 -0700 (PDT) X-Google-Smtp-Source: ABdhPJznoyNZe3AdvZBoCyR/7lJ69knitKFdFIMIDx5zYDnFaA04q3IDZ5qoJyBNPD+UccX/8AVm X-Received: by 2002:a17:90a:62c1:: with SMTP id k1mr6026226pjs.168.1595972614145; Tue, 28 Jul 2020 14:43:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1595972614; cv=none; d=google.com; s=arc-20160816; b=I0i9Lgr6sqzn/tLOHYREG8AWIrKiAHc3pLp/5znHlQOyRTysRtvH/El4wN4X6Hi9/F cFRW6euLTc4/4iCQBg7zgpWX5eU9UWB4dC+prey1Nct8bA3Ix15lKk/STHEMLmOXJaEg QBOI2iDSRWX+QHN3aCKjVcD4hWfJnjpd/Wt7enVTf2pMZDPRWAQggXlCg3/fLdl4s5Vp sfmsQiUK0Q8UaVG+jxJhswj520EkZvVz7iDDOZ7XBeR7hf8OY4ltsLu89iRvgWkbgKTX VZoWzYZrdZr5tGo2fmsU/hYXYlOcK5/yoak0JYqD8JMxJPRSOeFA7c1xT/y2bllGwoeJ zfLQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:mime-version:message-id:date:subject:to:from :dkim-signature:delivered-to; bh=LScyWuTiJqwcNHPPVmUuTZcmIqa2O5rxB6g00umnyiM=; b=KK6mXt3YHOjKrAEecSYfdtyU8rvFZjU2BqMD5TVzFuygzs+kXpJAVujxBXZr+huLo8 mzMYaYOcdxo8hbJ7cezDrzEt5IX7M6TVrAWRsxodhzqHuj9jM1qQXfROfmuviAoPkZTa KVmO7ZsrkH6kqU0fVF1zlfRXSIzyuRmOBB2Dy1AZt0LMd+cN06eY4/2hF+q7YM4aMdkl Ah+Mt8kYtDkvv2mQRyrFUC7W0XZcJmGXgmVyQaRffNTxUsNClXQqGa0CpNL96ovRTXBX CtBKgGCSpadJJN+13NmwoO892Z4QDAecc9Wff2MUNMiKYh/7gT77aTRiKMLTMW/+QNqJ gZRw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=jmAS+Qfp; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 2610:10:20:722:a800:ff:fe36:1795 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. [2610:10:20:722:a800:ff:fe36:1795]) by mx.google.com with ESMTPS id q4si96030pgt.284.2020.07.28.14.43.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Jul 2020 14:43:34 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 2610:10:20:722:a800:ff:fe36:1795 as permitted sender) client-ip=2610:10:20:722:a800:ff:fe36:1795; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=jmAS+Qfp; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 2610:10:20:722:a800:ff:fe36:1795 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 4E37589A98; Tue, 28 Jul 2020 21:43:31 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-lf1-x143.google.com (mail-lf1-x143.google.com [IPv6:2a00:1450:4864:20::143]) by gabe.freedesktop.org (Postfix) with ESMTPS id F296E89A98 for ; Tue, 28 Jul 2020 21:43:29 +0000 (UTC) Received: by mail-lf1-x143.google.com with SMTP id c3so4666080lfb.3 for ; Tue, 28 Jul 2020 14:43: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:mime-version :content-transfer-encoding; bh=qtrD1m0VGdTp9PTK8GspKpjBRQxcqfdlirbPrN7AYX8=; b=jmAS+QfpV97wT/ivSKE6pAusLF6nGcvYM90ZcpcDoRQOQZIjZEHcc9629T8DKAW1cE FR4LU0QjDjQRXtlqmM+KAaTfMRyxCvk/LkP2UNLqbN79G4PaIpMJImH7A1clMLXLm091 NLF4/qtOmzA2zFKpIkpFo15sSKywF9AHJx2qnvuV+FkdVZoL877q2JAAPYFyGHKLqRAB fCpCTogus4BPmG4FiTyXovuCC8JW+EovL5MgxzerbX6dESQMioSTJU1QOdK+2LN55YKc 01gAT9TPD8NBm9M1yLQNyU5K/9+ArOxhkZI7X+Z6uXD0D1j+6OQ2uzG7XTzZFBWBlMPi EMMg== 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:mime-version :content-transfer-encoding; bh=qtrD1m0VGdTp9PTK8GspKpjBRQxcqfdlirbPrN7AYX8=; b=HS7Z0AcMNN0Na1QlqNpXxeBSAqurncPaf+iLE/K6KAFccuWDHTGtKFmm/x8WXLt+Br RfWNYqwh4FHY6X56BJuO9Y4K/CSD8M+JTSvL6It4NgeW88P4VL7V0l1BipGPVMF+tXPz aglgzpFy35Qm2sTKBEYzcloWUzxPRQks314mqnl8cRCnSIIst2ui+rYpfu2PaJ4rMxUd yzkGeqbkimq/adxNd7cmjV5GoDpAubBhjvw0dsBGXZgQw0bprqfl/WzajUuhCYWNMRqx t3nGvLGoZfLVxJ49nMGfSYCn1Wc4/oUs6Yb8mnsT4tqPC6H+VN5J4umbzjNSEY+bAISh hOIw== X-Gm-Message-State: AOAM533FD19Sq5GD7c20PeUusixIWqkbdg8jbRXeuWmad+/hm9a+AkXt ESfqWpDIWJPZJ6ckocVoF8/E/2UnMwys+g== X-Received: by 2002:a19:e11:: with SMTP id 17mr15439267lfo.34.1595972608083; Tue, 28 Jul 2020 14:43:28 -0700 (PDT) Received: from localhost.bredbandsbolaget (c-92d7225c.014-348-6c756e10.bbcust.telenor.se. [92.34.215.146]) by smtp.gmail.com with ESMTPSA id y1sm4664921lfb.45.2020.07.28.14.43.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Jul 2020 14:43:27 -0700 (PDT) From: Linus Walleij To: dri-devel@lists.freedesktop.org, Maarten Lankhorst , Maxime Ripard , Sean Paul Subject: [PATCH 1/2] drm/mcde: Rename flow function Date: Tue, 28 Jul 2020 23:43:18 +0200 Message-Id: <20200728214319.143213-1-linus.walleij@linaro.org> X-Mailer: git-send-email 2.26.2 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: Stephan Gerhold , linux-arm-kernel@lists.infradead.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" The function mcde_display_send_one_frame() has a historical name that stems from being implemented when the driver only supported single frame updates. Rename it mcde_start_flow() so that it reflects the current usage. Cc: Stephan Gerhold Signed-off-by: Linus Walleij --- drivers/gpu/drm/mcde/mcde_display.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.26.2 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel Reviewed-by: Stephan Gerhold diff --git a/drivers/gpu/drm/mcde/mcde_display.c b/drivers/gpu/drm/mcde/mcde_display.c index 1d8ea8830a17..a99cc3fd5ef4 100644 --- a/drivers/gpu/drm/mcde/mcde_display.c +++ b/drivers/gpu/drm/mcde/mcde_display.c @@ -994,7 +994,7 @@ static void mcde_display_disable(struct drm_simple_display_pipe *pipe) dev_info(drm->dev, "MCDE display is disabled\n"); } -static void mcde_display_send_one_frame(struct mcde *mcde) +static void mcde_start_flow(struct mcde *mcde) { /* Request a TE ACK */ if (mcde->te_sync) @@ -1092,7 +1092,7 @@ static void mcde_display_update(struct drm_simple_display_pipe *pipe, * is not active yet. */ if (mcde->flow_active == 0) - mcde_display_send_one_frame(mcde); + mcde_start_flow(mcde); } dev_info_once(mcde->dev, "sent first display update\n"); } else { From patchwork Tue Jul 28 21:43:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 247231 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp896682ilg; Tue, 28 Jul 2020 14:43:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxLwT4BVVLM+rsNapn5SFq8j0JV1ereCXIQPp71koN8uxIMYTibFI/lFdhccNnuug28IjMQ X-Received: by 2002:a62:1bc6:: with SMTP id b189mr26256743pfb.150.1595972617584; Tue, 28 Jul 2020 14:43:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1595972617; cv=none; d=google.com; s=arc-20160816; b=KB6XkE4NWYwl23f5NIwYFQSrdbD9CNkVJQ/CugIL/Be/fcNFu2LsIoz/zqtljfvaZN avK4pFk5bFhz1Aw0LTPVzW413mpZFsWk8v/QlSNhiFj4P35PqKzGvnD5KW6cwzl3a/P5 WKUJWWmeYrC976dW4fqOB96A/prmLnGgdO2488h5SVw3kFJIYxszqj4Zf2EWMUD9XGZI QoTTsNGyhJQhcLGVH5WPzN1v7akZcP/k+U00IV4Ev4AvgtK535InZjPOPypiOw8KyH7S bH8OwisDwi/Gs4b638ltVtdqJiE0IFqr6o58UozU0QK+biL7IIu+fNZaHV8Q7BIDFGfK LgJw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:mime-version:references:in-reply-to:message-id:date :subject:to:from:dkim-signature:delivered-to; bh=KA0AUZe9JcA75qdN6e+vVD86Di3NDLQibzjMLV0cuZE=; b=qFvcb8G8q5eqSHMJGXlT37Srj+2QVIM/a00ICBdXccfHIwBZVVESRRRZ4N6JL6m5vM eQ/VMqocM7M714tFbfdjB3HPFTmyNwJCKtZ9HaKWVSHob1GYcUTsdnyiKKX9iXD9HyT8 R9LK6P91BAW1kegxuHrqy0Fn2M30o1hj9nYcbu9bwtqKqIiBz2Src7kNxS2WQCyav7yk 5rZxl521ELcO8cylVzbv2fe8hQc0gYEs+H4qsm52+10r6K2PmnDplDdf1uP63G8w2VJc Eal7higd+f0Ceohxo18uXND4FeH/rL3/j0y//OmqrC1wcbH9Gdywx9KhqLvxbD5pU5oA R5ZQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=pIsBum39; 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 n11si12381078pfu.323.2020.07.28.14.43.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Jul 2020 14:43: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=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=pIsBum39; 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 1BEE189B60; Tue, 28 Jul 2020 21:43:34 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-lj1-x243.google.com (mail-lj1-x243.google.com [IPv6:2a00:1450:4864:20::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id 84FB689B60 for ; Tue, 28 Jul 2020 21:43:32 +0000 (UTC) Received: by mail-lj1-x243.google.com with SMTP id t6so9863641ljk.9 for ; Tue, 28 Jul 2020 14:43: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=tfbNz0l1MbsH4OIHzEd/yS8xrSHzYSKRDgluz/33hbI=; b=pIsBum39MUs7M6qBCAGMU3mqED4roA/9Cd+chBPRqofTpdCqOgcpal6zZ3PBSs536r C3jcgbD0wuNhWhuCP+444k2w8Ysgf5qp3j68VgCQ8nV62oCoyYAbE25IXSI0Ef2Qx9QY caF+95hlovUNZ16H+2bVvg0QznZFECd+hpNUV1eEYFrdkGABBhRoKrp4XKIJSTANg0oW ipwjmU9CJL+Ht8tfZOBKWe1dZCeFKaHT+NAWnzDh5sqbhZCogeYB159FIZluAAv/iGkF qENn8rYjfLooz5zFGURRlUgH5HJK74T9BHZKGgATeZwrxH2vleFwYrl3dxHY2VXKB8h5 RHsA== 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=tfbNz0l1MbsH4OIHzEd/yS8xrSHzYSKRDgluz/33hbI=; b=BiNqwyvAQPpIfGyQrcSn9jv+hxDrPHE7h3Jfmsh6xv+O7i64oGws+JEmbEyvfjk5Pc SSEVHcj4uH4dbiOmOMPXzwhiE4X6/EeB4n+6gJOW/5oAXXoniGmBlW1r9+JTT4V8xl7z REgNQNdZdrcsAljALigmNGSVtx+qEad2Ve9+Ll1BdYCEJf+27l02dfqSpdWDmFpDMFal 7cF99lGVda4guWnl24077/HgYPEKToXkilyNf/DV8VvLN5az2FLruRDSC+Cz6ZZmCzLv 7iTBtnih4ANFqtuwkDeMV6U3+2t3uJR6o9Wmyu18e9c8pdCedHxm1WxE8zfLT9gbQ8Da Cegw== X-Gm-Message-State: AOAM533jOSEukE5vPUtnMr685ZikYvRsOvqCXLFi+Nj0TKZzVF6XEuhH Csp7+pXzCrZbHUtO/VpfvnlZ0MTzlyRHkw== X-Received: by 2002:a2e:8799:: with SMTP id n25mr13374829lji.416.1595972610396; Tue, 28 Jul 2020 14:43:30 -0700 (PDT) Received: from localhost.bredbandsbolaget (c-92d7225c.014-348-6c756e10.bbcust.telenor.se. [92.34.215.146]) by smtp.gmail.com with ESMTPSA id y1sm4664921lfb.45.2020.07.28.14.43.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Jul 2020 14:43:29 -0700 (PDT) From: Linus Walleij To: dri-devel@lists.freedesktop.org, Maarten Lankhorst , Maxime Ripard , Sean Paul Subject: [PATCH 2/2] drm/mcde: Fix display data flow control Date: Tue, 28 Jul 2020 23:43:19 +0200 Message-Id: <20200728214319.143213-2-linus.walleij@linaro.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200728214319.143213-1-linus.walleij@linaro.org> References: <20200728214319.143213-1-linus.walleij@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: Stephan Gerhold , linux-arm-kernel@lists.infradead.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Revamp the way that the flow of data to the display is defined. I realized that the hardware supports something like 5 different modes of flow: oneshot, command with TE IRQ, command with BTA (bus turn around) and TE IRQ, video with TE IRQ and video without TE IRQ instead synchronizing to the output of the MCDE DSI formatter. Like before the selection of the type of flow is done frome the DSI driver when we attach it to the MCDE and we get to know what the display wants. The new video mode synchronization method from the MCDE DSI formatter is used on some upstream devices such as Golden presumably because the TE IRQ is not working on the display. It will likely need some (new) special flag to be passed from the display to indicate this mode of operation once we make use of it. The only real semantic change is that we stop sending a TE request before every command when sending data to a display in command mode: this should only be explicitly requested when using BTA, according to the vendor driver. This has been tested and works fine with the command mode displays I have. (All that are supported upstream.) Reported-by: Stephan Gerhold Cc: Stephan Gerhold Signed-off-by: Linus Walleij --- drivers/gpu/drm/mcde/mcde_display.c | 107 +++++++++++++++++----------- drivers/gpu/drm/mcde/mcde_drm.h | 26 ++++++- drivers/gpu/drm/mcde/mcde_drv.c | 3 - drivers/gpu/drm/mcde/mcde_dsi.c | 18 ++++- 4 files changed, 104 insertions(+), 50 deletions(-) -- 2.26.2 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel diff --git a/drivers/gpu/drm/mcde/mcde_display.c b/drivers/gpu/drm/mcde/mcde_display.c index a99cc3fd5ef4..897d29e318d3 100644 --- a/drivers/gpu/drm/mcde/mcde_display.c +++ b/drivers/gpu/drm/mcde/mcde_display.c @@ -89,7 +89,7 @@ void mcde_display_irq(struct mcde *mcde) * the update function is called, then we disable the * flow on the channel once we get the TE IRQ. */ - if (mcde->oneshot_mode) { + if (mcde->flow_mode == MCDE_COMMAND_ONESHOT_FLOW) { spin_lock(&mcde->flow_lock); if (--mcde->flow_active == 0) { dev_dbg(mcde->dev, "TE0 IRQ\n"); @@ -524,19 +524,41 @@ static void mcde_configure_channel(struct mcde *mcde, enum mcde_channel ch, } /* Set up channel 0 sync (based on chnl_update_registers()) */ - if (mcde->video_mode || mcde->te_sync) + switch (mcde->flow_mode) { + case MCDE_COMMAND_ONESHOT_FLOW: + /* Oneshot is achieved with software sync */ + val = MCDE_CHNLXSYNCHMOD_SRC_SYNCH_SOFTWARE + << MCDE_CHNLXSYNCHMOD_SRC_SYNCH_SHIFT; + break; + case MCDE_COMMAND_TE_FLOW: val = MCDE_CHNLXSYNCHMOD_SRC_SYNCH_HARDWARE << MCDE_CHNLXSYNCHMOD_SRC_SYNCH_SHIFT; - else - val = MCDE_CHNLXSYNCHMOD_SRC_SYNCH_SOFTWARE + val |= MCDE_CHNLXSYNCHMOD_OUT_SYNCH_SRC_TE0 + << MCDE_CHNLXSYNCHMOD_OUT_SYNCH_SRC_SHIFT; + break; + case MCDE_COMMAND_BTA_TE_FLOW: + val = MCDE_CHNLXSYNCHMOD_SRC_SYNCH_HARDWARE << MCDE_CHNLXSYNCHMOD_SRC_SYNCH_SHIFT; - - if (mcde->te_sync) val |= MCDE_CHNLXSYNCHMOD_OUT_SYNCH_SRC_TE0 << MCDE_CHNLXSYNCHMOD_OUT_SYNCH_SRC_SHIFT; - else + break; + case MCDE_VIDEO_TE_FLOW: + val = MCDE_CHNLXSYNCHMOD_SRC_SYNCH_HARDWARE + << MCDE_CHNLXSYNCHMOD_SRC_SYNCH_SHIFT; + val |= MCDE_CHNLXSYNCHMOD_OUT_SYNCH_SRC_TE0 + << MCDE_CHNLXSYNCHMOD_OUT_SYNCH_SRC_SHIFT; + break; + case MCDE_VIDEO_FORMATTER_FLOW: + val = MCDE_CHNLXSYNCHMOD_SRC_SYNCH_HARDWARE + << MCDE_CHNLXSYNCHMOD_SRC_SYNCH_SHIFT; val |= MCDE_CHNLXSYNCHMOD_OUT_SYNCH_SRC_FORMATTER << MCDE_CHNLXSYNCHMOD_OUT_SYNCH_SRC_SHIFT; + break; + default: + dev_err(mcde->dev, "unknown flow mode %d\n", + mcde->flow_mode); + break; + } writel(val, mcde->regs + sync); @@ -946,7 +968,11 @@ static void mcde_display_enable(struct drm_simple_display_pipe *pipe, mcde_configure_dsi_formatter(mcde, MCDE_DSI_FORMATTER_0, formatter_frame, pkt_size); - if (mcde->te_sync) { + switch (mcde->flow_mode) { + case MCDE_COMMAND_TE_FLOW: + case MCDE_COMMAND_BTA_TE_FLOW: + case MCDE_VIDEO_TE_FLOW: + /* We are using TE in some comination */ if (mode->flags & DRM_MODE_FLAG_NVSYNC) val = MCDE_VSCRC_VSPOL; else @@ -956,16 +982,22 @@ static void mcde_display_enable(struct drm_simple_display_pipe *pipe, val = readl(mcde->regs + MCDE_CRC); val |= MCDE_CRC_SYCEN0; writel(val, mcde->regs + MCDE_CRC); + break; + default: + /* No TE capture */ + break; } drm_crtc_vblank_on(crtc); - if (mcde->video_mode) + if (mcde_flow_is_video(mcde)) { /* * Keep FIFO permanently enabled in video mode, * otherwise MCDE will stop feeding data to the panel. */ mcde_enable_fifo(mcde, MCDE_FIFO_A); + dev_dbg(mcde->dev, "started MCDE video FIFO flow\n"); + } dev_info(drm->dev, "MCDE display is enabled\n"); } @@ -996,38 +1028,36 @@ static void mcde_display_disable(struct drm_simple_display_pipe *pipe) static void mcde_start_flow(struct mcde *mcde) { - /* Request a TE ACK */ - if (mcde->te_sync) + /* Request a TE ACK only in TE+BTA mode */ + if (mcde->flow_mode == MCDE_COMMAND_BTA_TE_FLOW) mcde_dsi_te_request(mcde->mdsi); /* Enable FIFO A flow */ mcde_enable_fifo(mcde, MCDE_FIFO_A); - if (mcde->te_sync) { + /* + * If oneshot mode is enabled, the flow will be disabled + * when the TE0 IRQ arrives in the interrupt handler. Otherwise + * updates are continuously streamed to the display after this + * point. + */ + + if (mcde->flow_mode == MCDE_COMMAND_ONESHOT_FLOW) { + /* Trigger a software sync out on channel 0 */ + writel(MCDE_CHNLXSYNCHSW_SW_TRIG, + mcde->regs + MCDE_CHNL0SYNCHSW); + /* - * If oneshot mode is enabled, the flow will be disabled - * when the TE0 IRQ arrives in the interrupt handler. Otherwise - * updates are continuously streamed to the display after this - * point. + * Disable FIFO A flow again: since we are using TE sync we + * need to wait for the FIFO to drain before we continue + * so repeated calls to this function will not cause a mess + * in the hardware by pushing updates will updates are going + * on already. */ - dev_dbg(mcde->dev, "sent TE0 framebuffer update\n"); - return; + mcde_disable_fifo(mcde, MCDE_FIFO_A, true); } - /* Trigger a software sync out on channel 0 */ - writel(MCDE_CHNLXSYNCHSW_SW_TRIG, - mcde->regs + MCDE_CHNL0SYNCHSW); - - /* - * Disable FIFO A flow again: since we are using TE sync we - * need to wait for the FIFO to drain before we continue - * so repeated calls to this function will not cause a mess - * in the hardware by pushing updates will updates are going - * on already. - */ - mcde_disable_fifo(mcde, MCDE_FIFO_A, true); - - dev_dbg(mcde->dev, "sent SW framebuffer update\n"); + dev_dbg(mcde->dev, "started MCDE FIFO flow\n"); } static void mcde_set_extsrc(struct mcde *mcde, u32 buffer_address) @@ -1086,15 +1116,10 @@ static void mcde_display_update(struct drm_simple_display_pipe *pipe, */ if (fb) { mcde_set_extsrc(mcde, drm_fb_cma_get_gem_addr(fb, pstate, 0)); - if (!mcde->video_mode) { - /* - * Send a single frame using software sync if the flow - * is not active yet. - */ - if (mcde->flow_active == 0) - mcde_start_flow(mcde); - } - dev_info_once(mcde->dev, "sent first display update\n"); + dev_info_once(mcde->dev, "first update of display contents\n"); + /* The flow is already active in video mode */ + if (!mcde_flow_is_video(mcde) && mcde->flow_active == 0) + mcde_start_flow(mcde); } else { /* * If an update is receieved before the MCDE is enabled diff --git a/drivers/gpu/drm/mcde/mcde_drm.h b/drivers/gpu/drm/mcde/mcde_drm.h index 679c2c4e6d9d..3e406d783465 100644 --- a/drivers/gpu/drm/mcde/mcde_drm.h +++ b/drivers/gpu/drm/mcde/mcde_drm.h @@ -9,6 +9,22 @@ #ifndef _MCDE_DRM_H_ #define _MCDE_DRM_H_ +enum mcde_flow_mode { + /* One-shot mode: flow stops after one frame */ + MCDE_COMMAND_ONESHOT_FLOW, + /* Command mode with tearing effect (TE) IRQ sync */ + MCDE_COMMAND_TE_FLOW, + /* + * Command mode with bus turn-around (BTA) and tearing effect + * (TE) IRQ sync. + */ + MCDE_COMMAND_BTA_TE_FLOW, + /* Video mode with tearing effect (TE) sync IRQ */ + MCDE_VIDEO_TE_FLOW, + /* Video mode with the formatter itself as sync source */ + MCDE_VIDEO_FORMATTER_FLOW, +}; + struct mcde { struct drm_device drm; struct device *dev; @@ -18,9 +34,7 @@ struct mcde { struct drm_simple_display_pipe pipe; struct mipi_dsi_device *mdsi; s16 stride; - bool te_sync; - bool video_mode; - bool oneshot_mode; + enum mcde_flow_mode flow_mode; unsigned int flow_active; spinlock_t flow_lock; /* Locks the channel flow control */ @@ -36,6 +50,12 @@ struct mcde { #define to_mcde(dev) container_of(dev, struct mcde, drm) +static inline bool mcde_flow_is_video(struct mcde *mcde) +{ + return (mcde->flow_mode == MCDE_VIDEO_TE_FLOW || + mcde->flow_mode == MCDE_VIDEO_FORMATTER_FLOW); +} + bool mcde_dsi_irq(struct mipi_dsi_device *mdsi); void mcde_dsi_te_request(struct mipi_dsi_device *mdsi); extern struct platform_driver mcde_dsi_driver; diff --git a/drivers/gpu/drm/mcde/mcde_drv.c b/drivers/gpu/drm/mcde/mcde_drv.c index 80082d6dce3a..1671af101cf2 100644 --- a/drivers/gpu/drm/mcde/mcde_drv.c +++ b/drivers/gpu/drm/mcde/mcde_drv.c @@ -315,9 +315,6 @@ static int mcde_probe(struct platform_device *pdev) mcde->dev = dev; platform_set_drvdata(pdev, drm); - /* Enable continuous updates: this is what Linux' framebuffer expects */ - mcde->oneshot_mode = false; - /* First obtain and turn on the main power */ mcde->epod = devm_regulator_get(dev, "epod"); if (IS_ERR(mcde->epod)) { diff --git a/drivers/gpu/drm/mcde/mcde_dsi.c b/drivers/gpu/drm/mcde/mcde_dsi.c index 65b3d6d41456..58e5d07c8a06 100644 --- a/drivers/gpu/drm/mcde/mcde_dsi.c +++ b/drivers/gpu/drm/mcde/mcde_dsi.c @@ -148,9 +148,21 @@ static void mcde_dsi_attach_to_mcde(struct mcde_dsi *d) { d->mcde->mdsi = d->mdsi; - d->mcde->video_mode = !!(d->mdsi->mode_flags & MIPI_DSI_MODE_VIDEO); - /* Enable use of the TE signal for all command mode panels */ - d->mcde->te_sync = !d->mcde->video_mode; + /* + * Select the way the DSI data flow is pushing to the display: + * currently we just support video or command mode depending + * on the type of display. + * + * FIXME: add flags to struct mipi_dsi_device .flags to indicate + * displays that require BTA (bus turn around) so we can handle + * such displays as well. Figure out how to properly handle + * single frame on-demand updates with DRM for command mode + * displays (MCDE_COMMAND_ONESHOT_FLOW). + */ + if (d->mdsi->mode_flags & MIPI_DSI_MODE_VIDEO) + d->mcde->flow_mode = MCDE_VIDEO_TE_FLOW; + else + d->mcde->flow_mode = MCDE_COMMAND_TE_FLOW; } static int mcde_dsi_host_attach(struct mipi_dsi_host *host,