changelog shortlog tags branches files raw gz bz2 help

Mercurial > hg > plan9front / changeset: merge

changeset 4190: fbe5f205ecc4
parent 4188: f0be8cddca55
parent 4189: f257885c429b
child 4191: 6c111860e9b6
author: cinap_lenrek@felloff.net
date: Sat, 10 Jan 2015 02:16:50 +0100
files:
description: merge
     1.1--- a/sys/src/cmd/aux/vga/igfx.c
     1.2+++ b/sys/src/cmd/aux/vga/igfx.c
     1.3@@ -592,8 +592,11 @@ initdatalinkmn(Trans *t, int freq, int l
     1.4 static void
     1.5 inittrans(Trans *t, Mode *m)
     1.6 {
     1.7+	/* clear all but 27:28 frame start delay (initialized by bios) */
     1.8+	t->conf.v &= 3<<27;
     1.9+
    1.10 	/* tans/pipe enable */
    1.11-	t->conf.v = 1<<31;
    1.12+	t->conf.v |= 1<<31;
    1.13 
    1.14 	/* trans/pipe timing */
    1.15 	t->ht.v = (m->ht - 1)<<16 | (m->x - 1);
    1.16@@ -752,14 +755,6 @@ init(Vga* vga, Ctlr* ctlr)
    1.17 
    1.18 	initpipe(p, m);
    1.19 
    1.20-	/*
    1.21-	 * undocumented magic that makes the flickering
    1.22-	 * top bar go away on x230 on lcd. found by
    1.23-	 * comparing registers set by vesa bios.
    1.24-	 */
    1.25-	if(igfx->type == TypeIVB && islvds)
    1.26-		p->conf.v |= 3<<27;
    1.27-
    1.28 	ctlr->flag |= Finit;
    1.29 }
    1.30