diff options
| author | faith <faith> | 2000-01-12 10:53:03 +0000 |
|---|---|---|
| committer | faith <faith> | 2000-01-12 10:53:03 +0000 |
| commit | 97912dcc32d2d35550c6c2dd96be62457fe78645 (patch) | |
| tree | d256a8d1d2b3678d7c11f24b625f276bc38c42cd | |
| parent | aaf0250c05ea51b0b850b2b4675d611faccb0fe7 (diff) | |
Fix known r128 bugs on this branch.smt-0-0-1-20000112-base
| -rw-r--r-- | xc/programs/Xserver/hw/xfree86/drivers/r128/r128_accel.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/xc/programs/Xserver/hw/xfree86/drivers/r128/r128_accel.c b/xc/programs/Xserver/hw/xfree86/drivers/r128/r128_accel.c index 4a0a1089c..0aff918a2 100644 --- a/xc/programs/Xserver/hw/xfree86/drivers/r128/r128_accel.c +++ b/xc/programs/Xserver/hw/xfree86/drivers/r128/r128_accel.c @@ -223,13 +223,15 @@ static void R128SetupForSolidFill(ScrnInfoPtr pScrn, R128InfoPtr info = R128PTR(pScrn); unsigned char *R128MMIO = info->MMIO; - R128WaitForFifo(pScrn, 3); + R128WaitForFifo(pScrn, 4); OUTREG(R128_DP_GUI_MASTER_CNTL, (info->dp_gui_master_cntl | R128_GMC_BRUSH_SOLID_COLOR | R128_GMC_SRC_DATATYPE_COLOR | R128_ROP[rop].pattern)); OUTREG(R128_DP_BRUSH_FRGD_CLR, color); OUTREG(R128_DP_WRITE_MASK, planemask); + OUTREG(R128_DP_CNTL, (R128_DST_X_LEFT_TO_RIGHT + | R128_DST_Y_TOP_TO_BOTTOM)); } /* Subsequent XAA SolidFillRect. @@ -996,6 +998,7 @@ Bool R128AccelInit(ScreenPtr pScreen) | BIT_ORDER_IN_BYTE_LSBFIRST); /* Indirect CPU-To-Screen Color Expand */ + a->ScanlineCPUToScreenColorExpandFillFlags = 0; a->NumScanlineColorExpandBuffers = 1; a->ScanlineColorExpandBuffers = info->scratch_buffer; #if R128_IMAGEWRITE |