View | Details | Raw Unified | Return to bug 150146
Collapse All | Expand All

(-)ati/radeon_accel.c (-10 / +8 lines)
Lines 292-310 Link Here
292
{
292
{
293
    RADEONInfoPtr  info       = RADEONPTR(pScrn);
293
    RADEONInfoPtr  info       = RADEONPTR(pScrn);
294
    unsigned char *RADEONMMIO = info->MMIO;
294
    unsigned char *RADEONMMIO = info->MMIO;
295
    int            pitch64;
296
295
297
    RADEONTRACE(("EngineRestore (%d/%d)\n",
296
    RADEONTRACE(("EngineRestore (%d/%d)\n",
298
		 info->CurrentLayout.pixel_code,
297
		 info->CurrentLayout.pixel_code,
299
		 info->CurrentLayout.bitsPerPixel));
298
		 info->CurrentLayout.bitsPerPixel));
300
299
301
    RADEONWaitForFifo(pScrn, 1);
300
    /* Setup engine location. This shouldn't be necessary since we
302
301
     * set them appropriately before any accel ops, but let's avoid
303
    pitch64 = ((pScrn->displayWidth * (pScrn->bitsPerPixel / 8) + 0x3f)) >> 6;
302
     * random bogus DMA in case we inadvertently trigger the engine
304
303
     * in the wrong place (happened).
305
/*    RADEONWaitForFifo(pScrn, 2);
304
     */
305
    RADEONWaitForFifo(pScrn, 2);
306
    OUTREG(RADEON_DST_PITCH_OFFSET, info->dst_pitch_offset);
306
    OUTREG(RADEON_DST_PITCH_OFFSET, info->dst_pitch_offset);
307
    OUTREG(RADEON_SRC_PITCH_OFFSET, info->dst_pitch_offset);*/
307
    OUTREG(RADEON_SRC_PITCH_OFFSET, info->dst_pitch_offset);
308
308
309
    RADEONWaitForFifo(pScrn, 1);
309
    RADEONWaitForFifo(pScrn, 1);
310
#if X_BYTE_ORDER == X_BIG_ENDIAN
310
#if X_BYTE_ORDER == X_BIG_ENDIAN
Lines 326-334 Link Here
326
				       | RADEON_GMC_BRUSH_SOLID_COLOR
326
				       | RADEON_GMC_BRUSH_SOLID_COLOR
327
				       | RADEON_GMC_SRC_DATATYPE_COLOR));
327
				       | RADEON_GMC_SRC_DATATYPE_COLOR));
328
328
329
    RADEONWaitForFifo(pScrn, 7);
329
    RADEONWaitForFifo(pScrn, 5);
330
    OUTREG(RADEON_DST_LINE_START,    0);
331
    OUTREG(RADEON_DST_LINE_END,      0);
332
    OUTREG(RADEON_DP_BRUSH_FRGD_CLR, 0xffffffff);
330
    OUTREG(RADEON_DP_BRUSH_FRGD_CLR, 0xffffffff);
333
    OUTREG(RADEON_DP_BRUSH_BKGD_CLR, 0x00000000);
331
    OUTREG(RADEON_DP_BRUSH_BKGD_CLR, 0x00000000);
334
    OUTREG(RADEON_DP_SRC_FRGD_CLR,   0xffffffff);
332
    OUTREG(RADEON_DP_SRC_FRGD_CLR,   0xffffffff);

Return to bug 150146