diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2017-05-24 10:51:40 -0400 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2017-06-20 04:41:03 -0400 |
commit | 10631d724deff712343d96dd3017cd323349f761 (patch) | |
tree | 280d7d7a05cb5242b19e5b045e2b86e7353cbbf4 /drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | |
parent | 5c484cee7ef9c4fd29fa0ba09640d55960977145 (diff) |
drm/pci: Deprecate drm_pci_init/exit completely
The magic switching between proper pci driver and shadow-attach isn't
useful anymore since there's no ums+kms drivers left. Let's split this
up properly, calling pci_register_driver for kms drivers and renaming
the shadow-attach init to drm_legacy_pci_init/exit.
Acked-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170524145212.27837-6-daniel.vetter@ffwll.ch
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c index e7a4bce6358d..4911d304d8b9 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | |||
@@ -816,7 +816,7 @@ static int __init amdgpu_init(void) | |||
816 | driver->num_ioctls = amdgpu_max_kms_ioctl; | 816 | driver->num_ioctls = amdgpu_max_kms_ioctl; |
817 | amdgpu_register_atpx_handler(); | 817 | amdgpu_register_atpx_handler(); |
818 | /* let modprobe override vga console setting */ | 818 | /* let modprobe override vga console setting */ |
819 | return drm_pci_init(driver, pdriver); | 819 | return pci_register_driver(pdriver); |
820 | 820 | ||
821 | error_sched: | 821 | error_sched: |
822 | amdgpu_fence_slab_fini(); | 822 | amdgpu_fence_slab_fini(); |
@@ -831,7 +831,7 @@ error_sync: | |||
831 | static void __exit amdgpu_exit(void) | 831 | static void __exit amdgpu_exit(void) |
832 | { | 832 | { |
833 | amdgpu_amdkfd_fini(); | 833 | amdgpu_amdkfd_fini(); |
834 | drm_pci_exit(driver, pdriver); | 834 | pci_unregister_driver(pdriver); |
835 | amdgpu_unregister_atpx_handler(); | 835 | amdgpu_unregister_atpx_handler(); |
836 | amdgpu_sync_fini(); | 836 | amdgpu_sync_fini(); |
837 | amd_sched_fence_slab_fini(); | 837 | amd_sched_fence_slab_fini(); |