subject:"\[PATCH v2\] linux\-user\: syscall\: ioctls\: support DRM_IOCTL_I915

Re: [PATCH v2] linux-user: syscall: ioctls: support DRM_IOCTL_I915_GETPARAM

2020-08-24 Thread Laurent Vivier

Le 02/08/2020 à 15:39, cheng...@emindsoft.com.cn a écrit :
> From: Chen Gang 
> 
> Another DRM_IOCTL_I915 patches will be sent next.
> 
> Signed-off-by: Chen Gang 
> ---
>  linux-user/ioctls.h|  3 +++
>  linux-user/syscall.c   | 35 +++
>  linux-user/syscall_defs.h  |  8 
>  linux-user/syscall_types.h |  4 
>  4 files changed, 50 insertions(+)
> 
> diff --git a/linux-user/ioctls.h b/linux-user/ioctls.h
> index 0713ae1311..e2fc09b5a5 100644
> --- a/linux-user/ioctls.h
> +++ b/linux-user/ioctls.h
> @@ -581,6 +581,9 @@
>  #ifdef HAVE_DRM_H
>IOCTL_SPECIAL(DRM_IOCTL_VERSION, IOC_RW, do_ioctl_drm,
>  MK_PTR(MK_STRUCT(STRUCT_drm_version)))
> +
> +  IOCTL_SPECIAL(DRM_IOCTL_I915_GETPARAM, IOC_RW, do_ioctl_drm_i915,
> +MK_PTR(MK_STRUCT(STRUCT_drm_i915_getparam)))
>  #endif
>  
>  #ifdef TARGET_TIOCSTART
> diff --git a/linux-user/syscall.c b/linux-user/syscall.c
> index 945fc25279..b0e15f373c 100644
> --- a/linux-user/syscall.c
> +++ b/linux-user/syscall.c
> @@ -114,6 +114,7 @@
>  #include 
>  #ifdef HAVE_DRM_H
>  #include 
> +#include 
>  #endif
>  #include "linux_loop.h"
>  #include "uname.h"
> @@ -5413,6 +5414,40 @@ static abi_long do_ioctl_drm(const IOCTLEntry *ie, 
> uint8_t *buf_temp,
>  return -TARGET_ENOSYS;
>  }
>  
> +static abi_long do_ioctl_drm_i915_getparam(const IOCTLEntry *ie,
> +   struct drm_i915_getparam *gparam,
> +   int fd, abi_long arg)
> +{
> +abi_long ret;
> +int value;
> +struct target_drm_i915_getparam *target_gparam;
> +
> +if (!lock_user_struct(VERIFY_READ, target_gparam, arg, 0)) {
> +return -TARGET_EFAULT;
> +}
> +
> +__get_user(gparam->param, _gparam->param);
> +gparam->value = 
> +ret = get_errno(safe_ioctl(fd, ie->host_cmd, gparam));
> +put_user_s32(value, target_gparam->value);
> +
> +unlock_user_struct(target_gparam, arg, 0);
> +return ret;
> +}
> +
> +static abi_long do_ioctl_drm_i915(const IOCTLEntry *ie, uint8_t *buf_temp,
> +  int fd, int cmd, abi_long arg)
> +{
> +switch (ie->host_cmd) {
> +case DRM_IOCTL_I915_GETPARAM:
> +return do_ioctl_drm_i915_getparam(ie,
> +  (struct drm_i915_getparam 
> *)buf_temp,
> +  fd, arg);
> +default:
> +return -TARGET_ENOSYS;
> +}
> +}
> +
>  #endif
>  
>  IOCTLEntry ioctl_entries[] = {
> diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h
> index 3c261cff0e..5a1692aa26 100644
> --- a/linux-user/syscall_defs.h
> +++ b/linux-user/syscall_defs.h
> @@ -1170,6 +1170,9 @@ struct target_rtc_pll_info {
>  /* drm ioctls */
>  #define TARGET_DRM_IOCTL_VERSION  TARGET_IOWRU('d', 0x00)
>  
> +/* drm i915 ioctls */
> +#define TARGET_DRM_IOCTL_I915_GETPARAM  TARGET_IOWRU('d', 0x46)
> +
>  /* from asm/termbits.h */
>  
>  #define TARGET_NCC 8
> @@ -2613,6 +2616,11 @@ struct target_drm_version {
>  abi_ulong desc;
>  };
>  
> +struct target_drm_i915_getparam {
> +int param;
> +abi_ulong value;
> +};
> +
>  #include "socket.h"
>  
>  #include "errno_defs.h"
> diff --git a/linux-user/syscall_types.h b/linux-user/syscall_types.h
> index 3f1f033464..12bf3484e2 100644
> --- a/linux-user/syscall_types.h
> +++ b/linux-user/syscall_types.h
> @@ -325,6 +325,10 @@ STRUCT(drm_version,
> TYPE_ULONG, /* desc_len */
> TYPE_PTRVOID) /* desc */
>  
> +STRUCT(drm_i915_getparam,
> +   TYPE_INT, /* param */
> +   TYPE_PTRVOID) /* value */
> +
>  STRUCT(file_clone_range,
> TYPE_LONGLONG, /* src_fd */
> TYPE_ULONGLONG, /* src_offset */
> 


Applied to my linux-user-for-5.2 branch.

Thanks,
Laurent

Re: [PATCH v2] linux-user: syscall: ioctls: support DRM_IOCTL_I915_GETPARAM

2020-08-03 Thread Laurent Vivier

Le 02/08/2020 à 15:39, cheng...@emindsoft.com.cn a écrit :
> From: Chen Gang 
> 
> Another DRM_IOCTL_I915 patches will be sent next.
> 
> Signed-off-by: Chen Gang 
> ---
>  linux-user/ioctls.h|  3 +++
>  linux-user/syscall.c   | 35 +++
>  linux-user/syscall_defs.h  |  8 
>  linux-user/syscall_types.h |  4 
>  4 files changed, 50 insertions(+)
> 
> diff --git a/linux-user/ioctls.h b/linux-user/ioctls.h
> index 0713ae1311..e2fc09b5a5 100644
> --- a/linux-user/ioctls.h
> +++ b/linux-user/ioctls.h
> @@ -581,6 +581,9 @@
>  #ifdef HAVE_DRM_H
>IOCTL_SPECIAL(DRM_IOCTL_VERSION, IOC_RW, do_ioctl_drm,
>  MK_PTR(MK_STRUCT(STRUCT_drm_version)))
> +
> +  IOCTL_SPECIAL(DRM_IOCTL_I915_GETPARAM, IOC_RW, do_ioctl_drm_i915,
> +MK_PTR(MK_STRUCT(STRUCT_drm_i915_getparam)))
>  #endif
>  
>  #ifdef TARGET_TIOCSTART
> diff --git a/linux-user/syscall.c b/linux-user/syscall.c
> index 945fc25279..b0e15f373c 100644
> --- a/linux-user/syscall.c
> +++ b/linux-user/syscall.c
> @@ -114,6 +114,7 @@
>  #include 
>  #ifdef HAVE_DRM_H
>  #include 
> +#include 
>  #endif
>  #include "linux_loop.h"
>  #include "uname.h"
> @@ -5413,6 +5414,40 @@ static abi_long do_ioctl_drm(const IOCTLEntry *ie, 
> uint8_t *buf_temp,
>  return -TARGET_ENOSYS;
>  }
>  
> +static abi_long do_ioctl_drm_i915_getparam(const IOCTLEntry *ie,
> +   struct drm_i915_getparam *gparam,
> +   int fd, abi_long arg)
> +{
> +abi_long ret;
> +int value;
> +struct target_drm_i915_getparam *target_gparam;
> +
> +if (!lock_user_struct(VERIFY_READ, target_gparam, arg, 0)) {
> +return -TARGET_EFAULT;
> +}
> +
> +__get_user(gparam->param, _gparam->param);
> +gparam->value = 
> +ret = get_errno(safe_ioctl(fd, ie->host_cmd, gparam));
> +put_user_s32(value, target_gparam->value);
> +
> +unlock_user_struct(target_gparam, arg, 0);
> +return ret;
> +}
> +
> +static abi_long do_ioctl_drm_i915(const IOCTLEntry *ie, uint8_t *buf_temp,
> +  int fd, int cmd, abi_long arg)
> +{
> +switch (ie->host_cmd) {
> +case DRM_IOCTL_I915_GETPARAM:
> +return do_ioctl_drm_i915_getparam(ie,
> +  (struct drm_i915_getparam 
> *)buf_temp,
> +  fd, arg);
> +default:
> +return -TARGET_ENOSYS;
> +}
> +}
> +
>  #endif
>  
>  IOCTLEntry ioctl_entries[] = {
> diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h
> index 3c261cff0e..5a1692aa26 100644
> --- a/linux-user/syscall_defs.h
> +++ b/linux-user/syscall_defs.h
> @@ -1170,6 +1170,9 @@ struct target_rtc_pll_info {
>  /* drm ioctls */
>  #define TARGET_DRM_IOCTL_VERSION  TARGET_IOWRU('d', 0x00)
>  
> +/* drm i915 ioctls */
> +#define TARGET_DRM_IOCTL_I915_GETPARAM  TARGET_IOWRU('d', 0x46)
> +
>  /* from asm/termbits.h */
>  
>  #define TARGET_NCC 8
> @@ -2613,6 +2616,11 @@ struct target_drm_version {
>  abi_ulong desc;
>  };
>  
> +struct target_drm_i915_getparam {
> +int param;
> +abi_ulong value;
> +};
> +
>  #include "socket.h"
>  
>  #include "errno_defs.h"
> diff --git a/linux-user/syscall_types.h b/linux-user/syscall_types.h
> index 3f1f033464..12bf3484e2 100644
> --- a/linux-user/syscall_types.h
> +++ b/linux-user/syscall_types.h
> @@ -325,6 +325,10 @@ STRUCT(drm_version,
> TYPE_ULONG, /* desc_len */
> TYPE_PTRVOID) /* desc */
>  
> +STRUCT(drm_i915_getparam,
> +   TYPE_INT, /* param */
> +   TYPE_PTRVOID) /* value */
> +
>  STRUCT(file_clone_range,
> TYPE_LONGLONG, /* src_fd */
> TYPE_ULONGLONG, /* src_offset */
> 

Reviewed-by: Laurent Vivier

[PATCH v2] linux-user: syscall: ioctls: support DRM_IOCTL_I915_GETPARAM

2020-08-02 Thread chengang

From: Chen Gang 

Another DRM_IOCTL_I915 patches will be sent next.

Signed-off-by: Chen Gang 
---
 linux-user/ioctls.h|  3 +++
 linux-user/syscall.c   | 35 +++
 linux-user/syscall_defs.h  |  8 
 linux-user/syscall_types.h |  4 
 4 files changed, 50 insertions(+)

diff --git a/linux-user/ioctls.h b/linux-user/ioctls.h
index 0713ae1311..e2fc09b5a5 100644
--- a/linux-user/ioctls.h
+++ b/linux-user/ioctls.h
@@ -581,6 +581,9 @@
 #ifdef HAVE_DRM_H
   IOCTL_SPECIAL(DRM_IOCTL_VERSION, IOC_RW, do_ioctl_drm,
 MK_PTR(MK_STRUCT(STRUCT_drm_version)))
+
+  IOCTL_SPECIAL(DRM_IOCTL_I915_GETPARAM, IOC_RW, do_ioctl_drm_i915,
+MK_PTR(MK_STRUCT(STRUCT_drm_i915_getparam)))
 #endif
 
 #ifdef TARGET_TIOCSTART
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 945fc25279..b0e15f373c 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -114,6 +114,7 @@
 #include 
 #ifdef HAVE_DRM_H
 #include 
+#include 
 #endif
 #include "linux_loop.h"
 #include "uname.h"
@@ -5413,6 +5414,40 @@ static abi_long do_ioctl_drm(const IOCTLEntry *ie, 
uint8_t *buf_temp,
 return -TARGET_ENOSYS;
 }
 
+static abi_long do_ioctl_drm_i915_getparam(const IOCTLEntry *ie,
+   struct drm_i915_getparam *gparam,
+   int fd, abi_long arg)
+{
+abi_long ret;
+int value;
+struct target_drm_i915_getparam *target_gparam;
+
+if (!lock_user_struct(VERIFY_READ, target_gparam, arg, 0)) {
+return -TARGET_EFAULT;
+}
+
+__get_user(gparam->param, _gparam->param);
+gparam->value = 
+ret = get_errno(safe_ioctl(fd, ie->host_cmd, gparam));
+put_user_s32(value, target_gparam->value);
+
+unlock_user_struct(target_gparam, arg, 0);
+return ret;
+}
+
+static abi_long do_ioctl_drm_i915(const IOCTLEntry *ie, uint8_t *buf_temp,
+  int fd, int cmd, abi_long arg)
+{
+switch (ie->host_cmd) {
+case DRM_IOCTL_I915_GETPARAM:
+return do_ioctl_drm_i915_getparam(ie,
+  (struct drm_i915_getparam *)buf_temp,
+  fd, arg);
+default:
+return -TARGET_ENOSYS;
+}
+}
+
 #endif
 
 IOCTLEntry ioctl_entries[] = {
diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h
index 3c261cff0e..5a1692aa26 100644
--- a/linux-user/syscall_defs.h
+++ b/linux-user/syscall_defs.h
@@ -1170,6 +1170,9 @@ struct target_rtc_pll_info {
 /* drm ioctls */
 #define TARGET_DRM_IOCTL_VERSION  TARGET_IOWRU('d', 0x00)
 
+/* drm i915 ioctls */
+#define TARGET_DRM_IOCTL_I915_GETPARAM  TARGET_IOWRU('d', 0x46)
+
 /* from asm/termbits.h */
 
 #define TARGET_NCC 8
@@ -2613,6 +2616,11 @@ struct target_drm_version {
 abi_ulong desc;
 };
 
+struct target_drm_i915_getparam {
+int param;
+abi_ulong value;
+};
+
 #include "socket.h"
 
 #include "errno_defs.h"
diff --git a/linux-user/syscall_types.h b/linux-user/syscall_types.h
index 3f1f033464..12bf3484e2 100644
--- a/linux-user/syscall_types.h
+++ b/linux-user/syscall_types.h
@@ -325,6 +325,10 @@ STRUCT(drm_version,
TYPE_ULONG, /* desc_len */
TYPE_PTRVOID) /* desc */
 
+STRUCT(drm_i915_getparam,
+   TYPE_INT, /* param */
+   TYPE_PTRVOID) /* value */
+
 STRUCT(file_clone_range,
TYPE_LONGLONG, /* src_fd */
TYPE_ULONGLONG, /* src_offset */
-- 
2.24.0.308.g228f53135a

Re: [PATCH v2] linux-user: syscall: ioctls: support DRM_IOCTL_I915_GETPARAM

Re: [PATCH v2] linux-user: syscall: ioctls: support DRM_IOCTL_I915_GETPARAM

[PATCH v2] linux-user: syscall: ioctls: support DRM_IOCTL_I915_GETPARAM

3 matches

Site Navigation

Mail list logo

Footer information