diff options
| author |   Dave Airlie <airlied@redhat.com> | 2014-03-18 19:17:02 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-03-18 19:17:02 +1000 |
| commit | d1583c9997cf5e7e8ceef35b6f264262cda5f948 (patch) | |
| tree | 9451558c65eea52ad096f5a16313eaf02eb0775c /drivers/gpu/drm/i915/i915_gem.c | |
| parent | Merge tag 'v3.14-rc7' into drm-next (diff) | |
| parent | Merge branch 'drm-minor' into drm-next (diff) | |
| download | linux-dev-d1583c9997cf5e7e8ceef35b6f264262cda5f948.tar.xz linux-dev-d1583c9997cf5e7e8ceef35b6f264262cda5f948.zip | |
Merge branch 'drm-next' of git://people.freedesktop.org/~dvdhrm/linux into drm-next
This is the 3rd respin of the drm-anon patches. They allow module unloading, use
the pin_fs_* helpers recommended by Al and are rebased on top of drm-next. Note
that there are minor conflicts with the "drm-minor" branch.
* 'drm-next' of git://people.freedesktop.org/~dvdhrm/linux:
drm: init TTM dev_mapping in ttm_bo_device_init()
drm: use anon-inode instead of relying on cdevs
drm: add pseudo filesystem for shared inodes
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 177c20722656..9c52f68df66c 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -1532,7 +1532,8 @@ i915_gem_release_mmap(struct drm_i915_gem_object *obj) if (!obj->fault_mappable) return; - drm_vma_node_unmap(&obj->base.vma_node, obj->base.dev->dev_mapping); + drm_vma_node_unmap(&obj->base.vma_node, + obj->base.dev->anon_inode->i_mapping); obj->fault_mappable = false; } |