From patchwork Thu Apr 5 15:44:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 10324809 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 660986032A for ; Thu, 5 Apr 2018 15:45:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 56FB0292C7 for ; Thu, 5 Apr 2018 15:45:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4B962292CA; Thu, 5 Apr 2018 15:45:10 +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=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E4D89292C7 for ; Thu, 5 Apr 2018 15:45:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751278AbeDEPpJ (ORCPT ); Thu, 5 Apr 2018 11:45:09 -0400 Received: from mail-wm0-f67.google.com ([74.125.82.67]:55297 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751179AbeDEPpI (ORCPT ); Thu, 5 Apr 2018 11:45:08 -0400 Received: by mail-wm0-f67.google.com with SMTP id b127so6970933wmf.5 for ; Thu, 05 Apr 2018 08:45:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=G7NnhgHbcTHdkhbDO7cH75I+uuUeFR4QEP1A3Fu6qMU=; b=FUn84Uz1a4YFpc93u0/o/4bVK+EQ6GP6kn0bMse5jgHyRK1xthA+kcWVe9zbu6elR1 J0b+3O0wownl8KSDpJXdKNZ9fjgjer6d2tvfT84noS+idILJYl9thSlcEKEtcwfWNWW4 4v7iAExYN9si9sxdLiYG/go63zaNrbHMvXpSE= 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:in-reply-to :references; bh=G7NnhgHbcTHdkhbDO7cH75I+uuUeFR4QEP1A3Fu6qMU=; b=WQERJ02KKPp9EI03hsVG2Ud7fZ70YTuzRyrPKA9V311sFliXLSL2P/NQMBWtg2dnVb KbgMeqxt8RF3AL7RBdLPZbndTZy5VEKhrVl0Aap2BRImbqQjOVTFc4jvaq586yUD2GTc c3ia94RRxvcwxWrP6ylNEHHiM+hD8QB6hXvQPhYGKwX2WfuQUY730rjqzEf80yVJ1roj B/wZ74xwf3ONLHD2uJFzgdrp7M4a1DH/vLO86sSWopPavPr9mOuuWtgCflN6O7sT4ixl sea/oCSSN4yijdWEv3YtckBstDe6EZVN9lG7lYlcD1y/yfqqGeioj2kie9rNY+a5TXx1 lwoQ== X-Gm-Message-State: ALQs6tDcqkocgNnL8jRcaK4jqumW4p3pq0pZeNu0jrWFnA2mhQCMqAiN IWkbFFvYbY9HvUxX4Rg/IfqaFQ== X-Google-Smtp-Source: AIpwx4/xZBrMjSEGYbVt27DWu3eldiNTYk6zpGPID8nkEJI8dAoE0w184H3GQh0/SEg09d1Adgl4Zg== X-Received: by 10.80.250.9 with SMTP id b9mr3467925edq.304.1522943107529; Thu, 05 Apr 2018 08:45:07 -0700 (PDT) Received: from phenom.ffwll.local (212-51-149-109.fiber7.init7.net. [212.51.149.109]) by smtp.gmail.com with ESMTPSA id i48sm4970247ede.39.2018.04.05.08.45.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 05 Apr 2018 08:45:06 -0700 (PDT) From: Daniel Vetter To: DRI Development Cc: Daniel Vetter , Daniel Vetter , Rob Clark , linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org Subject: [PATCH 9/9] drm/msm: Always obey implicit fencing Date: Thu, 5 Apr 2018 17:44:49 +0200 Message-Id: <20180405154449.23038-10-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180405154449.23038-1-daniel.vetter@ffwll.ch> References: <20180405154449.23038-1-daniel.vetter@ffwll.ch> Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Again same justification as for drm_gem_fb_prepare_fb(). Definitely needs some testing because Rob doesn't remember why he did this, and Google/git.fd.o or anything also doesn't shed some light on it. Signed-off-by: Daniel Vetter Cc: Rob Clark Cc: linux-arm-msm@vger.kernel.org Cc: freedreno@lists.freedesktop.org --- drivers/gpu/drm/msm/msm_atomic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/msm/msm_atomic.c b/drivers/gpu/drm/msm/msm_atomic.c index bf5f8c39f34d..0dcdc922fc61 100644 --- a/drivers/gpu/drm/msm/msm_atomic.c +++ b/drivers/gpu/drm/msm/msm_atomic.c @@ -201,7 +201,7 @@ int msm_atomic_commit(struct drm_device *dev, * Figure out what fence to wait for: */ for_each_oldnew_plane_in_state(state, plane, old_plane_state, new_plane_state, i) { - if ((new_plane_state->fb != old_plane_state->fb) && new_plane_state->fb) { + if (new_plane_state->fb) { struct drm_gem_object *obj = msm_framebuffer_bo(new_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);