* [PATCH 1/2] exynos: Don't use DRM_EXYNOS_GEM_{MAP_OFFSET/MMAP} ioctls
@ 2014-10-31 1:28 Hyungwon Hwang
2014-10-31 1:28 ` [PATCH 2/2] exynos: remove " Hyungwon Hwang
2014-11-19 2:02 ` [PATCH 1/2] exynos: Don't use " Inki Dae
0 siblings, 2 replies; 5+ messages in thread
From: Hyungwon Hwang @ 2014-10-31 1:28 UTC (permalink / raw)
To: dri-devel, inki.dae, jy0922.shim; +Cc: Hyungwon Hwang
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.
Signed-off-by: Hyungwon Hwang <human.hwang@samsung.com>
---
exynos/exynos_drm.c | 24 +++++++++++++-----------
libkms/exynos.c | 7 ++++---
2 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/exynos/exynos_drm.c b/exynos/exynos_drm.c
index 4c7dd13..4cb6a6d 100644
--- a/exynos/exynos_drm.c
+++ b/exynos/exynos_drm.c
@@ -283,20 +283,22 @@ drm_public void *exynos_bo_map(struct exynos_bo *bo)
{
if (!bo->vaddr) {
struct exynos_device *dev = bo->dev;
- struct drm_exynos_gem_mmap req = {
- .handle = bo->handle,
- .size = bo->size,
- };
+ struct drm_mode_map_dumb arg;
+ void *map = NULL;
int ret;
- ret = drmIoctl(dev->fd, DRM_IOCTL_EXYNOS_GEM_MMAP, &req);
- if (ret) {
- fprintf(stderr, "failed to mmap[%s].\n",
- strerror(errno));
- return NULL;
- }
+ memset(&arg, 0, sizeof(arg));
+ arg.handle = bo->handle;
+
+ ret = drmIoctl(dev->fd, DRM_IOCTL_MODE_MAP_DUMB, &arg);
+ if (ret)
+ return ret;
- 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)
+ return NULL;
}
return bo->vaddr;
diff --git a/libkms/exynos.c b/libkms/exynos.c
index 92e329c..1123482 100644
--- a/libkms/exynos.c
+++ b/libkms/exynos.c
@@ -25,6 +25,7 @@
#include <sys/ioctl.h>
#include "xf86drm.h"
+#include "libdrm.h"
#include "exynos_drm.h"
struct exynos_bo
@@ -124,7 +125,7 @@ static int
exynos_bo_map(struct kms_bo *_bo, void **out)
{
struct exynos_bo *bo = (struct exynos_bo *)_bo;
- struct drm_exynos_gem_map_off arg;
+ struct drm_mode_map_dumb arg;
void *map = NULL;
int ret;
@@ -137,11 +138,11 @@ exynos_bo_map(struct kms_bo *_bo, void **out)
memset(&arg, 0, sizeof(arg));
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)
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)
return -errno;
--
1.8.3.2
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH 2/2] exynos: remove DRM_EXYNOS_GEM_{MAP_OFFSET/MMAP} ioctls
2014-10-31 1:28 [PATCH 1/2] exynos: Don't use DRM_EXYNOS_GEM_{MAP_OFFSET/MMAP} ioctls Hyungwon Hwang
@ 2014-10-31 1:28 ` Hyungwon Hwang
2014-11-19 2:03 ` Inki Dae
2014-11-19 2:02 ` [PATCH 1/2] exynos: Don't use " Inki Dae
1 sibling, 1 reply; 5+ messages in thread
From: Hyungwon Hwang @ 2014-10-31 1:28 UTC (permalink / raw)
To: dri-devel, inki.dae, jy0922.shim; +Cc: Hyungwon Hwang
This patch removes the ioctls which are removed from the linux kernel.
Signed-off-by: Hyungwon Hwang <human.hwang@samsung.com>
---
exynos/exynos_drm.h | 40 ----------------------------------------
1 file changed, 40 deletions(-)
diff --git a/exynos/exynos_drm.h b/exynos/exynos_drm.h
index c3c6579..256c02f 100644
--- a/exynos/exynos_drm.h
+++ b/exynos/exynos_drm.h
@@ -47,38 +47,6 @@ struct drm_exynos_gem_create {
};
/**
- * A structure for getting buffer offset.
- *
- * @handle: a pointer to gem object created.
- * @pad: just padding to be 64-bit aligned.
- * @offset: relatived offset value of the memory region allocated.
- * - this value should be set by user.
- */
-struct drm_exynos_gem_map_off {
- unsigned int handle;
- unsigned int pad;
- uint64_t offset;
-};
-
-/**
- * A structure for mapping buffer.
- *
- * @handle: a handle to gem object created.
- * @pad: just padding to be 64-bit aligned.
- * @size: memory size to be mapped.
- * @mapped: having user virtual address mmaped.
- * - this variable would be filled by exynos gem module
- * of kernel side with user virtual address which is allocated
- * by do_mmap().
- */
-struct drm_exynos_gem_mmap {
- unsigned int handle;
- unsigned int pad;
- uint64_t size;
- uint64_t mapped;
-};
-
-/**
* A structure to gem information.
*
* @handle: a handle to gem object created.
@@ -164,8 +132,6 @@ struct drm_exynos_g2d_exec {
};
#define DRM_EXYNOS_GEM_CREATE 0x00
-#define DRM_EXYNOS_GEM_MAP_OFFSET 0x01
-#define DRM_EXYNOS_GEM_MMAP 0x02
/* Reserved 0x04 ~ 0x05 for exynos specific gem ioctl */
#define DRM_EXYNOS_GEM_GET 0x04
#define DRM_EXYNOS_VIDI_CONNECTION 0x07
@@ -178,12 +144,6 @@ struct drm_exynos_g2d_exec {
#define DRM_IOCTL_EXYNOS_GEM_CREATE DRM_IOWR(DRM_COMMAND_BASE + \
DRM_EXYNOS_GEM_CREATE, struct drm_exynos_gem_create)
-#define DRM_IOCTL_EXYNOS_GEM_MAP_OFFSET DRM_IOWR(DRM_COMMAND_BASE + \
- DRM_EXYNOS_GEM_MAP_OFFSET, struct drm_exynos_gem_map_off)
-
-#define DRM_IOCTL_EXYNOS_GEM_MMAP DRM_IOWR(DRM_COMMAND_BASE + \
- DRM_EXYNOS_GEM_MMAP, struct drm_exynos_gem_mmap)
-
#define DRM_IOCTL_EXYNOS_GEM_GET DRM_IOWR(DRM_COMMAND_BASE + \
DRM_EXYNOS_GEM_GET, struct drm_exynos_gem_info)
--
1.8.3.2
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH 2/2] exynos: remove DRM_EXYNOS_GEM_{MAP_OFFSET/MMAP} ioctls
2014-10-31 1:28 ` [PATCH 2/2] exynos: remove " Hyungwon Hwang
@ 2014-11-19 2:03 ` Inki Dae
0 siblings, 0 replies; 5+ messages in thread
From: Inki Dae @ 2014-11-19 2:03 UTC (permalink / raw)
To: Hyungwon Hwang; +Cc: dri-devel
On 2014년 10월 31일 10:28, Hyungwon Hwang wrote:
> This patch removes the ioctls which are removed from the linux kernel.
Signed-off-by: Inki Dae <inki.dae@samsung.com>
>
> Signed-off-by: Hyungwon Hwang <human.hwang@samsung.com>
> ---
> exynos/exynos_drm.h | 40 ----------------------------------------
> 1 file changed, 40 deletions(-)
>
> diff --git a/exynos/exynos_drm.h b/exynos/exynos_drm.h
> index c3c6579..256c02f 100644
> --- a/exynos/exynos_drm.h
> +++ b/exynos/exynos_drm.h
> @@ -47,38 +47,6 @@ struct drm_exynos_gem_create {
> };
>
> /**
> - * A structure for getting buffer offset.
> - *
> - * @handle: a pointer to gem object created.
> - * @pad: just padding to be 64-bit aligned.
> - * @offset: relatived offset value of the memory region allocated.
> - * - this value should be set by user.
> - */
> -struct drm_exynos_gem_map_off {
> - unsigned int handle;
> - unsigned int pad;
> - uint64_t offset;
> -};
> -
> -/**
> - * A structure for mapping buffer.
> - *
> - * @handle: a handle to gem object created.
> - * @pad: just padding to be 64-bit aligned.
> - * @size: memory size to be mapped.
> - * @mapped: having user virtual address mmaped.
> - * - this variable would be filled by exynos gem module
> - * of kernel side with user virtual address which is allocated
> - * by do_mmap().
> - */
> -struct drm_exynos_gem_mmap {
> - unsigned int handle;
> - unsigned int pad;
> - uint64_t size;
> - uint64_t mapped;
> -};
> -
> -/**
> * A structure to gem information.
> *
> * @handle: a handle to gem object created.
> @@ -164,8 +132,6 @@ struct drm_exynos_g2d_exec {
> };
>
> #define DRM_EXYNOS_GEM_CREATE 0x00
> -#define DRM_EXYNOS_GEM_MAP_OFFSET 0x01
> -#define DRM_EXYNOS_GEM_MMAP 0x02
> /* Reserved 0x04 ~ 0x05 for exynos specific gem ioctl */
> #define DRM_EXYNOS_GEM_GET 0x04
> #define DRM_EXYNOS_VIDI_CONNECTION 0x07
> @@ -178,12 +144,6 @@ struct drm_exynos_g2d_exec {
> #define DRM_IOCTL_EXYNOS_GEM_CREATE DRM_IOWR(DRM_COMMAND_BASE + \
> DRM_EXYNOS_GEM_CREATE, struct drm_exynos_gem_create)
>
> -#define DRM_IOCTL_EXYNOS_GEM_MAP_OFFSET DRM_IOWR(DRM_COMMAND_BASE + \
> - DRM_EXYNOS_GEM_MAP_OFFSET, struct drm_exynos_gem_map_off)
> -
> -#define DRM_IOCTL_EXYNOS_GEM_MMAP DRM_IOWR(DRM_COMMAND_BASE + \
> - DRM_EXYNOS_GEM_MMAP, struct drm_exynos_gem_mmap)
> -
> #define DRM_IOCTL_EXYNOS_GEM_GET DRM_IOWR(DRM_COMMAND_BASE + \
> DRM_EXYNOS_GEM_GET, struct drm_exynos_gem_info)
>
>
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 1/2] exynos: Don't use DRM_EXYNOS_GEM_{MAP_OFFSET/MMAP} ioctls
2014-10-31 1:28 [PATCH 1/2] exynos: Don't use DRM_EXYNOS_GEM_{MAP_OFFSET/MMAP} ioctls Hyungwon Hwang
2014-10-31 1:28 ` [PATCH 2/2] exynos: remove " Hyungwon Hwang
@ 2014-11-19 2:02 ` Inki Dae
1 sibling, 0 replies; 5+ messages in thread
From: Inki Dae @ 2014-11-19 2:02 UTC (permalink / raw)
To: Hyungwon Hwang; +Cc: dri-devel
On 2014년 10월 31일 10:28, Hyungwon Hwang wrote:
> 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.
Signed-off-by: Inki Dae <inki.dae@samsung.com>
>
> Signed-off-by: Hyungwon Hwang <human.hwang@samsung.com>
> ---
> exynos/exynos_drm.c | 24 +++++++++++++-----------
> libkms/exynos.c | 7 ++++---
> 2 files changed, 17 insertions(+), 14 deletions(-)
>
> diff --git a/exynos/exynos_drm.c b/exynos/exynos_drm.c
> index 4c7dd13..4cb6a6d 100644
> --- a/exynos/exynos_drm.c
> +++ b/exynos/exynos_drm.c
> @@ -283,20 +283,22 @@ drm_public void *exynos_bo_map(struct exynos_bo *bo)
> {
> if (!bo->vaddr) {
> struct exynos_device *dev = bo->dev;
> - struct drm_exynos_gem_mmap req = {
> - .handle = bo->handle,
> - .size = bo->size,
> - };
> + struct drm_mode_map_dumb arg;
> + void *map = NULL;
> int ret;
>
> - ret = drmIoctl(dev->fd, DRM_IOCTL_EXYNOS_GEM_MMAP, &req);
> - if (ret) {
> - fprintf(stderr, "failed to mmap[%s].\n",
> - strerror(errno));
> - return NULL;
> - }
> + memset(&arg, 0, sizeof(arg));
> + arg.handle = bo->handle;
> +
> + ret = drmIoctl(dev->fd, DRM_IOCTL_MODE_MAP_DUMB, &arg);
> + if (ret)
> + return ret;
>
> - 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)
> + return NULL;
> }
>
> return bo->vaddr;
> diff --git a/libkms/exynos.c b/libkms/exynos.c
> index 92e329c..1123482 100644
> --- a/libkms/exynos.c
> +++ b/libkms/exynos.c
> @@ -25,6 +25,7 @@
> #include <sys/ioctl.h>
> #include "xf86drm.h"
>
> +#include "libdrm.h"
> #include "exynos_drm.h"
>
> struct exynos_bo
> @@ -124,7 +125,7 @@ static int
> exynos_bo_map(struct kms_bo *_bo, void **out)
> {
> struct exynos_bo *bo = (struct exynos_bo *)_bo;
> - struct drm_exynos_gem_map_off arg;
> + struct drm_mode_map_dumb arg;
> void *map = NULL;
> int ret;
>
> @@ -137,11 +138,11 @@ exynos_bo_map(struct kms_bo *_bo, void **out)
> memset(&arg, 0, sizeof(arg));
> 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)
> 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)
> return -errno;
>
>
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 5+ messages in thread
* libdrm/exynos: fix usage of removed ioctls
@ 2015-01-16 22:57 Tobias Jakobi
2015-01-16 22:57 ` [PATCH 2/2] exynos: remove DRM_EXYNOS_GEM_{MAP_OFFSET/MMAP} ioctls Tobias Jakobi
0 siblings, 1 reply; 5+ messages in thread
From: Tobias Jakobi @ 2015-01-16 22:57 UTC (permalink / raw)
To: dri-devel; +Cc: linux-samsung-soc
Hello,
these two patches are needed for the exynos component of libdrm to
properly work again. With the current stable 3.18.x the 'exynos_bo_map'
call is broken, making it impossible to get data from userspace into
a DRM buffer.
The patches were sent by Hyungwon Hwang some while ago, but the first
one was very much broken, so I fixed it up. I've put the changelog
into the commit message itself.
Please apply so that the exynos component is useable again.
With best wishes,
Tobias
^ permalink raw reply [flat|nested] 5+ messages in thread* [PATCH 2/2] exynos: remove DRM_EXYNOS_GEM_{MAP_OFFSET/MMAP} ioctls
2015-01-16 22:57 libdrm/exynos: fix usage of removed ioctls Tobias Jakobi
@ 2015-01-16 22:57 ` Tobias Jakobi
0 siblings, 0 replies; 5+ messages in thread
From: Tobias Jakobi @ 2015-01-16 22:57 UTC (permalink / raw)
To: dri-devel; +Cc: linux-samsung-soc, Hyungwon Hwang, Inki Dae, Tobias Jakobi
From: Hyungwon Hwang <human.hwang@samsung.com>
This patch removes the ioctls which are removed from the linux kernel.
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>
---
exynos/exynos_drm.h | 40 ----------------------------------------
1 file changed, 40 deletions(-)
diff --git a/exynos/exynos_drm.h b/exynos/exynos_drm.h
index c3c6579..256c02f 100644
--- a/exynos/exynos_drm.h
+++ b/exynos/exynos_drm.h
@@ -47,38 +47,6 @@ struct drm_exynos_gem_create {
};
/**
- * A structure for getting buffer offset.
- *
- * @handle: a pointer to gem object created.
- * @pad: just padding to be 64-bit aligned.
- * @offset: relatived offset value of the memory region allocated.
- * - this value should be set by user.
- */
-struct drm_exynos_gem_map_off {
- unsigned int handle;
- unsigned int pad;
- uint64_t offset;
-};
-
-/**
- * A structure for mapping buffer.
- *
- * @handle: a handle to gem object created.
- * @pad: just padding to be 64-bit aligned.
- * @size: memory size to be mapped.
- * @mapped: having user virtual address mmaped.
- * - this variable would be filled by exynos gem module
- * of kernel side with user virtual address which is allocated
- * by do_mmap().
- */
-struct drm_exynos_gem_mmap {
- unsigned int handle;
- unsigned int pad;
- uint64_t size;
- uint64_t mapped;
-};
-
-/**
* A structure to gem information.
*
* @handle: a handle to gem object created.
@@ -164,8 +132,6 @@ struct drm_exynos_g2d_exec {
};
#define DRM_EXYNOS_GEM_CREATE 0x00
-#define DRM_EXYNOS_GEM_MAP_OFFSET 0x01
-#define DRM_EXYNOS_GEM_MMAP 0x02
/* Reserved 0x04 ~ 0x05 for exynos specific gem ioctl */
#define DRM_EXYNOS_GEM_GET 0x04
#define DRM_EXYNOS_VIDI_CONNECTION 0x07
@@ -178,12 +144,6 @@ struct drm_exynos_g2d_exec {
#define DRM_IOCTL_EXYNOS_GEM_CREATE DRM_IOWR(DRM_COMMAND_BASE + \
DRM_EXYNOS_GEM_CREATE, struct drm_exynos_gem_create)
-#define DRM_IOCTL_EXYNOS_GEM_MAP_OFFSET DRM_IOWR(DRM_COMMAND_BASE + \
- DRM_EXYNOS_GEM_MAP_OFFSET, struct drm_exynos_gem_map_off)
-
-#define DRM_IOCTL_EXYNOS_GEM_MMAP DRM_IOWR(DRM_COMMAND_BASE + \
- DRM_EXYNOS_GEM_MMAP, struct drm_exynos_gem_mmap)
-
#define DRM_IOCTL_EXYNOS_GEM_GET DRM_IOWR(DRM_COMMAND_BASE + \
DRM_EXYNOS_GEM_GET, struct drm_exynos_gem_info)
--
2.0.5
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2015-01-16 22:58 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-10-31 1:28 [PATCH 1/2] exynos: Don't use DRM_EXYNOS_GEM_{MAP_OFFSET/MMAP} ioctls Hyungwon Hwang
2014-10-31 1:28 ` [PATCH 2/2] exynos: remove " Hyungwon Hwang
2014-11-19 2:03 ` Inki Dae
2014-11-19 2:02 ` [PATCH 1/2] exynos: Don't use " Inki Dae
-- strict thread matches above, loose matches on Subject: below --
2015-01-16 22:57 libdrm/exynos: fix usage of removed ioctls Tobias Jakobi
2015-01-16 22:57 ` [PATCH 2/2] exynos: remove DRM_EXYNOS_GEM_{MAP_OFFSET/MMAP} ioctls Tobias Jakobi
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.