diff options
| author | Dave Airlie <airlied@redhat.com> | 2014-08-26 09:05:14 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-08-26 09:05:14 +1000 |
| commit | 484048db6b4890bc433aac7f5e32fdcf1b2b4786 (patch) | |
| tree | c6be2f9cbe71d6732975c987e1c814c0298b0b65 /drivers/gpu/drm/radeon/radeon_device.c | |
| parent | d5a0f2e7be20d29c5a23fdbc65c1f8307690413c (diff) | |
| parent | bd645e4314b95b21146aa6ff893d783de20c4e60 (diff) | |
Merge branch 'drm-next-3.18' of git://people.freedesktop.org/~agd5f/linux into drm-next
radeon userptr support.
* 'drm-next-3.18' of git://people.freedesktop.org/~agd5f/linux:
drm/radeon: allow userptr write access under certain conditions
drm/radeon: add userptr flag to register MMU notifier v3
drm/radeon: add userptr flag to directly validate the BO to GTT
drm/radeon: add userptr flag to limit it to anonymous memory v2
drm/radeon: add userptr support v8
Conflicts:
drivers/gpu/drm/radeon/radeon_prime.c
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_device.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_device.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c index 6a219bcee66d..a5d202a7c0a4 100644 --- a/drivers/gpu/drm/radeon/radeon_device.c +++ b/drivers/gpu/drm/radeon/radeon_device.c @@ -1270,6 +1270,8 @@ int radeon_device_init(struct radeon_device *rdev, init_rwsem(&rdev->pm.mclk_lock); init_rwsem(&rdev->exclusive_lock); init_waitqueue_head(&rdev->irq.vblank_queue); + mutex_init(&rdev->mn_lock); + hash_init(rdev->mn_hash); r = radeon_gem_init(rdev); if (r) return r; |