From mboxrd@z Thu Jan 1 00:00:00 1970 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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 D9694C4320D for ; Tue, 24 Sep 2019 16:50:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9D9D721D6C for ; Tue, 24 Sep 2019 16:50:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1569343853; bh=PLozl86nLzZNnxSAsPpoLHxyeB4nJWP2wp3oZsOA194=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=lfwHSY95nobwP/3jHWZlib1yL3C//mxlFwBwBuZSU5/iWeNYa4Z4JE6tnAPjAjyuc loOvwJTUZJDa3Yjo+Cd9XbVRSjGilmRx8KD4RxD9fgP8KWKmx+pgVRUrRg8foDkUtD VTjuTsH91FT1jQxJ/QDklXKWYujqtYAsL3Snz6L8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2441516AbfIXQuw (ORCPT ); Tue, 24 Sep 2019 12:50:52 -0400 Received: from mail.kernel.org ([198.145.29.99]:43664 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2436577AbfIXQum (ORCPT ); Tue, 24 Sep 2019 12:50:42 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 7D9E4222C2; Tue, 24 Sep 2019 16:50:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1569343841; bh=PLozl86nLzZNnxSAsPpoLHxyeB4nJWP2wp3oZsOA194=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mjxs9XyXgQ2BtJv9qVQmSGMuPw8Or8ZWLM3i7X5AJniA03v1RGnDYhPQFx/kGDi5c RHAjg+g+ousu7aEHuwdnDc4PSvTTDLwf5K0rP0IaJqcV08+nACM8OsBbmOlShqvoYg PyVklltLskiol58+jN20Q7SRq6HijA8a//+A7UcU= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Ahmad Fatoum , Lucas Stach , Philippe Cornu , Benjamin Gaignard , Sasha Levin , dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 4.14 05/28] drm/stm: attach gem fence to atomic state Date: Tue, 24 Sep 2019 12:50:08 -0400 Message-Id: <20190924165031.28292-5-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190924165031.28292-1-sashal@kernel.org> References: <20190924165031.28292-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Ahmad Fatoum [ Upstream commit 8fabc9c3109a71b3577959a05408153ae69ccd8d ] To properly synchronize with other devices the fence from the GEM object backing the framebuffer needs to be attached to the atomic state, so the commit work can wait on fence signaling. Signed-off-by: Ahmad Fatoum Signed-off-by: Lucas Stach Acked-by: Philippe Cornu Tested-by: Philippe Cornu Signed-off-by: Benjamin Gaignard Link: https://patchwork.freedesktop.org/patch/msgid/20190712084228.8338-1-l.stach@pengutronix.de Signed-off-by: Sasha Levin --- drivers/gpu/drm/stm/ltdc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/stm/ltdc.c b/drivers/gpu/drm/stm/ltdc.c index d394a03632c45..c3bd80b03f165 100644 --- a/drivers/gpu/drm/stm/ltdc.c +++ b/drivers/gpu/drm/stm/ltdc.c @@ -20,6 +20,7 @@ #include #include #include +#include #include #include #include @@ -691,6 +692,7 @@ static const struct drm_plane_funcs ltdc_plane_funcs = { }; static const struct drm_plane_helper_funcs ltdc_plane_helper_funcs = { + .prepare_fb = drm_gem_fb_prepare_fb, .atomic_check = ltdc_plane_atomic_check, .atomic_update = ltdc_plane_atomic_update, .atomic_disable = ltdc_plane_atomic_disable, -- 2.20.1