mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-12-18 18:57:47 +07:00
drm/msm: Add support for private address space instances
Add support for allocating private address space instances. Targets that support per-context pagetables should implement their own function to allocate private address spaces. The default will return a pointer to the global address space. Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org> Signed-off-by: Rob Clark <robdclark@chromium.org> Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
This commit is contained in:
parent
b145c6e65e
commit
933415e24b
@ -589,7 +589,7 @@ static int context_init(struct drm_device *dev, struct drm_file *file)
|
||||
kref_init(&ctx->ref);
|
||||
msm_submitqueue_init(dev, ctx);
|
||||
|
||||
ctx->aspace = priv->gpu ? priv->gpu->aspace : NULL;
|
||||
ctx->aspace = msm_gpu_create_private_address_space(priv->gpu);
|
||||
file->driver_priv = ctx;
|
||||
|
||||
return 0;
|
||||
@ -772,18 +772,19 @@ static int msm_ioctl_gem_cpu_fini(struct drm_device *dev, void *data,
|
||||
}
|
||||
|
||||
static int msm_ioctl_gem_info_iova(struct drm_device *dev,
|
||||
struct drm_gem_object *obj, uint64_t *iova)
|
||||
struct drm_file *file, struct drm_gem_object *obj,
|
||||
uint64_t *iova)
|
||||
{
|
||||
struct msm_drm_private *priv = dev->dev_private;
|
||||
struct msm_file_private *ctx = file->driver_priv;
|
||||
|
||||
if (!priv->gpu)
|
||||
if (!ctx->aspace)
|
||||
return -EINVAL;
|
||||
|
||||
/*
|
||||
* Don't pin the memory here - just get an address so that userspace can
|
||||
* be productive
|
||||
*/
|
||||
return msm_gem_get_iova(obj, priv->gpu->aspace, iova);
|
||||
return msm_gem_get_iova(obj, ctx->aspace, iova);
|
||||
}
|
||||
|
||||
static int msm_ioctl_gem_info(struct drm_device *dev, void *data,
|
||||
@ -822,7 +823,7 @@ static int msm_ioctl_gem_info(struct drm_device *dev, void *data,
|
||||
args->value = msm_gem_mmap_offset(obj);
|
||||
break;
|
||||
case MSM_INFO_GET_IOVA:
|
||||
ret = msm_ioctl_gem_info_iova(dev, obj, &args->value);
|
||||
ret = msm_ioctl_gem_info_iova(dev, file, obj, &args->value);
|
||||
break;
|
||||
case MSM_INFO_SET_NAME:
|
||||
/* length check should leave room for terminating null: */
|
||||
|
@ -249,6 +249,10 @@ int msm_gem_map_vma(struct msm_gem_address_space *aspace,
|
||||
void msm_gem_close_vma(struct msm_gem_address_space *aspace,
|
||||
struct msm_gem_vma *vma);
|
||||
|
||||
|
||||
struct msm_gem_address_space *
|
||||
msm_gem_address_space_get(struct msm_gem_address_space *aspace);
|
||||
|
||||
void msm_gem_address_space_put(struct msm_gem_address_space *aspace);
|
||||
|
||||
struct msm_gem_address_space *
|
||||
@ -434,6 +438,7 @@ static inline void __msm_file_private_destroy(struct kref *kref)
|
||||
struct msm_file_private *ctx = container_of(kref,
|
||||
struct msm_file_private, ref);
|
||||
|
||||
msm_gem_address_space_put(ctx->aspace);
|
||||
kfree(ctx);
|
||||
}
|
||||
|
||||
|
@ -27,6 +27,15 @@ void msm_gem_address_space_put(struct msm_gem_address_space *aspace)
|
||||
kref_put(&aspace->kref, msm_gem_address_space_destroy);
|
||||
}
|
||||
|
||||
struct msm_gem_address_space *
|
||||
msm_gem_address_space_get(struct msm_gem_address_space *aspace)
|
||||
{
|
||||
if (!IS_ERR_OR_NULL(aspace))
|
||||
kref_get(&aspace->kref);
|
||||
|
||||
return aspace;
|
||||
}
|
||||
|
||||
/* Actually unmap memory for the vma */
|
||||
void msm_gem_purge_vma(struct msm_gem_address_space *aspace,
|
||||
struct msm_gem_vma *vma)
|
||||
|
@ -827,6 +827,28 @@ static int get_clocks(struct platform_device *pdev, struct msm_gpu *gpu)
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* Return a new address space for a msm_drm_private instance */
|
||||
struct msm_gem_address_space *
|
||||
msm_gpu_create_private_address_space(struct msm_gpu *gpu)
|
||||
{
|
||||
struct msm_gem_address_space *aspace = NULL;
|
||||
|
||||
if (!gpu)
|
||||
return NULL;
|
||||
|
||||
/*
|
||||
* If the target doesn't support private address spaces then return
|
||||
* the global one
|
||||
*/
|
||||
if (gpu->funcs->create_private_address_space)
|
||||
aspace = gpu->funcs->create_private_address_space(gpu);
|
||||
|
||||
if (IS_ERR_OR_NULL(aspace))
|
||||
aspace = msm_gem_address_space_get(gpu->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)
|
||||
|
@ -66,6 +66,8 @@ struct msm_gpu_funcs {
|
||||
void (*gpu_set_freq)(struct msm_gpu *gpu, struct dev_pm_opp *opp);
|
||||
struct msm_gem_address_space *(*create_address_space)
|
||||
(struct msm_gpu *gpu, struct platform_device *pdev);
|
||||
struct msm_gem_address_space *(*create_private_address_space)
|
||||
(struct msm_gpu *gpu);
|
||||
};
|
||||
|
||||
struct msm_gpu {
|
||||
@ -298,6 +300,9 @@ 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);
|
||||
|
||||
struct msm_gem_address_space *
|
||||
msm_gpu_create_private_address_space(struct msm_gpu *gpu);
|
||||
|
||||
void msm_gpu_cleanup(struct msm_gpu *gpu);
|
||||
|
||||
struct msm_gpu *adreno_load_gpu(struct drm_device *dev);
|
||||
|
Loading…
Reference in New Issue
Block a user