Commit bf33cb65 authored by Shashank Sharma's avatar Shashank Sharma Committed by Alex Deucher
Browse files

drm/amdgpu: add usermode queue base code 

This patch adds IP independent skeleton code for amdgpu
usermode queue. It contains:
- A new files with init functions of usermode queues.
- A queue context manager in driver private data.

V1: Worked on design review comments from RFC patch series:
(https://patchwork.freedesktop.org/series/112214/

)
- Alex: Keep a list of queues, instead of single queue per process.
- Christian: Use the queue manager instead of global ptrs,
           Don't keep the queue structure in amdgpu_ctx

V2:
 - Reformatted code, split the big patch into two

V3:
- Integration with doorbell manager

V4:
- Align the structure member names to the largest member's column
  (Luben)
- Added SPDX license (Luben)

V5:
- Do not add amdgpu.h in amdgpu_userqueue.h (Christian).
- Move struct amdgpu_userq_mgr into amdgpu_userqueue.h (Christian).

V6: Rebase
V9: Rebase
V10: Rebase + Alex's R-B

Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: Christian Koenig <christian.koenig@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarShashank Sharma <shashank.sharma@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 7eb61c2d

drivers/gpu/drm/amd/amdgpu/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -253,6 +253,8 @@ amdgpu-y += \ 
# add amdkfd interfaces

amdgpu-y += amdgpu_amdkfd.o



# add gfx usermode queue

amdgpu-y += amdgpu_userqueue.o



ifneq ($(CONFIG_HSA_AMD),)

AMDKFD_PATH := ../amdkfd

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

+3 −0
Original line number Diff line number Diff line
@@ -113,6 +113,7 @@ 
#include "amdgpu_xcp.h"

#include "amdgpu_seq64.h"

#include "amdgpu_reg_state.h"

#include "amdgpu_userqueue.h"

#if defined(CONFIG_DRM_AMD_ISP)

#include "amdgpu_isp.h"

#endif
@@ -502,6 +503,7 @@ struct amdgpu_fpriv { 
	struct mutex		bo_list_lock;

	struct idr		bo_list_handles;

	struct amdgpu_ctx_mgr	ctx_mgr;

	struct amdgpu_userq_mgr	userq_mgr;

	/** GPU partition selection */

	uint32_t		xcp_id;

};
@@ -1090,6 +1092,7 @@ struct amdgpu_device { 
	bool                            enable_uni_mes;

	struct amdgpu_mes               mes;

	struct amdgpu_mqd               mqds[AMDGPU_HW_IP_NUM];

	const struct amdgpu_userq_funcs *userq_funcs[AMDGPU_HW_IP_NUM];



	/* df */

	struct amdgpu_df                df;

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

+1 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ 
#include "amdgpu_reset.h"

#include "amdgpu_sched.h"

#include "amdgpu_xgmi.h"

#include "amdgpu_userqueue.h"

#include "../amdxcp/amdgpu_xcp_drv.h"



/*

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

+6 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ 
#include "amdgpu_ras.h"

#include "amdgpu_reset.h"

#include "amd_pcie.h"

#include "amdgpu_userqueue.h"



void amdgpu_unregister_gpu_instance(struct amdgpu_device *adev)

{
@@ -1378,6 +1379,10 @@ 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);

	if (r)

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



	file_priv->driver_priv = fpriv;

	goto out_suspend;
@@ -1447,6 +1452,7 @@ void amdgpu_driver_postclose_kms(struct drm_device *dev, 


	amdgpu_ctx_mgr_fini(&fpriv->ctx_mgr);

	amdgpu_vm_fini(adev, &fpriv->vm);

	amdgpu_userq_mgr_fini(&fpriv->userq_mgr);



	if (pasid)

		amdgpu_pasid_free_delayed(pd->tbo.base.resv, pasid);

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

0 → 100644
+40 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: MIT

/*

 * Copyright 2023 Advanced Micro Devices, Inc.

 *

 * Permission is hereby granted, free of charge, to any person obtaining a

 * copy of this software and associated documentation files (the "Software"),

 * to deal in the Software without restriction, including without limitation

 * the rights to use, copy, modify, merge, publish, distribute, sublicense,

 * and/or sell copies of the Software, and to permit persons to whom the

 * Software is furnished to do so, subject to the following conditions:

 *

 * The above copyright notice and this permission notice shall be included in

 * all copies or substantial portions of the Software.

 *

 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

 * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR

 * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

 * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

 * OTHER DEALINGS IN THE SOFTWARE.

 *

 */



#include "amdgpu.h"



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

{

	mutex_init(&userq_mgr->userq_mutex);

	idr_init_base(&userq_mgr->userq_idr, 1);

	userq_mgr->adev = adev;



	return 0;

}



void amdgpu_userq_mgr_fini(struct amdgpu_userq_mgr *userq_mgr)

{

	idr_destroy(&userq_mgr->userq_idr);

	mutex_destroy(&userq_mgr->userq_mutex);

}