[Spice-devel] [PATCH xf86-video-qxl] src/qxl_driver: use the new dixScreenSpecificPrivatesSize

[Jeremy White]

Hey Alon (and all),

Could this patch be done instead with an #ifdef on XORG_VERSION_CURRENT?

It'd be nice if the tip of spice could continue to be useful with older
Xorgs (said a guy who's focused on RHEL development... :-/).

If that would be okay, I can spin up a patch for it.

Cheers,

Jeremy

> This fix breaks backward compat. The next release will only work with
> xorg-xserver >= 1.12.99.901
> 
> RHBZ: 844463
> ---
>  src/qxl_driver.c | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/src/qxl_driver.c b/src/qxl_driver.c
> index d6edb3a..7116d8c 100644
> --- a/src/qxl_driver.c
> +++ b/src/qxl_driver.c
> @@ -1529,8 +1529,9 @@ qxl_screen_init(SCREEN_INIT_ARGS_DECL)
>      DamageSetup(pScreen);
>  
>      /* We need to set totalPixmapSize after setup_uxa and Damage,
> -       as the privatessize is not computed correctly until then */
> -    pScreen->totalPixmapSize = BitmapBytePad((sizeof(PixmapRec) + dixPrivatesSize(PRIVATE_PIXMAP) ) * 8);
> +       as the privatssize is not computed correctly until then */
> +    pScreen->totalPixmapSize = BitmapBytePad((sizeof(PixmapRec) +
> +			    dixScreenSpecificPrivatesSize(pScreen, PRIVATE_PIXMAP) ) * 8);
>  
>      miDCInitialize(pScreen, xf86GetPointerScreenFuncs());
>      if (!miCreateDefColormap(pScreen))