diff options
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/exynos/exynos_drm_drv.h | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/exynos/exynos_drm_iommu.c | 9 |
2 files changed, 2 insertions, 9 deletions
diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.h b/drivers/gpu/drm/exynos/exynos_drm_drv.h index cc33ec9296e7..b39d521f093d 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_drv.h +++ b/drivers/gpu/drm/exynos/exynos_drm_drv.h | |||
| @@ -224,8 +224,6 @@ struct exynos_drm_private { | |||
| 224 | struct drm_property *plane_zpos_property; | 224 | struct drm_property *plane_zpos_property; |
| 225 | 225 | ||
| 226 | struct device *dma_dev; | 226 | struct device *dma_dev; |
| 227 | unsigned long da_start; | ||
| 228 | unsigned long da_space_size; | ||
| 229 | void *mapping; | 227 | void *mapping; |
| 230 | 228 | ||
| 231 | unsigned int pipe; | 229 | unsigned int pipe; |
diff --git a/drivers/gpu/drm/exynos/exynos_drm_iommu.c b/drivers/gpu/drm/exynos/exynos_drm_iommu.c index 36dde9691274..0229bad43bd1 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_iommu.c +++ b/drivers/gpu/drm/exynos/exynos_drm_iommu.c | |||
| @@ -48,13 +48,8 @@ int drm_create_iommu_mapping(struct drm_device *drm_dev) | |||
| 48 | struct dma_iommu_mapping *mapping = NULL; | 48 | struct dma_iommu_mapping *mapping = NULL; |
| 49 | struct exynos_drm_private *priv = drm_dev->dev_private; | 49 | struct exynos_drm_private *priv = drm_dev->dev_private; |
| 50 | 50 | ||
| 51 | if (!priv->da_start) | 51 | mapping = arm_iommu_create_mapping(&platform_bus_type, |
| 52 | priv->da_start = EXYNOS_DEV_ADDR_START; | 52 | EXYNOS_DEV_ADDR_START, EXYNOS_DEV_ADDR_SIZE); |
| 53 | if (!priv->da_space_size) | ||
| 54 | priv->da_space_size = EXYNOS_DEV_ADDR_SIZE; | ||
| 55 | |||
| 56 | mapping = arm_iommu_create_mapping(&platform_bus_type, priv->da_start, | ||
| 57 | priv->da_space_size); | ||
| 58 | 53 | ||
| 59 | if (IS_ERR(mapping)) | 54 | if (IS_ERR(mapping)) |
| 60 | return PTR_ERR(mapping); | 55 | return PTR_ERR(mapping); |
