[Intel-gfx] TV Out strobing regression bisected

[Robert Lowery]

Folks,

I have an AOpen MP965-DR mini PC that I run a projector over DVI at
1920x1080 and a TV over component at 576p.  Updating to the master intel
driver has made the TV Out flash like a strobe light as if the picture is
too big for the screen.

I have bisected it to the below commit and confirmed that master minus
this commit works fine for me.

Any suggestions?

-Rob

commit id b9f5915ce812144ffd9d2aa42e8ba856129c35e,
which resolved bug #17235, but generate new regression-bug #19715.
This patch intends to resolve bug #17235, and avoid regression as well.
We have successfully re-tested it for bug #17235 and #19715 respectively.

diff --git a/src/i830_display.c b/src/i830_display.c
index 7a8e96d..8ecb5e5 100644
--- a/src/i830_display.c
+++ b/src/i830_display.c
@@ -808,10 +808,6 @@ i830_disable_vga_plane (xf86CrtcPtr crtc)

     vgacntrl |= VGA_DISP_DISABLE;

-    /* disable center mode */
-    if (IS_I9XX(pI830))
-	vgacntrl &= ~(3 << 24);
-
     OUTREG(VGACNTRL, vgacntrl);
     i830WaitForVblank(pScrn);