Commit d9483ecd authored by Christian König's avatar Christian König Committed by Alex Deucher
Browse files

drm/amdgpu: rename the files for HMM handling 



Clean that up a bit, no functional change.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Reviewed-by: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent fec8fdb5

drivers/gpu/drm/amd/amdgpu/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -250,7 +250,7 @@ endif 
amdgpu-$(CONFIG_COMPAT) += amdgpu_ioc32.o

amdgpu-$(CONFIG_VGA_SWITCHEROO) += amdgpu_atpx_handler.o

amdgpu-$(CONFIG_ACPI) += amdgpu_acpi.o

amdgpu-$(CONFIG_HMM_MIRROR) += amdgpu_mn.o

amdgpu-$(CONFIG_HMM_MIRROR) += amdgpu_hmm.o



include $(FULL_AMD_PATH)/pm/Makefile

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

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

#include "amdgpu_vcn.h"

#include "amdgpu_jpeg.h"

#include "amdgpu_mn.h"

#include "amdgpu_gmc.h"

#include "amdgpu_gfx.h"

#include "amdgpu_sdma.h"

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

+4 −3
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#include "amdgpu_object.h"

#include "amdgpu_gem.h"

#include "amdgpu_vm.h"

#include "amdgpu_hmm.h"

#include "amdgpu_amdkfd.h"

#include "amdgpu_dma_buf.h"

#include <uapi/linux/kfd_ioctl.h>
@@ -949,7 +950,7 @@ static int init_user_pages(struct kgd_mem *mem, uint64_t user_addr, 
		goto out;

	}



	ret = amdgpu_mn_register(bo, user_addr);

	ret = amdgpu_hmm_register(bo, user_addr);

	if (ret) {

		pr_err("%s: Failed to register MMU notifier: %d\n",

		       __func__, ret);
@@ -989,7 +990,7 @@ static int init_user_pages(struct kgd_mem *mem, uint64_t user_addr, 
	amdgpu_ttm_tt_get_user_pages_done(bo->tbo.ttm, range);

unregister_out:

	if (ret)

		amdgpu_mn_unregister(bo);

		amdgpu_hmm_unregister(bo);

out:

	mutex_unlock(&process_info->lock);

	return ret;
@@ -1773,7 +1774,7 @@ int amdgpu_amdkfd_gpuvm_free_memory_of_gpu( 
	mutex_unlock(&process_info->lock);



	/* No more MMU notifiers */

	amdgpu_mn_unregister(mem->bo);

	amdgpu_hmm_unregister(mem->bo);



	ret = reserve_bo_and_cond_vms(mem, NULL, BO_VM_ALL, &ctx);

	if (unlikely(ret))

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

+3 −2
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ 
#include "amdgpu.h"

#include "amdgpu_display.h"

#include "amdgpu_dma_buf.h"

#include "amdgpu_hmm.h"

#include "amdgpu_xgmi.h"



static const struct drm_gem_object_funcs amdgpu_gem_object_funcs;
@@ -87,7 +88,7 @@ static void amdgpu_gem_object_free(struct drm_gem_object *gobj) 
	struct amdgpu_bo *robj = gem_to_amdgpu_bo(gobj);



	if (robj) {

		amdgpu_mn_unregister(robj);

		amdgpu_hmm_unregister(robj);

		amdgpu_bo_unref(&robj);

	}

}
@@ -414,7 +415,7 @@ int amdgpu_gem_userptr_ioctl(struct drm_device *dev, void *data, 
	if (r)

		goto release_object;



	r = amdgpu_mn_register(bo, args->addr);

	r = amdgpu_hmm_register(bo, args->addr);

	if (r)

		goto release_object;

drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c→drivers/gpu/drm/amd/amdgpu/amdgpu_hmm.c

+19 −18
Original line number Diff line number Diff line
@@ -49,9 +49,10 @@ 


#include "amdgpu.h"

#include "amdgpu_amdkfd.h"

#include "amdgpu_hmm.h"



/**

 * amdgpu_mn_invalidate_gfx - callback to notify about mm change

 * amdgpu_hmm_invalidate_gfx - callback to notify about mm change

 *

 * @mni: the range (mm) is about to update

 * @range: details on the invalidation
@@ -60,7 +61,7 @@ 
 * Block for operations on BOs to finish and mark pages as accessed and

 * potentially dirty.

 */

static bool amdgpu_mn_invalidate_gfx(struct mmu_interval_notifier *mni,

static bool amdgpu_hmm_invalidate_gfx(struct mmu_interval_notifier *mni,

				      const struct mmu_notifier_range *range,

				      unsigned long cur_seq)

{
@@ -83,12 +84,12 @@ static bool amdgpu_mn_invalidate_gfx(struct mmu_interval_notifier *mni, 
	return true;

}



static const struct mmu_interval_notifier_ops amdgpu_mn_gfx_ops = {

	.invalidate = amdgpu_mn_invalidate_gfx,

static const struct mmu_interval_notifier_ops amdgpu_hmm_gfx_ops = {

	.invalidate = amdgpu_hmm_invalidate_gfx,

};



/**

 * amdgpu_mn_invalidate_hsa - callback to notify about mm change

 * amdgpu_hmm_invalidate_hsa - callback to notify about mm change

 *

 * @mni: the range (mm) is about to update

 * @range: details on the invalidation
@@ -97,7 +98,7 @@ static const struct mmu_interval_notifier_ops amdgpu_mn_gfx_ops = { 
 * We temporarily evict the BO attached to this range. This necessitates

 * evicting all user-mode queues of the process.

 */

static bool amdgpu_mn_invalidate_hsa(struct mmu_interval_notifier *mni,

static bool amdgpu_hmm_invalidate_hsa(struct mmu_interval_notifier *mni,

				      const struct mmu_notifier_range *range,

				      unsigned long cur_seq)

{
@@ -117,12 +118,12 @@ static bool amdgpu_mn_invalidate_hsa(struct mmu_interval_notifier *mni, 
	return true;

}



static const struct mmu_interval_notifier_ops amdgpu_mn_hsa_ops = {

	.invalidate = amdgpu_mn_invalidate_hsa,

static const struct mmu_interval_notifier_ops amdgpu_hmm_hsa_ops = {

	.invalidate = amdgpu_hmm_invalidate_hsa,

};



/**

 * amdgpu_mn_register - register a BO for notifier updates

 * amdgpu_hmm_register - register a BO for notifier updates

 *

 * @bo: amdgpu buffer object

 * @addr: userptr addr we should monitor
@@ -130,25 +131,25 @@ static const struct mmu_interval_notifier_ops amdgpu_mn_hsa_ops = { 
 * Registers a mmu_notifier for the given BO at the specified address.

 * Returns 0 on success, -ERRNO if anything goes wrong.

 */

int amdgpu_mn_register(struct amdgpu_bo *bo, unsigned long addr)

int amdgpu_hmm_register(struct amdgpu_bo *bo, unsigned long addr)

{

	if (bo->kfd_bo)

		return mmu_interval_notifier_insert(&bo->notifier, current->mm,

						    addr, amdgpu_bo_size(bo),

						    &amdgpu_mn_hsa_ops);

						    &amdgpu_hmm_hsa_ops);

	return mmu_interval_notifier_insert(&bo->notifier, current->mm, addr,

					    amdgpu_bo_size(bo),

					    &amdgpu_mn_gfx_ops);

					    &amdgpu_hmm_gfx_ops);

}



/**

 * amdgpu_mn_unregister - unregister a BO for notifier updates

 * amdgpu_hmm_unregister - unregister a BO for notifier updates

 *

 * @bo: amdgpu buffer object

 *

 * Remove any registration of mmu notifier updates from the buffer object.

 */

void amdgpu_mn_unregister(struct amdgpu_bo *bo)

void amdgpu_hmm_unregister(struct amdgpu_bo *bo)

{

	if (!bo->notifier.mm)

		return;