Index: trunk/i386/libsaio/nvidia.c =================================================================== --- trunk/i386/libsaio/nvidia.c (revision 990) +++ trunk/i386/libsaio/nvidia.c (revision 991) @@ -1318,41 +1318,39 @@ } } - if (getValueForKey(kdcfg0, &value, &len, &bootInfo->bootConfig) && len == DCFG0_LEN * 2) - { + if (getValueForKey(kdcfg0, &value, &len, &bootInfo->bootConfig) && len == DCFG0_LEN * 2){ + uint8_t new_dcfg0[DCFG0_LEN]; - + if (hex2bin(value, new_dcfg0, DCFG0_LEN) == 0) { - verbose("Using user supplied @0,display-cfg\n"); + memcpy(default_dcfg_0, new_dcfg0, DCFG0_LEN); + + verbose("Using user supplied @0,display-cfg\n"); printf("@0,display-cfg: %02x%02x%02x%02x\n", default_dcfg_0[0], default_dcfg_0[1], default_dcfg_0[2], default_dcfg_0[3]); - devprop_add_value(device, "@0,display-cfg", default_dcfg_0, DCFG0_LEN); + } - - - } - if (getValueForKey(kdcfg1, &value, &len, &bootInfo->bootConfig) && len == DCFG1_LEN * 2) - { + if (getValueForKey(kdcfg1, &value, &len, &bootInfo->bootConfig) && len == DCFG1_LEN * 2){ + uint8_t new_dcfg1[DCFG1_LEN]; - + if (hex2bin(value, new_dcfg1, DCFG1_LEN) == 0) { - verbose("Using user supplied @1,display-cfg\n"); memcpy(default_dcfg_1, new_dcfg1, DCFG1_LEN); + + verbose("Using user supplied @1,display-cfg\n"); printf("@1,display-cfg: %02x%02x%02x%02x\n", default_dcfg_1[0], default_dcfg_1[1], default_dcfg_1[2], default_dcfg_1[3]); - - - devprop_add_value(device, "@1,display-cfg", default_dcfg_1, DCFG1_LEN); + } + } - @@ -1370,9 +1368,10 @@ devprop_add_value(device, "VRAM,totalsize", (uint8_t*)&videoRam, 4); devprop_add_value(device, "model", (uint8_t*)model, strlen(model) + 1); devprop_add_value(device, "rom-revision", (uint8_t*)biosVersion, strlen(biosVersion) + 1); + devprop_add_value(device, "@0,display-cfg", default_dcfg_0, DCFG0_LEN); + devprop_add_value(device, "@1,display-cfg", default_dcfg_1, DCFG1_LEN); - if (getBoolForKey(kVBIOS, &doit, &bootInfo->bootConfig) && doit) { devprop_add_value(device, "vbios", rom, (nvBiosOveride > 0) ? nvBiosOveride : (rom[2] * 512)); }