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

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
...@@ -1376,7 +1376,7 @@ static int dm_late_init(void *handle) ...@@ -1376,7 +1376,7 @@ static int dm_late_init(void *handle)
unsigned int linear_lut[16]; unsigned int linear_lut[16];
int i; int i;
struct dmcu *dmcu = NULL; struct dmcu *dmcu = NULL;
bool ret; bool ret = true;
if (!adev->dm.fw_dmcu) if (!adev->dm.fw_dmcu)
return detect_mst_link_for_all_connectors(adev->ddev); return detect_mst_link_for_all_connectors(adev->ddev);
...@@ -1397,7 +1397,14 @@ static int dm_late_init(void *handle) ...@@ -1397,7 +1397,14 @@ static int dm_late_init(void *handle)
*/ */
params.min_abm_backlight = 0x28F; params.min_abm_backlight = 0x28F;
ret = dmcu_load_iram(dmcu, params); /* 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) if (!ret)
return -EINVAL; return -EINVAL;
...@@ -6226,7 +6233,7 @@ void amdgpu_dm_connector_init_helper(struct amdgpu_display_manager *dm, ...@@ -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; aconnector->base.state->max_requested_bpc = aconnector->base.state->max_bpc;
if (connector_type == DRM_MODE_CONNECTOR_eDP && 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, drm_object_attach_property(&aconnector->base.base,
adev->mode_info.abm_level_property, 0); adev->mode_info.abm_level_property, 0);
} }
......
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