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/radeon/radeon_object.c | |
| parent | bcc298bc924e0a990f853ba3e19f8b5a833cba7e (diff) | |
| parent | 07b48c3ac539828d744f0562da1f24e8a234d06e (diff) | |
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/radeon/radeon_object.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_object.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_object.c b/drivers/gpu/drm/radeon/radeon_object.c index ca79431b2c1..1375ff85b08 100644 --- a/drivers/gpu/drm/radeon/radeon_object.c +++ b/drivers/gpu/drm/radeon/radeon_object.c @@ -145,7 +145,6 @@ int radeon_bo_create(struct radeon_device *rdev, size = ALIGN(size, PAGE_SIZE); - rdev->mman.bdev.dev_mapping = rdev->ddev->dev_mapping; if (kernel) { type = ttm_bo_type_kernel; } else if (sg) { |