diff --git a/drivers/media/platform/msm/vidc/msm_vidc_res_parse.c b/drivers/media/platform/msm/vidc/msm_vidc_res_parse.c
index 25fccab99fb3..a3080be8cd7a 100644
--- a/drivers/media/platform/msm/vidc/msm_vidc_res_parse.c
+++ b/drivers/media/platform/msm/vidc/msm_vidc_res_parse.c
@@ -1166,7 +1166,6 @@ static int msm_vidc_setup_context_bank(struct context_bank_info *cb,
 		struct device *dev)
 {
 	int rc = 0;
-	int disable_htw = 1;
 	int secure_vmid = VMID_INVAL;
 	struct bus_type *bus;
 
@@ -1192,14 +1191,6 @@ static int msm_vidc_setup_context_bank(struct context_bank_info *cb,
 		goto remove_cb;
 	}
 
-	rc = iommu_domain_set_attr(cb->mapping->domain,
-			DOMAIN_ATTR_COHERENT_HTW_DISABLE, &disable_htw);
-	if (rc) {
-		dprintk(VIDC_ERR, "%s - disable coherent HTW failed: %s %d\n",
-				__func__, dev_name(dev), rc);
-		goto release_mapping;
-	}
-
 	if (cb->is_secure) {
 		secure_vmid = get_secure_vmid(cb);
 		rc = iommu_domain_set_attr(cb->mapping->domain,
diff --git a/drivers/media/platform/msm/vidc/venus_boot.c b/drivers/media/platform/msm/vidc/venus_boot.c
index 925c97a5b6e8..85c3e15edded 100644
--- a/drivers/media/platform/msm/vidc/venus_boot.c
+++ b/drivers/media/platform/msm/vidc/venus_boot.c
@@ -190,8 +190,6 @@ static int pil_venus_auth_and_reset(void)
 {
 	int rc;
 
-	/* Need to enable this for new SMMU to set the device attribute */
-	bool disable_htw = true;
 	phys_addr_t fw_bias = venus_data->resources->firmware_base;
 	void __iomem *reg_base = venus_data->reg_base;
 	u32 ver;
@@ -278,17 +276,6 @@ static int pil_venus_auth_and_reset(void)
 	if (iommu_present) {
 		phys_addr_t pa = fw_bias;
 
-		/* Enable this for new SMMU to set the device attribute */
-		rc = iommu_domain_set_attr(venus_data->mapping->domain,
-				DOMAIN_ATTR_COHERENT_HTW_DISABLE,
-				&disable_htw);
-		if (rc) {
-			dprintk(VIDC_ERR,
-				"%s: Failed to disable COHERENT_HTW: %s\n",
-				__func__, dev_name(dev));
-			goto release_mapping;
-		}
-
 		rc = arm_iommu_attach_device(dev, venus_data->mapping);
 		if (rc) {
 			dprintk(VIDC_ERR,