Commit 42a66677 authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/amdgpu/userq: use consistent function naming 



s/userqueue/userq/

1. remove the mix of amdgpu_userqueue and amdgpu_userq
2. to be consistent with other amdgpu_userq_fence.c
3. it's shorter

Reviewed-by: default avatarPrike Liang <Prike.Liang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 4fdbe3a6

drivers/gpu/drm/amd/amdgpu/Makefile

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



# add gfx usermode queue

amdgpu-y += amdgpu_userqueue.o

amdgpu-y += amdgpu_userq.o



ifneq ($(CONFIG_HSA_AMD),)

AMDKFD_PATH := ../amdkfd

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

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

#include "amdgpu_seq64.h"

#include "amdgpu_reg_state.h"

#include "amdgpu_userqueue.h"

#include "amdgpu_userq.h"

#include "amdgpu_eviction_fence.h"

#if defined(CONFIG_DRM_AMD_ISP)

#include "amdgpu_isp.h"

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

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

#include "amdgpu_sched.h"

#include "amdgpu_xgmi.h"

#include "amdgpu_userqueue.h"

#include "amdgpu_userq.h"

#include "amdgpu_userq_fence.h"

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

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

+1 −1
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ amdgpu_eviction_fence_suspend_worker(struct work_struct *work) 
	if (!ev_fence)

		goto unlock;



	amdgpu_userqueue_evict(uq_mgr, ev_fence);

	amdgpu_userq_evict(uq_mgr, ev_fence);



unlock:

	mutex_unlock(&uq_mgr->userq_mutex);

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

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

#include "amdgpu_reset.h"

#include "amd_pcie.h"

#include "amdgpu_userqueue.h"

#include "amdgpu_userq.h"



void amdgpu_unregister_gpu_instance(struct amdgpu_device *adev)

{
@@ -1009,7 +1009,7 @@ int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file *filp) 
			}

		}



		dev_info->userq_ip_mask = amdgpu_userqueue_get_supported_ip_mask(adev);

		dev_info->userq_ip_mask = amdgpu_userq_get_supported_ip_mask(adev);



		ret = copy_to_user(out, dev_info,

				   min((size_t)size, sizeof(*dev_info))) ? -EFAULT : 0;