aboutsummaryrefslogtreecommitdiffstats
path: root/exynos
diff options
context:
space:
mode:
authorHyungwon Hwang2015-01-16 16:57:33 -0600
committerRob Clark2015-02-02 13:45:39 -0600
commitd41b7a3a745a32dff6edeb31962da4e24f870a1d (patch)
tree39617cb3d8e3a48543880f974e72deb524c5a0d2 /exynos
parent28ee135a37e10b9a6cd62d67df0332e38ee0b85c (diff)
downloadexternal-libgbm-d41b7a3a745a32dff6edeb31962da4e24f870a1d.tar.gz
external-libgbm-d41b7a3a745a32dff6edeb31962da4e24f870a1d.tar.xz
external-libgbm-d41b7a3a745a32dff6edeb31962da4e24f870a1d.zip
exynos: Don't use DRM_EXYNOS_GEM_{MAP_OFFSET/MMAP} ioctls
The ioctl DRM_EXYNOS_GEM_MAP_OFFSET and DRM_EXYNOS_GEM_MMAP are removed from the linux kernel. This patch modifies libdrm and libkms to use drm generic ioctls instead of the removed ioctls. v2: The original patch was erroneous. In case the MODE_MAP_DUMB ioctl failed it would return the retvalue as a void-pointer. Users of libdrm would then happily use that ptr, eventually leading to a segfault. Change this to return NULL in that case and also restore the previous behaviour of logging to stderr. The other error was that 'bo->vaddr' was never filled with the mapped buffer address. Hence exynos_bo_map still returned NULL even if the buffer mapping succeeded. Signed-off-by: Hyungwon Hwang <human.hwang@samsung.com> Signed-off-by: Inki Dae <inki.dae@samsung.com> Signed-off-by: Tobias Jakobi <tjakobi@math.uni-bielefeld.de> Signed-off-by: Rob Clark <robclark@freedesktop.org>
Diffstat (limited to 'exynos')
-rw-r--r--exynos/exynos_drm.c19
1 files changed, 12 insertions, 7 deletions
diff --git a/exynos/exynos_drm.c b/exynos/exynos_drm.c
index 4c7dd13e..c5dd9489 100644
--- a/exynos/exynos_drm.c
+++ b/exynos/exynos_drm.c
@@ -283,20 +283,25 @@ drm_public void *exynos_bo_map(struct exynos_bo *bo)
283{ 283{
284 if (!bo->vaddr) { 284 if (!bo->vaddr) {
285 struct exynos_device *dev = bo->dev; 285 struct exynos_device *dev = bo->dev;
286 struct drm_exynos_gem_mmap req = { 286 struct drm_mode_map_dumb arg;
287 .handle = bo->handle, 287 void *map = NULL;
288 .size = bo->size,
289 };
290 int ret; 288 int ret;
291 289
292 ret = drmIoctl(dev->fd, DRM_IOCTL_EXYNOS_GEM_MMAP, &req); 290 memset(&arg, 0, sizeof(arg));
291 arg.handle = bo->handle;
292
293 ret = drmIoctl(dev->fd, DRM_IOCTL_MODE_MAP_DUMB, &arg);
293 if (ret) { 294 if (ret) {
294 fprintf(stderr, "failed to mmap[%s].\n", 295 fprintf(stderr, "failed to map dumb buffer[%s].\n",
295 strerror(errno)); 296 strerror(errno));
296 return NULL; 297 return NULL;
297 } 298 }
298 299
299 bo->vaddr = (void *)(uintptr_t)req.mapped; 300 map = drm_mmap(0, bo->size, PROT_READ | PROT_WRITE, MAP_SHARED,
301 dev->fd, arg.offset);
302
303 if (map != MAP_FAILED)
304 bo->vaddr = map;
300 } 305 }
301 306
302 return bo->vaddr; 307 return bo->vaddr;