Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3d093da0 authored by Tao Zhou's avatar Tao Zhou Committed by Alex Deucher
Browse files

drm/amdgpu: add amdgpu_mmhub_funcs definition 



add amdgpu_mmhub_funcs definition and initialize it,
prepare for mmhub ras enablement

Signed-off-by: default avatarTao Zhou <tao.zhou1@amd.com>
Reviewed-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 44494f96

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

+2 −0
Original line number Diff line number Diff line
@@ -87,6 +87,7 @@ 
#include "amdgpu_discovery.h"

#include "amdgpu_mes.h"

#include "amdgpu_umc.h"

#include "amdgpu_mmhub.h"



#define MAX_GPU_INSTANCE		16
@@ -976,6 +977,7 @@ struct amdgpu_device { 


	const struct amdgpu_nbio_funcs	*nbio_funcs;

	const struct amdgpu_df_funcs	*df_funcs;

	const struct amdgpu_mmhub_funcs	*mmhub_funcs;



	/* delayed work_func for deferring clockgating during resume */

	struct delayed_work     delayed_init_work;

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

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

 * Copyright (C) 2019  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) 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.

 */

#ifndef __AMDGPU_MMHUB_H__

#define __AMDGPU_MMHUB_H__



struct amdgpu_mmhub_funcs {

	void (*ras_init)(struct amdgpu_device *adev);

	void (*query_ras_error_count)(struct amdgpu_device *adev,

					void *ras_error_status);

};



#endif

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

+12 −0
Original line number Diff line number Diff line
@@ -656,6 +656,17 @@ static void gmc_v9_0_set_umc_funcs(struct amdgpu_device *adev) 
	}

}



static void gmc_v9_0_set_mmhub_funcs(struct amdgpu_device *adev)

{

	switch (adev->asic_type) {

	case CHIP_VEGA20:

		adev->mmhub_funcs = &mmhub_v1_0_funcs;

		break;

	default:

		break;

	}

}



static int gmc_v9_0_early_init(void *handle)

{

	struct amdgpu_device *adev = (struct amdgpu_device *)handle;
@@ -663,6 +674,7 @@ static int gmc_v9_0_early_init(void *handle) 
	gmc_v9_0_set_gmc_funcs(adev);

	gmc_v9_0_set_irq_funcs(adev);

	gmc_v9_0_set_umc_funcs(adev);

	gmc_v9_0_set_mmhub_funcs(adev);



	adev->gmc.shared_aperture_start = 0x2000000000000000ULL;

	adev->gmc.shared_aperture_end =

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

+9 −0
Original line number Diff line number Diff line
@@ -584,3 +584,12 @@ void mmhub_v1_0_get_clockgating(struct amdgpu_device *adev, u32 *flags) 
	if (data & ATC_L2_MISC_CG__MEM_LS_ENABLE_MASK)

		*flags |= AMD_CG_SUPPORT_MC_LS;

}



static void mmhub_v1_0_query_ras_error_count(struct amdgpu_device *adev,

					   void *ras_error_status)

{

}



const struct amdgpu_mmhub_funcs mmhub_v1_0_funcs = {

	.query_ras_error_count = mmhub_v1_0_query_ras_error_count,

};

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

+2 −0
Original line number Diff line number Diff line
@@ -23,6 +23,8 @@ 
#ifndef __MMHUB_V1_0_H__

#define __MMHUB_V1_0_H__



extern const struct amdgpu_mmhub_funcs mmhub_v1_0_funcs;



u64 mmhub_v1_0_get_fb_location(struct amdgpu_device *adev);

int mmhub_v1_0_gart_enable(struct amdgpu_device *adev);

void mmhub_v1_0_gart_disable(struct amdgpu_device *adev);