-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
yaml --- r: 307506 b: refs/heads/master c: 1286ff7 h: refs/heads/master v: v3
- Loading branch information
Daniel Vetter
authored and
Dave Airlie
committed
May 23, 2012
1 parent
3448b10
commit e473f31
Showing
7 changed files
with
240 additions
and
7 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,2 @@ | ||
| --- | ||
| refs/heads/master: 22b33e8ed0e38b8ddcf082e35580f2e67a3a0262 | ||
| refs/heads/master: 1286ff7397737e407cdd8e5cd574318db177ba1f |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,171 @@ | ||
| /* | ||
| * 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 "drmP.h" | ||
| #include "i915_drv.h" | ||
| #include <linux/dma-buf.h> | ||
|
|
||
| struct sg_table *i915_gem_map_dma_buf(struct dma_buf_attachment *attachment, | ||
| enum dma_data_direction dir) | ||
| { | ||
| struct drm_i915_gem_object *obj = attachment->dmabuf->priv; | ||
| struct drm_device *dev = obj->base.dev; | ||
| int npages = obj->base.size / PAGE_SIZE; | ||
| struct sg_table *sg = NULL; | ||
| int ret; | ||
| int nents; | ||
|
|
||
| ret = i915_mutex_lock_interruptible(dev); | ||
| if (ret) | ||
| return ERR_PTR(ret); | ||
|
|
||
| if (!obj->pages) { | ||
| ret = i915_gem_object_get_pages_gtt(obj, __GFP_NORETRY | __GFP_NOWARN); | ||
| if (ret) | ||
| goto out; | ||
| } | ||
|
|
||
| /* link the pages into an SG then map the sg */ | ||
| sg = drm_prime_pages_to_sg(obj->pages, npages); | ||
| nents = dma_map_sg(attachment->dev, sg->sgl, sg->nents, dir); | ||
| out: | ||
| mutex_unlock(&dev->struct_mutex); | ||
| return sg; | ||
| } | ||
|
|
||
| void i915_gem_unmap_dma_buf(struct dma_buf_attachment *attachment, | ||
| struct sg_table *sg, enum dma_data_direction dir) | ||
| { | ||
| dma_unmap_sg(attachment->dev, sg->sgl, sg->nents, dir); | ||
| sg_free_table(sg); | ||
| kfree(sg); | ||
| } | ||
|
|
||
| void i915_gem_dmabuf_release(struct dma_buf *dma_buf) | ||
| { | ||
| struct drm_i915_gem_object *obj = dma_buf->priv; | ||
|
|
||
| if (obj->base.export_dma_buf == dma_buf) { | ||
| /* drop the reference on the export fd holds */ | ||
| obj->base.export_dma_buf = NULL; | ||
| drm_gem_object_unreference_unlocked(&obj->base); | ||
| } | ||
| } | ||
|
|
||
| static void *i915_gem_dmabuf_kmap_atomic(struct dma_buf *dma_buf, unsigned long page_num) | ||
| { | ||
| return NULL; | ||
| } | ||
|
|
||
| static void i915_gem_dmabuf_kunmap_atomic(struct dma_buf *dma_buf, unsigned long page_num, void *addr) | ||
| { | ||
|
|
||
| } | ||
| static void *i915_gem_dmabuf_kmap(struct dma_buf *dma_buf, unsigned long page_num) | ||
| { | ||
| return NULL; | ||
| } | ||
|
|
||
| static void i915_gem_dmabuf_kunmap(struct dma_buf *dma_buf, unsigned long page_num, void *addr) | ||
| { | ||
|
|
||
| } | ||
|
|
||
| struct dma_buf_ops i915_dmabuf_ops = { | ||
| .map_dma_buf = i915_gem_map_dma_buf, | ||
| .unmap_dma_buf = i915_gem_unmap_dma_buf, | ||
| .release = i915_gem_dmabuf_release, | ||
| .kmap = i915_gem_dmabuf_kmap, | ||
| .kmap_atomic = i915_gem_dmabuf_kmap_atomic, | ||
| .kunmap = i915_gem_dmabuf_kunmap, | ||
| .kunmap_atomic = i915_gem_dmabuf_kunmap_atomic, | ||
| }; | ||
|
|
||
| struct dma_buf *i915_gem_prime_export(struct drm_device *dev, | ||
| struct drm_gem_object *gem_obj, int flags) | ||
| { | ||
| struct drm_i915_gem_object *obj = to_intel_bo(gem_obj); | ||
|
|
||
| return dma_buf_export(obj, &i915_dmabuf_ops, | ||
| obj->base.size, 0600); | ||
| } | ||
|
|
||
| struct drm_gem_object *i915_gem_prime_import(struct drm_device *dev, | ||
| struct dma_buf *dma_buf) | ||
| { | ||
| struct dma_buf_attachment *attach; | ||
| struct sg_table *sg; | ||
| struct drm_i915_gem_object *obj; | ||
| int npages; | ||
| int size; | ||
| int ret; | ||
|
|
||
| /* is this one of own objects? */ | ||
| if (dma_buf->ops == &i915_dmabuf_ops) { | ||
| obj = dma_buf->priv; | ||
| /* is it from our device? */ | ||
| if (obj->base.dev == dev) { | ||
| drm_gem_object_reference(&obj->base); | ||
| return &obj->base; | ||
| } | ||
| } | ||
|
|
||
| /* need to attach */ | ||
| attach = dma_buf_attach(dma_buf, dev->dev); | ||
| if (IS_ERR(attach)) | ||
| return ERR_CAST(attach); | ||
|
|
||
| sg = dma_buf_map_attachment(attach, DMA_BIDIRECTIONAL); | ||
| if (IS_ERR(sg)) { | ||
| ret = PTR_ERR(sg); | ||
| goto fail_detach; | ||
| } | ||
|
|
||
| size = dma_buf->size; | ||
| npages = size / PAGE_SIZE; | ||
|
|
||
| obj = kzalloc(sizeof(*obj), GFP_KERNEL); | ||
| if (obj == NULL) { | ||
| ret = -ENOMEM; | ||
| goto fail_unmap; | ||
| } | ||
|
|
||
| ret = drm_gem_private_object_init(dev, &obj->base, size); | ||
| if (ret) { | ||
| kfree(obj); | ||
| goto fail_unmap; | ||
| } | ||
|
|
||
| obj->sg_table = sg; | ||
| obj->base.import_attach = attach; | ||
|
|
||
| return &obj->base; | ||
|
|
||
| fail_unmap: | ||
| dma_buf_unmap_attachment(attach, sg, DMA_BIDIRECTIONAL); | ||
| fail_detach: | ||
| dma_buf_detach(dma_buf, attach); | ||
| return ERR_PTR(ret); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters