diff options
| author | Jordan Crouse <jcrouse@codeaurora.org> | 2020-05-22 16:03:14 -0600 |
|---|---|---|
| committer | Rob Clark <robdclark@chromium.org> | 2020-05-23 13:37:38 -0700 |
| commit | 52da6d513183cf543df6efc95bf504aee0da70d6 (patch) | |
| tree | ad3e5114d1eedc9940f5227b0dd53c298fbe8663 /drivers/gpu/drm/msm/msm_gpummu.c | |
| parent | 7d4eedb03fc754625e0e0c482f42bfeabce685ce (diff) | |
| download | linux-stable-52da6d513183cf543df6efc95bf504aee0da70d6.tar.gz linux-stable-52da6d513183cf543df6efc95bf504aee0da70d6.tar.bz2 linux-stable-52da6d513183cf543df6efc95bf504aee0da70d6.zip | |
drm/msm: Attach the IOMMU device during initialization
Everywhere an IOMMU object is created by msm_gpu_create_address_space
the IOMMU device is attached immediately after. Instead of carrying around
the infrastructure to do the attach from the device specific code do it
directly in the msm_iommu_init() function. This gets it out of the way for
more aggressive cleanups that follow.
Reviewed-by: Rob Clark <robdclark@gmail.com>
Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
Tested-by: Shawn Guo <shawn.guo@linaro.org>
[squash in rebase fixups and fix for unused fxn]
Signed-off-by: Rob Clark <robdclark@chromium.org>
Diffstat (limited to 'drivers/gpu/drm/msm/msm_gpummu.c')
| -rw-r--r-- | drivers/gpu/drm/msm/msm_gpummu.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/gpu/drm/msm/msm_gpummu.c b/drivers/gpu/drm/msm/msm_gpummu.c index 34980d8eb7ad..0ad0f848560a 100644 --- a/drivers/gpu/drm/msm/msm_gpummu.c +++ b/drivers/gpu/drm/msm/msm_gpummu.c @@ -21,11 +21,6 @@ struct msm_gpummu { #define GPUMMU_PAGE_SIZE SZ_4K #define TABLE_SIZE (sizeof(uint32_t) * GPUMMU_VA_RANGE / GPUMMU_PAGE_SIZE) -static int msm_gpummu_attach(struct msm_mmu *mmu) -{ - return 0; -} - static void msm_gpummu_detach(struct msm_mmu *mmu) { } @@ -85,7 +80,6 @@ static void msm_gpummu_destroy(struct msm_mmu *mmu) } static const struct msm_mmu_funcs funcs = { - .attach = msm_gpummu_attach, .detach = msm_gpummu_detach, .map = msm_gpummu_map, .unmap = msm_gpummu_unmap, |