33 lines
1019 B
Diff
33 lines
1019 B
Diff
|
--- kbd-1.14.1wip/src/kdfontop.c.orig 2008-03-03 23:47:18.160420000 +0100
|
||
|
|
+++ kbd-1.14.1wip/src/kdfontop.c 2008-03-03 23:52:32.918345000 +0100
|
||
|
|
@@ -268,6 +268,23 @@
|
||
|
|
return 0;
|
||
|
|
}
|
||
|
|
|
||
|
|
+#if 1
|
||
|
|
+ // We no longer try PIO_FONT* calls.
|
||
|
|
+ // A former patch even added a possible 5 seconds delay loop here, in an attempt to
|
||
|
|
+ // gain victory over kdm. We no do this fight, as it can only result in races.
|
||
|
|
+ // https://bugzilla.novell.com/show_bug.cgi?id=302010
|
||
|
|
+ //
|
||
|
|
+ // Two effects:
|
||
|
|
+ // a) Without the delay loop, we are fast enough to run early.
|
||
|
|
+ // Moving setfont calls to an earlier point most likly
|
||
|
|
+ // avoids the race.
|
||
|
|
+ // b) Without the old compat calls, it should be easier to
|
||
|
|
+ // fix this in kernel side.
|
||
|
|
+ //
|
||
|
|
+ fprintf(stderr, "%s: putfont: %d,%dx%d: failed: %d\n", progname, count, width, height, i);
|
||
|
|
+ perror("putfont: KDFONTOP");
|
||
|
|
+ return -1;
|
||
|
|
+#else
|
||
|
|
/* Second attempt: PIO_FONTX */
|
||
|
|
cfd.charcount = count;
|
||
|
|
cfd.charheight = height;
|
||
|
|
@@ -302,4 +319,5 @@
|
||
|
|
return -1;
|
||
|
|
}
|
||
|
|
return 0;
|
||
|
|
+#endif
|
||
|
|
}
|