diff --git a/[refs] b/[refs] index 837926bb8810..cdd43ef6953f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1b2f2fe8ac0273ae9a9b480b799ce62d832168cb +refs/heads/master: a524d946bdced73c5fbe60170fb33611491c4211 diff --git a/trunk/drivers/video/tgafb.c b/trunk/drivers/video/tgafb.c index 2a6bfcdc3039..781ca7f77c09 100644 --- a/trunk/drivers/video/tgafb.c +++ b/trunk/drivers/video/tgafb.c @@ -197,7 +197,9 @@ tgafb_set_par(struct fb_info *info) while (TGA_READ_REG(par, TGA_CMD_STAT_REG) & 1) /* wait for not busy */ continue; mb(); - TGA_WRITE_REG(par, deep_presets[tga_type], TGA_DEEP_REG); + TGA_WRITE_REG(par, deep_presets[tga_type] | + (par->sync_on_green ? 0x0 : 0x00010000), + TGA_DEEP_REG); while (TGA_READ_REG(par, TGA_CMD_STAT_REG) & 1) /* wait for not busy */ continue; mb(); @@ -261,11 +263,11 @@ tgafb_set_par(struct fb_info *info) } else { /* 24-plane or 24plusZ */ - /* Init BT463 registers. */ + /* Init BT463 RAMDAC registers. */ BT463_WRITE(par, BT463_REG_ACC, BT463_CMD_REG_0, 0x40); BT463_WRITE(par, BT463_REG_ACC, BT463_CMD_REG_1, 0x08); BT463_WRITE(par, BT463_REG_ACC, BT463_CMD_REG_2, - (par->sync_on_green ? 0x80 : 0x40)); + (par->sync_on_green ? 0xc0 : 0x40)); BT463_WRITE(par, BT463_REG_ACC, BT463_READ_MASK_0, 0xff); BT463_WRITE(par, BT463_REG_ACC, BT463_READ_MASK_1, 0xff);