[ANNOUNCE] xf86-video-intel-2.1.99

[Colin Guthrie]

Jesse Barnes wrote:
>> 04_fix_hw_restore.diff
> 
> Already upstream.

Just had a user report to my that a similar fix he did in his RPM seemed
to fix things but the 2.1.99 package I issued didn't work for him.

On closer inspection I wonder if the patch applied in upstream has a
typo (circa line 2058):

   /*
    * Make sure the DPLL is active and not in VGA mode or the
    * write of PIPEnCONF may cause a crash
    */
   if ((pI830->saveDPLL_B & DPLL_VCO_ENABLE) &&
       (pI830->saveDPLL_B & DPLL_VGA_MODE_DIS))
           OUTREG(PIPEACONF, pI830->savePIPEACONF);
.......

      /*
       * See PIPEnCONF note above
       */
      if ((pI830->saveDPLL_B & DPLL_VCO_ENABLE) &&
          (pI830->saveDPLL_B & DPLL_VGA_MODE_DIS))
              OUTREG(PIPEBCONF, pI830->savePIPEBCONF);


In the first hunk it seems to be checking the wrong info. Should the
following patch be applied:

--- src/i830_driver.c~  2007-11-09 12:12:39.000000000 +0000
+++ src/i830_driver.c   2007-11-12 12:01:43.000000000 +0000
@@ -2059,8 +2059,8 @@
     * Make sure the DPLL is active and not in VGA mode or the
     * write of PIPEnCONF may cause a crash
     */
-   if ((pI830->saveDPLL_B & DPLL_VCO_ENABLE) &&
-       (pI830->saveDPLL_B & DPLL_VGA_MODE_DIS))
+   if ((pI830->saveDPLL_A & DPLL_VCO_ENABLE) &&
+       (pI830->saveDPLL_A & DPLL_VGA_MODE_DIS))
           OUTREG(PIPEACONF, pI830->savePIPEACONF);
    i830WaitForVblank(pScrn);
    OUTREG(DSPACNTR, pI830->saveDSPACNTR);



Col