File tree Expand file tree Collapse file tree 2 files changed +4
-15
lines changed
drivers/gpu/drm/amd/amdgpu Expand file tree Collapse file tree 2 files changed +4
-15
lines changed Original file line number Diff line number Diff line change @@ -2912,20 +2912,6 @@ static int amdgpu_pmops_runtime_idle(struct device *dev)
2912
2912
return ret ;
2913
2913
}
2914
2914
2915
- static int amdgpu_drm_release (struct inode * inode , struct file * filp )
2916
- {
2917
- struct drm_file * file_priv = filp -> private_data ;
2918
- struct amdgpu_fpriv * fpriv = file_priv -> driver_priv ;
2919
-
2920
- if (fpriv ) {
2921
- fpriv -> evf_mgr .fd_closing = true;
2922
- amdgpu_eviction_fence_destroy (& fpriv -> evf_mgr );
2923
- amdgpu_userq_mgr_fini (& fpriv -> userq_mgr );
2924
- }
2925
-
2926
- return drm_release (inode , filp );
2927
- }
2928
-
2929
2915
long amdgpu_drm_ioctl (struct file * filp ,
2930
2916
unsigned int cmd , unsigned long arg )
2931
2917
{
@@ -2977,7 +2963,7 @@ static const struct file_operations amdgpu_driver_kms_fops = {
2977
2963
.owner = THIS_MODULE ,
2978
2964
.open = drm_open ,
2979
2965
.flush = amdgpu_flush ,
2980
- .release = amdgpu_drm_release ,
2966
+ .release = drm_release ,
2981
2967
.unlocked_ioctl = amdgpu_drm_ioctl ,
2982
2968
.mmap = drm_gem_mmap ,
2983
2969
.poll = drm_poll ,
Original file line number Diff line number Diff line change @@ -1501,6 +1501,9 @@ void amdgpu_driver_postclose_kms(struct drm_device *dev,
1501
1501
amdgpu_vm_bo_del (adev , fpriv -> prt_va );
1502
1502
amdgpu_bo_unreserve (pd );
1503
1503
}
1504
+ fpriv -> evf_mgr .fd_closing = true;
1505
+ amdgpu_eviction_fence_destroy (& fpriv -> evf_mgr );
1506
+ amdgpu_userq_mgr_fini (& fpriv -> userq_mgr );
1504
1507
1505
1508
amdgpu_ctx_mgr_fini (& fpriv -> ctx_mgr );
1506
1509
amdgpu_vm_fini (adev , & fpriv -> vm );
You can’t perform that action at this time.
0 commit comments