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/Makefile | |
| 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/Makefile')
| -rw-r--r-- | drivers/gpu/drm/radeon/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/Makefile b/drivers/gpu/drm/radeon/Makefile index f77b7135ee4c..357f09afd222 100644 --- a/drivers/gpu/drm/radeon/Makefile +++ b/drivers/gpu/drm/radeon/Makefile @@ -80,7 +80,7 @@ radeon-y += radeon_device.o radeon_asic.o radeon_kms.o \ r600_dpm.o rs780_dpm.o rv6xx_dpm.o rv770_dpm.o rv730_dpm.o rv740_dpm.o \ rv770_smc.o cypress_dpm.o btc_dpm.o sumo_dpm.o sumo_smc.o trinity_dpm.o \ trinity_smc.o ni_dpm.o si_smc.o si_dpm.o kv_smc.o kv_dpm.o ci_smc.o \ - ci_dpm.o dce6_afmt.o radeon_vm.o radeon_ucode.o radeon_ib.o + ci_dpm.o dce6_afmt.o radeon_vm.o radeon_ucode.o radeon_ib.o radeon_mn.o # add async DMA block radeon-y += \ |