Commit 56801cb8 authored by Arvind Yadav's avatar Arvind Yadav Committed by Alex Deucher
Browse files

drm/amdgpu: remove DRM_AMDGPU_NAVI3X_USERQ config for UQ 



DRM_AMDGPU_NAVI3X_USERQ config support is not required for
usermode queue.

v2: rebase.

Cc: Arunpravin Paneer Selvam <Arunpravin.PaneerSelvam@amd.com>
Reviewed-by: default avatarSunil Khatri <sunil.khatri@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarArvind Yadav <Arvind.Yadav@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 716ad3c2

drivers/gpu/drm/amd/amdgpu/Kconfig

+0 −8
Original line number Diff line number Diff line
@@ -96,14 +96,6 @@ config DRM_AMDGPU_WERROR 
	  Add -Werror to the build flags for amdgpu.ko.

	  Only enable this if you are warning code for amdgpu.ko.



config DRM_AMDGPU_NAVI3X_USERQ

	bool "Enable amdgpu usermode queues"

	depends on DRM_AMDGPU

	default n

	help

	  Choose this option to enable GFX usermode queue support for GFX/SDMA/Compute

          workload submission. This feature is experimental and supported on GFX11+.



source "drivers/gpu/drm/amd/acp/Kconfig"

source "drivers/gpu/drm/amd/display/Kconfig"

source "drivers/gpu/drm/amd/amdkfd/Kconfig"

drivers/gpu/drm/amd/amdgpu/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ amdgpu-y += \ 
	mes_v12_0.o \



# add GFX userqueue support

amdgpu-$(CONFIG_DRM_AMDGPU_NAVI3X_USERQ) += mes_userqueue.o

amdgpu-y += mes_userqueue.o



# add UVD block

amdgpu-y += \

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

+1 −6
Original line number Diff line number Diff line
@@ -3513,9 +3513,7 @@ static int amdgpu_device_ip_fini_early(struct amdgpu_device *adev) 
	amdgpu_device_set_cg_state(adev, AMD_CG_STATE_UNGATE);



	amdgpu_amdkfd_suspend(adev, false);

#ifdef CONFIG_DRM_AMDGPU_NAVI3X_USERQ

	amdgpu_userq_suspend(adev);

#endif



	/* Workaround for ASICs need to disable SMC first */

	amdgpu_device_smu_fini_early(adev);
@@ -5086,9 +5084,7 @@ int amdgpu_device_suspend(struct drm_device *dev, bool notify_clients) 


	if (!adev->in_s0ix) {

		amdgpu_amdkfd_suspend(adev, adev->in_runpm);

#ifdef CONFIG_DRM_AMDGPU_NAVI3X_USERQ

		amdgpu_userq_suspend(adev);

#endif

	}



	r = amdgpu_device_evict_resources(adev);
@@ -5156,11 +5152,10 @@ int amdgpu_device_resume(struct drm_device *dev, bool notify_clients) 
		r = amdgpu_amdkfd_resume(adev, adev->in_runpm);

		if (r)

			goto exit;

#ifdef CONFIG_DRM_AMDGPU_NAVI3X_USERQ



		r = amdgpu_userq_resume(adev);

		if (r)

			goto exit;

#endif

	}



	r = amdgpu_device_ip_late_init(adev);

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

+1 −4
Original line number Diff line number Diff line
@@ -1981,9 +1981,7 @@ static void amdgpu_gfx_kfd_sch_ctrl(struct amdgpu_device *adev, u32 idx, 
		if (adev->gfx.userq_sch_req_count[idx] == 0) {

			cancel_delayed_work_sync(&adev->gfx.enforce_isolation[idx].work);

			if (!adev->gfx.userq_sch_inactive[idx]) {

#ifdef CONFIG_DRM_AMDGPU_NAVI3X_USERQ

				amdgpu_userq_stop_sched_for_enforce_isolation(adev, idx);

#endif

				if (adev->kfd.init_complete)

					amdgpu_amdkfd_stop_sched(adev, idx);

				adev->gfx.userq_sch_inactive[idx] = true;
@@ -2041,9 +2039,8 @@ void amdgpu_gfx_enforce_isolation_handler(struct work_struct *work) 
		/* Tell KFD to resume the runqueue */

		WARN_ON_ONCE(!adev->gfx.userq_sch_inactive[idx]);

		WARN_ON_ONCE(adev->gfx.userq_sch_req_count[idx]);

#ifdef CONFIG_DRM_AMDGPU_NAVI3X_USERQ



		amdgpu_userq_start_sched_for_enforce_isolation(adev, idx);

#endif

		if (adev->kfd.init_complete)

			amdgpu_amdkfd_start_sched(adev, idx);

		adev->gfx.userq_sch_inactive[idx] = false;

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

+0 −8
Original line number Diff line number Diff line
@@ -129,7 +129,6 @@ amdgpu_userq_active(struct amdgpu_userq_mgr *uq_mgr) 
	return ret;

}



#ifdef CONFIG_DRM_AMDGPU_NAVI3X_USERQ

static struct amdgpu_usermode_queue *

amdgpu_userq_find(struct amdgpu_userq_mgr *uq_mgr, int qid)

{
@@ -520,13 +519,6 @@ int amdgpu_userq_ioctl(struct drm_device *dev, void *data, 


	return r;

}

#else

int amdgpu_userq_ioctl(struct drm_device *dev, void *data,

		       struct drm_file *filp)

{

	return -ENOTSUPP;

}

#endif



static int

amdgpu_userq_restore_all(struct amdgpu_userq_mgr *uq_mgr)