From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7E589C47255 for ; Mon, 11 May 2020 09:36:22 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 47B642075E for ; Mon, 11 May 2020 09:36:22 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=ffwll.ch header.i=@ffwll.ch header.b="EIvtL04e" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 47B642075E Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ffwll.ch Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id DD48D6E418; Mon, 11 May 2020 09:36:07 +0000 (UTC) Received: from mail-wr1-x444.google.com (mail-wr1-x444.google.com [IPv6:2a00:1450:4864:20::444]) by gabe.freedesktop.org (Postfix) with ESMTPS id D0EAB6E415 for ; Mon, 11 May 2020 09:36:06 +0000 (UTC) Received: by mail-wr1-x444.google.com with SMTP id k1so10044328wrx.4 for ; Mon, 11 May 2020 02:36:06 -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 :mime-version:content-transfer-encoding; bh=2Ir7TJSxw5q5w7D2aNk3E/aUWu32eOFoB7St8IoKp3I=; b=EIvtL04eDAWYFMgnpvXY860jstI6qzISn7BmVpIzEFuCbh2Y+ZoJBYTYnxCsO3dIQb vwA+Im0vcNx6g0X0nMtNHkNu9V1/bakVKQynr9IlgK714d/ITumUL6k0We4FV9YZqer5 p2eUlikogNFzPt1hQf3nglNOPdFoqx9Jbiyno= 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=2Ir7TJSxw5q5w7D2aNk3E/aUWu32eOFoB7St8IoKp3I=; b=A88RxTvsTnaNbmfcntBYyC0CwImcRGjHHiKis6ZLik1ktKwgHog7/tkZCS9MxkZEhc /pyywMxyLidp/az5vDNfaxCk7+Zr5M1qOehhB+k9aKIWm2K7BmPhwgMzGCMnnRpLyYSB Iyo6mompmCSAReGYGLQOhniMj4k6qyq0YBBpp8wVBDwj7CT1kuxLC0eaZwzo/rfu/W0F Q0le7Pt5xalV9n2+vqKku9JgN5Lg82lAWFW4GFMPCrVTyfm8QbFPgkKTJsjJMowf4w/V R+7BFZiSswgvajyV8og5fGIqBYCoa1lJf9QUrENA5cgcWpN9PBTOitVQnLDvWFd7gtBu NvMw== X-Gm-Message-State: AGi0PuYRe7dIhsp+I9xuP/Qlw80JMm9NmcyfLBjJC/l4XygcTVBGOOr0 +KRQgFp1vjaAvVas6sgHIYauNtbRrBE= X-Google-Smtp-Source: APiQypJV3XuZoFMauwsbabZrjZ13KMVDXGUYhiaMJeiGyabt6ydaz9Ks26iGQ4kT3KAXQG1oqUPUDA== X-Received: by 2002:adf:fa04:: with SMTP id m4mr17753963wrr.30.1589189765296; Mon, 11 May 2020 02:36:05 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id q17sm9013945wmk.36.2020.05.11.02.36.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 May 2020 02:36:04 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH 5/9] drm/udl: Don't call get/put_pages on imported dma-buf Date: Mon, 11 May 2020 11:35:50 +0200 Message-Id: <20200511093554.211493-6-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200511093554.211493-1-daniel.vetter@ffwll.ch> References: <20200511093554.211493-1-daniel.vetter@ffwll.ch> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sam Ravnborg , Daniel Vetter , Intel Graphics Development , Gerd Hoffmann , Thomas Zimmermann , Daniel Vetter , Alex Deucher , Dave Airlie , Thomas Gleixner , Sean Paul Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" There's no direct harm, because for the shmem helpers these are noops on imported buffers. The trouble is in the locks these take - I want to change dma_buf_vmap locking, and so need to make sure that we only ever take certain locks on one side of the dma-buf interface: Either for exporters, or for importers. Signed-off-by: Daniel Vetter Cc: Dave Airlie Cc: Sean Paul Cc: Gerd Hoffmann Cc: Thomas Zimmermann Cc: Alex Deucher Cc: Daniel Vetter Cc: Thomas Gleixner Cc: Sam Ravnborg --- drivers/gpu/drm/udl/udl_gem.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/udl/udl_gem.c b/drivers/gpu/drm/udl/udl_gem.c index b6e26f98aa0a..c68d3e265329 100644 --- a/drivers/gpu/drm/udl/udl_gem.c +++ b/drivers/gpu/drm/udl/udl_gem.c @@ -46,29 +46,31 @@ static void *udl_gem_object_vmap(struct drm_gem_object *obj) if (shmem->vmap_use_count++ > 0) goto out; - ret = drm_gem_shmem_get_pages(shmem); - if (ret) - goto err_zero_use; - - if (obj->import_attach) + if (obj->import_attach) { shmem->vaddr = dma_buf_vmap(obj->import_attach->dmabuf); - else + } else { + ret = drm_gem_shmem_get_pages(shmem); + if (ret) + goto err; + shmem->vaddr = vmap(shmem->pages, obj->size >> PAGE_SHIFT, VM_MAP, PAGE_KERNEL); + if (!shmem->vaddr) + drm_gem_shmem_put_pages(shmem); + } + if (!shmem->vaddr) { DRM_DEBUG_KMS("Failed to vmap pages\n"); ret = -ENOMEM; - goto err_put_pages; + goto err; } out: mutex_unlock(&shmem->vmap_lock); return shmem->vaddr; -err_put_pages: - drm_gem_shmem_put_pages(shmem); -err_zero_use: +err: shmem->vmap_use_count = 0; mutex_unlock(&shmem->vmap_lock); return ERR_PTR(ret); -- 2.26.2 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel