[igt-dev] [PATCH i-g-t 10/29] drm-uapi: patch sync_file.h to depend on drm.h

Jani Nikula jani.nikula at linux.intel.com
Thu Dec 12 11:01:50 UTC 2019


On Tue, 10 Dec 2019, D Scott Phillips <d.scott.phillips at intel.com> wrote:
> linux/sync_file.h isn't strictly part of the drm uapi and so
> doesn't include drm.h. drm.h contains some compatibility #defines
> for non-Linux platforms for things like __u32 which synf_file
> needs.

Unfortunately, stuff in drm-uapi are supposed to be verbatim copies from
the kernel.

BR,
Jani.

>
> Signed-off-by: D Scott Phillips <d.scott.phillips at intel.com>
> ---
>  include/drm-uapi/sync_file.h | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/include/drm-uapi/sync_file.h b/include/drm-uapi/sync_file.h
> index b4f2db00..4713b5b9 100644
> --- a/include/drm-uapi/sync_file.h
> +++ b/include/drm-uapi/sync_file.h
> @@ -12,8 +12,7 @@
>  #ifndef _LINUX_SYNC_H
>  #define _LINUX_SYNC_H
>  
> -#include <linux/ioctl.h>
> -#include <linux/types.h>
> +#include "drm.h"
>  
>  /**
>   * struct sync_merge_data - data passed to merge ioctl

-- 
Jani Nikula, Intel Open Source Graphics Center


More information about the igt-dev mailing list