diff options
| author |   Andrzej Hajda <a.hajda@samsung.com> | 2018-10-12 12:53:43 +0200 |
|---|---|---|
| committer |   Inki Dae <inki.dae@samsung.com> | 2018-12-04 13:23:17 +0900 |
| commit | 237556962e51150f89bdc8d04171a3619bfeaf8d (patch) | |
| tree | fcca6f2ffb2247f3143022cb206db129f11af13a /drivers/gpu/drm/exynos/exynos_mixer.c | |
| parent | drm/exynos/iommu: remove DRM_EXYNOS_IOMMU Kconfig symbol (diff) | |
| download | linux-dev-237556962e51150f89bdc8d04171a3619bfeaf8d.tar.xz linux-dev-237556962e51150f89bdc8d04171a3619bfeaf8d.zip | |
drm/exynos/iommu: integrate IOMMU/DMA internal API
Exynos DRM drivers should work with and without IOMMU. Providing common
API generic to both scenarios should make code cleaner and allow further
code improvements.
The patch removes including of exynos_drm_iommu.h as the file contains
mostly IOMMU specific stuff, instead it exposes exynos_drm_*_dma functions
and puts them into exynos_drm_dma.c.
Signed-off-by: Andrzej Hajda <a.hajda@samsung.com>
Signed-off-by: Inki Dae <inki.dae@samsung.com>
Diffstat (limited to 'drivers/gpu/drm/exynos/exynos_mixer.c')
| -rw-r--r-- | drivers/gpu/drm/exynos/exynos_mixer.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/drm/exynos/exynos_mixer.c b/drivers/gpu/drm/exynos/exynos_mixer.c index 52193de577d2..5a47af8e76c0 100644 --- a/drivers/gpu/drm/exynos/exynos_mixer.c +++ b/drivers/gpu/drm/exynos/exynos_mixer.c @@ -40,7 +40,6 @@ #include "exynos_drm_crtc.h" #include "exynos_drm_fb.h" #include "exynos_drm_plane.h" -#include "exynos_drm_iommu.h" #define MIXER_WIN_NR 3 #define VP_DEFAULT_WIN 2 @@ -883,7 +882,7 @@ static int mixer_initialize(struct mixer_context *mixer_ctx, static void mixer_ctx_remove(struct mixer_context *mixer_ctx) { - drm_iommu_detach_device(mixer_ctx->drm_dev, mixer_ctx->dev); + exynos_drm_unregister_dma(mixer_ctx->drm_dev, mixer_ctx->dev); } static int mixer_enable_vblank(struct exynos_drm_crtc *crtc) |