[PATCH 1/2] EXA/mixed: Don't clear deferred status of pixmaps if migration is limited.

[Maarten Maathuis]

Acked-by: Maarten Maathuis <madman2003 at gmail.com>

2009/12/28 Michel Dänzer <michel at daenzer.net>:
> From: Michel Dänzer <daenzer at vmware.com>
>
> * With optimized migration, only the pending damage region is synchronized for
>  destination pixmaps.
> * Migration of source pixmaps can be limited to a bounding region.
>
> Signed-off-by: Michel Dänzer <daenzer at vmware.com>
> ---
>  exa/exa_migration_mixed.c |    3 ++-
>  1 files changed, 2 insertions(+), 1 deletions(-)
>
> diff --git a/exa/exa_migration_mixed.c b/exa/exa_migration_mixed.c
> index b755b83..14cb5a7 100644
> --- a/exa/exa_migration_mixed.c
> +++ b/exa/exa_migration_mixed.c
> @@ -112,7 +112,8 @@ exaDoMigration_mixed(ExaMigrationPtr pixmaps, int npixmaps, Bool can_accel)
>            pPixmap->devKind = pExaPixmap->fb_pitch;
>            exaCopyDirtyToFb(pixmaps + i);
>
> -           if (pExaScr->deferred_mixed_pixmap == pPixmap)
> +           if (pExaScr->deferred_mixed_pixmap == pPixmap &&
> +               !pixmaps[i].as_dst && !pixmaps[i].pReg)
>                pExaScr->deferred_mixed_pixmap = NULL;
>        }
>
> --
> 1.6.5.7
>
> _______________________________________________
> xorg-devel mailing list
> xorg-devel at lists.x.org
> http://lists.x.org/mailman/listinfo/xorg-devel
>