From patchwork Mon Nov 18 10:35:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 11249373 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 CD34313A4 for ; Mon, 18 Nov 2019 10:36:29 +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 B591620726 for ; Mon, 18 Nov 2019 10:36:29 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B591620726 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 ED4756E334; Mon, 18 Nov 2019 10:36:03 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wr1-x441.google.com (mail-wr1-x441.google.com [IPv6:2a00:1450:4864:20::441]) by gabe.freedesktop.org (Postfix) with ESMTPS id 639006E260 for ; Mon, 18 Nov 2019 10:35:59 +0000 (UTC) Received: by mail-wr1-x441.google.com with SMTP id n1so18758444wra.10 for ; Mon, 18 Nov 2019 02:35:59 -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=U+mnkihGleGDkz4cDlq1mLe29a8SOWxU0+l2t1XXTsM=; b=aafg+B1eEGpfW3aiBPhhT46/3KRib54oWktcKOHSYdCX0CU08KIQvRURSrqM563UnV f47E20EALvQ8I2kA6JFsZiS2EC7f9HnpktIqPC/DFVqpBG21KAfWX0O2PrBv4ZGDxAm5 jwftviNxqBhF3dXp9cc8tzaMUziGjf8dE6/sJwnepKD0xxuqpKCKMwgvg1jvqpZl/8nG doVTGeNWWZE58JMa1EkuvBXA6Nc4zuhFSmIG/9CAsoeaDZxBUHYu0vY5KnAfejkW0ErA dzGGYonNaqRUfoGXFJW4mM5/qt2eRNvtKGZX+Pme5FJtz5/goHcG6etxN28rT6geeqt7 4L9g== X-Gm-Message-State: APjAAAVPLRLeotx3ecq62UhiipVAD/Zp2oYOB7mtSpWXHSzUiBKJfEsJ wzcHHDg76R35dFUsNuUPHJVtgNJTd1I= X-Google-Smtp-Source: APXvYqzozGBqOejgw5+ZgybYSc6jvyuvTvJnin4nV8lOaRoK+ViPBQ0kjctGRaZWOGVKaQEY//LxDg== X-Received: by 2002:a5d:6083:: with SMTP id w3mr10863416wrt.308.1574073357688; Mon, 18 Nov 2019 02:35:57 -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.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Nov 2019 02:35:57 -0800 (PST) From: Daniel Vetter To: DRI Development Subject: [PATCH 12/15] drm/tee_shm: Drop dma_buf_k(unmap) support Date: Mon, 18 Nov 2019 11:35:33 +0100 Message-Id: <20191118103536.17675-13-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=U+mnkihGleGDkz4cDlq1mLe29a8SOWxU0+l2t1XXTsM=; b=RR2OzqVMDpULL+gS2tHr0M+ZMjNZ5gKVSX3SlUePY2ypTYNyj/EXJfTxJIphgLHle3 mB7l4HfL83nmzQOHXVl9t8F9sUIuceYAkUTLqE+yjK+tSUTWliD5Hu+1E7wn8GyLk6ur k+dehpjIQhD43Jts4rOcdlGI3FIOtyAihnPHA= 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: Arnd Bergmann , Daniel Vetter , Intel Graphics Development , tee-dev@lists.linaro.org, Greg Kroah-Hartman , Daniel Vetter , Jens Wiklander Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" There's no in-tree users anymore. Signed-off-by: Daniel Vetter Cc: Arnd Bergmann Cc: Greg Kroah-Hartman Cc: Jens Wiklander Cc: tee-dev@lists.linaro.org Acked-by: Greg Kroah-Hartman Acked-by: Jens Wiklander --- Ack for merging this through drm trees very much appreciated. -Daniel --- drivers/misc/fastrpc.c | 8 -------- drivers/tee/tee_shm.c | 6 ------ 2 files changed, 14 deletions(-) diff --git a/drivers/misc/fastrpc.c b/drivers/misc/fastrpc.c index 1b1a794d639d..d0cbef9ec28a 100644 --- a/drivers/misc/fastrpc.c +++ b/drivers/misc/fastrpc.c @@ -555,13 +555,6 @@ static void fastrpc_dma_buf_detatch(struct dma_buf *dmabuf, kfree(a); } -static void *fastrpc_kmap(struct dma_buf *dmabuf, unsigned long pgnum) -{ - struct fastrpc_buf *buf = dmabuf->priv; - - return buf->virt ? buf->virt + pgnum * PAGE_SIZE : NULL; -} - static void *fastrpc_vmap(struct dma_buf *dmabuf) { struct fastrpc_buf *buf = dmabuf->priv; @@ -585,7 +578,6 @@ static const struct dma_buf_ops fastrpc_dma_buf_ops = { .map_dma_buf = fastrpc_map_dma_buf, .unmap_dma_buf = fastrpc_unmap_dma_buf, .mmap = fastrpc_mmap, - .map = fastrpc_kmap, .vmap = fastrpc_vmap, .release = fastrpc_release, }; diff --git a/drivers/tee/tee_shm.c b/drivers/tee/tee_shm.c index 09ddcd06c715..937ac5aaa6d8 100644 --- a/drivers/tee/tee_shm.c +++ b/drivers/tee/tee_shm.c @@ -71,11 +71,6 @@ static void tee_shm_op_release(struct dma_buf *dmabuf) tee_shm_release(shm); } -static void *tee_shm_op_map(struct dma_buf *dmabuf, unsigned long pgnum) -{ - return NULL; -} - static int tee_shm_op_mmap(struct dma_buf *dmabuf, struct vm_area_struct *vma) { struct tee_shm *shm = dmabuf->priv; @@ -93,7 +88,6 @@ static const struct dma_buf_ops tee_shm_dma_buf_ops = { .map_dma_buf = tee_shm_op_map_dma_buf, .unmap_dma_buf = tee_shm_op_unmap_dma_buf, .release = tee_shm_op_release, - .map = tee_shm_op_map, .mmap = tee_shm_op_mmap, };