From patchwork Mon Nov 18 10:35:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 11249349 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 F149713A4 for ; Mon, 18 Nov 2019 10:36:14 +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 D5FED20730 for ; Mon, 18 Nov 2019 10:36:14 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D5FED20730 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 6E66C6E083; Mon, 18 Nov 2019 10:35:55 +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 95C2489FDE for ; Mon, 18 Nov 2019 10:35:52 +0000 (UTC) Received: by mail-wr1-x444.google.com with SMTP id f2so18786131wrs.11 for ; Mon, 18 Nov 2019 02:35:52 -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=LJxEIZGHH8M3drJjaoOzPjkBzGIpJKPTjBWGtqQ4YAE=; b=SGURdmcZFE06+1E49xpBCTJJUwJ0pQITV4wxqGx98FynsjuaTK8lpnxg8hK88Fyc+P EVMwB+YN/IgqK8fr1Z2g2G9R/NqcYIifxTn4ASJWhLM9Th12ZeYh9Wx+NrKczYsqp8M9 jMDmQLN/w7xuY0r72RLWPCwhekFKycrT/E73/YDli3ShebO2XoxEwZLUd+73rh5oiuzO oNvooIenR1ghKzRUvs+UI+RYAgkvzJhrhCpsz5t0qHPeYaCzO/tDR21HlbSNin/rlEPv cFcS8PO9tR2we1E2dKI9VjD6Keg4xGnEO2o93SKx2XJU+Lt1AzkPoK4Qjb7PerqdFJu8 Mc2Q== X-Gm-Message-State: APjAAAXYPuPt+94/rgU7DCQe1FNnhpVfKoHbovWLu9mXY79N9wgWlZdq +oOtGCRsxzU+sLXBdeSmjD8emfThpdQ= X-Google-Smtp-Source: APXvYqzHJtGiZS/Lstzz2gIsBLR0N/5g/ik2uF3G5oFSfoo3hnghJYh8il4OYqw5bW/rdjVXPhiKGQ== X-Received: by 2002:adf:f5c6:: with SMTP id k6mr28154611wrp.245.1574073350930; Mon, 18 Nov 2019 02:35:50 -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.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Nov 2019 02:35:50 -0800 (PST) From: Daniel Vetter To: DRI Development Subject: [PATCH 06/15] drm/i915: Drop dma_buf->k(un)map Date: Mon, 18 Nov 2019 11:35:27 +0100 Message-Id: <20191118103536.17675-7-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=LJxEIZGHH8M3drJjaoOzPjkBzGIpJKPTjBWGtqQ4YAE=; b=iob00DFIp7F8+l0wsHW1V5nOi+O62T06QlHw9Xpx+o7641f9Hgv13W24BVFtFcje7O khpwjOaOjtdh+9qp+VDUJhyK5z6/muzt7V0zB+9809qRVs+S16Fjv+n8ZrTPrTObMwA9 16T38k5Xz5HTAjGelKZehjfoDJ8INL4/EY7Ww= 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: Jani Nikula , Daniel Vetter , Intel Graphics Development , Matthew Auld , Daniel Vetter , Sam Ravnborg , =?utf-8?q?Christian_K=C3=B6nig?= Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" No in-tree users left. Aside, I think mock_dmabuf would be a nice addition to drm mock/selftest helpers (we have some already), with an EXPORT_SYMBOL_FOR_TESTS_ONLY. Signed-off-by: Daniel Vetter Cc: Chris Wilson Cc: Matthew Auld Cc: Daniel Vetter Cc: Jani Nikula Cc: Sam Ravnborg Cc: "Christian König" Acked-by: Christian König Reviewed-by: Chris Wilson --- drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c | 36 ------------------- .../gpu/drm/i915/gem/selftests/mock_dmabuf.c | 16 --------- 2 files changed, 52 deletions(-) diff --git a/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c b/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c index eaea49d08eb5..372b57ca0efc 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c @@ -93,40 +93,6 @@ static void i915_gem_dmabuf_vunmap(struct dma_buf *dma_buf, void *vaddr) i915_gem_object_unpin_map(obj); } -static void *i915_gem_dmabuf_kmap(struct dma_buf *dma_buf, unsigned long page_num) -{ - struct drm_i915_gem_object *obj = dma_buf_to_obj(dma_buf); - struct page *page; - - if (page_num >= obj->base.size >> PAGE_SHIFT) - return NULL; - - if (!i915_gem_object_has_struct_page(obj)) - return NULL; - - if (i915_gem_object_pin_pages(obj)) - return NULL; - - /* Synchronisation is left to the caller (via .begin_cpu_access()) */ - page = i915_gem_object_get_page(obj, page_num); - if (IS_ERR(page)) - goto err_unpin; - - return kmap(page); - -err_unpin: - i915_gem_object_unpin_pages(obj); - return NULL; -} - -static void i915_gem_dmabuf_kunmap(struct dma_buf *dma_buf, unsigned long page_num, void *addr) -{ - struct drm_i915_gem_object *obj = dma_buf_to_obj(dma_buf); - - kunmap(virt_to_page(addr)); - i915_gem_object_unpin_pages(obj); -} - static int i915_gem_dmabuf_mmap(struct dma_buf *dma_buf, struct vm_area_struct *vma) { struct drm_i915_gem_object *obj = dma_buf_to_obj(dma_buf); @@ -195,8 +161,6 @@ static const struct dma_buf_ops i915_dmabuf_ops = { .map_dma_buf = i915_gem_map_dma_buf, .unmap_dma_buf = i915_gem_unmap_dma_buf, .release = drm_gem_dmabuf_release, - .map = i915_gem_dmabuf_kmap, - .unmap = i915_gem_dmabuf_kunmap, .mmap = i915_gem_dmabuf_mmap, .vmap = i915_gem_dmabuf_vmap, .vunmap = i915_gem_dmabuf_vunmap, diff --git a/drivers/gpu/drm/i915/gem/selftests/mock_dmabuf.c b/drivers/gpu/drm/i915/gem/selftests/mock_dmabuf.c index b9e059d4328a..9272bef57092 100644 --- a/drivers/gpu/drm/i915/gem/selftests/mock_dmabuf.c +++ b/drivers/gpu/drm/i915/gem/selftests/mock_dmabuf.c @@ -76,20 +76,6 @@ static void mock_dmabuf_vunmap(struct dma_buf *dma_buf, void *vaddr) vm_unmap_ram(vaddr, mock->npages); } -static void *mock_dmabuf_kmap(struct dma_buf *dma_buf, unsigned long page_num) -{ - struct mock_dmabuf *mock = to_mock(dma_buf); - - return kmap(mock->pages[page_num]); -} - -static void mock_dmabuf_kunmap(struct dma_buf *dma_buf, unsigned long page_num, void *addr) -{ - struct mock_dmabuf *mock = to_mock(dma_buf); - - return kunmap(mock->pages[page_num]); -} - static int mock_dmabuf_mmap(struct dma_buf *dma_buf, struct vm_area_struct *vma) { return -ENODEV; @@ -99,8 +85,6 @@ static const struct dma_buf_ops mock_dmabuf_ops = { .map_dma_buf = mock_map_dma_buf, .unmap_dma_buf = mock_unmap_dma_buf, .release = mock_dmabuf_release, - .map = mock_dmabuf_kmap, - .unmap = mock_dmabuf_kunmap, .mmap = mock_dmabuf_mmap, .vmap = mock_dmabuf_vmap, .vunmap = mock_dmabuf_vunmap,