aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
diff options
context:
space:
mode:
authorChristian König <christian.koenig@amd.com>2015-08-04 10:20:31 -0400
committerAlex Deucher <alexander.deucher@amd.com>2015-08-17 16:51:00 -0400
commitefd4ccb59a4acb8b85835d6b053362dbacee40f9 (patch)
tree6718cb4d186aa13c1daf45ec3afa8ae0154cc75e /drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
parent34cb581a7d99401cad0e1c43b528690885435f5b (diff)
drm/amdgpu: cleanup ctx_mgr init/fini
Signed-off-by: Christian König <christian.koenig@amd.com> Reviewed-by: Chunming Zhou <david1.zhou@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
index 53da3d8a868c..7226def4e8fb 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
@@ -527,10 +527,7 @@ int amdgpu_driver_open_kms(struct drm_device *dev, struct drm_file *file_priv)
527 mutex_init(&fpriv->bo_list_lock); 527 mutex_init(&fpriv->bo_list_lock);
528 idr_init(&fpriv->bo_list_handles); 528 idr_init(&fpriv->bo_list_handles);
529 529
530 /* init context manager */ 530 amdgpu_ctx_mgr_init(&fpriv->ctx_mgr);
531 mutex_init(&fpriv->ctx_mgr.lock);
532 idr_init(&fpriv->ctx_mgr.ctx_handles);
533 fpriv->ctx_mgr.adev = adev;
534 531
535 file_priv->driver_priv = fpriv; 532 file_priv->driver_priv = fpriv;
536 533
@@ -571,8 +568,7 @@ void amdgpu_driver_postclose_kms(struct drm_device *dev,
571 idr_destroy(&fpriv->bo_list_handles); 568 idr_destroy(&fpriv->bo_list_handles);
572 mutex_destroy(&fpriv->bo_list_lock); 569 mutex_destroy(&fpriv->bo_list_lock);
573 570
574 /* release context */ 571 amdgpu_ctx_mgr_fini(&fpriv->ctx_mgr);
575 amdgpu_ctx_fini(fpriv);
576 572
577 kfree(fpriv); 573 kfree(fpriv);
578 file_priv->driver_priv = NULL; 574 file_priv->driver_priv = NULL;