Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1758341AbcJ1HeX (ORCPT <rfc822;w@1wt.eu>);
        Fri, 28 Oct 2016 03:34:23 -0400
Received: from mail-wm0-f67.google.com ([74.125.82.67]:36422 "EHLO
        mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1758262AbcJ1HeV (ORCPT
        <rfc822;linux-kernel@vger.kernel.org>);
        Fri, 28 Oct 2016 03:34:21 -0400
Date: Fri, 28 Oct 2016 09:34:16 +0200
From: Daniel Vetter <daniel@ffwll.ch>
To: Gustavo Padovan <gustavo@padovan.org>
Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org,
        Daniel Stone <daniels@collabora.com>,
        Daniel Vetter <daniel.vetter@ffwll.ch>,
        Rob Clark <robdclark@gmail.com>, Greg Hackmann <ghackmann@google.com>,
        John Harrison <John.C.Harrison@Intel.com>,
        laurent.pinchart@ideasonboard.com, seanpaul@google.com,
        marcheu@google.com, m.chehab@samsung.com,
        Sumit Semwal <sumit.semwal@linaro.org>,
        Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
        Brian Starkey <brian.starkey@arm.com>,
        Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Subject: Re: [PATCH v6 3/6] drm/msm: use drm_atomic_set_fence_for_plane() to
 set the fence
Message-ID: <20161028073416.ijkga3umleopkye4@phenom.ffwll.local>
Mail-Followup-To: Gustavo Padovan <gustavo@padovan.org>,
        dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org,
        Daniel Stone <daniels@collabora.com>,
        Rob Clark <robdclark@gmail.com>,
        Greg Hackmann <ghackmann@google.com>,
        John Harrison <John.C.Harrison@Intel.com>,
        laurent.pinchart@ideasonboard.com, seanpaul@google.com,
        marcheu@google.com, m.chehab@samsung.com,
        Sumit Semwal <sumit.semwal@linaro.org>,
        Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
        Brian Starkey <brian.starkey@arm.com>,
        Gustavo Padovan <gustavo.padovan@collabora.co.uk>
References: <1477597031-5139-1-git-send-email-gustavo@padovan.org>
 <1477597031-5139-4-git-send-email-gustavo@padovan.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <1477597031-5139-4-git-send-email-gustavo@padovan.org>
X-Operating-System: Linux phenom 4.6.0-1-amd64 
User-Agent: NeoMutt/20161014 (1.7.1)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
Content-Length: 1279
Lines: 37

On Thu, Oct 27, 2016 at 05:37:08PM -0200, Gustavo Padovan wrote:
> From: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
> 
> 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 <gustavo.padovan@collabora.co.uk>

Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>

> ---
>  drivers/gpu/drm/msm/msm_atomic.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/msm/msm_atomic.c b/drivers/gpu/drm/msm/msm_atomic.c
> index db193f8..4e21e1d 100644
> --- a/drivers/gpu/drm/msm/msm_atomic.c
> +++ b/drivers/gpu/drm/msm/msm_atomic.c
> @@ -217,8 +217,9 @@ int msm_atomic_commit(struct drm_device *dev,
>  		if ((plane->state->fb != plane_state->fb) && plane_state->fb) {
>  			struct drm_gem_object *obj = msm_framebuffer_bo(plane_state->fb, 0);
>  			struct msm_gem_object *msm_obj = to_msm_bo(obj);
> +			struct dma_fence *fence = reservation_object_get_excl_rcu(msm_obj->resv);
>  
> -			plane_state->fence = reservation_object_get_excl_rcu(msm_obj->resv);
> +			drm_atomic_set_fence_for_plane(plane_state, fence);
>  		}
>  	}
>  
> -- 
> 2.5.5
> 

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch