From patchwork Mon Jun 22 15:01:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hsin-Yi Wang X-Patchwork-Id: 11618083 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7A71713A0 for ; Mon, 22 Jun 2020 15:04:15 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 52EC22070E for ; Mon, 22 Jun 2020 15:04:15 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="zkuNd2tf"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="gE/TTU+D" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 52EC22070E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To:From: Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender :Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=xaMNihh7pFTb/CTG3XXLZ3RMIHA98MulLSGnJ5dyRY0=; b=zkuNd2tfyn5N/xGTMP6ZsJWiqk Mq3JeR/LzXEwYn5bF4jM9lNDmyS1EIgdn6f7FCl8BuhVbCwfgOsxe5TIEMMZIZIg0m6gGVFd9kYU4 HDNSeHe/GUSKxBv8s/0t2i2AJ7X/UZD0a0CGgWv9HlmbN/4bsOTFXb/OJAbYDhEvkAOMPND28RkBf ZhSQuNurSRxaOuJsikyK7WPjPIkq/5MXz6aKhQ1GZlo8y+5cjVdjRHJb6IfZQH3bsrRQFAS9lc/m9 3F4ABTu/JL2ubeRPaTJnNsAFt/R2SaCuPWJBRLTBruAfMA4sZyTX5KZPSrDXGUOIjrh7jFl4vVm+k NvTtwJbQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jnNxm-0004Ky-3k; Mon, 22 Jun 2020 15:02:22 +0000 Received: from mail-pj1-x1042.google.com ([2607:f8b0:4864:20::1042]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jnNxj-0004KM-TG for linux-arm-kernel@lists.infradead.org; Mon, 22 Jun 2020 15:02:20 +0000 Received: by mail-pj1-x1042.google.com with SMTP id i4so8757702pjd.0 for ; Mon, 22 Jun 2020 08:02:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=dZVD0oXPQ4Vgqd6246WLtuLGZy0JHZAVsnDaKWilj8U=; b=gE/TTU+DUc4/SwYXVs8HGxNbuuc+CfEim7+eHmeeIy3ghku8uXPB1lkSAAzBCmPLQK XuhmUzZLXhLDipNrHe9+UaHN79UyS5wk/bsHSwDNG1yZwF9mw6DjhqAwCXZBe0yEtMhy j4S5loJiHU72q1+yCqJ/1G1e+KOQdWh4bTlpY= 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=dZVD0oXPQ4Vgqd6246WLtuLGZy0JHZAVsnDaKWilj8U=; b=WSDegSX9eFGHDB1S2ucuQxttRssgyx7nt1JU2AauZXTGxVqxFBtm37kuvIfXG5r6pe oUOtAYDcrCeIkUfUsli7yDPgwKklVxpt4sKU+Y0T09ose2bJKs7nMFwrzagUJiG/V0Ne YctfxFnhXUnKdAF5HX043HUF99vDOKRsyxyzik4xKu3uofpXbSMeTc6IIwsy3bUy9/4T ecWGNBd7cQsN4QSSKu+S0OwTBAryg0dxSfiCUHjQz9aYYEa0l+s+OR95nJpmGTelJaTS gpPj1tfTJC/fR0qaGPQ/u9JLdeOjuCcMu9d2mkqUC34o+xtQXpFVihcB0RnOWPQrVaTc 8TMA== X-Gm-Message-State: AOAM533bdlCmzNXLpjNyiuy8clNBSQe5G6qXgV49yIu0ev842iPRTjuZ wpwc/6TJtSi7GJJntk57b0SD7oV28kc= X-Google-Smtp-Source: ABdhPJx4uZC5fXg6XELfgCrKxRoKDGalQWvOZ7PrYOynWWRBfztarOhfdQkY30e4WtakXs5VctClyg== X-Received: by 2002:a17:90a:2c48:: with SMTP id p8mr19049280pjm.189.1592838077126; Mon, 22 Jun 2020 08:01:17 -0700 (PDT) Received: from hsinyi-z840.tpe.corp.google.com ([2401:fa00:1:10:b852:bd51:9305:4261]) by smtp.gmail.com with ESMTPSA id h9sm14465808pfe.32.2020.06.22.08.01.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Jun 2020 08:01:16 -0700 (PDT) From: Hsin-Yi Wang To: linux-arm-kernel@lists.infradead.org, Chun-Kuang Hu Subject: [PATCH v2] drm/mediatek: check plane visibility in atomic_update Date: Mon, 22 Jun 2020 23:01:09 +0800 Message-Id: <20200622150109.91205-1-hsinyi@chromium.org> X-Mailer: git-send-email 2.27.0.111.gc72c7da667-goog MIME-Version: 1.0 X-Spam-Note: CRM114 invocation failed X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:1042 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.0 DKIMWL_WL_HIGH DKIMwl.org - Whitelisted High sender X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Philipp Zabel , David Airlie , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, yongqiang.niu@mediatek.com, linux-mediatek@lists.infradead.org, Daniel Vetter , Matthias Brugger , tfiga@chromium.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Disable the plane if it's not visible. Otherwise mtk_ovl_layer_config() would proceed with invalid plane and we may see vblank timeout. Fixes: 119f5173628a ("drm/mediatek: Add DRM Driver for Mediatek SoC MT8173.") Signed-off-by: Hsin-Yi Wang Reviewed-by: Chun-Kuang Hu --- v2: Add fixes tag --- drivers/gpu/drm/mediatek/mtk_drm_plane.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/mediatek/mtk_drm_plane.c b/drivers/gpu/drm/mediatek/mtk_drm_plane.c index c2bd683a87c8..74dc71c7f3b6 100644 --- a/drivers/gpu/drm/mediatek/mtk_drm_plane.c +++ b/drivers/gpu/drm/mediatek/mtk_drm_plane.c @@ -164,6 +164,16 @@ static int mtk_plane_atomic_check(struct drm_plane *plane, true, true); } +static void mtk_plane_atomic_disable(struct drm_plane *plane, + struct drm_plane_state *old_state) +{ + struct mtk_plane_state *state = to_mtk_plane_state(plane->state); + + state->pending.enable = false; + wmb(); /* Make sure the above parameter is set before update */ + state->pending.dirty = true; +} + static void mtk_plane_atomic_update(struct drm_plane *plane, struct drm_plane_state *old_state) { @@ -178,6 +188,9 @@ static void mtk_plane_atomic_update(struct drm_plane *plane, if (!crtc || WARN_ON(!fb)) return; + if (!plane->state->visible) + return mtk_plane_atomic_disable(plane, old_state); + gem = fb->obj[0]; mtk_gem = to_mtk_gem_obj(gem); addr = mtk_gem->dma_addr; @@ -200,16 +213,6 @@ static void mtk_plane_atomic_update(struct drm_plane *plane, state->pending.dirty = true; } -static void mtk_plane_atomic_disable(struct drm_plane *plane, - struct drm_plane_state *old_state) -{ - struct mtk_plane_state *state = to_mtk_plane_state(plane->state); - - state->pending.enable = false; - wmb(); /* Make sure the above parameter is set before update */ - state->pending.dirty = true; -} - static const struct drm_plane_helper_funcs mtk_plane_helper_funcs = { .prepare_fb = drm_gem_fb_prepare_fb, .atomic_check = mtk_plane_atomic_check,