[Mesa-stable] [Mesa-dev] [PATCH 1/2] winsys/svga: Update the vmwgfx_drm.h header to latest version from kernel

[Emil Velikov]

On 07/04/14 10:50, Thomas Hellstrom wrote:
> Cc: "10.1" <mesa-stable at lists.freedesktop.org>
> Signed-off-by: Thomas Hellstrom <thellstrom at vmware.com>
Rather silly question:

Why do you guys pull this header inside mesa and over using the one provided
by libdrm ? AFAICS every other driver seems to do the latter.

-Emil
> ---
>  src/gallium/winsys/svga/drm/vmwgfx_drm.h | 13 ++++++++++++-
>  1 file changed, 12 insertions(+), 1 deletion(-)
> 
> diff --git a/src/gallium/winsys/svga/drm/vmwgfx_drm.h b/src/gallium/winsys/svga/drm/vmwgfx_drm.h
> index e42b3f5..73ad205 100644
> --- a/src/gallium/winsys/svga/drm/vmwgfx_drm.h
> +++ b/src/gallium/winsys/svga/drm/vmwgfx_drm.h
> @@ -87,6 +87,16 @@
>  #define DRM_VMW_PARAM_MAX_SURF_MEMORY  7
>  #define DRM_VMW_PARAM_3D_CAPS_SIZE     8
>  #define DRM_VMW_PARAM_MAX_MOB_MEMORY   9
> +#define DRM_VMW_PARAM_MAX_MOB_SIZE     10
> +
> +/**
> + * enum drm_vmw_handle_type - handle type for ref ioctls
> + *
> + */
> +enum drm_vmw_handle_type {
> +	DRM_VMW_HANDLE_LEGACY = 0,
> +	DRM_VMW_HANDLE_PRIME = 1
> +};
>  
>  /**
>   * struct drm_vmw_getparam_arg
> @@ -176,6 +186,7 @@ struct drm_vmw_surface_create_req {
>   * struct drm_wmv_surface_arg
>   *
>   * @sid: Surface id of created surface or surface to destroy or reference.
> + * @handle_type: Handle type for DRM_VMW_REF_SURFACE Ioctl.
>   *
>   * Output data from the DRM_VMW_CREATE_SURFACE Ioctl.
>   * Input argument to the DRM_VMW_UNREF_SURFACE Ioctl.
> @@ -184,7 +195,7 @@ struct drm_vmw_surface_create_req {
>  
>  struct drm_vmw_surface_arg {
>  	int32_t sid;
> -	uint32_t pad64;
> +	enum drm_vmw_handle_type handle_type;
>  };
>  
>  /**
>