Commit 30ff7580 authored by Sunil Khatri's avatar Sunil Khatri Committed by Alex Deucher
Browse files

drm/amdgpu: add drm_file reference in userq_mgr 



drm_file will be used in usermode queues code to
enable better process information in logging and hence
add drm_file part of the userq_mgr struct.

update the drm_file pointer in userq_mgr for each
amdgpu_driver_open_kms.

Signed-off-by: default avatarSunil Khatri <sunil.khatri@amd.com>
Reviewed-by: default avatarTvrtko Ursulin <tvrtko.ursulin@igalia.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent fc3817fb

drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c

+1 −1
Original line number Diff line number Diff line
@@ -1431,7 +1431,7 @@ int amdgpu_driver_open_kms(struct drm_device *dev, struct drm_file *file_priv) 


	amdgpu_ctx_mgr_init(&fpriv->ctx_mgr, adev);



	r = amdgpu_userq_mgr_init(&fpriv->userq_mgr, adev);

	r = amdgpu_userq_mgr_init(&fpriv->userq_mgr, file_priv, adev);

	if (r)

		DRM_WARN("Can't setup usermode queues, use legacy workload submission only\n");

drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c

+3 −1
Original line number Diff line number Diff line
@@ -753,11 +753,13 @@ amdgpu_userq_evict(struct amdgpu_userq_mgr *uq_mgr, 
	schedule_delayed_work(&uq_mgr->resume_work, 0);

}



int amdgpu_userq_mgr_init(struct amdgpu_userq_mgr *userq_mgr, struct amdgpu_device *adev)

int amdgpu_userq_mgr_init(struct amdgpu_userq_mgr *userq_mgr, struct drm_file *file_priv,

			  struct amdgpu_device *adev)

{

	mutex_init(&userq_mgr->userq_mutex);

	idr_init_base(&userq_mgr->userq_idr, 1);

	userq_mgr->adev = adev;

	userq_mgr->file = file_priv;



	mutex_lock(&adev->userq_mutex);

	list_add(&userq_mgr->list, &adev->userq_mgr_list);

drivers/gpu/drm/amd/amdgpu/amdgpu_userq.h

+3 −1
Original line number Diff line number Diff line
@@ -86,6 +86,7 @@ struct amdgpu_userq_mgr { 
	struct amdgpu_device		*adev;

	struct delayed_work		resume_work;

	struct list_head		list;

	struct drm_file			*file;

};



struct amdgpu_db_info {
@@ -97,7 +98,8 @@ struct amdgpu_db_info { 


int amdgpu_userq_ioctl(struct drm_device *dev, void *data, struct drm_file *filp);



int amdgpu_userq_mgr_init(struct amdgpu_userq_mgr *userq_mgr, struct amdgpu_device *adev);

int amdgpu_userq_mgr_init(struct amdgpu_userq_mgr *userq_mgr, struct drm_file *file_priv,

			  struct amdgpu_device *adev);



void amdgpu_userq_mgr_fini(struct amdgpu_userq_mgr *userq_mgr);