evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

msm: vidc: Remove obsolete IOMMU domain attribute

Browse source 
The DOMAIN_ATTR_COHERENT_HTW_DISABLE IOMMU domain attribute is being
removed.  SMMU coherency will be configured through the SMMU device tree
nodes moving forward.  Remove the obsolete option.

Change-Id: Ia823466d27791549502a98c716114ebc0d68a4c7
Signed-off-by: Mitchel Humpherys <mitchelh@codeaurora.org>
This commit is contained in:
Mitchel Humpherys 2016-06-07 14:42:42 -07:00 • committed by Liam Mark
parent 9b0bb7abb4
commit d4763c0489
2 changed files with 0 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
drivers/media/platform/msm/vidc/msm_vidc_res_parse.c
View file

@ -1166,7 +1166,6 @@ static int msm_vidc_setup_context_bank(struct context_bank_info *cb,
struct device *dev) struct device *dev)
{ {
int rc = 0; int rc = 0;
int disable_htw = 1;
int secure_vmid = VMID_INVAL; int secure_vmid = VMID_INVAL;
struct bus_type *bus; struct bus_type *bus;
@ -1192,14 +1191,6 @@ static int msm_vidc_setup_context_bank(struct context_bank_info *cb,
goto remove_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) { if (cb->is_secure) {
secure_vmid = get_secure_vmid(cb); secure_vmid = get_secure_vmid(cb);
rc = iommu_domain_set_attr(cb->mapping->domain, rc = iommu_domain_set_attr(cb->mapping->domain,

13
drivers/media/platform/msm/vidc/venus_boot.c
View file

@ -190,8 +190,6 @@ static int pil_venus_auth_and_reset(void)
{ {
int rc; 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; phys_addr_t fw_bias = venus_data->resources->firmware_base;
void __iomem *reg_base = venus_data->reg_base; void __iomem *reg_base = venus_data->reg_base;
u32 ver; u32 ver;
@ -278,17 +276,6 @@ static int pil_venus_auth_and_reset(void)
if (iommu_present) { if (iommu_present) {
phys_addr_t pa = fw_bias; 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); rc = arm_iommu_attach_device(dev, venus_data->mapping);
if (rc) { if (rc) {
dprintk(VIDC_ERR, dprintk(VIDC_ERR,