xf86-video-ati: Branch 'randr-1.2'

[Michel Dänzer]

On Thu, 2007-05-31 at 21:24 -0700, Matthieu Herrb wrote:
> src/radeon_crtc.c |    4 ++++
>  1 files changed, 4 insertions(+)
> 
> New commits:
> diff-tree 802804461ebdca9a951e7e562ec68fd08d8eae01 (from 0e0946e0aa2527794e07473199e851bbfbc47cb1)
> Author: Matthieu Herrb <matthieu at deville.herrb.com>
> Date:   Thu May 31 22:23:57 2007 -0600
> 
>     Fix build whithout XF86DRI
> 
> diff --git a/src/radeon_crtc.c b/src/radeon_crtc.c
> index 79ab578..bee05e2 100644
> --- a/src/radeon_crtc.c
> +++ b/src/radeon_crtc.c
> @@ -255,8 +255,10 @@ RADEONInitCrtcRegisters(xf86CrtcPtr crtc
>  				     : 0));
>  
>      save->crtc_offset      = pScrn->fbOffset;
> +#ifdef XF86DRI
>      if (info->allowPageFlip)
>  	save->crtc_offset_cntl = RADEON_CRTC_OFFSET_FLIP_CNTL;
> +#endif
>  
>      if (info->tilingEnabled) {
>         if (IS_R300_VARIANT)
> @@ -443,8 +445,10 @@ RADEONInitCrtc2Registers(xf86CrtcPtr crt
>      /* It seems all fancy options apart from pflip can be safely disabled
>       */
>      save->crtc2_offset      = pScrn->fbOffset;
> +#ifdef XF86DRI
>      if (info->allowPageFlip)
>  	save->crtc2_offset_cntl = RADEON_CRTC_OFFSET_FLIP_CNTL;
> +#endif

Hmm, looks like I accidentally sneaked in my experimental changes to
prevent page flipping from breaking on mode / VT switches. Feel free to
revert that part if it causes any trouble.


-- 
Earthling Michel Dänzer           |          http://tungstengraphics.com
Libre software enthusiast         |          Debian, X and DRI developer