Commit e5028e9f authored by Harry Wentland's avatar Harry Wentland Committed by Alex Deucher

drm/amd/display: Add DCN reg offsets to DC

[Why&How]
Add a field to store the DCN IP offset for use with runtime offset
calculation

This offset is indexed using reg*_BASE_IDX for the corresponding
group of registers. For example, address of DIG_BE_CNTL instance 0 is
calculated like: dcn_reg_offsets[regDIG0_DIG_BE_CNTL_BASE_IDX] +
regDIG0_DIG_BE_CNTL.

{dcn,nbio}_reg_offsets are used only for the ASICs for which runtime
initializaion of offsets are enabled through the modified SR* macros
that contain an additional REG_STRUCT element in the macro definition.

DCN3.5+ will fail dc_create() if {dcn,nbio}_reg_offsets are null. They
are applicable starting with DCN32/321 and are not used for ASICs
upstreamed before them. ASICs before DCN32/321 will not contain any
computation that involves {dcn,nbio}_reg_offsets. For them, the
address/offset computation is done during compile time.

This is evident from the BASE_INNER definition for compile time vs run
time initialization:

Compile time init: #define BASE_INNER(seg) DCN_BASE__INST0_SEG ## seg
Run time init:     #define BASE_INNER(seg) ctx->dcn_reg_offsets[seg]

BASE_INNER macro is local to each dcnxx_resource.c and hence different
ASICs can have either runtime or compile time initialization of offsets.

The computation of offset is done for registers all at once during
driver load and hence it does not introduce any performance overhead
during normal operation.
Reviewed-by: default avatarRodrigo Siqueira <Rodrigo.Siqueira@amd.com>
Acked-by: default avatarSolomon Chiu <solomon.chiu@amd.com>
Signed-off-by: default avatarHarry Wentland <harry.wentland@amd.com>
Signed-off-by: default avatarAurabindo Pillai <aurabindo.pillai@amd.com>
Tested-by: default avatarDaniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 76611a84
...@@ -1564,6 +1564,8 @@ static int amdgpu_dm_init(struct amdgpu_device *adev) ...@@ -1564,6 +1564,8 @@ static int amdgpu_dm_init(struct amdgpu_device *adev)
init_data.flags.enable_mipi_converter_optimization = true; init_data.flags.enable_mipi_converter_optimization = true;
init_data.dcn_reg_offsets = adev->reg_offset[DCE_HWIP][0];
INIT_LIST_HEAD(&adev->dm.da_list); INIT_LIST_HEAD(&adev->dm.da_list);
retrieve_dmi_info(&adev->dm); retrieve_dmi_info(&adev->dm);
......
...@@ -862,6 +862,7 @@ static bool dc_construct_ctx(struct dc *dc, ...@@ -862,6 +862,7 @@ static bool dc_construct_ctx(struct dc *dc,
dc_ctx->dc_sink_id_count = 0; dc_ctx->dc_sink_id_count = 0;
dc_ctx->dc_stream_id_count = 0; dc_ctx->dc_stream_id_count = 0;
dc_ctx->dce_environment = init_params->dce_environment; dc_ctx->dce_environment = init_params->dce_environment;
dc_ctx->dcn_reg_offsets = init_params->dcn_reg_offsets;
/* Create logger */ /* Create logger */
...@@ -1241,6 +1242,8 @@ struct dc *dc_create(const struct dc_init_data *init_params) ...@@ -1241,6 +1242,8 @@ struct dc *dc_create(const struct dc_init_data *init_params)
dc->versions.dmcu_version = dc->res_pool->dmcu->dmcu_version; dc->versions.dmcu_version = dc->res_pool->dmcu->dmcu_version;
} }
dc->dcn_reg_offsets = init_params->dcn_reg_offsets;
/* Populate versioning information */ /* Populate versioning information */
dc->versions.dc_ver = DC_VER; dc->versions.dc_ver = DC_VER;
......
...@@ -808,6 +808,8 @@ struct dc { ...@@ -808,6 +808,8 @@ struct dc {
const char *build_id; const char *build_id;
struct vm_helper *vm_helper; struct vm_helper *vm_helper;
uint32_t *dcn_reg_offsets;
}; };
enum frame_buffer_mode { enum frame_buffer_mode {
...@@ -847,6 +849,14 @@ struct dc_init_data { ...@@ -847,6 +849,14 @@ struct dc_init_data {
struct dpcd_vendor_signature vendor_signature; struct dpcd_vendor_signature vendor_signature;
bool force_smu_not_present; bool force_smu_not_present;
/*
* IP offset for run time initializaion of register addresses
*
* DCN3.5+ will fail dc_create() if these fields are null for them. They are
* applicable starting with DCN32/321 and are not used for ASICs upstreamed
* before them.
*/
uint32_t *dcn_reg_offsets;
}; };
struct dc_callback_init { struct dc_callback_init {
......
...@@ -876,7 +876,7 @@ struct dc_context { ...@@ -876,7 +876,7 @@ struct dc_context {
#ifdef CONFIG_DRM_AMD_DC_HDCP #ifdef CONFIG_DRM_AMD_DC_HDCP
struct cp_psp cp_psp; struct cp_psp cp_psp;
#endif #endif
uint32_t *dcn_reg_offsets;
}; };
/* DSC DPCD capabilities */ /* DSC DPCD capabilities */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment