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

drm/amdgpu: move MMU notifier related defines to amdgpu_mn.h 



Just some cleanup.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarMichel Dänzer <michel.daenzer@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 711becf0

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

+1 −24
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ 
#include "amdgpu_uvd.h"

#include "amdgpu_vce.h"

#include "amdgpu_vcn.h"

#include "amdgpu_mn.h"



#include "gpu_scheduler.h"

#include "amdgpu_virt.h"
@@ -178,7 +179,6 @@ struct amdgpu_cs_parser; 
struct amdgpu_job;

struct amdgpu_irq_src;

struct amdgpu_fpriv;

struct amdgpu_mn;

struct amdgpu_bo_va_mapping;



enum amdgpu_cp_irq {
@@ -1200,29 +1200,6 @@ void amdgpu_benchmark(struct amdgpu_device *adev, int test_number); 
 */

void amdgpu_test_moves(struct amdgpu_device *adev);



/*

 * MMU Notifier

 */

#if defined(CONFIG_MMU_NOTIFIER)

void amdgpu_mn_lock(struct amdgpu_mn *mn);

void amdgpu_mn_unlock(struct amdgpu_mn *mn);

struct amdgpu_mn *amdgpu_mn_get(struct amdgpu_device *adev);

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

void amdgpu_mn_unregister(struct amdgpu_bo *bo);

#else

static inline void amdgpu_mn_lock(struct amdgpu_mn *mn) {}

static inline void amdgpu_mn_unlock(struct amdgpu_mn *mn) {}

static inline struct amdgpu_mn *amdgpu_mn_get(struct amdgpu_device *adev)

{

	return NULL;

}

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

{

	return -ENODEV;

}

static inline void amdgpu_mn_unregister(struct amdgpu_bo *bo) {}

#endif



/*

 * Debugfs

 */

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

0 → 100644
+52 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2017 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.

 *

 * Authors: Christian König

 */

#ifndef __AMDGPU_MN_H__

#define __AMDGPU_MN_H__



/*

 * MMU Notifier

 */

struct amdgpu_mn;



#if defined(CONFIG_MMU_NOTIFIER)

void amdgpu_mn_lock(struct amdgpu_mn *mn);

void amdgpu_mn_unlock(struct amdgpu_mn *mn);

struct amdgpu_mn *amdgpu_mn_get(struct amdgpu_device *adev);

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

void amdgpu_mn_unregister(struct amdgpu_bo *bo);

#else

static inline void amdgpu_mn_lock(struct amdgpu_mn *mn) {}

static inline void amdgpu_mn_unlock(struct amdgpu_mn *mn) {}

static inline struct amdgpu_mn *amdgpu_mn_get(struct amdgpu_device *adev)

{

	return NULL;

}

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

{

	return -ENODEV;

}

static inline void amdgpu_mn_unregister(struct amdgpu_bo *bo) {}

#endif



#endif