Module Name: xsrc
Committed By: macallan
Date: Sun Dec 19 04:50:27 UTC 2021
Modified Files:
xsrc/external/mit/xf86-video-suncg14/dist/src: cg14_accel.c
Log Message:
always drain the pipeline before writing SX_ROP_CONTROL
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 \
xsrc/external/mit/xf86-video-suncg14/dist/src/cg14_accel.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-suncg14/dist/src/cg14_accel.c
diff -u xsrc/external/mit/xf86-video-suncg14/dist/src/cg14_accel.c:1.25 xsrc/external/mit/xf86-video-suncg14/dist/src/cg14_accel.c:1.26
--- xsrc/external/mit/xf86-video-suncg14/dist/src/cg14_accel.c:1.25 Fri Dec 10 21:57:13 2021
+++ xsrc/external/mit/xf86-video-suncg14/dist/src/cg14_accel.c Sun Dec 19 04:50:27 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: cg14_accel.c,v 1.25 2021/12/10 21:57:13 macallan Exp $ */
+/* $NetBSD: cg14_accel.c,v 1.26 2021/12/19 04:50:27 macallan Exp $ */
/*
* Copyright (c) 2013 Michael Lorenz
* All rights reserved.
@@ -450,6 +450,7 @@ CG14Copy8_short_rop(Cg14Ptr p, int srcst
/* mask out the leading pixels in dst by using a mask and ROP */
if (pre != 0) {
+ CG14Wait(p);
write_sx_reg(p, SX_ROP_CONTROL, (p->last_rop & 0xf0) | 0xa);
write_sx_reg(p, SX_QUEUED(R_MASK), 0xffffffff);
}
@@ -561,6 +562,7 @@ CG14Copy8_short_norop(Cg14Ptr p, int src
/* mask out the leading pixels in dst by using a mask and ROP */
if (pre != 0) {
+ CG14Wait(p);
write_sx_reg(p, SX_ROP_CONTROL, 0xca);
write_sx_reg(p, SX_QUEUED(R_MASK), lmask);
}
