diff options
Diffstat (limited to 'drivers/gpu/drm/exynos/exynos_drm_drv.c')
-rw-r--r-- | drivers/gpu/drm/exynos/exynos_drm_drv.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.c b/drivers/gpu/drm/exynos/exynos_drm_drv.c index b86a04bd9399..050684ceab9d 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_drv.c +++ b/drivers/gpu/drm/exynos/exynos_drm_drv.c | |||
@@ -36,6 +36,7 @@ | |||
36 | #include "exynos_drm_fbdev.h" | 36 | #include "exynos_drm_fbdev.h" |
37 | #include "exynos_drm_fb.h" | 37 | #include "exynos_drm_fb.h" |
38 | #include "exynos_drm_gem.h" | 38 | #include "exynos_drm_gem.h" |
39 | #include "exynos_drm_plane.h" | ||
39 | 40 | ||
40 | #define DRIVER_NAME "exynos-drm" | 41 | #define DRIVER_NAME "exynos-drm" |
41 | #define DRIVER_DESC "Samsung SoC DRM" | 42 | #define DRIVER_DESC "Samsung SoC DRM" |
@@ -77,6 +78,12 @@ static int exynos_drm_load(struct drm_device *dev, unsigned long flags) | |||
77 | goto err_crtc; | 78 | goto err_crtc; |
78 | } | 79 | } |
79 | 80 | ||
81 | for (nr = 0; nr < MAX_PLANE; nr++) { | ||
82 | ret = exynos_plane_init(dev, nr); | ||
83 | if (ret) | ||
84 | goto err_crtc; | ||
85 | } | ||
86 | |||
80 | ret = drm_vblank_init(dev, MAX_CRTC); | 87 | ret = drm_vblank_init(dev, MAX_CRTC); |
81 | if (ret) | 88 | if (ret) |
82 | goto err_crtc; | 89 | goto err_crtc; |
@@ -163,6 +170,8 @@ static struct drm_ioctl_desc exynos_ioctls[] = { | |||
163 | DRM_AUTH), | 170 | DRM_AUTH), |
164 | DRM_IOCTL_DEF_DRV(EXYNOS_GEM_MMAP, | 171 | DRM_IOCTL_DEF_DRV(EXYNOS_GEM_MMAP, |
165 | exynos_drm_gem_mmap_ioctl, DRM_UNLOCKED | DRM_AUTH), | 172 | exynos_drm_gem_mmap_ioctl, DRM_UNLOCKED | DRM_AUTH), |
173 | DRM_IOCTL_DEF_DRV(EXYNOS_PLANE_SET_ZPOS, exynos_plane_set_zpos_ioctl, | ||
174 | DRM_UNLOCKED | DRM_AUTH), | ||
166 | }; | 175 | }; |
167 | 176 | ||
168 | static const struct file_operations exynos_drm_driver_fops = { | 177 | static const struct file_operations exynos_drm_driver_fops = { |