From patchwork Mon Nov 18 10:35:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 11249351 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 C2079184E for ; Mon, 18 Nov 2019 10:36:16 +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 AA96520730 for ; Mon, 18 Nov 2019 10:36:16 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AA96520730 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 B26496E0F1; Mon, 18 Nov 2019 10:35:56 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org 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 CA7BB89FDE for ; Mon, 18 Nov 2019 10:35:53 +0000 (UTC) Received: by mail-wr1-x444.google.com with SMTP id w9so18823848wrr.0 for ; Mon, 18 Nov 2019 02:35:53 -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=rolM2WPKs8+DsIxKqhNuDcQ0QT80+P3uSe9mlBm5Xok=; b=N9kPwH0jBzy7HcVmk6PWmabdKP7JzusBu40zTfiHjOJEv5z2DXz2feFaJG7AcAGANl TVOBLs7o39o5md85WvayGO+llgcH3969Mxbqzks2T570+mnJDkwgUiFuQMUxpoLLAb4u 7tEkXY8mvFatn9nkIQQyZEtjSDbwxINX0flRu9CfnjK7w+V/RnFsTUdY2NTPJtIUQ39v o71iZTSgr5ArL0w/EiG1STh1XusftcAvhe600mDbud6U+Z+ozY+hd10AkMwn/7IVuUUO /a5mpJRRrCBYt0yNO9nh66YUpc/zb5LdB8RhZGh/6RkgWnI/3CLZyWWnoULNA4kbe/Ri VU0Q== X-Gm-Message-State: APjAAAVs5cybTPpk4SJQaWHyV9/FGd+v21e9au1E9J2qhKlkn3EUDs2a ydDHCc1Ph5hPEKA7Tcj+aNzGWtyumcI= X-Google-Smtp-Source: APXvYqwPRFZSkWVwmowI7t5vonOru3FCQvDaRuKAk40jMAWnOvg8mPVy/34XnMryuGKWE5aYD5LbCA== X-Received: by 2002:a5d:4b86:: with SMTP id b6mr22717029wrt.143.1574073352170; Mon, 18 Nov 2019 02:35:52 -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.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Nov 2019 02:35:51 -0800 (PST) From: Daniel Vetter To: DRI Development Subject: [PATCH 07/15] drm/omapdrm: Drop dma_buf->k(un)map Date: Mon, 18 Nov 2019 11:35:28 +0100 Message-Id: <20191118103536.17675-8-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=rolM2WPKs8+DsIxKqhNuDcQ0QT80+P3uSe9mlBm5Xok=; b=agyUJnU75V0fGIBlkG1uo6HVgtfTsAY9NjSlXJlJjrD4Fh9sOf2ESoLtrvfr1BVc5/ QwhpO9T+v71nfmzjbfDeLpfLyrJiW9gHQdvIbv00Y2kz18fMSU85uWJdqyU0QnSVb5jK vQDQafOLTMMM99wDNOPj6qc7zD1XH3M+RgrCQ= 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 , Tomi Valkeinen , Daniel Vetter Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" No in-tree users left. Note that this is one of the few (if only) implementations of dma-buf that provided a kmap, but not a vmap implemenation. Given that the only real user (in-tree at least) of kmap was tegra, and it's impossible to buy a chip with tegra host1x and ompadrm on the same SoC, there's no problem here. Signed-off-by: Daniel Vetter Cc: Tomi Valkeinen Acked-by: Tomi Valkeinen --- drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c b/drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c index 7344bb61936c..b319fe7f2371 100644 --- a/drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c +++ b/drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c @@ -85,25 +85,6 @@ static int omap_gem_dmabuf_end_cpu_access(struct dma_buf *buffer, return 0; } -static void *omap_gem_dmabuf_kmap(struct dma_buf *buffer, - unsigned long page_num) -{ - struct drm_gem_object *obj = buffer->priv; - struct page **pages; - omap_gem_get_pages(obj, &pages, false); - omap_gem_cpu_sync_page(obj, page_num); - return kmap(pages[page_num]); -} - -static void omap_gem_dmabuf_kunmap(struct dma_buf *buffer, - unsigned long page_num, void *addr) -{ - struct drm_gem_object *obj = buffer->priv; - struct page **pages; - omap_gem_get_pages(obj, &pages, false); - kunmap(pages[page_num]); -} - static int omap_gem_dmabuf_mmap(struct dma_buf *buffer, struct vm_area_struct *vma) { @@ -123,8 +104,6 @@ static const struct dma_buf_ops omap_dmabuf_ops = { .release = drm_gem_dmabuf_release, .begin_cpu_access = omap_gem_dmabuf_begin_cpu_access, .end_cpu_access = omap_gem_dmabuf_end_cpu_access, - .map = omap_gem_dmabuf_kmap, - .unmap = omap_gem_dmabuf_kunmap, .mmap = omap_gem_dmabuf_mmap, };