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

(-)a/src/i830_driver.c (-2 / +14 lines)
Lines 2052-2058 RestoreHWState(ScrnInfoPtr pScrn) Link Here
2052
      OUTREG(DSPASURF, pI830->saveDSPASURF);
2052
      OUTREG(DSPASURF, pI830->saveDSPASURF);
2053
      OUTREG(DSPATILEOFF, pI830->saveDSPATILEOFF);
2053
      OUTREG(DSPATILEOFF, pI830->saveDSPATILEOFF);
2054
   }
2054
   }
2055
   OUTREG(PIPEACONF, pI830->savePIPEACONF);
2055
   /*
2056
    * Make sure the DPLL is active and not in VGA mode or the
2057
    * write of PIPEnCONF may cause a crash
2058
    */
2059
   if ((pI830->saveDPLL_B & DPLL_VCO_ENABLE) &&
2060
       (pI830->saveDPLL_B & DPLL_VGA_MODE_DIS))
2061
	   OUTREG(PIPEACONF, pI830->savePIPEACONF);
2056
   i830WaitForVblank(pScrn);
2062
   i830WaitForVblank(pScrn);
2057
   OUTREG(DSPACNTR, pI830->saveDSPACNTR);
2063
   OUTREG(DSPACNTR, pI830->saveDSPACNTR);
2058
   OUTREG(DSPABASE, INREG(DSPABASE));
2064
   OUTREG(DSPABASE, INREG(DSPABASE));
Lines 2092-2098 RestoreHWState(ScrnInfoPtr pScrn) Link Here
2092
	 OUTREG(DSPBSURF, pI830->saveDSPBSURF);
2098
	 OUTREG(DSPBSURF, pI830->saveDSPBSURF);
2093
	 OUTREG(DSPBTILEOFF, pI830->saveDSPBTILEOFF);
2099
	 OUTREG(DSPBTILEOFF, pI830->saveDSPBTILEOFF);
2094
      }
2100
      }
2095
      OUTREG(PIPEBCONF, pI830->savePIPEBCONF);
2101
2102
      /*
2103
       * See PIPEnCONF note above
2104
       */
2105
      if ((pI830->saveDPLL_B & DPLL_VCO_ENABLE) &&
2106
	  (pI830->saveDPLL_B & DPLL_VGA_MODE_DIS))
2107
	      OUTREG(PIPEBCONF, pI830->savePIPEBCONF);
2096
      i830WaitForVblank(pScrn);
2108
      i830WaitForVblank(pScrn);
2097
      OUTREG(DSPBCNTR, pI830->saveDSPBCNTR);
2109
      OUTREG(DSPBCNTR, pI830->saveDSPBCNTR);
2098
      OUTREG(DSPBBASE, INREG(DSPBBASE));
2110
      OUTREG(DSPBBASE, INREG(DSPBBASE));

Return to bug 327064