[PATCH 2/3] exa/mixed: setting devKind before exaCopyDirty* is not needed

Michel Dänzer michel at daenzer.net
Thu Dec 3 00:03:45 PST 2009


On Wed, 2009-12-02 at 20:24 +0100, Maarten Maathuis wrote: 
> Signed-off-by: Maarten Maathuis <madman2003 at gmail.com>
> ---
>  exa/exa_migration_mixed.c |   12 ++++++++----
>  1 files changed, 8 insertions(+), 4 deletions(-)
> 
> diff --git a/exa/exa_migration_mixed.c b/exa/exa_migration_mixed.c
> index a7fdf63..274fde3 100644
> --- a/exa/exa_migration_mixed.c
> +++ b/exa/exa_migration_mixed.c
> @@ -101,6 +101,13 @@ exaDoMigration_mixed(ExaMigrationPtr pixmaps, int npixmaps, Bool can_accel)
>  	if (pExaPixmap->pDamage && exaPixmapHasGpuCopy(pPixmap)) {
>  	    ExaScreenPriv(pPixmap->drawable.pScreen);
>  
> +	    /* This pitch is needed for proper acceleration. For some reason
> +	     * there are pixmaps without pDamage and a bad fb_pitch value.
> +	     * So setting devKind when only exaPixmapHasGpuCopy() is true
> +	     * causes corruption. Pixmaps without pDamage are not migrated
> +	     * and should have a valid devKind at all times, so that's why this
> +	     * isn't causing problems. Pixmaps have their gpu pitch set the
> +	     * first time in the MPH call from exaCreateDriverPixmap_mixed(). */

The */ should go on the next line such that all the asterisks align.

With that fixed,

Acked-by: Michel Dänzer <michel at daenzer.net>


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


More information about the xorg-devel mailing list