From f4dc9fb0dccaeea65b21175b481aa3b4da3997ba Mon Sep 17 00:00:00 2001 From: Yashwanth Date: Thu, 12 Dec 2019 18:49:07 +0530 Subject: [PATCH] disp: rotator: remove setting secure domain attribute at probe This change removes setting attribute call at probe since it gets pre-initialized from smmu. Change-Id: I8c434e9d88ecf36e0cf033798c52613e14e2faba Signed-off-by: Yashwanth --- rotator/sde_rotator_smmu.c | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/rotator/sde_rotator_smmu.c b/rotator/sde_rotator_smmu.c index bf722a0b64..f692261fde 100644 --- a/rotator/sde_rotator_smmu.c +++ b/rotator/sde_rotator_smmu.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-only /* - * Copyright (c) 2015-2019, The Linux Foundation. All rights reserved. + * Copyright (c) 2015-2020, The Linux Foundation. All rights reserved. */ #define pr_fmt(fmt) "%s: " fmt, __func__ @@ -601,17 +601,6 @@ int sde_smmu_probe(struct platform_device *pdev) return -EINVAL; } - if (smmu_domain.domain == SDE_IOMMU_DOMAIN_ROT_SECURE) { - int secure_vmid = VMID_CP_PIXEL; - - rc = iommu_domain_set_attr(sde_smmu->rot_domain, - DOMAIN_ATTR_SECURE_VMID, &secure_vmid); - if (rc) { - SDEROT_ERR("couldn't set secure pixel vmid\n"); - goto release_mapping; - } - } - if (!dev->dma_parms) dev->dma_parms = devm_kzalloc(dev, sizeof(*dev->dma_parms), GFP_KERNEL); @@ -629,8 +618,6 @@ int sde_smmu_probe(struct platform_device *pdev) smmu_domain.domain); return 0; -release_mapping: - sde_smmu->rot_domain = NULL; bus_client_destroy: sde_reg_bus_vote_client_destroy(sde_smmu->reg_bus_clt); sde_smmu->reg_bus_clt = NULL;