geemili
/
drm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
main
Hyungwon Hwang 2015-01-16 23:57:33 +01:00 committed by Rob Clark
parent 28ee135a37
commit d41b7a3a74
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
exynos/exynos_drm.c
View File

@ -283,20 +283,25 @@ drm_public void *exynos_bo_map(struct exynos_bo *bo)
{ {
if (!bo->vaddr) { if (!bo->vaddr) {
struct exynos_device *dev = bo->dev; struct exynos_device *dev = bo->dev;
struct drm_exynos_gem_mmap req = { struct drm_mode_map_dumb arg;
.handle = bo->handle, void *map = NULL;
.size = bo->size,
};
int ret; int ret;
ret = drmIoctl(dev->fd, DRM_IOCTL_EXYNOS_GEM_MMAP, &req); memset(&arg, 0, sizeof(arg));
arg.handle = bo->handle;
ret = drmIoctl(dev->fd, DRM_IOCTL_MODE_MAP_DUMB, &arg);
if (ret) { if (ret) {
fprintf(stderr, "failed to mmap[%s].\n", fprintf(stderr, "failed to map dumb buffer[%s].\n",
strerror(errno)); strerror(errno));
return NULL; return NULL;
} }
bo->vaddr = (void *)(uintptr_t)req.mapped; map = drm_mmap(0, bo->size, PROT_READ | PROT_WRITE, MAP_SHARED,
dev->fd, arg.offset);
if (map != MAP_FAILED)
bo->vaddr = map;
} }
return bo->vaddr; return bo->vaddr;

7
libkms/exynos.c
View File

@ -25,6 +25,7 @@
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include "xf86drm.h" #include "xf86drm.h"
#include "libdrm.h"
#include "exynos_drm.h" #include "exynos_drm.h"
struct exynos_bo struct exynos_bo
@ -124,7 +125,7 @@ static int
exynos_bo_map(struct kms_bo *_bo, void **out) exynos_bo_map(struct kms_bo *_bo, void **out)
{ {
struct exynos_bo *bo = (struct exynos_bo *)_bo; struct exynos_bo *bo = (struct exynos_bo *)_bo;
struct drm_exynos_gem_map_off arg; struct drm_mode_map_dumb arg;
void *map = NULL; void *map = NULL;
int ret; int ret;
@ -137,11 +138,11 @@ exynos_bo_map(struct kms_bo *_bo, void **out)
memset(&arg, 0, sizeof(arg)); memset(&arg, 0, sizeof(arg));
arg.handle = bo->base.handle; arg.handle = bo->base.handle;
ret = drmCommandWriteRead(bo->base.kms->fd, DRM_EXYNOS_GEM_MAP_OFFSET, &arg, sizeof(arg)); ret = drmIoctl(bo->base.kms->fd, DRM_IOCTL_MODE_MAP_DUMB, &arg);
if (ret) if (ret)
return ret; return ret;
map = mmap(0, bo->base.size, PROT_READ | PROT_WRITE, MAP_SHARED, bo->base.kms->fd, arg.offset); map = drm_mmap(0, bo->base.size, PROT_READ | PROT_WRITE, MAP_SHARED, bo->base.kms->fd, arg.offset);
if (map == MAP_FAILED) if (map == MAP_FAILED)
return -errno; return -errno;