Commit 0f2e1d62 authored by Lijo Lazar's avatar Lijo Lazar Committed by Alex Deucher
Browse files

drm/amdgpu: Get supported memory partition modes 



Expand the interface to get supported memory partition modes also along
with the current memory partition mode.

Signed-off-by: default avatarLijo Lazar <lijo.lazar@amd.com>
Reviewed-by: default avatarLe Ma <le.ma@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent b6f90baa

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

+2 −1
Original line number Diff line number Diff line
@@ -97,7 +97,8 @@ struct amdgpu_nbio_funcs { 
	void (*clear_doorbell_interrupt)(struct amdgpu_device *adev);

	u32 (*get_rom_offset)(struct amdgpu_device *adev);

	int (*get_compute_partition_mode)(struct amdgpu_device *adev);

	u32 (*get_memory_partition_mode)(struct amdgpu_device *adev);

	u32 (*get_memory_partition_mode)(struct amdgpu_device *adev,

					 u32 *supp_modes);

	void (*set_compute_partition_mode)(struct amdgpu_device *adev,

					   enum amdgpu_gfx_partition mode);

};

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

+9 −2
Original line number Diff line number Diff line
@@ -1331,16 +1331,23 @@ static unsigned gmc_v9_0_get_vbios_fb_size(struct amdgpu_device *adev) 
}



static enum amdgpu_memory_partition

gmc_v9_0_query_memory_partition(struct amdgpu_device *adev)

gmc_v9_0_get_memory_partition(struct amdgpu_device *adev, u32 *supp_modes)

{

	enum amdgpu_memory_partition mode = UNKNOWN_MEMORY_PARTITION_MODE;



	if (adev->nbio.funcs->get_memory_partition_mode)

		mode = adev->nbio.funcs->get_memory_partition_mode(adev);

		mode = adev->nbio.funcs->get_memory_partition_mode(adev,

								   supp_modes);



	return mode;

}



static enum amdgpu_memory_partition

gmc_v9_0_query_memory_partition(struct amdgpu_device *adev)

{

	return gmc_v9_0_get_memory_partition(adev, NULL);

}



static const struct amdgpu_gmc_funcs gmc_v9_0_gmc_funcs = {

	.flush_gpu_tlb = gmc_v9_0_flush_gpu_tlb,

	.flush_gpu_tlb_pasid = gmc_v9_0_flush_gpu_tlb_pasid,

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

+8 −1
Original line number Diff line number Diff line
@@ -408,12 +408,19 @@ static void nbio_v7_9_set_compute_partition_mode(struct amdgpu_device *adev, 
	WREG32_SOC15(NBIO, 0, regBIF_BX_PF0_PARTITION_COMPUTE_STATUS, tmp);

}



static enum amdgpu_memory_partition nbio_v7_9_get_memory_partition_mode(struct amdgpu_device *adev)

static enum amdgpu_memory_partition

nbio_v7_9_get_memory_partition_mode(struct amdgpu_device *adev, u32 *supp_modes)

{

	u32 tmp;



	tmp = RREG32_SOC15(NBIO, 0, regBIF_BX_PF0_PARTITION_MEM_STATUS);

	tmp = REG_GET_FIELD(tmp, BIF_BX_PF0_PARTITION_MEM_STATUS, NPS_MODE);



	if (supp_modes) {

		*supp_modes =

			RREG32_SOC15(NBIO, 0, regBIF_BX_PF0_PARTITION_MEM_CAP);

	}



	return ffs(tmp);

}