samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

disp: msm: update iommu parameter to orig_nents

Browse Source 
iommu_map_sg has been updated and is expecting argument
orig_nents instead of nents. This change updates the parameter
in places where that function is being used.

Change-Id: I3b15485e3f0186f1d2f1c81a8205c46b521893f3
Signed-off-by: Samantha Tran <samtran@codeaurora.org>
This commit is contained in:
Samantha Tran
2021-01-13 16:09:38 -08:00
parent 8bb1e0a34d
commit 0bae60fcc6
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
msm/msm_iommu.c
View File

@@ -64,7 +64,7 @@ static int msm_iommu_map(struct msm_mmu *mmu, uint64_t iova,
size_t ret; size_t ret;
// pm_runtime_get_sync(mmu->dev); // pm_runtime_get_sync(mmu->dev);
ret = iommu_map_sg(iommu->domain, iova, sgt->sgl, sgt->nents, prot); ret = iommu_map_sg(iommu->domain, iova, sgt->sgl, sgt->orig_nents, prot);
// pm_runtime_put_sync(mmu->dev); // pm_runtime_put_sync(mmu->dev);
WARN_ON(!ret); WARN_ON(!ret);

4
msm/msm_smmu.c
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2015-2020, The Linux Foundation. All rights reserved. * Copyright (c) 2015-2021, The Linux Foundation. All rights reserved.
* Copyright (C) 2013 Red Hat * Copyright (C) 2013 Red Hat
* Author: Rob Clark <robdclark@gmail.com> * Author: Rob Clark <robdclark@gmail.com>
* *
@@ -185,7 +185,7 @@ static int msm_smmu_map(struct msm_mmu *mmu, uint64_t iova,
if (sgt && sgt->sgl) { if (sgt && sgt->sgl) {
ret = iommu_map_sg(client->domain, iova, sgt->sgl, ret = iommu_map_sg(client->domain, iova, sgt->sgl,
sgt->nents, prot); sgt->orig_nents, prot);
WARN_ON((int)ret < 0); WARN_ON((int)ret < 0);
DRM_DEBUG("%pad/0x%x/0x%x/\n", &sgt->sgl->dma_address, DRM_DEBUG("%pad/0x%x/0x%x/\n", &sgt->sgl->dma_address,
sgt->sgl->dma_length, prot); sgt->sgl->dma_length, prot);