diff options
| author | Joonyoung Shim <jy0922.shim@samsung.com> | 2015-10-06 19:09:16 +0900 |
|---|---|---|
| committer | Hoegeun Kwon <hoegeun.kwon@samsung.com> | 2020-12-08 14:36:11 +0900 |
| commit | 33bb9c8210c98d5f5dc17b408b69ed8da95f2c80 (patch) | |
| tree | d62bd288dccb5911201f2431cb979063465cfad0 /exynos/exynos_drm.c | |
| parent | f6e4f3f6f1e3ca16265d8c8e65ce17bf44e6e842 (diff) | |
| download | libdrm-33bb9c8210c98d5f5dc17b408b69ed8da95f2c80.tar.gz libdrm-33bb9c8210c98d5f5dc17b408b69ed8da95f2c80.tar.bz2 libdrm-33bb9c8210c98d5f5dc17b408b69ed8da95f2c80.zip | |
exynos: support DRM_IOCTL_EXYNOS_GEM_MAP
The commit d41b7a3a745a("exynos: Don't use DRM_EXYNOS_GEM_{MAP_OFFSET/
MMAP} ioctls") removed it same with the ioctl that this patch adds. The
reason that removed DRM_IOCTL_EXYNOS_GEM_MAP_OFFSET was we could use
DRM_IOCTL_MODE_MAP_DUMB. Both did exactly same thing.
Now exynos-drm driver of linux kernel revives it as DRM_EXYNOS_GEM_MAP
because of render node. DRM_IOCTL_MODE_MAP_DUMB isn't permitted in
render node, so this patch also supports DRM_IOCTL_EXYNOS_GEM_MAP.
Change-Id: Ib548dc8a6bea076375465f64ee2fdd658a90e435
Signed-off-by: Joonyoung Shim <jy0922.shim@samsung.com>
exynos: fix build warnings
Fix build warnings to exynos_fimg2d module.
This patch fixes below two build warnings,
exynos_fimg2d.c: In function 'g2d_scale_and_blend':
exynos_fimg2d.c:978:3: warning: 'scale_y' may be used uninitialized in this function [-Wmaybe-uninitialized]
g2d_add_cmd(ctx, SRC_YSCALE_REG, scale_y);
^
exynos_fimg2d.c:977:3: warning: 'scale_x' may be used uninitialized in this function [-Wmaybe-uninitialized]
g2d_add_cmd(ctx, SRC_XSCALE_REG, scale_x);
Change-Id: I70908088c61b85570aec6e3ec19b405df4820d37
Signed-off-by: Inki Dae <inki.dae@samsung.com>
Diffstat (limited to 'exynos/exynos_drm.c')
| -rw-r--r-- | exynos/exynos_drm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/exynos/exynos_drm.c b/exynos/exynos_drm.c index b008ad73..b593eb6c 100644 --- a/exynos/exynos_drm.c +++ b/exynos/exynos_drm.c @@ -282,14 +282,14 @@ drm_public void *exynos_bo_map(struct exynos_bo *bo) { if (!bo->vaddr) { struct exynos_device *dev = bo->dev; - struct drm_mode_map_dumb arg; + struct drm_exynos_gem_map arg; void *map = NULL; int ret; memset(&arg, 0, sizeof(arg)); arg.handle = bo->handle; - ret = drmIoctl(dev->fd, DRM_IOCTL_MODE_MAP_DUMB, &arg); + ret = drmIoctl(dev->fd, DRM_IOCTL_EXYNOS_GEM_MAP, &arg); if (ret) { fprintf(stderr, "failed to map dumb buffer[%s].\n", strerror(errno)); |