drm/msm: Cleanups ahead of per-instance pagetables
Subsystems (4)
cover drm/msm: Cleanups ahead of per-instance pagetables
These are three cleanup and reorganization patches that were originally part of one of my many per-instance pagetable stacks [1] [2] but make life better in general and can stand on their own. Send them now to get them out of my other stack and make that processs ever so easier.
[1] https://patchwork.kernel.org/patch/11355255/
[2] https://patchwork.kernel.org/patch/11355259/
Jordan Crouse (3):
drm/msm: Attach the IOMMU device during initialization drm/msm: Refactor address space initialization drm/msm: Update the MMU helper function APIs
drivers/gpu/drm/msm/adreno/a2xx_gpu.c | 16 ++++++++ drivers/gpu/drm/msm/adreno/a3xx_gpu.c | 1 + drivers/gpu/drm/msm/adreno/a4xx_gpu.c | 1 + drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 1 + drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 1 + drivers/gpu/drm/msm/adreno/adreno_gpu.c | 23 ++++++++--- drivers/gpu/drm/msm/adreno/adreno_gpu.h | 8 ++++ drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 18 +++------ drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c | 18 ++++----- drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.c | 4 -- drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c | 18 ++++----- drivers/gpu/drm/msm/msm_drv.h | 8 +--- drivers/gpu/drm/msm/msm_gem_vma.c | 36 +++-------------- drivers/gpu/drm/msm/msm_gpu.c | 49 +----------------------- drivers/gpu/drm/msm/msm_gpu.h | 4 +- drivers/gpu/drm/msm/msm_gpummu.c | 10 +---- drivers/gpu/drm/msm/msm_iommu.c | 15 ++++++-- drivers/gpu/drm/msm/msm_mmu.h | 5 +-- 18 files changed, 95 insertions(+), 141 deletions(-)
Signature · 6 lines
2.17.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 1/3 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.
---
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 8 -------- drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c | 4 ---- drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c | 7 ------- drivers/gpu/drm/msm/msm_gem_vma.c | 23 +++++++++++++++++++---- drivers/gpu/drm/msm/msm_gpu.c | 11 +---------- drivers/gpu/drm/msm/msm_gpummu.c | 6 ------ drivers/gpu/drm/msm/msm_iommu.c | 8 +++++++- drivers/gpu/drm/msm/msm_mmu.h | 1 - 8 files changed, 27 insertions(+), 41 deletions(-)
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +0 -8
@@ -794,7 +794,6 @@ static int _dpu_kms_mmu_init(struct dpu_kms *dpu_kms) {struct iommu_domain *domain;struct msm_gem_address_space *aspace; -int ret; domain =iommu_domain_alloc (&platform_bus_type);if (!domain)
@@ -810,13 +809,6 @@ static int _dpu_kms_mmu_init(struct dpu_kms *dpu_kms)return PTR_ERR (aspace); } - ret = aspace->mmu->funcs->attach (aspace->mmu); -if (ret) { -DPU_ERROR ("failed to attach iommu %d\n" , ret); -msm_gem_address_space_put (aspace); -return ret; - } - dpu_kms->base.aspace = aspace;return 0 ; }
drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c +0 -4
@@ -518,10 +518,6 @@ struct msm_kms *mdp4_kms_init(struct drm_device *dev) } kms->aspace = aspace; - - ret = aspace->mmu->funcs->attach (aspace->mmu); -if (ret) - goto fail; }else {DRM_DEV_INFO (dev->dev,"no iommu, fallback to phys " "contig buffers for scanout\n" );
drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c +0 -7
@@ -636,13 +636,6 @@ struct msm_kms *mdp5_kms_init(struct drm_device *dev) } kms->aspace = aspace; - - ret = aspace->mmu->funcs->attach (aspace->mmu); -if (ret) { -DRM_DEV_ERROR (&pdev->dev,"failed to attach iommu: %d\n" , - ret); - goto fail; - } }else {DRM_DEV_INFO (&pdev->dev,"no iommu, fallback to phys contig buffers for scanout\n" );
drivers/gpu/drm/msm/msm_gem_vma.c +19 -4
@@ -133,8 +133,8 @@ msm_gem_address_space_create(struct device *dev, struct iommu_domain *domain, const char *name) {struct msm_gem_address_space *aspace; -u64 size = domain->geometry.aperture_end - - domain->geometry.aperture_start; +u64 start = domain->geometry.aperture_start; +u64 size = domain->geometry.aperture_end - start; aspace =kzalloc (sizeof (*aspace),GFP_KERNEL );if (!aspace)
@@ -143,9 +143,18 @@ msm_gem_address_space_create(struct device *dev, struct iommu_domain *domain,spin_lock_init (&aspace->lock); aspace->name = name; aspace->mmu =msm_iommu_new (dev, domain); +if (IS_ERR (aspace->mmu)) { +int ret =PTR_ERR (aspace->mmu); -drm_mm_init (&aspace->mm, (domain->geometry.aperture_start >>PAGE_SHIFT ), - size >>PAGE_SHIFT ); +kfree (aspace); +return ERR_PTR (ret); + } + +/* +* Attaching the IOMMU device changes the aperture values so use the +* cached values instead +*/ +drm_mm_init (&aspace->mm, start >>PAGE_SHIFT , size >>PAGE_SHIFT );kref_init (&aspace->kref);
@@ -166,6 +175,12 @@ msm_gem_address_space_create_a2xx(struct device *dev, struct msm_gpu *gpu,spin_lock_init (&aspace->lock); aspace->name = name; aspace->mmu =msm_gpummu_new (dev, gpu); +if (IS_ERR (aspace->mmu)) { +int ret =PTR_ERR (aspace->mmu); + +kfree (aspace); +return ERR_PTR (ret); + }drm_mm_init (&aspace->mm, (va_start >>PAGE_SHIFT ), size >>PAGE_SHIFT );
drivers/gpu/drm/msm/msm_gpu.c +1 -10
@@ -826,7 +826,6 @@ msm_gpu_create_address_space(struct msm_gpu *gpu, struct platform_device *pdev, uint64_t va_start, uint64_t va_end) {struct msm_gem_address_space *aspace; -int ret;/* * Setup IOMMU.. eventually we will (I think) do this once per context
@@ -851,17 +850,9 @@ msm_gpu_create_address_space(struct msm_gpu *gpu, struct platform_device *pdev, va_start, va_end); } -if (IS_ERR (aspace)) { +if (IS_ERR (aspace))DRM_DEV_ERROR (gpu->dev->dev,"failed to init mmu: %ld\n" ,PTR_ERR (aspace)); -return ERR_CAST (aspace); - } - - ret = aspace->mmu->funcs->attach (aspace->mmu); -if (ret) { -msm_gem_address_space_put (aspace); -return ERR_PTR (ret); - }return aspace; }
drivers/gpu/drm/msm/msm_gpummu.c +0 -6
@@ -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,
drivers/gpu/drm/msm/msm_iommu.c +7 -1
@@ -66,7 +66,6 @@ static void msm_iommu_destroy(struct msm_mmu *mmu) }static const struct msm_mmu_funcs funcs = { - .attach = msm_iommu_attach, .detach = msm_iommu_detach, .map = msm_iommu_map, .unmap = msm_iommu_unmap,
@@ -76,6 +75,7 @@ static const struct msm_mmu_funcs funcs = {struct msm_mmu *msm_iommu_new (struct device *dev,struct iommu_domain *domain) {struct msm_iommu *iommu; +int ret; iommu =kzalloc (sizeof (*iommu),GFP_KERNEL );if (!iommu)
@@ -85,5 +85,11 @@ struct msm_mmu *msm_iommu_new(struct device *dev, struct iommu_domain *domain)msm_mmu_init (&iommu->base, dev, &funcs);iommu_set_fault_handler (domain, msm_fault_handler, iommu); + ret =iommu_attach_device (iommu->domain, dev); +if (ret) { +kfree (iommu); +return ERR_PTR (ret); + } +return &iommu->base; }
drivers/gpu/drm/msm/msm_mmu.h +0 -1
@@ -10,7 +10,6 @@#include <linux/iommu.h> struct msm_mmu_funcs { -int (*attach)(struct msm_mmu *mmu);void (*detach)(struct msm_mmu *mmu);int (*map)(struct msm_mmu *mmu,uint64_t iova,struct sg_table *sgt,unsigned len,int prot);
Signature · 1 line
2.17.1
PATCH 3/3 drm/msm: Update the MMU helper function APIs
In reply to Jordan CrouseInstead of using a bare unsigned type for the length value for map/unmap functions pass in a size_t to more correctly match up with the underlying APIs.
---
drivers/gpu/drm/msm/msm_gpummu.c | 4 ++-- drivers/gpu/drm/msm/msm_iommu.c | 4 ++-- drivers/gpu/drm/msm/msm_mmu.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-)
drivers/gpu/drm/msm/msm_gpummu.c +2 -2
@@ -26,7 +26,7 @@ static void msm_gpummu_detach(struct msm_mmu *mmu) }static int msm_gpummu_map (struct msm_mmu *mmu,uint64_t iova, -struct sg_table *sgt,unsigned len,int prot) +struct sg_table *sgt,size_t len,int prot) {struct msm_gpummu *gpummu =to_msm_gpummu (mmu);unsigned idx = (iova -GPUMMU_VA_START ) /GPUMMU_PAGE_SIZE ;
@@ -54,7 +54,7 @@ static int msm_gpummu_map(struct msm_mmu *mmu, uint64_t iova,return 0 ; } -static int msm_gpummu_unmap (struct msm_mmu *mmu,uint64_t iova,unsigned len) +static int msm_gpummu_unmap (struct msm_mmu *mmu,uint64_t iova,size_t len) {struct msm_gpummu *gpummu =to_msm_gpummu (mmu);unsigned idx = (iova -GPUMMU_VA_START ) /GPUMMU_PAGE_SIZE ;
drivers/gpu/drm/msm/msm_iommu.c +2 -2
@@ -38,7 +38,7 @@ static void msm_iommu_detach(struct msm_mmu *mmu) }static int msm_iommu_map (struct msm_mmu *mmu,uint64_t iova, -struct sg_table *sgt,unsigned len,int prot) +struct sg_table *sgt,size_t len,int prot) {struct msm_iommu *iommu =to_msm_iommu (mmu);size_t ret;
@@ -49,7 +49,7 @@ static int msm_iommu_map(struct msm_mmu *mmu, uint64_t iova,return (ret == len) ?0 : -EINVAL ; } -static int msm_iommu_unmap (struct msm_mmu *mmu,uint64_t iova,unsigned len) +static int msm_iommu_unmap (struct msm_mmu *mmu,uint64_t iova,size_t len) {struct msm_iommu *iommu =to_msm_iommu (mmu);
drivers/gpu/drm/msm/msm_mmu.h +2 -2
@@ -12,8 +12,8 @@struct msm_mmu_funcs {void (*detach)(struct msm_mmu *mmu);int (*map)(struct msm_mmu *mmu,uint64_t iova,struct sg_table *sgt, -unsigned len,int prot); -int (*unmap)(struct msm_mmu *mmu,uint64_t iova,unsigned len); +size_t len,int prot); +int (*unmap)(struct msm_mmu *mmu,uint64_t iova,size_t len);void (*destroy)(struct msm_mmu *mmu); };
Signature · 1 line
2.17.1
PATCH 2/3 drm/msm: Refactor address space initialization
In reply to Jordan CrouseRefactor how address space initialization works. Instead of having the address space function create the MMU object (and thus require separate but equal functions for gpummu and iommu) use a single function and pass the MMU struct in. Make the generic code cleaner by using target specific functions to create the address space so a2xx can do its own thing in its own space. For all the other targets use a generic helper to initialize IOMMU but leave the door open for newer targets to use customization if they need it.
---
drivers/gpu/drm/msm/adreno/a2xx_gpu.c | 16 ++++++++ drivers/gpu/drm/msm/adreno/a3xx_gpu.c | 1 + drivers/gpu/drm/msm/adreno/a4xx_gpu.c | 1 + drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 1 + drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 1 + drivers/gpu/drm/msm/adreno/adreno_gpu.c | 23 ++++++++--- drivers/gpu/drm/msm/adreno/adreno_gpu.h | 8 ++++ drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 10 ++--- drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c | 14 ++++--- drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.c | 4 -- drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c | 11 ++++- drivers/gpu/drm/msm/msm_drv.h | 8 +--- drivers/gpu/drm/msm/msm_gem_vma.c | 51 +++--------------------- drivers/gpu/drm/msm/msm_gpu.c | 40 +------------------ drivers/gpu/drm/msm/msm_gpu.h | 4 +- drivers/gpu/drm/msm/msm_iommu.c | 3 ++ 16 files changed, 82 insertions(+), 114 deletions(-)
drivers/gpu/drm/msm/adreno/a2xx_gpu.c +16 -0
@@ -401,6 +401,21 @@ static struct msm_gpu_state *a2xx_gpu_state_get(struct msm_gpu *gpu)return state; } +static struct msm_gem_address_space * +a2xx_create_address_space (struct msm_gpu *gpu,struct platform_device *pdev) +{ +struct msm_mmu *mmu =msm_gpummu_new (&pdev->dev, gpu); +struct msm_gem_address_space *aspace; + + aspace =msm_gem_address_space_create (mmu,"gpu" ,SZ_16M , +SZ_16M +0xfff *SZ_64K ); + +if (IS_ERR (aspace) && !IS_ERR (mmu)) + mmu->funcs->destroy (mmu); + +return aspace; +} +/* Register offset defines for A2XX - copy of A3XX */ static const unsigned int a2xx_register_offsets[REG_ADRENO_REGISTER_MAX ] = {REG_ADRENO_DEFINE (REG_ADRENO_CP_RB_BASE ,REG_AXXX_CP_RB_BASE ),
@@ -429,6 +444,7 @@ static const struct adreno_gpu_funcs funcs = {#endif .gpu_state_get = a2xx_gpu_state_get, .gpu_state_put = adreno_gpu_state_put, + .create_address_space = a2xx_create_address_space, }, };
drivers/gpu/drm/msm/adreno/a3xx_gpu.c +1 -0
@@ -441,6 +441,7 @@ static const struct adreno_gpu_funcs funcs = {#endif .gpu_state_get = a3xx_gpu_state_get, .gpu_state_put = adreno_gpu_state_put, + .create_address_space = adreno_iommu_create_address_space, }, };
drivers/gpu/drm/msm/adreno/a4xx_gpu.c +1 -0
@@ -583,6 +583,7 @@ static const struct adreno_gpu_funcs funcs = {#endif .gpu_state_get = a4xx_gpu_state_get, .gpu_state_put = adreno_gpu_state_put, + .create_address_space = adreno_iommu_create_address_space, }, .get_timestamp = a4xx_get_timestamp, };
drivers/gpu/drm/msm/adreno/a5xx_gpu.c +1 -0
@@ -1445,6 +1445,7 @@ static const struct adreno_gpu_funcs funcs = { .gpu_busy = a5xx_gpu_busy, .gpu_state_get = a5xx_gpu_state_get, .gpu_state_put = a5xx_gpu_state_put, + .create_address_space = adreno_iommu_create_address_space, }, .get_timestamp = a5xx_get_timestamp, };
drivers/gpu/drm/msm/adreno/a6xx_gpu.c +1 -0
@@ -893,6 +893,7 @@ static const struct adreno_gpu_funcs funcs = {#if defined(CONFIG_DRM_MSM_GPU_STATE ) .gpu_state_get = a6xx_gpu_state_get, .gpu_state_put = a6xx_gpu_state_put, + .create_address_space = adreno_iommu_create_address_space,#endif }, .get_timestamp = a6xx_get_timestamp,
drivers/gpu/drm/msm/adreno/adreno_gpu.c +17 -6
@@ -185,6 +185,23 @@ int adreno_zap_shader_load(struct msm_gpu *gpu, u32 pasid)return zap_shader_load_mdt (gpu, adreno_gpu->info->zapfw, pasid); } +struct msm_gem_address_space * +adreno_iommu_create_address_space (struct msm_gpu *gpu, +struct platform_device *pdev) +{ +struct iommu_domain *iommu =iommu_domain_alloc (&platform_bus_type); +struct msm_mmu *mmu =msm_iommu_new (&pdev->dev, iommu); +struct msm_gem_address_space *aspace; + + aspace =msm_gem_address_space_create (mmu,"gpu" ,SZ_16M , +0xfffffff ); + +if (IS_ERR (aspace) && !IS_ERR (mmu)) + mmu->funcs->destroy (mmu); + +return aspace; +} +int adreno_get_param (struct msm_gpu *gpu,uint32_t param,uint64_t *value) {struct adreno_gpu *adreno_gpu =to_adreno_gpu (gpu);
@@ -988,12 +1005,6 @@ int adreno_gpu_init(struct drm_device *drm, struct platform_device *pdev, adreno_gpu_config.ioname ="kgsl_3d0_reg_memory" ; - adreno_gpu_config.va_start =SZ_16M ; - adreno_gpu_config.va_end =0xffffffff ; -/* maximum range of a2xx mmu */ -if (adreno_is_a2xx (adreno_gpu)) - adreno_gpu_config.va_end =SZ_16M +0xfff *SZ_64K ; - adreno_gpu_config.nr_rings = nr_rings;adreno_get_pwrlevels (&pdev->dev, gpu);
drivers/gpu/drm/msm/adreno/adreno_gpu.h +8 -0
@@ -287,6 +287,14 @@ void adreno_gpu_state_destroy(struct msm_gpu_state *state);int adreno_gpu_state_get (struct msm_gpu *gpu,struct msm_gpu_state *state);int adreno_gpu_state_put (struct msm_gpu_state *state); +/* +* Common helper function to initialize the default address space for arm-smmu +* attached targets +*/ +struct msm_gem_address_space * +adreno_iommu_create_address_space (struct msm_gpu *gpu, +struct platform_device *pdev); +/* * For a5xx and a6xx targets load the zap shader that is used to pull the GPU * out of secure mode
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +5 -5
@@ -794,18 +794,18 @@ static int _dpu_kms_mmu_init(struct dpu_kms *dpu_kms) {struct iommu_domain *domain;struct msm_gem_address_space *aspace; +struct msm_mmu *mmu; domain =iommu_domain_alloc (&platform_bus_type);if (!domain)return 0 ; - domain->geometry.aperture_start =0x1000 ; - domain->geometry.aperture_end =0xffffffff ; + mmu =msm_iommu_new (dpu_kms->dev->dev, domain); + aspace =msm_gem_address_space_create (mmu,"dpu1" , +0x1000 ,0xfffffff ); - aspace =msm_gem_address_space_create (dpu_kms->dev->dev, - domain,"dpu1" );if (IS_ERR (aspace)) { -iommu_domain_free (domain); + mmu->funcs->destroy (mmu);return PTR_ERR (aspace); }
drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c +8 -6
@@ -510,9 +510,15 @@ struct msm_kms *mdp4_kms_init(struct drm_device *dev)mdelay (16 );if (config->iommu) { - aspace =msm_gem_address_space_create (&pdev->dev, - config->iommu,"mdp4" ); +struct msm_mmu *mmu =msm_iommu_new (&pdev->dev, + config->iommu); + + aspace =msm_gem_address_space_create (mmu, +"mdp4" ,0x1000 ,0xffffffff ); +if (IS_ERR (aspace)) { +if (!IS_ERR (mmu)) + mmu->funcs->destroy (mmu); ret =PTR_ERR (aspace); goto fail; }
@@ -565,10 +571,6 @@ static struct mdp4_platform_config *mdp4_get_config(struct platform_device *dev)/* TODO: Chips that aren't apq8064 have a 200 Mhz max_clk */ config.max_clk =266667000 ; config.iommu =iommu_domain_alloc (&platform_bus_type); -if (config.iommu) { - config.iommu->geometry.aperture_start =0x1000 ; - config.iommu->geometry.aperture_end =0xffffffff ; - }return &config; }
drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.c +0 -4
@@ -1017,10 +1017,6 @@ static struct mdp5_cfg_platform *mdp5_get_config(struct platform_device *dev)static struct mdp5_cfg_platform config = {}; config.iommu =iommu_domain_alloc (&platform_bus_type); -if (config.iommu) { - config.iommu->geometry.aperture_start =0x1000 ; - config.iommu->geometry.aperture_end =0xffffffff ; - }return &config; }
drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c +9 -2
@@ -624,13 +624,20 @@ struct msm_kms *mdp5_kms_init(struct drm_device *dev)mdelay (16 );if (config->platform.iommu) { +struct msm_mmu *mmu; + iommu_dev = &pdev->dev;if (!dev_iommu_fwspec_get (iommu_dev)) iommu_dev = iommu_dev->parent; - aspace =msm_gem_address_space_create (iommu_dev, - config->platform.iommu,"mdp5" ); + mmu =msm_iommu_new (iommu_dev, config->platform.iommu); + + aspace =msm_gem_address_space_create (mmu,"mdp5" , +0x1000 ,0xffffffff ); +if (IS_ERR (aspace)) { +if (!IS_ERR (mmu)) + mmu->funcs->destroy (mmu); ret =PTR_ERR (aspace); goto fail; }
drivers/gpu/drm/msm/msm_drv.h +2 -6
@@ -252,12 +252,8 @@ void msm_gem_close_vma(struct msm_gem_address_space *aspace,void msm_gem_address_space_put (struct msm_gem_address_space *aspace);struct msm_gem_address_space * -msm_gem_address_space_create (struct device *dev,struct iommu_domain *domain, -const char *name); - -struct msm_gem_address_space * -msm_gem_address_space_create_a2xx (struct device *dev,struct msm_gpu *gpu, -const char *name,uint64_t va_start,uint64_t va_end); +msm_gem_address_space_create (struct msm_mmu *mmu,const char *name, +u64 va_start,u64 size);int msm_register_mmu (struct drm_device *dev,struct msm_mmu *mmu);void msm_unregister_mmu (struct drm_device *dev,struct msm_mmu *mmu);
drivers/gpu/drm/msm/msm_gem_vma.c +6 -45
68 lines not on this page · raw message
drivers/gpu/drm/msm/msm_gpu.c +2 -38
@@ -821,42 +821,6 @@ static int get_clocks(struct platform_device *pdev, struct msm_gpu *gpu)return 0 ; } -static struct msm_gem_address_space * -msm_gpu_create_address_space (struct msm_gpu *gpu,struct platform_device *pdev, -uint64_t va_start,uint64_t va_end) -{ -struct msm_gem_address_space *aspace; - -/* -* Setup IOMMU.. eventually we will (I think) do this once per context -* and have separate page tables per context. For now, to keep things -* simple and to get something working, just use a single address space: -*/ -if (!adreno_is_a2xx (to_adreno_gpu (gpu))) { -struct iommu_domain *iommu =iommu_domain_alloc (&platform_bus_type); -if (!iommu) -return NULL ; - - iommu->geometry.aperture_start = va_start; - iommu->geometry.aperture_end = va_end; - -DRM_DEV_INFO (gpu->dev->dev,"%s: using IOMMU\n" , gpu->name); - - aspace =msm_gem_address_space_create (&pdev->dev, iommu,"gpu" ); -if (IS_ERR (aspace)) -iommu_domain_free (iommu); - }else { - aspace =msm_gem_address_space_create_a2xx (&pdev->dev, gpu,"gpu" , - va_start, va_end); - } - -if (IS_ERR (aspace)) -DRM_DEV_ERROR (gpu->dev->dev,"failed to init mmu: %ld\n" , -PTR_ERR (aspace)); - -return aspace; -} -int msm_gpu_init (struct drm_device *drm,struct platform_device *pdev,struct msm_gpu *gpu,const struct msm_gpu_funcs *funcs,const char *name,struct msm_gpu_config *config)
@@ -929,8 +893,8 @@ int msm_gpu_init(struct drm_device *drm, struct platform_device *pdev,msm_devfreq_init (gpu); - gpu->aspace =msm_gpu_create_address_space (gpu, pdev, - config->va_start, config->va_end); + + gpu->aspace = gpu->funcs->create_address_space (gpu, pdev);if (gpu->aspace ==NULL )DRM_DEV_INFO (drm->dev,"%s: no IOMMU, fallback to VRAM carveout!\n" , name);
drivers/gpu/drm/msm/msm_gpu.h +2 -2
@@ -21,8 +21,6 @@ struct msm_gpu_state;struct msm_gpu_config {const char *ioname; -uint64_t va_start; -uint64_t va_end;unsigned int nr_rings; };
@@ -64,6 +62,8 @@ struct msm_gpu_funcs {int (*gpu_state_put)(struct msm_gpu_state *state);unsigned long (*gpu_get_freq)(struct msm_gpu *gpu);void (*gpu_set_freq)(struct msm_gpu *gpu,unsigned long freq); +struct msm_gem_address_space *(*create_address_space) + (struct msm_gpu *gpu,struct platform_device *pdev); };struct msm_gpu {
drivers/gpu/drm/msm/msm_iommu.c +3 -0
@@ -77,6 +77,9 @@ struct msm_mmu *msm_iommu_new(struct device *dev, struct iommu_domain *domain)struct msm_iommu *iommu;int ret; +if (!domain) +return ERR_PTR (-ENODEV ); + iommu =kzalloc (sizeof (*iommu),GFP_KERNEL );if (!iommu)return ERR_PTR (-ENOMEM );
Signature · 6 lines
2.17.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 5 lines · Jordan Crouse
These are three cleanup and reorganization patches that were originally part of one of my many per-instance pagetable stacks [1] [2] but make life better in general and can stand on their own. Send them now to get them out of my other stack and make that processs ever so easier.
Quoted 7 lines
[1] https://patchwork.kernel.org/patch/11355255/
[2] https://patchwork.kernel.org/patch/11355259/Jordan Crouse (3):
drm/msm: Attach the IOMMU device during initialization drm/msm: Refactor address space initialization drm/msm: Update the MMU helper function APIs
FWIW, on A405 with glmark2:
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v1 1/3] drm/msm: Attach the IOMMU device during initialization
In reply to Jordan CrouseQuoted 29 lines · Jordan Crouse
drivers/gpu/drm/msm/msm_gpummu.c +0
-6@@ -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,drivers/gpu/drm/msm/msm_iommu.c +0
-0
drivers/gpu/drm/msm/msm_iommu.c static void msm_iommu_destroy(struct msm_mmu *mmu) · line 69
Quoted 4 lines
drivers/gpu/drm/msm/msm_iommu.c +0
-1@@ -66,7 +66,6 @@ static void msm_iommu_destroy(struct msm_mmu *mmu) }static const struct msm_mmu_funcs funcs = { - .attach = msm_iommu_attach,
It causes an unused function warning as below.
drivers/gpu/drm/msm/msm_iommu.c:26:12: warning: ‘msm_iommu_attach’ defined but not used [-Wunused-function]
static int msm_iommu_attach(struct msm_mmu *mmu)
^~~~~~~~~~~~~~~~
Not sure if you will use it again in future patches though.
Shawn
Quoted 38 lines
drivers/gpu/drm/msm/msm_iommu.c +7
-0.detach = msm_iommu_detach, .map = msm_iommu_map, .unmap = msm_iommu_unmap,@@ -76,6 +75,7 @@ static const struct msm_mmu_funcs funcs = {struct msm_mmu *msm_iommu_new (struct device *dev,struct iommu_domain *domain) {struct msm_iommu *iommu; +int ret; iommu =kzalloc (sizeof (*iommu),GFP_KERNEL );if (!iommu)@@ -85,5 +85,11 @@ struct msm_mmu *msm_iommu_new(struct device *dev, struct iommu_domain *domain)msm_mmu_init (&iommu->base, dev, &funcs);iommu_set_fault_handler (domain, msm_fault_handler, iommu); + ret =iommu_attach_device (iommu->domain, dev); +if (ret) { +kfree (iommu); +return ERR_PTR (ret); + } +return &iommu->base; }drivers/gpu/drm/msm/msm_mmu.h +0
-1@@ -10,7 +10,6 @@#include <linux/iommu.h> struct msm_mmu_funcs { -int (*attach)(struct msm_mmu *mmu);void (*detach)(struct msm_mmu *mmu);int (*map)(struct msm_mmu *mmu,uint64_t iova,struct sg_table *sgt,unsigned len,int prot);Signature · 1 line
2.17.1
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v1 1/3] drm/msm: Attach the IOMMU device during initialization
Quoted 38 lines · Shawn Guo
Quoted 29 lines · Jordan Crouse
drivers/gpu/drm/msm/msm_gpummu.c +0
-6@@ -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,drivers/gpu/drm/msm/msm_iommu.c +0
-0drivers/gpu/drm/msm/msm_iommu.c static void msm_iommu_destroy(struct msm_mmu *mmu) · line 69
Quoted 4 lines
drivers/gpu/drm/msm/msm_iommu.c +0
-1@@ -66,7 +66,6 @@ static void msm_iommu_destroy(struct msm_mmu *mmu) }static const struct msm_mmu_funcs funcs = { - .attach = msm_iommu_attach,It causes an unused function warning as below.
Quoted 5 lines
drivers/gpu/drm/msm/msm_iommu.c:26:12: warning: ‘msm_iommu_attach’ defined but not used [-Wunused-function]
static intmsm_iommu_attach(struct msm_mmu *mmu)^~~~~~~~~~~~~~~~Not sure if you will use it again in future patches though.
looks like this was removed in msm_gpummu (a2xx) but not msm_iommu (a3xx+).. I've squashed a fixup and pushed to msm-next
thx
BR,
-R
Quoted 40 lines
Shawn
Quoted 38 lines
drivers/gpu/drm/msm/msm_iommu.c +7
-0.detach = msm_iommu_detach, .map = msm_iommu_map, .unmap = msm_iommu_unmap,@@ -76,6 +75,7 @@ static const struct msm_mmu_funcs funcs = {struct msm_mmu *msm_iommu_new (struct device *dev,struct iommu_domain *domain) {struct msm_iommu *iommu; +int ret; iommu =kzalloc (sizeof (*iommu),GFP_KERNEL );if (!iommu)@@ -85,5 +85,11 @@ struct msm_mmu *msm_iommu_new(struct device *dev, struct iommu_domain *domain)msm_mmu_init (&iommu->base, dev, &funcs);iommu_set_fault_handler (domain, msm_fault_handler, iommu); + ret =iommu_attach_device (iommu->domain, dev); +if (ret) { +kfree (iommu); +return ERR_PTR (ret); + } +return &iommu->base; }drivers/gpu/drm/msm/msm_mmu.h +0
-2@@ -10,7 +10,6 @@#include <linux/iommu.h> struct msm_mmu_funcs { -int (*attach)(struct msm_mmu *mmu);void (*detach)(struct msm_mmu *mmu);int (*map)(struct msm_mmu *mmu,uint64_t iova,struct sg_table *sgt,unsigned len,int prot); --2.17.1