Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 307510
b: refs/heads/master
c: 6a101cb
h: refs/heads/master
v: v3
  • Loading branch information
Dave Airlie committed May 23, 2012
1 parent 1cffd8a commit 6808cad
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 5288b7b205ccd59ad40ef8ec270302bf94ac4697
refs/heads/master: 6a101cb209e70308f2e1cb63820cd14a34058e37
8 changes: 4 additions & 4 deletions trunk/drivers/gpu/drm/i915/i915_gem_dmabuf.c
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
#include "i915_drv.h"
#include <linux/dma-buf.h>

struct sg_table *i915_gem_map_dma_buf(struct dma_buf_attachment *attachment,
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 = attachment->dmabuf->priv;
Expand Down Expand Up @@ -55,15 +55,15 @@ struct sg_table *i915_gem_map_dma_buf(struct dma_buf_attachment *attachment,
return sg;
}

void i915_gem_unmap_dma_buf(struct dma_buf_attachment *attachment,
static 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)
static void i915_gem_dmabuf_release(struct dma_buf *dma_buf)
{
struct drm_i915_gem_object *obj = dma_buf->priv;

Expand Down Expand Up @@ -93,7 +93,7 @@ static void i915_gem_dmabuf_kunmap(struct dma_buf *dma_buf, unsigned long page_n

}

struct dma_buf_ops i915_dmabuf_ops = {
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 = i915_gem_dmabuf_release,
Expand Down

0 comments on commit 6808cad

Please sign in to comment.