From patchwork Fri Jun 14 20:36:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 10996751 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 46733112C for ; Fri, 14 Jun 2019 20:39:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3864528733 for ; Fri, 14 Jun 2019 20:39:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2CE5C2876B; Fri, 14 Jun 2019 20:39:27 +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=unavailable 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 DF92C28733 for ; Fri, 14 Jun 2019 20:39:26 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0513389872; Fri, 14 Jun 2019 20:37:42 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-ed1-x541.google.com (mail-ed1-x541.google.com [IPv6:2a00:1450:4864:20::541]) by gabe.freedesktop.org (Postfix) with ESMTPS id EF4F389612 for ; Fri, 14 Jun 2019 20:37:17 +0000 (UTC) Received: by mail-ed1-x541.google.com with SMTP id a14so5201446edv.12 for ; Fri, 14 Jun 2019 13:37:17 -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=KFPSYVwN3kk9QZ4sKRltB7QwR18X686gyXUMlqrYsrY=; b=jlpYUZKxdpmvhfqP5JVqEKUvVNGuWW8o+pOASl3rRC5lz9+0F513frUnc4QvtTp8es inVb35EG9w4kjQnOd38rs/hO7ft4dwzShPQItp222i4GKZ8NIuXRiOdyO07u9aeAdklq yq4apkSiL0bdNWRjRAE0/TaRI6hgGgMXoo5GfvCl0IQlsbHn9HQT00VxMKau0QDiFROO BOhO5NjRgbff6Tl5vad/hcUKIPU2cuoMsxl+p1S+EjEsycF8nEC8F8eaRmCfONqbGxlY E4h0JofGsFxBSbJZSvxZLnnsQGFzwpghdxQVVif0oDca9SgIQQCOS/ZDPwRWh5XIK+xu z0Ow== X-Gm-Message-State: APjAAAX1lW1bLl65jX3KQjNGuv+GtRgEeQdWyJEogp2CvBMvpIiL9X1o 18Kr3Wb/lTHX/Iw0edxG8wF7M6ZNwpA= X-Google-Smtp-Source: APXvYqx6f03vXMhDJunlmmOY4VivqbA2U9HTxczdzhG2kOU+jL8CIwcPl1B1GkGGY+Ooq04DMb4KOQ== X-Received: by 2002:a50:b1e7:: with SMTP id n36mr55073451edd.227.1560544635843; Fri, 14 Jun 2019 13:37:15 -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.14 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Fri, 14 Jun 2019 13:37:15 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH 47/59] drm/vc4: Don set gem_obj->resv in prime import anymore Date: Fri, 14 Jun 2019 22:36:03 +0200 Message-Id: <20190614203615.12639-48-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=KFPSYVwN3kk9QZ4sKRltB7QwR18X686gyXUMlqrYsrY=; b=IsOqiwSAcFTgXxTRrpMpQV8o5pikcwR33RNFL991UaWuy+f+6Ck3xYHOCTtC/taWha efSVJaCFMHu0fgTtriz8xJGibqGfbafRU29u7gWBy1cUCJmjnTjZIvso+HTfMJ0ojgdP vXjYBS4GPya21gswLI+3oP9Tsiz6nQtj9zYyI= 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 , Intel Graphics Development , Daniel Vetter Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP This is done in drm_prime.c now. Signed-off-by: Daniel Vetter Cc: Eric Anholt --- drivers/gpu/drm/vc4/vc4_bo.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_bo.c b/drivers/gpu/drm/vc4/vc4_bo.c index b0f9eb6632a2..707bcd9927f3 100644 --- a/drivers/gpu/drm/vc4/vc4_bo.c +++ b/drivers/gpu/drm/vc4/vc4_bo.c @@ -793,8 +793,6 @@ vc4_prime_import_sg_table(struct drm_device *dev, if (IS_ERR(obj)) return obj; - obj->resv = attach->dmabuf->resv; - return obj; }