Commit 5cb32419 authored by Roman Li's avatar Roman Li Committed by Alex Deucher
Browse files

drm/amd/display: Decouple ABM init from dmcu 



[Why]
With ABM implemented on DMUB the ABM enablement
shoudn't be solely rely on dmcu. Otherwise it won't work
if dmcu is disabled.

[How]
1. Decouple dmcub config copy from dmcu iram copy.
2. Set abm connector property if either dmcu or dmub enabled.

Signed-off-by: default avatarRoman Li <roman.li@amd.com>
Reviewed-by: default avatarNicholas Kazlauskas <Nicholas.Kazlauskas@amd.com>
Acked-by: default avatarQingqing Zhuo <qingqing.zhuo@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 831010da

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

+10 −3
Original line number Diff line number Diff line
@@ -1376,7 +1376,7 @@ static int dm_late_init(void *handle) 
	unsigned int linear_lut[16];

	int i;

	struct dmcu *dmcu = NULL;

	bool ret;

	bool ret = true;



	if (!adev->dm.fw_dmcu)

		return detect_mst_link_for_all_connectors(adev->ddev);
@@ -1397,7 +1397,14 @@ static int dm_late_init(void *handle) 
	 */

	params.min_abm_backlight = 0x28F;



	/* In the case where abm is implemented on dmcub,

	 * dmcu object will be null.

	 * ABM 2.4 and up are implemented on dmcub.

	 */

	if (dmcu)

		ret = dmcu_load_iram(dmcu, params);

	else if (adev->dm.dc->ctx->dmub_srv)

		ret = dmub_init_abm_config(adev->dm.dc->res_pool->abm, params);



	if (!ret)

		return -EINVAL;
@@ -6226,7 +6233,7 @@ void amdgpu_dm_connector_init_helper(struct amdgpu_display_manager *dm, 
	aconnector->base.state->max_requested_bpc = aconnector->base.state->max_bpc;



	if (connector_type == DRM_MODE_CONNECTOR_eDP &&

	    dc_is_dmcu_initialized(adev->dm.dc)) {

	    (dc_is_dmcu_initialized(adev->dm.dc) || adev->dm.dc->ctx->dmub_srv)) {

		drm_object_attach_property(&aconnector->base.base,

				adev->mode_info.abm_level_property, 0);

	}