From patchwork Thu Oct 27 19:37:07 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gustavo Padovan X-Patchwork-Id: 9400279 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id F3BCE60231 for ; Thu, 27 Oct 2016 19:37:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D56A52A38D for ; Thu, 27 Oct 2016 19:37:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CA39B2A399; Thu, 27 Oct 2016 19:37:37 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 415922A38D for ; Thu, 27 Oct 2016 19:37:37 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C8B4E6EACA; Thu, 27 Oct 2016 19:37:36 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-yb0-f196.google.com (mail-yb0-f196.google.com [209.85.213.196]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9C9D96EACA for ; Thu, 27 Oct 2016 19:37:35 +0000 (UTC) Received: by mail-yb0-f196.google.com with SMTP id d128so980627ybh.3 for ; Thu, 27 Oct 2016 12:37:35 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=sdZkqZbL/rUVKOwSUaJGeL/DV1A0pni9/CdCbuHzFic=; b=m75T44fCE49Dh5OgSfEmjus/9yE0JBp4FZvcznHpEQC5/R+ha3KPckRYt4vmIBC7an NobKkUwFKb1kCgCrtkRFZO3tplDLYzbvRkWMgemhFF42BewKyjTHLlvU92zWwFtKF2ew 4YDUkG5mV6onPyfelgD/Wiu7GGIGN4L72q5Rkvc5+1bPxycQP7EY0PX7cbpOQ8zFY1uU +nfbat3E+TCt20nMfiP77Ebf7WsOQtNORaMCPHxINuGwv/imYwUflUBWwqbSeEaiGHqU Df0wySquLd6dB7+mYMpBPo3BIYyfaoWnZntUFXZtMuM4A88C010HuJNjHmtJXsGGIox2 R4Hw== X-Gm-Message-State: ABUngveoJAPq0Po2y1BqmXdgyy3fbigpcO7TR4c8n7ICiWDu5HVSK8Dyed/jU+89nbxDAA== X-Received: by 10.37.115.198 with SMTP id o189mr8588970ybc.90.1477597054726; Thu, 27 Oct 2016 12:37:34 -0700 (PDT) Received: from jade.localdomain ([187.64.228.41]) by smtp.gmail.com with ESMTPSA id b207sm3129787ywa.4.2016.10.27.12.37.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 27 Oct 2016 12:37:34 -0700 (PDT) From: Gustavo Padovan To: dri-devel@lists.freedesktop.org Subject: [PATCH v6 2/6] drm/imx: use drm_atomic_set_fence_for_plane() to set the fence Date: Thu, 27 Oct 2016 17:37:07 -0200 Message-Id: <1477597031-5139-3-git-send-email-gustavo@padovan.org> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1477597031-5139-1-git-send-email-gustavo@padovan.org> References: <1477597031-5139-1-git-send-email-gustavo@padovan.org> Cc: marcheu@google.com, Daniel Stone , seanpaul@google.com, Daniel Vetter , linux-kernel@vger.kernel.org, laurent.pinchart@ideasonboard.com, Gustavo Padovan , John Harrison , m.chehab@samsung.com X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Gustavo Padovan drm_atomic_set_fence_for_plane() is smart and won't overwrite plane_state->fence if the user already set an explicit fence there. Signed-off-by: Gustavo Padovan Reviewed-by: Daniel Vetter --- drivers/gpu/drm/imx/imx-drm-core.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/imx/imx-drm-core.c b/drivers/gpu/drm/imx/imx-drm-core.c index 98df09c..07fe955 100644 --- a/drivers/gpu/drm/imx/imx-drm-core.c +++ b/drivers/gpu/drm/imx/imx-drm-core.c @@ -158,6 +158,7 @@ static int imx_drm_atomic_commit(struct drm_device *dev, struct drm_plane_state *plane_state; struct drm_plane *plane; struct dma_buf *dma_buf; + struct dma_fence *fence; int i; /* @@ -170,8 +171,9 @@ static int imx_drm_atomic_commit(struct drm_device *dev, 0)->base.dma_buf; if (!dma_buf) continue; - plane_state->fence = - reservation_object_get_excl_rcu(dma_buf->resv); + fence = reservation_object_get_excl_rcu(dma_buf->resv); + + drm_atomic_set_fence_for_plane(plane_state, fence); } }