Commit bda9afda authored by Dmytro Laktyushkin's avatar Dmytro Laktyushkin Committed by Alex Deucher
Browse files

drm/amd/display: move vmid determination logic to a module 



Currently vmid is decided internally inside dc. With the introduction
of new asics we are required to coordinate vmid use with external
components.

This change converts vmid logic to a DAL module allowing vmid to be
passed in as a parameter to DC.

Signed-off-by: default avatarDmytro Laktyushkin <Dmytro.Laktyushkin@amd.com>
Reviewed-by: default avatarCharlene Liu <Charlene.Liu@amd.com>
Acked-by: default avatarBhawanpreet Lakha <Bhawanpreet.Lakha@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent a6465d1f

drivers/gpu/drm/amd/display/dc/Makefile

+5 −2
Original line number Diff line number Diff line
@@ -50,8 +50,11 @@ AMD_DC = $(addsuffix /Makefile, $(addprefix $(FULL_AMD_DISPLAY_PATH)/dc/,$(DC_LI 
include $(AMD_DC)



DISPLAY_CORE = dc.o dc_link.o dc_resource.o dc_hw_sequencer.o dc_sink.o \

dc_surface.o dc_link_hwss.o dc_link_dp.o dc_link_ddc.o dc_debug.o dc_stream.o \

dc_vm_helper.o

dc_surface.o dc_link_hwss.o dc_link_dp.o dc_link_ddc.o dc_debug.o dc_stream.o



ifdef CONFIG_DRM_AMD_DC_DCN2_0

DISPLAY_CORE += dc_vm_helper.o

endif



AMD_DISPLAY_CORE = $(addprefix $(AMDDALPATH)/dc/core/,$(DISPLAY_CORE))

drivers/gpu/drm/amd/display/dc/core/dc.c

+0 −20
Original line number Diff line number Diff line
@@ -808,26 +808,6 @@ void dc_destroy(struct dc **dc) 
	*dc = NULL;

}



#ifdef CONFIG_DRM_AMD_DC_DCN2_0

bool dc_init_memory_hub(struct dc *dc, struct dc_addr_space_config *config)

{

	// Memory hub init isn't done as part of dc_create because in windows, dal/dc is

	// constructed before the vm config is setup in kmd so there's no way

	// they can give it to us at boot/dc_create

	bool vmSupported;



	// Call HWSS to setup HUBBUB for address config

	dc->hwss.init_dchub(dc->hwseq, dc, config);



	// Pre-init system aperture start/end for all HUBP instances (if not gating?)

	// or cache system aperture if using power gating

	memcpy(&dc->vm_config, config, sizeof(struct dc_addr_space_config));



	vmSupported = (dc->ctx->asic_id.chip_family == FAMILY_NV) ? true : false;

	return vmSupported;

}



#endif

static void enable_timing_multisync(

		struct dc *dc,

		struct dc_state *ctx)

drivers/gpu/drm/amd/display/dc/core/dc_vm_helper.c

+23 −70
Original line number Diff line number Diff line
@@ -24,8 +24,9 @@ 
 */



#include "vm_helper.h"

#include "dc.h"



static void mark_vmid_used(struct vm_helper *vm_helper, unsigned int pos, uint8_t hubp_idx)

void vm_helper_mark_vmid_used(struct vm_helper *vm_helper, unsigned int pos, uint8_t hubp_idx)

{

	struct vmid_usage vmids = vm_helper->hubp_vmid_usage[hubp_idx];
@@ -33,91 +34,43 @@ static void mark_vmid_used(struct vm_helper *vm_helper, unsigned int pos, uint8_ 
	vmids.vmid_usage[1] = 1 << pos;

}



static void add_ptb_to_table(struct vm_helper *vm_helper, unsigned int vmid, uint64_t ptb)

int dc_setup_system_context(struct dc *dc, struct dc_phy_addr_space_config *pa_config)

{

	vm_helper->ptb_assigned_to_vmid[vmid] = ptb;

	vm_helper->num_vmids_available--;

}



static void clear_entry_from_vmid_table(struct vm_helper *vm_helper, unsigned int vmid)

{

	vm_helper->ptb_assigned_to_vmid[vmid] = 0;

	vm_helper->num_vmids_available++;

}



static void evict_vmids(struct vm_helper *vm_helper)

{

	int i;

	uint16_t ord = 0;



	for (i = 0; i < vm_helper->num_vmid; i++)

		ord |= vm_helper->hubp_vmid_usage[i].vmid_usage[0] | vm_helper->hubp_vmid_usage[i].vmid_usage[1];



	// At this point any positions with value 0 are unused vmids, evict them

	for (i = 1; i < vm_helper->num_vmid; i++) {

		if (ord & (1u << i))

			clear_entry_from_vmid_table(vm_helper, i);

	}

}

	int num_vmids = 0;



// Return value of -1 indicates vmid table unitialized or ptb dne in the table

static int get_existing_vmid_for_ptb(struct vm_helper *vm_helper, uint64_t ptb)

{

	int i;

	/* Call HWSS to setup HUBBUB for address config */

	if (dc->hwss.init_sys_ctx) {

		num_vmids = dc->hwss.init_sys_ctx(dc->hwseq, dc, pa_config);



	for (i = 0; i < vm_helper->num_vmid; i++) {

		if (vm_helper->ptb_assigned_to_vmid[i] == ptb)

			return i;

		/* Pre-init system aperture start/end for all HUBP instances (if not gating?)

		 * or cache system aperture if using power gating

		 */

		memcpy(&dc->vm_pa_config, pa_config, sizeof(struct dc_phy_addr_space_config));

		dc->vm_pa_config.valid = true;

	}



	return -1;

	return num_vmids;

}



// Expected to be called only when there's an available vmid

static int get_next_available_vmid(struct vm_helper *vm_helper)

void dc_setup_vm_context(struct dc *dc, struct dc_virtual_addr_space_config *va_config, int vmid)

{

	int i;



	for (i = 1; i < vm_helper->num_vmid; i++) {

		if (vm_helper->ptb_assigned_to_vmid[i] == 0)

			return i;

	}



	return -1;

	dc->hwss.init_vm_ctx(dc->hwseq, dc, va_config, vmid);

}



uint8_t get_vmid_for_ptb(struct vm_helper *vm_helper, int64_t ptb, uint8_t hubp_idx)

int dc_get_vmid_use_vector(struct dc *dc)

{

	unsigned int vmid = 0;

	int vmid_exists = -1;



	// Physical address gets vmid 0

	if (ptb == 0)

		return 0;



	vmid_exists = get_existing_vmid_for_ptb(vm_helper, ptb);



	if (vmid_exists != -1) {

		mark_vmid_used(vm_helper, vmid_exists, hubp_idx);

		vmid = vmid_exists;

	} else {

		if (vm_helper->num_vmids_available == 0)

			evict_vmids(vm_helper);



		vmid = get_next_available_vmid(vm_helper);

		mark_vmid_used(vm_helper, vmid, hubp_idx);

		add_ptb_to_table(vm_helper, vmid, ptb);

	}

	int i;

	int in_use = 0;



	return vmid;

	for (i = 0; i < dc->vm_helper->num_vmid; i++)

		in_use |= dc->vm_helper->hubp_vmid_usage[i].vmid_usage[0]

			| dc->vm_helper->hubp_vmid_usage[i].vmid_usage[1];

	return in_use;

}



void init_vm_helper(struct vm_helper *vm_helper, unsigned int num_vmid, unsigned int num_hubp)

void vm_helper_init(struct vm_helper *vm_helper, unsigned int num_vmid)

{

	vm_helper->num_vmid = num_vmid;

	vm_helper->num_hubp = num_hubp;

	vm_helper->num_vmids_available = num_vmid - 1;



	memset(vm_helper->hubp_vmid_usage, 0, sizeof(vm_helper->hubp_vmid_usage[0]) * MAX_HUBP);

	memset(vm_helper->ptb_assigned_to_vmid, 0, sizeof(vm_helper->ptb_assigned_to_vmid[0]) * MAX_VMID);

}

drivers/gpu/drm/amd/display/dc/dc.h

+8 −9
Original line number Diff line number Diff line
@@ -403,21 +403,17 @@ struct dc_phy_addr_space_config { 
		uint64_t page_table_end_addr;

		uint64_t page_table_base_addr;

	} gart_config;



	bool valid;

};



struct dc_virtual_addr_space_config {

	uint64_t	page_table_base_addr;

	uint64_t	page_table_start_addr;

	uint64_t	page_table_end_addr;

	uint32_t	page_table_block_size_in_bytes;

	uint8_t		page_table_depth; // 1 = 1 level, 2 = 2 level, etc.  0 = invalid

};



struct dc_addr_space_config {

	struct dc_phy_addr_space_config		pa_config;

	struct dc_virtual_addr_space_config	va_config;

	uint32_t	valid:1;

};



#endif



struct dc_bounding_box_overrides {
@@ -449,7 +445,7 @@ struct dc { 
#endif

	struct dc_context *ctx;

#ifdef CONFIG_DRM_AMD_DC_DCN2_0

	struct dc_addr_space_config vm_config;

	struct dc_phy_addr_space_config vm_pa_config;

#endif



	uint8_t link_count;
@@ -539,8 +535,11 @@ struct dc_callback_init { 
};



struct dc *dc_create(const struct dc_init_data *init_params);

int dc_get_vmid_use_vector(struct dc *dc);

#ifdef CONFIG_DRM_AMD_DC_DCN2_0

bool dc_init_memory_hub(struct dc *dc, struct dc_addr_space_config *config);

void dc_setup_vm_context(struct dc *dc, struct dc_virtual_addr_space_config *va_config, int vmid);

/* Returns the number of vmids supported */

int dc_setup_system_context(struct dc *dc, struct dc_phy_addr_space_config *pa_config);

#endif

void dc_init_callbacks(struct dc *dc,

		const struct dc_callback_init *init_params);

drivers/gpu/drm/amd/display/dc/dc_hw_types.h

+2 −0
Original line number Diff line number Diff line
@@ -99,6 +99,8 @@ struct dc_plane_address { 
	};



	union large_integer page_table_base;



	uint8_t vmid;

};



struct dc_size {

CRA Git | Maintained and supported by SUSTech CRA and CCSE