Commit ed9d059f authored by Petr Vandrovec's avatar Petr Vandrovec

[PATCH] Small matroxfb fixes

* Fix compile warning in matroxfb when only 8bpp support is enabled.
* Set memory type correctly on Matrox G400.
parent b51c0c92
......@@ -758,6 +758,7 @@ static void matrox_cfb8_revc(struct display* p, int xx, int yy) {
}
#endif
#if defined(FBCON_HAS_CFB16) || defined(FBCON_HAS_CFB24) || defined(FBCON_HAS_CFB32)
static void matrox_cfbX_revc(struct display* p, int xx, int yy) {
CRITFLAGS
MINFO_FROM_DISP(p);
......@@ -778,6 +779,7 @@ static void matrox_cfbX_revc(struct display* p, int xx, int yy) {
CRITEND
}
#endif
static void matrox_cfbX_clear_margins(struct vc_data* conp, struct display* p, int bottom_only) {
unsigned int bottom_height, right_width;
......
......@@ -849,7 +849,7 @@ static int parse_pins4(WPMINFO const struct matrox_bios* bd) {
( bd->pins[86] & 0x0000000F);
MINFO->values.reg.opt = ((bd->pins[53] << 15) & 0x00400000) |
((bd->pins[53] << 22) & 0x10000000) |
((bd->pins[53] << 10) & 0x00001C00);
((bd->pins[53] << 7) & 0x00001C00);
MINFO->values.reg.opt3 = get_u32(bd->pins + 67);
MINFO->values.pll.system = (bd->pins[ 65] == 0xFF) ? 200000 : bd->pins[ 65] * 4000;
MINFO->features.pll.ref_freq = (bd->pins[ 92] & 0x01) ? 14318 : 27000;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment