Hi Maarten,

Maarten Maathuis escreveu:
>  linux-core/drm_crtc.c         |   96 +++++++++++++++++++++++++++++++++++++++-
>  linux-core/drm_crtc.h         |   50 +++++----------------
>  linux-core/drm_sysfs.c        |   98 
> +++++++++++++++++++++++++++++++++++++++++
>  linux-core/intel_tv.c         |    2 
>  linux-core/nv50_connector.h   |    1 
>  linux-core/nv50_kms_wrapper.c |  100 
> ++++++++++++++++++++++++++++++++++++------
>  linux-core/nv50_kms_wrapper.h |    1 
>  shared-core/drm.h             |   56 +++++++++++++++++++++--
>  8 files changed, 345 insertions(+), 59 deletions(-)
> 
> New commits:
> commit c9915d695dad8e4f75b4f551f9f78ff3d64dc666
> Author: Maarten Maathuis <[EMAIL PROTECTED]>
> Date:   Fri Jul 4 17:28:04 2008 +0200
> 
>     modesetting-101: Move some defines used for enumeration into the public 
> header.
>     
>     - Otherwise userspace has no idea of the meaning.
> 
> diff --git a/linux-core/drm_crtc.h b/linux-core/drm_crtc.h
> index caceb65..d4bb879 100644
> --- a/linux-core/drm_crtc.h
> +++ b/linux-core/drm_crtc.h
> @@ -90,6 +90,8 @@ enum drm_mode_status {
>       .vsync_start = (vss), .vsync_end = (vse), .vtotal = (vt), \
>       .vscan = (vs), .flags = (f), .vrefresh = 0
>  
> +#define CRTC_INTERLACE_HALVE_V 0x1 /* halve V values for interlacing */
> +
>  struct drm_display_mode {
>       /* Header */
>       struct list_head head;
> @@ -147,51 +149,6 @@ struct drm_display_mode {
>       float hsync;
>  };
>  
> -/* Video mode flags */
> -#define V_PHSYNC     (1<<0)
> -#define V_NHSYNC     (1<<1)
> -#define V_PVSYNC     (1<<2)
> -#define V_NVSYNC     (1<<3)
> -#define V_INTERLACE  (1<<4)
> -#define V_DBLSCAN    (1<<5)
> -#define V_CSYNC              (1<<6)
> -#define V_PCSYNC     (1<<7)
> -#define V_NCSYNC     (1<<8)
> -#define V_HSKEW              (1<<9) /* hskew provided */
> -#define V_BCAST              (1<<10)
> -#define V_PIXMUX     (1<<11)
> -#define V_DBLCLK     (1<<12)
> -#define V_CLKDIV2    (1<<13)

...

> --- a/shared-core/drm.h
> +++ b/shared-core/drm.h
> @@ -1010,6 +1010,28 @@ struct drm_mm_info_arg {
>  #define DRM_MODE_TYPE_USERDEF        (1<<5)
>  #define DRM_MODE_TYPE_DRIVER (1<<6)
>  
> +/* Video mode flags */
> +#define V_PHSYNC     (1<<0)
> +#define V_NHSYNC     (1<<1)
> +#define V_PVSYNC     (1<<2)
> +#define V_NVSYNC     (1<<3)
> +#define V_INTERLACE  (1<<4)
> +#define V_DBLSCAN    (1<<5)
> +#define V_CSYNC              (1<<6)
> +#define V_PCSYNC     (1<<7)
> +#define V_NCSYNC     (1<<8)
> +#define V_HSKEW              (1<<9) /* hskew provided */
> +#define V_BCAST              (1<<10)
> +#define V_PIXMUX     (1<<11)
> +#define V_DBLCLK     (1<<12)
> +#define V_CLKDIV2    (1<<13)

This commit is causing conflict with the X server letting it doesn't 
compile anymore. Those video mode flags are already defined in 
hw/xfree86/common/xf86str.h.


Cheers,

Tiago Vignatti

-------------------------------------------------------------------------
Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW!
Studies have shown that voting for your favorite open source project,
along with a healthy diet, reduces your potential for chronic lameness
and boredom. Vote Now at http://www.sourceforge.net/community/cca08
--
_______________________________________________
Dri-devel mailing list
Dri-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/dri-devel

Reply via email to