drm/i915: Fix up broken merge (d8080976) · Commits · 戴 / test

drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -204,8 +204,7 @@ static const struct dma_buf_ops i915_dmabuf_ops = {
		.end_cpu_access = i915_gem_end_cpu_access,
		};

		struct dma_buf i915_gem_prime_export(struct drm_device dev,
		struct drm_gem_object *gem_obj, int flags)
		struct dma_buf i915_gem_prime_export(struct drm_gem_object gem_obj, int flags)
		{
		struct drm_i915_gem_object *obj = to_intel_bo(gem_obj);
		DEFINE_DMA_BUF_EXPORT_INFO(exp_info);
		@@ -222,7 +221,7 @@ struct dma_buf i915_gem_prime_export(struct drm_device dev,
		return ERR_PTR(ret);
		}

		return drm_gem_dmabuf_export(dev, &exp_info);
		return drm_gem_dmabuf_export(gem_obj->dev, &exp_info);
		}

		static int i915_gem_object_get_pages_dmabuf(struct drm_i915_gem_object *obj)

drivers/gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -20,7 +20,7 @@ static int igt_dmabuf_export(void *arg)
		if (IS_ERR(obj))
		return PTR_ERR(obj);

		dmabuf = i915_gem_prime_export(&i915->drm, &obj->base, 0);
		dmabuf = i915_gem_prime_export(&obj->base, 0);
		i915_gem_object_put(obj);
		if (IS_ERR(dmabuf)) {
		pr_err("i915_gem_prime_export failed with err=%d\n",
		@@ -44,7 +44,7 @@ static int igt_dmabuf_import_self(void *arg)
		if (IS_ERR(obj))
		return PTR_ERR(obj);

		dmabuf = i915_gem_prime_export(&i915->drm, &obj->base, 0);
		dmabuf = i915_gem_prime_export(&obj->base, 0);
		if (IS_ERR(dmabuf)) {
		pr_err("i915_gem_prime_export failed with err=%d\n",
		(int)PTR_ERR(dmabuf));
		@@ -219,7 +219,7 @@ static int igt_dmabuf_export_vmap(void *arg)
		if (IS_ERR(obj))
		return PTR_ERR(obj);

		dmabuf = i915_gem_prime_export(&i915->drm, &obj->base, 0);
		dmabuf = i915_gem_prime_export(&obj->base, 0);
		if (IS_ERR(dmabuf)) {
		pr_err("i915_gem_prime_export failed with err=%d\n",
		(int)PTR_ERR(dmabuf));
		@@ -266,7 +266,7 @@ static int igt_dmabuf_export_kmap(void *arg)
		if (IS_ERR(obj))
		return PTR_ERR(obj);

		dmabuf = i915_gem_prime_export(&i915->drm, &obj->base, 0);
		dmabuf = i915_gem_prime_export(&obj->base, 0);
		i915_gem_object_put(obj);
		if (IS_ERR(dmabuf)) {
		err = PTR_ERR(dmabuf);

drivers/gpu/drm/i915/i915_gem_dmabuf.c

deleted100644 → 0

+0 −336

Original line number	Diff line number	Diff line
		/*
		* Copyright 2012 Red Hat Inc
		*
		* Permission is hereby granted, free of charge, to any person obtaining a
		* copy of this software and associated documentation files (the "Software"),
		* to deal in the Software without restriction, including without limitation
		* the rights to use, copy, modify, merge, publish, distribute, sublicense,
		* and/or sell copies of the Software, and to permit persons to whom the
		* Software is furnished to do so, subject to the following conditions:
		*
		* The above copyright notice and this permission notice (including the next
		* paragraph) shall be included in all copies or substantial portions of the
		* Software.
		*
		* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
		* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
		* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
		* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
		* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
		* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
		* DEALINGS IN THE SOFTWARE.
		*
		* Authors:
		* Dave Airlie <airlied@redhat.com>
		*/

		#include <linux/dma-buf.h>
		#include <linux/reservation.h>


		#include "i915_drv.h"

		static struct drm_i915_gem_object dma_buf_to_obj(struct dma_buf buf)
		{
		return to_intel_bo(buf->priv);
		}

		static struct sg_table i915_gem_map_dma_buf(struct dma_buf_attachment attachment,
		enum dma_data_direction dir)
		{
		struct drm_i915_gem_object *obj = dma_buf_to_obj(attachment->dmabuf);
		struct sg_table *st;
		struct scatterlist src, dst;
		int ret, i;

		ret = i915_gem_object_pin_pages(obj);
		if (ret)
		goto err;

		/* Copy sg so that we make an independent mapping */
		st = kmalloc(sizeof(struct sg_table), GFP_KERNEL);
		if (st == NULL) {
		ret = -ENOMEM;
		goto err_unpin_pages;
		}

		ret = sg_alloc_table(st, obj->mm.pages->nents, GFP_KERNEL);
		if (ret)
		goto err_free;

		src = obj->mm.pages->sgl;
		dst = st->sgl;
		for (i = 0; i < obj->mm.pages->nents; i++) {
		sg_set_page(dst, sg_page(src), src->length, 0);
		dst = sg_next(dst);
		src = sg_next(src);
		}

		if (!dma_map_sg(attachment->dev, st->sgl, st->nents, dir)) {
		ret = -ENOMEM;
		goto err_free_sg;
		}

		return st;

		err_free_sg:
		sg_free_table(st);
		err_free:
		kfree(st);
		err_unpin_pages:
		i915_gem_object_unpin_pages(obj);
		err:
		return ERR_PTR(ret);
		}

		static void i915_gem_unmap_dma_buf(struct dma_buf_attachment *attachment,
		struct sg_table *sg,
		enum dma_data_direction dir)
		{
		struct drm_i915_gem_object *obj = dma_buf_to_obj(attachment->dmabuf);

		dma_unmap_sg(attachment->dev, sg->sgl, sg->nents, dir);
		sg_free_table(sg);
		kfree(sg);

		i915_gem_object_unpin_pages(obj);
		}

		static void i915_gem_dmabuf_vmap(struct dma_buf dma_buf)
		{
		struct drm_i915_gem_object *obj = dma_buf_to_obj(dma_buf);

		return i915_gem_object_pin_map(obj, I915_MAP_WB);
		}

		static void i915_gem_dmabuf_vunmap(struct dma_buf dma_buf, void vaddr)
		{
		struct drm_i915_gem_object *obj = dma_buf_to_obj(dma_buf);

		i915_gem_object_flush_map(obj);
		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);
		int ret;

		if (obj->base.size < vma->vm_end - vma->vm_start)
		return -EINVAL;

		if (!obj->base.filp)
		return -ENODEV;

		ret = call_mmap(obj->base.filp, vma);
		if (ret)
		return ret;

		fput(vma->vm_file);
		vma->vm_file = get_file(obj->base.filp);

		return 0;
		}

		static int i915_gem_begin_cpu_access(struct dma_buf *dma_buf, enum dma_data_direction direction)
		{
		struct drm_i915_gem_object *obj = dma_buf_to_obj(dma_buf);
		struct drm_device *dev = obj->base.dev;
		bool write = (direction == DMA_BIDIRECTIONAL \|\| direction == DMA_TO_DEVICE);
		int err;

		err = i915_gem_object_pin_pages(obj);
		if (err)
		return err;

		err = i915_mutex_lock_interruptible(dev);
		if (err)
		goto out;

		err = i915_gem_object_set_to_cpu_domain(obj, write);
		mutex_unlock(&dev->struct_mutex);

		out:
		i915_gem_object_unpin_pages(obj);
		return err;
		}

		static int i915_gem_end_cpu_access(struct dma_buf *dma_buf, enum dma_data_direction direction)
		{
		struct drm_i915_gem_object *obj = dma_buf_to_obj(dma_buf);
		struct drm_device *dev = obj->base.dev;
		int err;

		err = i915_gem_object_pin_pages(obj);
		if (err)
		return err;

		err = i915_mutex_lock_interruptible(dev);
		if (err)
		goto out;

		err = i915_gem_object_set_to_gtt_domain(obj, false);
		mutex_unlock(&dev->struct_mutex);

		out:
		i915_gem_object_unpin_pages(obj);
		return err;
		}

		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,
		.begin_cpu_access = i915_gem_begin_cpu_access,
		.end_cpu_access = i915_gem_end_cpu_access,
		};

		struct dma_buf i915_gem_prime_export(struct drm_gem_object gem_obj, int flags)
		{
		struct drm_i915_gem_object *obj = to_intel_bo(gem_obj);
		DEFINE_DMA_BUF_EXPORT_INFO(exp_info);

		exp_info.ops = &i915_dmabuf_ops;
		exp_info.size = gem_obj->size;
		exp_info.flags = flags;
		exp_info.priv = gem_obj;
		exp_info.resv = obj->resv;

		if (obj->ops->dmabuf_export) {
		int ret = obj->ops->dmabuf_export(obj);
		if (ret)
		return ERR_PTR(ret);
		}

		return drm_gem_dmabuf_export(gem_obj->dev, &exp_info);
		}

		static int i915_gem_object_get_pages_dmabuf(struct drm_i915_gem_object *obj)
		{
		struct sg_table *pages;
		unsigned int sg_page_sizes;

		pages = dma_buf_map_attachment(obj->base.import_attach,
		DMA_BIDIRECTIONAL);
		if (IS_ERR(pages))
		return PTR_ERR(pages);

		sg_page_sizes = i915_sg_page_sizes(pages->sgl);

		__i915_gem_object_set_pages(obj, pages, sg_page_sizes);

		return 0;
		}

		static void i915_gem_object_put_pages_dmabuf(struct drm_i915_gem_object *obj,
		struct sg_table *pages)
		{
		dma_buf_unmap_attachment(obj->base.import_attach, pages,
		DMA_BIDIRECTIONAL);
		}

		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,
		};

		struct drm_gem_object i915_gem_prime_import(struct drm_device dev,
		struct dma_buf *dma_buf)
		{
		struct dma_buf_attachment *attach;
		struct drm_i915_gem_object *obj;
		int ret;

		/* is this one of own objects? */
		if (dma_buf->ops == &i915_dmabuf_ops) {
		obj = dma_buf_to_obj(dma_buf);
		/* is it from our device? */
		if (obj->base.dev == dev) {
		/*
		* Importing dmabuf exported from out own gem increases
		* refcount on gem itself instead of f_count of dmabuf.
		*/
		return &i915_gem_object_get(obj)->base;
		}
		}

		/* need to attach */
		attach = dma_buf_attach(dma_buf, dev->dev);
		if (IS_ERR(attach))
		return ERR_CAST(attach);

		get_dma_buf(dma_buf);

		obj = i915_gem_object_alloc();
		if (obj == NULL) {
		ret = -ENOMEM;
		goto fail_detach;
		}

		drm_gem_private_object_init(dev, &obj->base, dma_buf->size);
		i915_gem_object_init(obj, &i915_gem_object_dmabuf_ops);
		obj->base.import_attach = attach;
		obj->resv = dma_buf->resv;

		/* We use GTT as shorthand for a coherent domain, one that is
		* neither in the GPU cache nor in the CPU cache, where all
		* writes are immediately visible in memory. (That's not strictly
		* true, but it's close! There are internal buffers such as the
		* write-combined buffer or a delay through the chipset for GTT
		* writes that do require us to treat GTT as a separate cache domain.)
		*/
		obj->read_domains = I915_GEM_DOMAIN_GTT;
		obj->write_domain = 0;

		return &obj->base;

		fail_detach:
		dma_buf_detach(dma_buf, attach);
		dma_buf_put(dma_buf);

		return ERR_PTR(ret);
		}

		#if IS_ENABLED(CONFIG_DRM_I915_SELFTEST)
		#include "selftests/mock_dmabuf.c"
		#include "selftests/i915_gem_dmabuf.c"
		#endif

drivers/gpu/drm/i915/selftests/i915_gem_dmabuf.c

deleted100644 → 0

+0 −404

Original line number	Diff line number	Diff line
		/*
		* Copyright © 2016 Intel Corporation
		*
		* Permission is hereby granted, free of charge, to any person obtaining a
		* copy of this software and associated documentation files (the "Software"),
		* to deal in the Software without restriction, including without limitation
		* the rights to use, copy, modify, merge, publish, distribute, sublicense,
		* and/or sell copies of the Software, and to permit persons to whom the
		* Software is furnished to do so, subject to the following conditions:
		*
		* The above copyright notice and this permission notice (including the next
		* paragraph) shall be included in all copies or substantial portions of the
		* Software.
		*
		* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
		* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
		* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
		* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
		* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
		* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
		* IN THE SOFTWARE.
		*
		*/

		#include "../i915_selftest.h"

		#include "mock_gem_device.h"
		#include "mock_dmabuf.h"

		static int igt_dmabuf_export(void *arg)
		{
		struct drm_i915_private *i915 = arg;
		struct drm_i915_gem_object *obj;
		struct dma_buf *dmabuf;

		obj = i915_gem_object_create(i915, PAGE_SIZE);
		if (IS_ERR(obj))
		return PTR_ERR(obj);

		dmabuf = i915_gem_prime_export(&obj->base, 0);
		i915_gem_object_put(obj);
		if (IS_ERR(dmabuf)) {
		pr_err("i915_gem_prime_export failed with err=%d\n",
		(int)PTR_ERR(dmabuf));
		return PTR_ERR(dmabuf);
		}

		dma_buf_put(dmabuf);
		return 0;
		}

		static int igt_dmabuf_import_self(void *arg)
		{
		struct drm_i915_private *i915 = arg;
		struct drm_i915_gem_object *obj;
		struct drm_gem_object *import;
		struct dma_buf *dmabuf;
		int err;

		obj = i915_gem_object_create(i915, PAGE_SIZE);
		if (IS_ERR(obj))
		return PTR_ERR(obj);

		dmabuf = i915_gem_prime_export(&obj->base, 0);
		if (IS_ERR(dmabuf)) {
		pr_err("i915_gem_prime_export failed with err=%d\n",
		(int)PTR_ERR(dmabuf));
		err = PTR_ERR(dmabuf);
		goto out;
		}

		import = i915_gem_prime_import(&i915->drm, dmabuf);
		if (IS_ERR(import)) {
		pr_err("i915_gem_prime_import failed with err=%d\n",
		(int)PTR_ERR(import));
		err = PTR_ERR(import);
		goto out_dmabuf;
		}

		if (import != &obj->base) {
		pr_err("i915_gem_prime_import created a new object!\n");
		err = -EINVAL;
		goto out_import;
		}

		err = 0;
		out_import:
		i915_gem_object_put(to_intel_bo(import));
		out_dmabuf:
		dma_buf_put(dmabuf);
		out:
		i915_gem_object_put(obj);
		return err;
		}

		static int igt_dmabuf_import(void *arg)
		{
		struct drm_i915_private *i915 = arg;
		struct drm_i915_gem_object *obj;
		struct dma_buf *dmabuf;
		void obj_map, dma_map;
		u32 pattern[] = { 0, 0xaa, 0xcc, 0x55, 0xff };
		int err, i;

		dmabuf = mock_dmabuf(1);
		if (IS_ERR(dmabuf))
		return PTR_ERR(dmabuf);

		obj = to_intel_bo(i915_gem_prime_import(&i915->drm, dmabuf));
		if (IS_ERR(obj)) {
		pr_err("i915_gem_prime_import failed with err=%d\n",
		(int)PTR_ERR(obj));
		err = PTR_ERR(obj);
		goto out_dmabuf;
		}

		if (obj->base.dev != &i915->drm) {
		pr_err("i915_gem_prime_import created a non-i915 object!\n");
		err = -EINVAL;
		goto out_obj;
		}

		if (obj->base.size != PAGE_SIZE) {
		pr_err("i915_gem_prime_import is wrong size found %lld, expected %ld\n",
		(long long)obj->base.size, PAGE_SIZE);
		err = -EINVAL;
		goto out_obj;
		}

		dma_map = dma_buf_vmap(dmabuf);
		if (!dma_map) {
		pr_err("dma_buf_vmap failed\n");
		err = -ENOMEM;
		goto out_obj;
		}

		if (0) { /* Can not yet map dmabuf */
		obj_map = i915_gem_object_pin_map(obj, I915_MAP_WB);
		if (IS_ERR(obj_map)) {
		err = PTR_ERR(obj_map);
		pr_err("i915_gem_object_pin_map failed with err=%d\n", err);
		goto out_dma_map;
		}

		for (i = 0; i < ARRAY_SIZE(pattern); i++) {
		memset(dma_map, pattern[i], PAGE_SIZE);
		if (memchr_inv(obj_map, pattern[i], PAGE_SIZE)) {
		err = -EINVAL;
		pr_err("imported vmap not all set to %x!\n", pattern[i]);
		i915_gem_object_unpin_map(obj);
		goto out_dma_map;
		}
		}

		for (i = 0; i < ARRAY_SIZE(pattern); i++) {
		memset(obj_map, pattern[i], PAGE_SIZE);
		if (memchr_inv(dma_map, pattern[i], PAGE_SIZE)) {
		err = -EINVAL;
		pr_err("exported vmap not all set to %x!\n", pattern[i]);
		i915_gem_object_unpin_map(obj);
		goto out_dma_map;
		}
		}

		i915_gem_object_unpin_map(obj);
		}

		err = 0;
		out_dma_map:
		dma_buf_vunmap(dmabuf, dma_map);
		out_obj:
		i915_gem_object_put(obj);
		out_dmabuf:
		dma_buf_put(dmabuf);
		return err;
		}

		static int igt_dmabuf_import_ownership(void *arg)
		{
		struct drm_i915_private *i915 = arg;
		struct drm_i915_gem_object *obj;
		struct dma_buf *dmabuf;
		void *ptr;
		int err;

		dmabuf = mock_dmabuf(1);
		if (IS_ERR(dmabuf))
		return PTR_ERR(dmabuf);

		ptr = dma_buf_vmap(dmabuf);
		if (!ptr) {
		pr_err("dma_buf_vmap failed\n");
		err = -ENOMEM;
		goto err_dmabuf;
		}

		memset(ptr, 0xc5, PAGE_SIZE);
		dma_buf_vunmap(dmabuf, ptr);

		obj = to_intel_bo(i915_gem_prime_import(&i915->drm, dmabuf));
		if (IS_ERR(obj)) {
		pr_err("i915_gem_prime_import failed with err=%d\n",
		(int)PTR_ERR(obj));
		err = PTR_ERR(obj);
		goto err_dmabuf;
		}

		dma_buf_put(dmabuf);

		err = i915_gem_object_pin_pages(obj);
		if (err) {
		pr_err("i915_gem_object_pin_pages failed with err=%d\n", err);
		goto out_obj;
		}

		err = 0;
		i915_gem_object_unpin_pages(obj);
		out_obj:
		i915_gem_object_put(obj);
		return err;

		err_dmabuf:
		dma_buf_put(dmabuf);
		return err;
		}

		static int igt_dmabuf_export_vmap(void *arg)
		{
		struct drm_i915_private *i915 = arg;
		struct drm_i915_gem_object *obj;
		struct dma_buf *dmabuf;
		void *ptr;
		int err;

		obj = i915_gem_object_create(i915, PAGE_SIZE);
		if (IS_ERR(obj))
		return PTR_ERR(obj);

		dmabuf = i915_gem_prime_export(&obj->base, 0);
		if (IS_ERR(dmabuf)) {
		pr_err("i915_gem_prime_export failed with err=%d\n",
		(int)PTR_ERR(dmabuf));
		err = PTR_ERR(dmabuf);
		goto err_obj;
		}
		i915_gem_object_put(obj);

		ptr = dma_buf_vmap(dmabuf);
		if (!ptr) {
		pr_err("dma_buf_vmap failed\n");
		err = -ENOMEM;
		goto out;
		}

		if (memchr_inv(ptr, 0, dmabuf->size)) {
		pr_err("Exported object not initialiased to zero!\n");
		err = -EINVAL;
		goto out;
		}

		memset(ptr, 0xc5, dmabuf->size);

		err = 0;
		dma_buf_vunmap(dmabuf, ptr);
		out:
		dma_buf_put(dmabuf);
		return err;

		err_obj:
		i915_gem_object_put(obj);
		return err;
		}

		static int igt_dmabuf_export_kmap(void *arg)
		{
		struct drm_i915_private *i915 = arg;
		struct drm_i915_gem_object *obj;
		struct dma_buf *dmabuf;
		void *ptr;
		int err;

		obj = i915_gem_object_create(i915, 2*PAGE_SIZE);
		if (IS_ERR(obj))
		return PTR_ERR(obj);

		dmabuf = i915_gem_prime_export(&obj->base, 0);
		i915_gem_object_put(obj);
		if (IS_ERR(dmabuf)) {
		err = PTR_ERR(dmabuf);
		pr_err("i915_gem_prime_export failed with err=%d\n", err);
		return err;
		}

		ptr = dma_buf_kmap(dmabuf, 0);
		if (!ptr) {
		pr_err("dma_buf_kmap failed\n");
		err = -ENOMEM;
		goto err;
		}

		if (memchr_inv(ptr, 0, PAGE_SIZE)) {
		dma_buf_kunmap(dmabuf, 0, ptr);
		pr_err("Exported page[0] not initialiased to zero!\n");
		err = -EINVAL;
		goto err;
		}

		memset(ptr, 0xc5, PAGE_SIZE);
		dma_buf_kunmap(dmabuf, 0, ptr);

		ptr = i915_gem_object_pin_map(obj, I915_MAP_WB);
		if (IS_ERR(ptr)) {
		err = PTR_ERR(ptr);
		pr_err("i915_gem_object_pin_map failed with err=%d\n", err);
		goto err;
		}
		memset(ptr + PAGE_SIZE, 0xaa, PAGE_SIZE);
		i915_gem_object_flush_map(obj);
		i915_gem_object_unpin_map(obj);

		ptr = dma_buf_kmap(dmabuf, 1);
		if (!ptr) {
		pr_err("dma_buf_kmap failed\n");
		err = -ENOMEM;
		goto err;
		}

		if (memchr_inv(ptr, 0xaa, PAGE_SIZE)) {
		dma_buf_kunmap(dmabuf, 1, ptr);
		pr_err("Exported page[1] not set to 0xaa!\n");
		err = -EINVAL;
		goto err;
		}

		memset(ptr, 0xc5, PAGE_SIZE);
		dma_buf_kunmap(dmabuf, 1, ptr);

		ptr = dma_buf_kmap(dmabuf, 0);
		if (!ptr) {
		pr_err("dma_buf_kmap failed\n");
		err = -ENOMEM;
		goto err;
		}
		if (memchr_inv(ptr, 0xc5, PAGE_SIZE)) {
		dma_buf_kunmap(dmabuf, 0, ptr);
		pr_err("Exported page[0] did not retain 0xc5!\n");
		err = -EINVAL;
		goto err;
		}
		dma_buf_kunmap(dmabuf, 0, ptr);

		ptr = dma_buf_kmap(dmabuf, 2);
		if (ptr) {
		pr_err("Erroneously kmapped beyond the end of the object!\n");
		dma_buf_kunmap(dmabuf, 2, ptr);
		err = -EINVAL;
		goto err;
		}

		ptr = dma_buf_kmap(dmabuf, -1);
		if (ptr) {
		pr_err("Erroneously kmapped before the start of the object!\n");
		dma_buf_kunmap(dmabuf, -1, ptr);
		err = -EINVAL;
		goto err;
		}

		err = 0;
		err:
		dma_buf_put(dmabuf);
		return err;
		}

		int i915_gem_dmabuf_mock_selftests(void)
		{
		static const struct i915_subtest tests[] = {
		SUBTEST(igt_dmabuf_export),
		SUBTEST(igt_dmabuf_import_self),
		SUBTEST(igt_dmabuf_import),
		SUBTEST(igt_dmabuf_import_ownership),
		SUBTEST(igt_dmabuf_export_vmap),
		SUBTEST(igt_dmabuf_export_kmap),
		};
		struct drm_i915_private *i915;
		int err;

		i915 = mock_gem_device();
		if (!i915)
		return -ENOMEM;

		err = i915_subtests(tests, i915);

		drm_dev_put(&i915->drm);
		return err;
		}

		int i915_gem_dmabuf_live_selftests(struct drm_i915_private *i915)
		{
		static const struct i915_subtest tests[] = {
		SUBTEST(igt_dmabuf_export),
		};

		return i915_subtests(tests, i915);
		}

Admin message