From patchwork Fri Jun 14 20:36:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 10996745 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 35C0814E5 for ; Fri, 14 Jun 2019 20:39:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2806B28733 for ; Fri, 14 Jun 2019 20:39:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1C6692876B; Fri, 14 Jun 2019 20:39:24 +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=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, 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 D387628755 for ; Fri, 14 Jun 2019 20:39:23 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 65A48898C2; Fri, 14 Jun 2019 20:37:43 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-ed1-x543.google.com (mail-ed1-x543.google.com [IPv6:2a00:1450:4864:20::543]) by gabe.freedesktop.org (Postfix) with ESMTPS id 93340897E0 for ; Fri, 14 Jun 2019 20:37:21 +0000 (UTC) Received: by mail-ed1-x543.google.com with SMTP id p26so5270740edr.2 for ; Fri, 14 Jun 2019 13:37:21 -0700 (PDT) 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:mime-version:content-transfer-encoding; bh=WzT6U0WhgobdeP303rEiKhwYgKLzSzO8WG/ZfKn+9Ns=; b=rMFsp9O9sT3KMN1nnoTSMjwQOKowLczQ2wB18ol7rgxbCJ9ZHrtmFf/VBDWHwEn0g+ pOI9HhuNRiNlFy0DSJDmPsHbqw0h3h8x+Gh0JwlbgVUOjksYl84WpMhFo2p7jpAKgrzv fN2qf/okQq71Yh5/67FaZZOr2pw/LL7cn+jMsWcDy+x3E+MldIX3W08SC1YXl0VbQvUf vhBberq+UItKBjDK7HOKHS7GJeEqFh/HmQbQpKFI0QBj5Kvm6hjI52x1wxG62XkNIOmw 7B8Ipz/inyhpqTKAkOWhIUgbc5spOeXJfug+Bd8PmcTcJQNh0py78Dw7XJWF0jVF0dmi MtmA== X-Gm-Message-State: APjAAAVRvQvG+waLTjx07vMYGqvA/xjlj5GikdQysVwHcWVZb3kuI1HK JCSGPaAhXDmc+MiauzTT1AFVTV87e4U= X-Google-Smtp-Source: APXvYqylEP6VyuIhHG5p3/sL+186wPgoa2pmMLwABLQV0tmBldXeHZ4unRx2OIkygJ0mAII9+YulCg== X-Received: by 2002:a50:b13b:: with SMTP id k56mr62380262edd.192.1560544639295; Fri, 14 Jun 2019 13:37:19 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:569e:0:3106:d637:d723:e855]) by smtp.gmail.com with ESMTPSA id n15sm1166672edd.49.2019.06.14.13.37.18 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Fri, 14 Jun 2019 13:37:18 -0700 (PDT) From: Daniel Vetter To: DRI Development Date: Fri, 14 Jun 2019 22:36:06 +0200 Message-Id: <20190614203615.12639-51-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190614203615.12639-1-daniel.vetter@ffwll.ch> References: <20190614203615.12639-1-daniel.vetter@ffwll.ch> MIME-Version: 1.0 X-Mailman-Original-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 :mime-version:content-transfer-encoding; bh=WzT6U0WhgobdeP303rEiKhwYgKLzSzO8WG/ZfKn+9Ns=; b=fUYqy5EX7S68buoXknbSdujJXaPoDAre4KSzShpXZfYThrGGy9PdcaIqxb1nz1sRMk EWImsJ3LOqnEGRIRuNyMp2FKO45TaUP+a/pxN5Smn/AKpy4hRkC9voLQAlyTwTpOSlLE T4KHaZZR8/P1bE6FX7aKhQO0ij0AeqVs22XQU= Subject: [Intel-gfx] [PATCH 50/59] drm/vc4: Use drm_gem_fb_prepare_fb X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Daniel Vetter , Intel Graphics Development , Daniel Vetter Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP vc4 has switched to using drm_fb->obj[], so we can just use the helper unchanged. Signed-off-by: Daniel Vetter Cc: Eric Anholt --- drivers/gpu/drm/vc4/vc4_plane.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_plane.c index 441e06d45c89..f59f8c404d80 100644 --- a/drivers/gpu/drm/vc4/vc4_plane.c +++ b/drivers/gpu/drm/vc4/vc4_plane.c @@ -1132,10 +1132,7 @@ static int vc4_prepare_fb(struct drm_plane *plane, if (!state->fb) return 0; - bo = to_vc4_bo(&drm_fb_cma_get_gem_obj(state->fb, 0)->base); - - fence = reservation_object_get_excl_rcu(bo->base.base.resv); - drm_atomic_set_fence_for_plane(state, fence); + drm_gem_fb_prepare_fb(plane, state); if (plane->state->fb == state->fb) return 0;