Remove the silly symlinking rules from the intelfb makefile and remove
one of the copies of the private copy of modedb in intelfb. Maybe
someone who actually has the hardware could fix it to properly use
modedb directly.
--- 1.1/drivers/video/intel/Makefile Sun Feb 23 19:07:33 2003
+++ edited/drivers/video/intel/Makefile Fri Mar 21 16:46:30 2003
@@ -8,11 +8,3 @@
include $(TOPDIR)/Rules.make
intelfbdrv.o: builtinmodes.c
-
-builtinmodes.c: modes.c
- rm -f builtinmodes.c
- ln -s modes.c builtinmodes.c
-
-clean:
- rm -f core *.o *.a *.s builtinmodes.c
-
--- 1.1/drivers/video/intel/modes.c Sun Feb 23 19:07:47 2003
+++ edited/drivers/video/intel/modes.c Fri Mar 21 16:46:37 2003
@@ -1,222 +0,0 @@
-
-/*
- * THIS FILE IS AUTOMATICALLY GENERATED BY fbmode.pl -- DO NOT EDIT
- */
-
-static struct fb_videomode modedb[] = {
- {
- /* 640x350 @ 85 Hz, 37.9 kHz hsync */
- "640x350@85", 85, 640, 350, 31746, 96, 32, 60, 32, 64, 3,
- FB_SYNC_HOR_HIGH_ACT, FB_VMODE_NONINTERLACED
- },
- {
- /* 640x400 @ 85 Hz, 37.9 kHz hsync */
- "640x400@85", 85, 640, 400, 31746, 96, 32, 41, 1, 64, 3,
- FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED
- },
- {
- /* 720x400 @ 85 Hz, 37.9 kHz hsync */
- "720x400@85", 85, 720, 400, 28169, 108, 36, 42, 1, 72, 3,
- FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED
- },
- {
- /* 640x480 @ 60 Hz, 31.5 kHz hsync */
- "640x480@60", 60, 640, 480, 39683, 48, 16, 33, 10, 96, 2,
- 0, FB_VMODE_NONINTERLACED
- },
- {
- /* 640x480 @ 73 Hz, 37.9 kHz hsync */
- "640x480@73", 73, 640, 480, 31746, 128, 24, 29, 9, 40, 2,
- 0, FB_VMODE_NONINTERLACED
- },
- {
- /* 640x480 @ 75 Hz, 37.5 kHz hsync */
- "640x480@75", 75, 640, 480, 31746, 120, 16, 16, 1, 64, 3,
- 0, FB_VMODE_NONINTERLACED
- },
- {
- /* 640x480 @ 85 Hz, 43.3 kHz hsync */
- "640x480@85", 85, 640, 480, 27778, 80, 56, 25, 1, 56, 3,
- 0, FB_VMODE_NONINTERLACED
- },
- {
- /* 800x600 @ 56 Hz, 35.2 kHz hsync */
- "800x600@56", 56, 800, 600, 27778, 128, 24, 22, 1, 72, 2,
- FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED
- },
- {
- /* 800x600 @ 60 Hz, 37.9 kHz hsync */
- "800x600@60", 60, 800, 600, 25000, 88, 40, 23, 1, 128, 4,
- FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED
- },
- {
- /* 800x600 @ 72 Hz, 48.1 kHz hsync */
- "800x600@72", 72, 800, 600, 20000, 64, 56, 23, 37, 120, 6,
- FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED
- },
- {
- /* 800x600 @ 75 Hz, 46.9 kHz hsync */
- "800x600@75", 75, 800, 600, 20202, 160, 16, 21, 1, 80, 3,
- FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED
- },
- {
- /* 800x600 @ 85 Hz, 53.7 kHz hsync */
- "800x600@85", 85, 800, 600, 17762, 152, 32, 27, 1, 64, 3,
- FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED
- },
- {
- /* 1024x768 @ 60 Hz, 48.4 kHz hsync */
- "1024x768@60", 60, 1024, 768, 15385, 160, 24, 29, 3, 136, 6,
- 0, FB_VMODE_NONINTERLACED
- },
- {
- /* 1024x768 @ 70 Hz, 56.5 kHz hsync */
- "1024x768@70", 70, 1024, 768, 13333, 144, 24, 29, 3, 136, 6,
- 0, FB_VMODE_NONINTERLACED
- },
- {
- /* 1024x768 @ 75 Hz, 60.1 kHz hsync */
- "1024x768@75", 75, 1024, 768, 12690, 176, 16, 28, 1, 96, 3,
- FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED
- },
- {
- /* 1024x768 @ 85 Hz, 68.7 kHz hsync */
- "1024x768@85", 85, 1024, 768, 10582, 208, 48, 36, 1, 96, 3,
- FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED
- },
- {
- /* 1152x864 @ 75 Hz, 67.5 kHz hsync */
- "1152x864@75", 75, 1152, 864, 9259, 256, 64, 32, 1, 128, 3,
- FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED
- },
- {
- /* 1280x960 @ 60 Hz, 60.0 kHz hsync */
- "1280x960@60", 60, 1280, 960, 9259, 312, 96, 36, 1, 112, 3,
- FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED
- },
- {
- /* 1280x960 @ 85 Hz, 85.9 kHz hsync */
- "1280x960@85", 85, 1280, 960, 6734, 224, 64, 47, 1, 160, 3,
- FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED
- },
- {
- /* 1280x1024 @ 60 Hz, 64.0 kHz hsync */
- "1280x1024@60", 60, 1280, 1024, 9259, 248, 48, 38, 1, 112, 3,
- FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED
- },
- {
- /* 1280x1024 @ 75 Hz, 80.0 kHz hsync */
- "1280x1024@75", 75, 1280, 1024, 7407, 248, 16, 38, 1, 144, 3,
- FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED
- },
- {
- /* 1280x1024 @ 85 Hz, 91.1 kHz hsync */
- "1280x1024@85", 85, 1280, 1024, 6349, 224, 64, 44, 1, 160, 3,
- FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED
- },
- {
- /* 1600x1200 @ 60 Hz, 75.0 kHz hsync */
- "1600x1200@60", 60, 1600, 1200, 6173, 304, 64, 46, 1, 192, 3,
- FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED
- },
- {
- /* 1600x1200 @ 65 Hz, 81.2 kHz hsync */
- "1600x1200@65", 65, 1600, 1200, 5698, 304, 64, 46, 1, 192, 3,
- FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED
- },
- {
- /* 1600x1200 @ 70 Hz, 87.5 kHz hsync */
- "1600x1200@70", 70, 1600, 1200, 5291, 304, 64, 46, 1, 192, 3,
- FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED
- },
- {
- /* 1600x1200 @ 75 Hz, 93.8 kHz hsync */
- "1600x1200@75", 75, 1600, 1200, 4938, 304, 64, 46, 1, 192, 3,
- FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED
- },
- {
- /* 1600x1200 @ 85 Hz, 106.2 kHz hsync */
- "1600x1200@85", 85, 1600, 1200, 4357, 304, 64, 46, 1, 192, 3,
- FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED
- },
- {
- /* 1792x1344 @ 60 Hz, 83.7 kHz hsync */
- "1792x1344@60", 60, 1792, 1344, 4883, 328, 128, 46, 1, 200, 3,
- FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED
- },
- {
- /* 1792x1344 @ 75 Hz, 106.3 kHz hsync */
- "1792x1344@75", 75, 1792, 1344, 3831, 352, 96, 69, 1, 216, 3,
- FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED
- },
- {
- /* 1856x1392 @ 60 Hz, 86.4 kHz hsync */
- "1856x1392@60", 60, 1856, 1392, 4581, 352, 96, 43, 1, 224, 3,
- FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED
- },
- {
- /* 1856x1392 @ 75 Hz, 112.5 kHz hsync */
- "1856x1392@75", 75, 1856, 1392, 3472, 352, 128, 104, 1, 224, 3,
- FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED
- },
- {
- /* 1920x1440 @ 60 Hz, 90.0 kHz hsync */
- "1920x1440@60", 60, 1920, 1440, 4274, 344, 128, 56, 1, 208, 3,
- FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED
- },
- {
- /* 1920x1440 @ 75 Hz, 112.5 kHz hsync */
- "1920x1440@75", 75, 1920, 1440, 3367, 352, 144, 56, 1, 224, 3,
- FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED
- },
- {
- /* 832x624 @ 75 Hz, 49.7 kHz hsync */
- "832x624@75", 75, 832, 624, 17457, 224, 32, 39, 1, 64, 3,
- 0, FB_VMODE_NONINTERLACED
- },
- {
- /* 1152x768 @ 55 Hz, 44.2 kHz hsync */
- "1152x768@55", 55, 1152, 768, 15386, 158, 26, 29, 3, 136, 6,
- FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED
- },
- {
- /* 1400x1050 @ 60 Hz, 64.9 kHz hsync */
- "1400x1050@60", 60, 1400, 1050, 8197, 240, 88, 18, 2, 152, 12,
- FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED
- },
- {
- /* 1400x1050 @ 75 Hz, 81.5 kHz hsync */
- "1400x1050@75", 75, 1400, 1050, 6418, 128, 64, 26, 2, 320, 12,
- FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED
- },
- {
- /* 1600x1024 @ 60 Hz, 64.0 kHz hsync */
- "1600x1024@60", 60, 1600, 1024, 9354, 30, 20, 37, 3, 20, 3,
- 0, FB_VMODE_NONINTERLACED
- },
- {
- /* 1920x1440 @ 85 Hz, 128.5 kHz hsync */
- "1920x1440@85", 85, 1920, 1440, 2930, 368, 152, 68, 1, 216, 3,
- FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED
- },
- {
- /* 2048x1536 @ 60 Hz, 95.3 kHz hsync */
- "2048x1536@60", 60, 2048, 1536, 3746, 376, 152, 49, 1, 224, 3,
- FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED
- },
- {
- /* 2048x1536 @ 75 Hz, 120.2 kHz hsync */
- "2048x1536@75", 75, 2048, 1536, 2937, 392, 168, 63, 1, 224, 3,
- FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED
- },
- {
- /* 2048x1536 @ 85 Hz, 137.0 kHz hsync */
- "2048x1536@85", 85, 2048, 1536, 2577, 392, 168, 72, 1, 224, 3,
- FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED
- }
-};
-
-static int num_modes = sizeof(modedb) / sizeof(modedb[0]);
-
-#define DFLT_MODE 3
-
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/