[PATCH] Sync the mode flags for the stereo 3D formats

[Kristian Høgsberg]

On Wed, Sep 12, 2012 at 06:47:56PM +0100, Damien Lespiau wrote:
> From: Damien Lespiau <damien.lespiau at intel.com>
> 
> Signed-off-by: Damien Lespiau <damien.lespiau at intel.com>
> ---
>  include/drm/drm_mode.h | 35 +++++++++++++++++++++--------------
>  xf86drmMode.h          | 35 +++++++++++++++++++++--------------
>  2 files changed, 42 insertions(+), 28 deletions(-)
> 
> diff --git a/include/drm/drm_mode.h b/include/drm/drm_mode.h
> index 62ba997..1ab936c 100644
> --- a/include/drm/drm_mode.h
> +++ b/include/drm/drm_mode.h
> @@ -42,20 +42,27 @@
>  
>  /* Video mode flags */
>  /* bit compatible with the xorg definitions. */
> -#define DRM_MODE_FLAG_PHSYNC	(1<<0)
> -#define DRM_MODE_FLAG_NHSYNC	(1<<1)
> -#define DRM_MODE_FLAG_PVSYNC	(1<<2)
> -#define DRM_MODE_FLAG_NVSYNC	(1<<3)
> -#define DRM_MODE_FLAG_INTERLACE	(1<<4)
> -#define DRM_MODE_FLAG_DBLSCAN	(1<<5)
> -#define DRM_MODE_FLAG_CSYNC	(1<<6)
> -#define DRM_MODE_FLAG_PCSYNC	(1<<7)
> -#define DRM_MODE_FLAG_NCSYNC	(1<<8)
> -#define DRM_MODE_FLAG_HSKEW	(1<<9) /* hskew provided */
> -#define DRM_MODE_FLAG_BCAST	(1<<10)
> -#define DRM_MODE_FLAG_PIXMUX	(1<<11)
> -#define DRM_MODE_FLAG_DBLCLK	(1<<12)
> -#define DRM_MODE_FLAG_CLKDIV2	(1<<13)
> +#define DRM_MODE_FLAG_PHSYNC			(1<<0)
> +#define DRM_MODE_FLAG_NHSYNC			(1<<1)
> +#define DRM_MODE_FLAG_PVSYNC			(1<<2)
> +#define DRM_MODE_FLAG_NVSYNC			(1<<3)
> +#define DRM_MODE_FLAG_INTERLACE			(1<<4)
> +#define DRM_MODE_FLAG_DBLSCAN			(1<<5)
> +#define DRM_MODE_FLAG_CSYNC			(1<<6)
> +#define DRM_MODE_FLAG_PCSYNC			(1<<7)
> +#define DRM_MODE_FLAG_NCSYNC			(1<<8)
> +#define DRM_MODE_FLAG_HSKEW			(1<<9) /* hskew provided */
> +#define DRM_MODE_FLAG_BCAST			(1<<10)
> +#define DRM_MODE_FLAG_PIXMUX			(1<<11)
> +#define DRM_MODE_FLAG_DBLCLK			(1<<12)
> +#define DRM_MODE_FLAG_CLKDIV2			(1<<13)
> +#define DRM_MODE_FLAG_3D_TOP_BOTTOM		(1<<14)
> +#define DRM_MODE_FLAG_3D_SIDE_BY_SIDE_HALF	(1<<15)
> +#define DRM_MODE_FLAG_3D_FRAME_PACKING		(1<<16)
> +
> +#define DRM_MODE_FLAG_3D_MASK	(DRM_MODE_FLAG_3D_TOP_BOTTOM |		\
> +				 DRM_MODE_FLAG_3D_SIDE_BY_SIDE_HALF |	\
> +				 DRM_MODE_FLAG_3D_FRAME_PACKING)

This is really an enum, right?  Should we just use two bits?

>  
>  /* DPMS flags */
>  /* bit compatible with the xorg definitions. */
> diff --git a/xf86drmMode.h b/xf86drmMode.h
> index 8e40034..f88522e 100644
> --- a/xf86drmMode.h
> +++ b/xf86drmMode.h
> @@ -81,20 +81,27 @@ extern "C" {
>  
>  /* Video mode flags */
>  /* bit compatible with the xorg definitions. */
> -#define DRM_MODE_FLAG_PHSYNC    (1<<0)
> -#define DRM_MODE_FLAG_NHSYNC    (1<<1)
> -#define DRM_MODE_FLAG_PVSYNC    (1<<2)
> -#define DRM_MODE_FLAG_NVSYNC    (1<<3)
> -#define DRM_MODE_FLAG_INTERLACE (1<<4)
> -#define DRM_MODE_FLAG_DBLSCAN   (1<<5)
> -#define DRM_MODE_FLAG_CSYNC     (1<<6)
> -#define DRM_MODE_FLAG_PCSYNC    (1<<7)
> -#define DRM_MODE_FLAG_NCSYNC    (1<<8)
> -#define DRM_MODE_FLAG_HSKEW     (1<<9) /* hskew provided */
> -#define DRM_MODE_FLAG_BCAST     (1<<10)
> -#define DRM_MODE_FLAG_PIXMUX    (1<<11)
> -#define DRM_MODE_FLAG_DBLCLK    (1<<12)
> -#define DRM_MODE_FLAG_CLKDIV2   (1<<13)
> +#define DRM_MODE_FLAG_PHSYNC			(1<<0)
> +#define DRM_MODE_FLAG_NHSYNC			(1<<1)
> +#define DRM_MODE_FLAG_PVSYNC			(1<<2)
> +#define DRM_MODE_FLAG_NVSYNC			(1<<3)
> +#define DRM_MODE_FLAG_INTERLACE			(1<<4)
> +#define DRM_MODE_FLAG_DBLSCAN			(1<<5)
> +#define DRM_MODE_FLAG_CSYNC			(1<<6)
> +#define DRM_MODE_FLAG_PCSYNC			(1<<7)
> +#define DRM_MODE_FLAG_NCSYNC			(1<<8)
> +#define DRM_MODE_FLAG_HSKEW			(1<<9) /* hskew provided */
> +#define DRM_MODE_FLAG_BCAST			(1<<10)
> +#define DRM_MODE_FLAG_PIXMUX			(1<<11)
> +#define DRM_MODE_FLAG_DBLCLK			(1<<12)
> +#define DRM_MODE_FLAG_CLKDIV2			(1<<13)
> +#define DRM_MODE_FLAG_3D_TOP_BOTTOM		(1<<14)
> +#define DRM_MODE_FLAG_3D_SIDE_BY_SIDE_HALF	(1<<15)
> +#define DRM_MODE_FLAG_3D_FRAME_PACKING		(1<<16)
> +
> +#define DRM_MODE_FLAG_3D_MASK	(DRM_MODE_FLAG_3D_TOP_BOTTOM |		\
> +				 DRM_MODE_FLAG_3D_SIDE_BY_SIDE_HALF |	\
> +				 DRM_MODE_FLAG_3D_FRAME_PACKING)
>  
>  /* DPMS flags */
>  /* bit compatible with the xorg definitions. */
> -- 
> 1.7.11.4
> 
> _______________________________________________
> dri-devel mailing list
> dri-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel