From patchwork Thu Oct 31 08:29:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janusz Krzysztofik X-Patchwork-Id: 11220687 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 25CD31599 for ; Thu, 31 Oct 2019 08:30:37 +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 0CCD120873 for ; Thu, 31 Oct 2019 08:30:36 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0CCD120873 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4CF616EDB3; Thu, 31 Oct 2019 08:30:36 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by gabe.freedesktop.org (Postfix) with ESMTPS id 38FC56EDB3 for ; Thu, 31 Oct 2019 08:30:34 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 31 Oct 2019 01:30:33 -0700 X-IronPort-AV: E=Sophos;i="5.68,250,1569308400"; d="scan'208";a="190551981" Received: from jkrzyszt-desk.igk.intel.com ([172.22.244.17]) by orsmga007-auth.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 31 Oct 2019 01:30:30 -0700 From: Janusz Krzysztofik To: intel-gfx@lists.freedesktop.org Date: Thu, 31 Oct 2019 09:29:56 +0100 Message-Id: <20191031082958.10755-1-janusz.krzysztofik@linux.intel.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Subject: [Intel-gfx] [RESEND PATCH 1/3] drm/i915/dmabuf: Implement pwrite() callback X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Daniel Vetter , Matthew Auld Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" We need dmabuf specific pwrite() callback utilizing dma-buf API, otherwise GEM_PWRITE IOCTL will no longer work with dma-buf backed (i.e., PRIME imported) objects on hardware with no mappable aperture. Signed-off-by: Janusz Krzysztofik Cc: Daniele Ceraolo Spurio Cc: Michal Wajdeczko --- drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c | 55 ++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c b/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c index 96ce95c8ac5a..93eea1031c82 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c @@ -248,9 +248,64 @@ static void i915_gem_object_put_pages_dmabuf(struct drm_i915_gem_object *obj, DMA_BIDIRECTIONAL); } +static int i915_gem_object_pwrite_dmabuf(struct drm_i915_gem_object *obj, + const struct drm_i915_gem_pwrite *args) +{ + struct dma_buf *dmabuf = obj->base.import_attach->dmabuf; + void __user *user_data = u64_to_user_ptr(args->data_ptr); + struct file *file = dmabuf->file; + const struct file_operations *fop = file->f_op; + void __force *vaddr; + int ret; + + if (fop->write) { + loff_t offset = args->offset; + + /* + * fop->write() is supposed to call dma_buf_begin_cpu_access() + * if O_SYNC flag is set, avoid calling it twice + */ + if (!(file->f_flags & O_SYNC)) { + ret = dma_buf_begin_cpu_access(dmabuf, DMA_TO_DEVICE); + if (ret) + return ret; + } + + ret = fop->write(file, user_data, args->size, &offset); + + if (!(file->f_flags & O_SYNC)) + dma_buf_end_cpu_access(dmabuf, DMA_TO_DEVICE); + + if (!ret) + return 0; + } + + /* dma-buf file .write() not supported or failed, try dma_buf_vmap() */ + ret = dma_buf_begin_cpu_access(dmabuf, DMA_TO_DEVICE); + if (ret) + return ret; + + vaddr = dma_buf_vmap(dmabuf); + if (!vaddr) + goto out_err; + + ret = copy_from_user(vaddr + args->offset, user_data, args->size); + dma_buf_vunmap(dmabuf, vaddr); + if (!ret) + goto out_end; + +out_err: + /* fall back to GTT mapping */ + ret = -ENODEV; +out_end: + dma_buf_end_cpu_access(dmabuf, DMA_TO_DEVICE); + return ret; +} + static const struct drm_i915_gem_object_ops i915_gem_object_dmabuf_ops = { .get_pages = i915_gem_object_get_pages_dmabuf, .put_pages = i915_gem_object_put_pages_dmabuf, + .pwrite = i915_gem_object_pwrite_dmabuf, }; struct drm_gem_object *i915_gem_prime_import(struct drm_device *dev, From patchwork Thu Oct 31 08:29:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janusz Krzysztofik X-Patchwork-Id: 11220689 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 ADA861599 for ; Thu, 31 Oct 2019 08:30:40 +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 94A6D20873 for ; Thu, 31 Oct 2019 08:30:40 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 94A6D20873 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 04FFB6EDB5; Thu, 31 Oct 2019 08:30:40 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by gabe.freedesktop.org (Postfix) with ESMTPS id AD97B6EDB4 for ; Thu, 31 Oct 2019 08:30:36 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 31 Oct 2019 01:30:36 -0700 X-IronPort-AV: E=Sophos;i="5.68,250,1569308400"; d="scan'208";a="190551995" Received: from jkrzyszt-desk.igk.intel.com ([172.22.244.17]) by orsmga007-auth.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 31 Oct 2019 01:30:33 -0700 From: Janusz Krzysztofik To: intel-gfx@lists.freedesktop.org Date: Thu, 31 Oct 2019 09:29:57 +0100 Message-Id: <20191031082958.10755-2-janusz.krzysztofik@linux.intel.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191031082958.10755-1-janusz.krzysztofik@linux.intel.com> References: <20191031082958.10755-1-janusz.krzysztofik@linux.intel.com> MIME-Version: 1.0 Subject: [Intel-gfx] [RESEND PATCH 2/3] drm/i915: Add vfunc for pread X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Daniel Vetter , Matthew Auld Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" From: Matthew Auld Similar to pwrite, we need pread for (better) support of non-GTT backends. Signed-off-by: Matthew Auld Cc: Joonas Lahtinen Cc: Abdiel Janulgue Signed-off-by: Janusz Krzysztofik Cc: Michal Wajdeczko --- drivers/gpu/drm/i915/gem/i915_gem_object_types.h | 2 ++ drivers/gpu/drm/i915/i915_gem.c | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/drivers/gpu/drm/i915/gem/i915_gem_object_types.h b/drivers/gpu/drm/i915/gem/i915_gem_object_types.h index a387e3ee728b..3ad13556ed75 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_object_types.h +++ b/drivers/gpu/drm/i915/gem/i915_gem_object_types.h @@ -55,6 +55,8 @@ struct drm_i915_gem_object_ops { void (*truncate)(struct drm_i915_gem_object *obj); void (*writeback)(struct drm_i915_gem_object *obj); + int (*pread)(struct drm_i915_gem_object *obj, + const struct drm_i915_gem_pread *arg); int (*pwrite)(struct drm_i915_gem_object *obj, const struct drm_i915_gem_pwrite *arg); diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index dd0a3271b4e2..bb9121887ce6 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -469,6 +469,12 @@ i915_gem_pread_ioctl(struct drm_device *dev, void *data, trace_i915_gem_object_pread(obj, args->offset, args->size); + if (obj->ops->pread) { + ret = obj->ops->pread(obj, args); + if (ret != -ENODEV) + goto out; + } + ret = i915_gem_object_wait(obj, I915_WAIT_INTERRUPTIBLE, MAX_SCHEDULE_TIMEOUT); From patchwork Thu Oct 31 08:29:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janusz Krzysztofik X-Patchwork-Id: 11220691 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 8F3A31390 for ; Thu, 31 Oct 2019 08:30:44 +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 76B3920873 for ; Thu, 31 Oct 2019 08:30:44 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 76B3920873 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 056E66EDB7; Thu, 31 Oct 2019 08:30:44 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by gabe.freedesktop.org (Postfix) with ESMTPS id 057E96EDB7 for ; Thu, 31 Oct 2019 08:30:39 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 31 Oct 2019 01:30:39 -0700 X-IronPort-AV: E=Sophos;i="5.68,250,1569308400"; d="scan'208";a="190552009" Received: from jkrzyszt-desk.igk.intel.com ([172.22.244.17]) by orsmga007-auth.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 31 Oct 2019 01:30:36 -0700 From: Janusz Krzysztofik To: intel-gfx@lists.freedesktop.org Date: Thu, 31 Oct 2019 09:29:58 +0100 Message-Id: <20191031082958.10755-3-janusz.krzysztofik@linux.intel.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191031082958.10755-1-janusz.krzysztofik@linux.intel.com> References: <20191031082958.10755-1-janusz.krzysztofik@linux.intel.com> MIME-Version: 1.0 Subject: [Intel-gfx] [RESEND PATCH 3/3] drm/i915/dmabuf: Implement pread() callback X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Daniel Vetter , Matthew Auld Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" We need dmabuf specific pread() callback utilizing dma-buf API, otherwise GEM_PREAD IOCTL will no longer work with dma-buf backed (i.e., PRIME imported) objects on hardware with no mappable aperture. Signed-off-by: Janusz Krzysztofik Cc: Daniele Ceraolo Spurio Cc: Michal Wajdeczko --- drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c | 55 ++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c b/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c index 93eea1031c82..207dbf044296 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c @@ -248,6 +248,60 @@ static void i915_gem_object_put_pages_dmabuf(struct drm_i915_gem_object *obj, DMA_BIDIRECTIONAL); } +static int i915_gem_object_pread_dmabuf(struct drm_i915_gem_object *obj, + const struct drm_i915_gem_pread *args) +{ + struct dma_buf *dmabuf = obj->base.import_attach->dmabuf; + void __user *user_data = u64_to_user_ptr(args->data_ptr); + struct file *file = dmabuf->file; + const struct file_operations *fop = file->f_op; + void __force *vaddr; + int ret; + + if (fop->read) { + loff_t offset = args->offset; + + /* + * fop->read() is supposed to call dma_buf_begin_cpu_access() + * if O_SYNC flag is set, avoid calling it twice + */ + if (!(file->f_flags & O_SYNC)) { + ret = dma_buf_begin_cpu_access(dmabuf, DMA_FROM_DEVICE); + if (ret) + return ret; + } + + ret = fop->read(file, user_data, args->size, &offset); + + if (!(file->f_flags & O_SYNC)) + dma_buf_end_cpu_access(dmabuf, DMA_FROM_DEVICE); + + if (!ret) + return 0; + } + + /* dma-buf file .read() not supported or failed, try dma_buf_vmap() */ + ret = dma_buf_begin_cpu_access(dmabuf, DMA_FROM_DEVICE); + if (ret) + return ret; + + vaddr = dma_buf_vmap(dmabuf); + if (!vaddr) + goto out_err; + + ret = copy_to_user(user_data, vaddr + args->offset, args->size); + dma_buf_vunmap(dmabuf, vaddr); + if (!ret) + goto out_end; + +out_err: + /* fall back to GTT mapping */ + ret = -ENODEV; +out_end: + dma_buf_end_cpu_access(dmabuf, DMA_FROM_DEVICE); + return ret; +} + static int i915_gem_object_pwrite_dmabuf(struct drm_i915_gem_object *obj, const struct drm_i915_gem_pwrite *args) { @@ -305,6 +359,7 @@ static int i915_gem_object_pwrite_dmabuf(struct drm_i915_gem_object *obj, static const struct drm_i915_gem_object_ops i915_gem_object_dmabuf_ops = { .get_pages = i915_gem_object_get_pages_dmabuf, .put_pages = i915_gem_object_put_pages_dmabuf, + .pread = i915_gem_object_pread_dmabuf, .pwrite = i915_gem_object_pwrite_dmabuf, };