diff options
| author | Rob Clark <robdclark@gmail.com> | 2017-06-13 11:07:08 -0400 |
|---|---|---|
| committer | Rob Clark <robdclark@gmail.com> | 2017-06-16 11:16:04 -0400 |
| commit | 8bdcd949bbe7e7f9e60a3564baa600884f8f4ba7 (patch) | |
| tree | 3533095936dfa62a37977c8b9a877443fced303e /drivers/gpu/drm/msm/msm_drv.c | |
| parent | f59f62d592a0553bbff6c5b2ba66036becb01c4a (diff) | |
drm/msm: pass address-space to _get_iova() and friends
No functional change, that will come later. But this will make it
easier to deal with dynamically created address spaces (ie. per-
process pagetables for gpu).
Signed-off-by: Rob Clark <robdclark@gmail.com>
Diffstat (limited to 'drivers/gpu/drm/msm/msm_drv.c')
| -rw-r--r-- | drivers/gpu/drm/msm/msm_drv.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c index beb4f6b3ac70..a9c3c6b813d3 100644 --- a/drivers/gpu/drm/msm/msm_drv.c +++ b/drivers/gpu/drm/msm/msm_drv.c @@ -51,6 +51,7 @@ static const struct drm_mode_config_funcs mode_config_funcs = { .atomic_state_free = msm_atomic_state_free, }; +#include "msm_gem.h" /* temporary */ int msm_register_address_space(struct drm_device *dev, struct msm_gem_address_space *aspace) { @@ -61,7 +62,9 @@ int msm_register_address_space(struct drm_device *dev, priv->aspace[priv->num_aspaces] = aspace; - return priv->num_aspaces++; + aspace->id = priv->num_aspaces++; + + return aspace->id; } #ifdef CONFIG_DRM_MSM_REGISTER_LOGGING @@ -707,7 +710,7 @@ static int msm_ioctl_gem_info_iova(struct drm_device *dev, if (!priv->gpu) return -EINVAL; - return msm_gem_get_iova(obj, priv->gpu->id, iova); + return msm_gem_get_iova(obj, priv->gpu->aspace, iova); } static int msm_ioctl_gem_info(struct drm_device *dev, void *data, |