From patchwork Mon Nov 18 10:35:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 11249361 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D4E65930 for ; Mon, 18 Nov 2019 10: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 BD52B20730 for ; Mon, 18 Nov 2019 10:36:22 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BD52B20730 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 E56156E2CA; Mon, 18 Nov 2019 10:35:59 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wr1-x443.google.com (mail-wr1-x443.google.com [IPv6:2a00:1450:4864:20::443]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3155C6E260 for ; Mon, 18 Nov 2019 10:35:57 +0000 (UTC) Received: by mail-wr1-x443.google.com with SMTP id w9so18824070wrr.0 for ; Mon, 18 Nov 2019 02:35:57 -0800 (PST) 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=x4nXMVJDOotuhduK9qJMseWJ5lAEYnYb7OE2peSjq/A=; b=aEo3yeoIufQ5/TdIYLG7pZkeDmR95Tea9wzSxz7JnEFTz36/OshTmND/vQlh7S93hf TWc7t55eQboL8VWa6qrBbaixKtFZbbSGA6fVW+nxCj1wEspawpjQ8dbZl9aUiant88ec pcA/2q3y+T2G8QCK6EgnRlMejpWX+LEBFYHkzOWNdEsDnOf/ueOb/B6MMltapxX6uWzT 8bS+CeNVBUlmOcf22UVBK0a/GXmnVyLrGJyRSGqZKa8tnZLwuyLVA/dRSpRKs6L4PkNJ oATAStDGI/dxNAFbNLRZngrFv2bVsW5l0RIIxYwk0XNybpyjNXR56NcnsBMBFVfEcLNO qauw== X-Gm-Message-State: APjAAAXP03pbKw1PpXrcah+7RNgT+kS3fNXEwm5keOPmsw9DuhbHb5lD Uq35sPbWp2UzGl+cTYXRWVfjNkVQDgY= X-Google-Smtp-Source: APXvYqz1JCjGY1ka8JaIypun02hgQIEHd4TjAdSqF6jgH02cDn+b7whzWidkDLc/Dl1HVLz3Ix97BA== X-Received: by 2002:a5d:6706:: with SMTP id o6mr8574718wru.54.1574073355554; Mon, 18 Nov 2019 02:35:55 -0800 (PST) Received: from phenom.ffwll.local (212-51-149-96.fiber7.init7.net. [212.51.149.96]) by smtp.gmail.com with ESMTPSA id j2sm22749200wrt.61.2019.11.18.02.35.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Nov 2019 02:35:54 -0800 (PST) From: Daniel Vetter To: DRI Development Subject: [PATCH 10/15] drm/vmwgfx: Delete mmaping functions Date: Mon, 18 Nov 2019 11:35:31 +0100 Message-Id: <20191118103536.17675-11-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191118103536.17675-1-daniel.vetter@ffwll.ch> References: <20191118103536.17675-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=x4nXMVJDOotuhduK9qJMseWJ5lAEYnYb7OE2peSjq/A=; b=GLwhR5Ugo2MaoDON08K3o2HoJGGcm0QkLHFVVEemIzNuXTVnYK8MKB1r4+WPGl3IKD jmrIeytG3Y37EtZiPO11j93fWwSnvdbetPU3Kkg0g5CjDB5xeJaZeRykkpzo0XAuAQy4 /k+TaWMnGcZGXmhHMuNbONQVqxI6tUukuAdlo= 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 , VMware Graphics , Thomas Hellstrom , Daniel Vetter Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" No need for stubs, dma-buf.c takes care of that. Aside, not having a ->release callback smelled like refcounting leak somewhere. It will also score you a WARN_ON backtrace in dma-buf.c on every export. But then I found that ttm_device_object_init overwrites it. Overwriting const memory is not going to go down well in recent kernels. One more aside: The (un)map_dma_buf can't ever be called because ->attach rejects everything. Might want to drop a BUG_ON(1) in there. Same for ->detach. Signed-off-by: Daniel Vetter Cc: VMware Graphics Cc: Thomas Hellstrom Reviewed-by: Thomas Hellstrom --- drivers/gpu/drm/vmwgfx/vmwgfx_prime.c | 33 --------------------------- 1 file changed, 33 deletions(-) diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_prime.c b/drivers/gpu/drm/vmwgfx/vmwgfx_prime.c index e420675e8db3..d9552a1efd13 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_prime.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_prime.c @@ -62,45 +62,12 @@ static void vmw_prime_unmap_dma_buf(struct dma_buf_attachment *attach, { } -static void *vmw_prime_dmabuf_vmap(struct dma_buf *dma_buf) -{ - return NULL; -} - -static void vmw_prime_dmabuf_vunmap(struct dma_buf *dma_buf, void *vaddr) -{ -} - -static void *vmw_prime_dmabuf_kmap(struct dma_buf *dma_buf, - unsigned long page_num) -{ - return NULL; -} - -static void vmw_prime_dmabuf_kunmap(struct dma_buf *dma_buf, - unsigned long page_num, void *addr) -{ - -} - -static int vmw_prime_dmabuf_mmap(struct dma_buf *dma_buf, - struct vm_area_struct *vma) -{ - WARN_ONCE(true, "Attempted use of dmabuf mmap. Bad.\n"); - return -ENOSYS; -} - const struct dma_buf_ops vmw_prime_dmabuf_ops = { .attach = vmw_prime_map_attach, .detach = vmw_prime_map_detach, .map_dma_buf = vmw_prime_map_dma_buf, .unmap_dma_buf = vmw_prime_unmap_dma_buf, .release = NULL, - .map = vmw_prime_dmabuf_kmap, - .unmap = vmw_prime_dmabuf_kunmap, - .mmap = vmw_prime_dmabuf_mmap, - .vmap = vmw_prime_dmabuf_vmap, - .vunmap = vmw_prime_dmabuf_vunmap, }; int vmw_prime_fd_to_handle(struct drm_device *dev,