xserver: Branch 'master'

[GitLab Mirror]

 exa/exa_accel.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 83826075e59c0393c16d2a2482dc5c9f2fdf4564
Author: George Matsumura <gmmatsumura01 at bvsd.org>
Date:   Thu Dec 26 23:01:26 2019 +0000

    Restrict 1x1 pixmap filling optimization to GXcopy
    
    This restricts an optimization whereby the filling of 1x1 pixmaps
    went around the driver-provided function to cases where the
    source color is meant to be directly copied to the destination,
    as opposed to other operations which should produce different
    destination values than just the foreground color.
    
    Signed-off-by: George Matsumura <gmmatsumura01 at bvsd.org>
    Reviewed-by: Michel Dänzer <mdaenzer at redhat.com>

diff --git a/exa/exa_accel.c b/exa/exa_accel.c
index b26d5c804..41fcb129f 100644
--- a/exa/exa_accel.c
+++ b/exa/exa_accel.c
@@ -1037,7 +1037,7 @@ exaFillRegionSolid(DrawablePtr pDrawable, RegionPtr pRegion, Pixel pixel,
         if (pExaPixmap->pDamage &&
             pExaPixmap->sys_ptr && pDrawable->type == DRAWABLE_PIXMAP &&
             pDrawable->width == 1 && pDrawable->height == 1 &&
-            pDrawable->bitsPerPixel != 24) {
+            pDrawable->bitsPerPixel != 24 && alu == GXcopy) {
             RegionPtr pending_damage = DamagePendingRegion(pExaPixmap->pDamage);
 
             switch (pDrawable->bitsPerPixel) {