disp: msm: replace msm_smmu_set_attribute with qcom_iommu_enable_s1_translations

Domain attributes has been deprecated on 5.14 kernel, so replace
msm_smmu_set_attribute with qcom_iommu_enable_s1_translations.

Change-Id: I1bf2d5ee089a418eb73605327e82b2e26bd6bada
Signed-off-by: Jeykumar Sankaran <jsanka@codeaurora.org>
This commit is contained in:
Lei Chen
2021-09-24 15:01:46 +08:00
zatwierdzone przez Gerrit - the friendly Code Review server
rodzic 6a3c793980
commit 8f074719a5
3 zmienionych plików z 10 dodań i 15 usunięć

Wyświetl plik

@@ -4063,7 +4063,6 @@ static int _sde_kms_mmu_init(struct sde_kms *sde_kms)
{
struct msm_mmu *mmu;
int i, ret;
int early_map = 0;
if (!sde_kms || !sde_kms->dev || !sde_kms->dev->dev)
return -EINVAL;
@@ -4096,7 +4095,7 @@ static int _sde_kms_mmu_init(struct sde_kms *sde_kms)
ret = _sde_kms_map_all_splash_regions(sde_kms);
if (ret) {
SDE_ERROR("failed to map ret:%d\n", ret);
goto early_map_fail;
goto enable_trans_fail;
}
}
@@ -4104,12 +4103,10 @@ static int _sde_kms_mmu_init(struct sde_kms *sde_kms)
* disable early-map which would have been enabled during
* bootup by smmu through the device-tree hint for cont-spash
*/
ret = mmu->funcs->set_attribute(mmu, DOMAIN_ATTR_EARLY_MAP,
&early_map);
ret = mmu->funcs->enable_smmu_translations(mmu);
if (ret) {
SDE_ERROR("failed to set_att ret:%d, early_map:%d\n",
ret, early_map);
goto early_map_fail;
SDE_ERROR("failed to enable_s1_translations ret:%d\n", ret);
goto enable_trans_fail;
}
}
@@ -4117,7 +4114,7 @@ static int _sde_kms_mmu_init(struct sde_kms *sde_kms)
return 0;
early_map_fail:
enable_trans_fail:
_sde_kms_unmap_all_splash_regions(sde_kms);
fail:
_sde_kms_mmu_destroy(sde_kms);