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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 87F93C4360C for ; Sun, 6 Oct 2019 18:00:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 565A320673 for ; Sun, 6 Oct 2019 18:00:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1570384812; bh=D+5+refmVJN0BInrZBrBKnq8Z+wMu8TansF66Q6t0aY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Q5QpGe55cYCQ2VO2a4P0OLAIKC3pNY3APDrnajP3jtOtjxK8dIShPOlcmfgzXzDp6 LTdXbLvyq9peDc/goJqhaFqix9FAose6SfSK7xyPpi+sqxTboUE0WJaG38YFRWdbte HQTgh/cIKe8TZuPpgO7x+k9V1YhK3ZvKBVntBmF8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728188AbfJFR3d (ORCPT ); Sun, 6 Oct 2019 13:29:33 -0400 Received: from mail.kernel.org ([198.145.29.99]:55274 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728206AbfJFR3d (ORCPT ); Sun, 6 Oct 2019 13:29:33 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 89E442087E; Sun, 6 Oct 2019 17:29:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1570382973; bh=D+5+refmVJN0BInrZBrBKnq8Z+wMu8TansF66Q6t0aY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Fngxx3+8MCfv9/o1lduR/MirpwFptbmv/uskw63JY9zZTd7FWq7nSeaWrzZZyT2/C r9e4o/pP0Sye7b80BCg+Nwigi/90DVddpPXv/7n1GFAJN4vuvbnQUN9lLzMEMEzJf2 SIMDb67VmC+md3QZpoYNBWu8ayz4qRMbSFSkXgVc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ahmad Fatoum , Lucas Stach , Philippe Cornu , Benjamin Gaignard , Sasha Levin Subject: [PATCH 4.19 006/106] drm/stm: attach gem fence to atomic state Date: Sun, 6 Oct 2019 19:20:12 +0200 Message-Id: <20191006171128.006307663@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191006171124.641144086@linuxfoundation.org> References: <20191006171124.641144086@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@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 808d9fb627e97..477d0a27b9a5d 100644 --- a/drivers/gpu/drm/stm/ltdc.c +++ b/drivers/gpu/drm/stm/ltdc.c @@ -19,6 +19,7 @@ #include #include #include +#include #include #include #include @@ -825,6 +826,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