From patchwork Tue Jun 25 20:42:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 11016379 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 DFBFA14C0 for ; Tue, 25 Jun 2019 20:42:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D04D8206AF for ; Tue, 25 Jun 2019 20:42:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C4B6928496; Tue, 25 Jun 2019 20:42:29 +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 80B7A206AF for ; Tue, 25 Jun 2019 20:42:29 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8984B6E23D; Tue, 25 Jun 2019 20:42:24 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-ed1-x542.google.com (mail-ed1-x542.google.com [IPv6:2a00:1450:4864:20::542]) by gabe.freedesktop.org (Postfix) with ESMTPS id 91E306E22C for ; Tue, 25 Jun 2019 20:42:19 +0000 (UTC) Received: by mail-ed1-x542.google.com with SMTP id e3so29053371edr.10 for ; Tue, 25 Jun 2019 13:42:19 -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=0DSYgb9aonHfnDZhSr9L4wZg7nFbljE2Y+5VozO9vs0=; b=G8vVKebhx6LFnk5rmEH46S6M0ckymEsDsekL2slEWqzoFz6paPo+XgJZKyu2Bi8oiJ Tx6XjKAYqgncoCtRozlgK0+Yry64Co8N6IqcHtdjp0QHAEY5SJHDv1aAKeWYC2imXnq8 c2SObMprjmN7O3XrrwlLxfEnRKjRJ4ufP7665SHN0syeJ3Ma7Anq05DB2oPQzzACIUdb UiFQyVgfi1IiWHnbdS8/RSlqi5FB2FJLTNoKU3vPXgTLtkzuGc4YUKz1Aa+xYEXzAkBt fXyLNy0MeBEF3bsJvVS6Kk+wX7yPTEkKDqLB9UuoqyW7hAWms6HGGxtCqt5Pa9+jhvd9 3hyA== X-Gm-Message-State: APjAAAXzjPM9ZyTli5+Q/rgp+IgIx69cYil9zAR73Cz1HAJ9AJJJsHNe pgTmhZ9PwY/MEiczJjGieVKAkZeXifk= X-Google-Smtp-Source: APXvYqyGRhODXn/gilTyRQ8sMRjwlvREVn5+5CCRL8e6AH2uLRjcRLK4QKh2kkdiuL4+bk9WSztjqA== X-Received: by 2002:a17:906:6a89:: with SMTP id p9mr507513ejr.44.1561495337301; Tue, 25 Jun 2019 13:42:17 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:569e:0:3106:d637:d723:e855]) by smtp.gmail.com with ESMTPSA id u9sm5187262edm.71.2019.06.25.13.42.15 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 25 Jun 2019 13:42:16 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH 3/7] drm/vc4: Use drm_gem_fb_prepare_fb Date: Tue, 25 Jun 2019 22:42:04 +0200 Message-Id: <20190625204208.5614-4-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190625204208.5614-1-daniel.vetter@ffwll.ch> References: <20190625204208.5614-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=0DSYgb9aonHfnDZhSr9L4wZg7nFbljE2Y+5VozO9vs0=; b=Q3enBxpjusayBOw0Jh50TtLOeecXRU8mmS4ktxWzEkFRe2jfLrURwEAir4xRPnhJ00 exs4u4FqwF1CfrJgLhnCAZtJsqtNyG2obABuSkEA5I5NpmIuIkXT/fG/1Pcsy4lPk2k3 VQyv57EvwTvEn66erEFdon/CheZ1+eEo4cBek= X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Daniel Vetter , Daniel Vetter , Emil Velikov Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP vc4 has switched to using drm_fb->obj[], so we can just use the helper unchanged. v2: Make it compile ... oops. Cc: Eric Anholt Cc: Emil Velikov Signed-off-by: Daniel Vetter Cc: Eric Anholt --- drivers/gpu/drm/vc4/vc4_plane.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_plane.c index 0a0207c350a5..a996ca8ff972 100644 --- a/drivers/gpu/drm/vc4/vc4_plane.c +++ b/drivers/gpu/drm/vc4/vc4_plane.c @@ -20,6 +20,7 @@ #include #include #include +#include #include "uapi/drm/vc4_drm.h" #include "vc4_drv.h" @@ -1123,7 +1124,6 @@ static int vc4_prepare_fb(struct drm_plane *plane, struct drm_plane_state *state) { struct vc4_bo *bo; - struct dma_fence *fence; int ret; if (!state->fb) @@ -1131,8 +1131,7 @@ static int vc4_prepare_fb(struct drm_plane *plane, 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;