From c6d5841b5f693cd47a17b452735d20a1674b41b5 Mon Sep 17 00:00:00 2001 From: Aaro Koskinen Date: Sat, 7 Apr 2012 01:13:58 +0300 Subject: [PATCH] staging: xgifb: delete mode rows and columns Delete redudant rows and columns data. Signed-off-by: Aaro Koskinen Signed-off-by: Greg Kroah-Hartman --- drivers/staging/xgifb/XGI_main.h | 116 +++++++++++++++++++-------------------- 1 file changed, 57 insertions(+), 59 deletions(-) diff --git a/drivers/staging/xgifb/XGI_main.h b/drivers/staging/xgifb/XGI_main.h index b8f9337..0e2a625 100644 --- a/drivers/staging/xgifb/XGI_main.h +++ b/drivers/staging/xgifb/XGI_main.h @@ -90,124 +90,122 @@ static const struct _XGIbios_mode { u16 xres; u16 yres; u16 bpp; - u16 cols; - u16 rows; u8 chipset; } XGIbios_mode[] = { - { 0x56, 0x0000, 0x0000, 320, 240, 16, 40, 15, + { 0x56, 0x0000, 0x0000, 320, 240, 16, MD_XGI315}, - { 0x5A, 0x0000, 0x0000, 320, 480, 8, 40, 30, + { 0x5A, 0x0000, 0x0000, 320, 480, 8, MD_XGI315}, /* TW: FSTN */ - { 0x5B, 0x0000, 0x0000, 320, 480, 16, 40, 30, + { 0x5B, 0x0000, 0x0000, 320, 480, 16, MD_XGI315}, /* TW: FSTN */ - { 0x2E, 0x0101, 0x0101, 640, 480, 8, 80, 30, + { 0x2E, 0x0101, 0x0101, 640, 480, 8, MD_XGI300|MD_XGI315}, - { 0x44, 0x0111, 0x0111, 640, 480, 16, 80, 30, + { 0x44, 0x0111, 0x0111, 640, 480, 16, MD_XGI300|MD_XGI315}, - { 0x62, 0x013a, 0x0112, 640, 480, 32, 80, 30, + { 0x62, 0x013a, 0x0112, 640, 480, 32, MD_XGI300|MD_XGI315}, - { 0x31, 0x0000, 0x0000, 720, 480, 8, 90, 30, + { 0x31, 0x0000, 0x0000, 720, 480, 8, MD_XGI300|MD_XGI315}, - { 0x33, 0x0000, 0x0000, 720, 480, 16, 90, 30, + { 0x33, 0x0000, 0x0000, 720, 480, 16, MD_XGI300|MD_XGI315}, - { 0x35, 0x0000, 0x0000, 720, 480, 32, 90, 30, + { 0x35, 0x0000, 0x0000, 720, 480, 32, MD_XGI300|MD_XGI315}, - { 0x32, 0x0000, 0x0000, 720, 576, 8, 90, 36, + { 0x32, 0x0000, 0x0000, 720, 576, 8, MD_XGI300|MD_XGI315}, - { 0x34, 0x0000, 0x0000, 720, 576, 16, 90, 36, + { 0x34, 0x0000, 0x0000, 720, 576, 16, MD_XGI300|MD_XGI315}, - { 0x36, 0x0000, 0x0000, 720, 576, 32, 90, 36, + { 0x36, 0x0000, 0x0000, 720, 576, 32, MD_XGI300|MD_XGI315}, - { 0x36, 0x0000, 0x0000, 720, 576, 32, 90, 36, + { 0x36, 0x0000, 0x0000, 720, 576, 32, MD_XGI300|MD_XGI315}, - { 0x70, 0x0000, 0x0000, 800, 480, 8, 100, 30, + { 0x70, 0x0000, 0x0000, 800, 480, 8, MD_XGI300|MD_XGI315}, - { 0x7a, 0x0000, 0x0000, 800, 480, 16, 100, 30, + { 0x7a, 0x0000, 0x0000, 800, 480, 16, MD_XGI300|MD_XGI315}, - { 0x76, 0x0000, 0x0000, 800, 480, 32, 100, 30, + { 0x76, 0x0000, 0x0000, 800, 480, 32, MD_XGI300|MD_XGI315}, - { 0x30, 0x0103, 0x0103, 800, 600, 8, 100, 37, + { 0x30, 0x0103, 0x0103, 800, 600, 8, MD_XGI300|MD_XGI315}, #define DEFAULT_MODE 17 /* index for 800x600x16 */ - { 0x47, 0x0114, 0x0114, 800, 600, 16, 100, 37, + { 0x47, 0x0114, 0x0114, 800, 600, 16, MD_XGI300|MD_XGI315}, - { 0x63, 0x013b, 0x0115, 800, 600, 32, 100, 37, + { 0x63, 0x013b, 0x0115, 800, 600, 32, MD_XGI300|MD_XGI315}, - { 0x71, 0x0000, 0x0000, 1024, 576, 8, 128, 36, + { 0x71, 0x0000, 0x0000, 1024, 576, 8, MD_XGI300|MD_XGI315}, - { 0x74, 0x0000, 0x0000, 1024, 576, 16, 128, 36, + { 0x74, 0x0000, 0x0000, 1024, 576, 16, MD_XGI300|MD_XGI315}, - { 0x77, 0x0000, 0x0000, 1024, 576, 32, 128, 36, + { 0x77, 0x0000, 0x0000, 1024, 576, 32, MD_XGI300|MD_XGI315}, - { 0x77, 0x0000, 0x0000, 1024, 576, 32, 128, 36, + { 0x77, 0x0000, 0x0000, 1024, 576, 32, MD_XGI300|MD_XGI315}, - { 0x20, 0x0000, 0x0000, 1024, 600, 8, 128, 37, + { 0x20, 0x0000, 0x0000, 1024, 600, 8, MD_XGI300 }, /* TW: 300 series only */ - { 0x21, 0x0000, 0x0000, 1024, 600, 16, 128, 37, + { 0x21, 0x0000, 0x0000, 1024, 600, 16, MD_XGI300 }, - { 0x22, 0x0000, 0x0000, 1024, 600, 32, 128, 37, + { 0x22, 0x0000, 0x0000, 1024, 600, 32, MD_XGI300 }, - { 0x38, 0x0105, 0x0105, 1024, 768, 8, 128, 48, + { 0x38, 0x0105, 0x0105, 1024, 768, 8, MD_XGI300|MD_XGI315}, - { 0x4A, 0x0117, 0x0117, 1024, 768, 16, 128, 48, + { 0x4A, 0x0117, 0x0117, 1024, 768, 16, MD_XGI300|MD_XGI315}, - { 0x64, 0x013c, 0x0118, 1024, 768, 32, 128, 48, + { 0x64, 0x013c, 0x0118, 1024, 768, 32, MD_XGI300|MD_XGI315}, - { 0x64, 0x013c, 0x0118, 1024, 768, 32, 128, 48, + { 0x64, 0x013c, 0x0118, 1024, 768, 32, MD_XGI300|MD_XGI315}, - { 0x23, 0x0000, 0x0000, 1152, 768, 8, 144, 48, + { 0x23, 0x0000, 0x0000, 1152, 768, 8, MD_XGI300 }, /* TW: 300 series only */ - { 0x24, 0x0000, 0x0000, 1152, 768, 16, 144, 48, + { 0x24, 0x0000, 0x0000, 1152, 768, 16, MD_XGI300 }, - { 0x25, 0x0000, 0x0000, 1152, 768, 32, 144, 48, + { 0x25, 0x0000, 0x0000, 1152, 768, 32, MD_XGI300 }, - { 0x79, 0x0000, 0x0000, 1280, 720, 8, 160, 45, + { 0x79, 0x0000, 0x0000, 1280, 720, 8, MD_XGI300|MD_XGI315}, - { 0x75, 0x0000, 0x0000, 1280, 720, 16, 160, 45, + { 0x75, 0x0000, 0x0000, 1280, 720, 16, MD_XGI300|MD_XGI315}, - { 0x78, 0x0000, 0x0000, 1280, 720, 32, 160, 45, + { 0x78, 0x0000, 0x0000, 1280, 720, 32, MD_XGI300|MD_XGI315}, - { 0x23, 0x0000, 0x0000, 1280, 768, 8, 160, 48, + { 0x23, 0x0000, 0x0000, 1280, 768, 8, MD_XGI315}, /* TW: 310/325 series only */ - { 0x24, 0x0000, 0x0000, 1280, 768, 16, 160, 48, + { 0x24, 0x0000, 0x0000, 1280, 768, 16, MD_XGI315}, - { 0x25, 0x0000, 0x0000, 1280, 768, 32, 160, 48, + { 0x25, 0x0000, 0x0000, 1280, 768, 32, MD_XGI315}, - { 0x7C, 0x0000, 0x0000, 1280, 960, 8, 160, 60, + { 0x7C, 0x0000, 0x0000, 1280, 960, 8, MD_XGI300|MD_XGI315}, - { 0x7D, 0x0000, 0x0000, 1280, 960, 16, 160, 60, + { 0x7D, 0x0000, 0x0000, 1280, 960, 16, MD_XGI300|MD_XGI315}, - { 0x7E, 0x0000, 0x0000, 1280, 960, 32, 160, 60, + { 0x7E, 0x0000, 0x0000, 1280, 960, 32, MD_XGI300|MD_XGI315}, - { 0x3A, 0x0107, 0x0107, 1280, 1024, 8, 160, 64, + { 0x3A, 0x0107, 0x0107, 1280, 1024, 8, MD_XGI300|MD_XGI315}, - { 0x4D, 0x011a, 0x011a, 1280, 1024, 16, 160, 64, + { 0x4D, 0x011a, 0x011a, 1280, 1024, 16, MD_XGI300|MD_XGI315}, - { 0x65, 0x013d, 0x011b, 1280, 1024, 32, 160, 64, + { 0x65, 0x013d, 0x011b, 1280, 1024, 32, MD_XGI300|MD_XGI315}, - { 0x26, 0x0000, 0x0000, 1400, 1050, 8, 175, 65, + { 0x26, 0x0000, 0x0000, 1400, 1050, 8, MD_XGI315}, /* TW: 310/325 series only */ - { 0x27, 0x0000, 0x0000, 1400, 1050, 16, 175, 65, + { 0x27, 0x0000, 0x0000, 1400, 1050, 16, MD_XGI315}, - { 0x28, 0x0000, 0x0000, 1400, 1050, 32, 175, 65, + { 0x28, 0x0000, 0x0000, 1400, 1050, 32, MD_XGI315}, - { 0x3C, 0x0130, 0x011c, 1600, 1200, 8, 200, 75, + { 0x3C, 0x0130, 0x011c, 1600, 1200, 8, MD_XGI300|MD_XGI315}, - { 0x3D, 0x0131, 0x011e, 1600, 1200, 16, 200, 75, + { 0x3D, 0x0131, 0x011e, 1600, 1200, 16, MD_XGI300|MD_XGI315}, - { 0x66, 0x013e, 0x011f, 1600, 1200, 32, 200, 75, + { 0x66, 0x013e, 0x011f, 1600, 1200, 32, MD_XGI300|MD_XGI315}, - { 0x68, 0x013f, 0x0000, 1920, 1440, 8, 240, 75, + { 0x68, 0x013f, 0x0000, 1920, 1440, 8, MD_XGI300|MD_XGI315}, - { 0x69, 0x0140, 0x0000, 1920, 1440, 16, 240, 75, + { 0x69, 0x0140, 0x0000, 1920, 1440, 16, MD_XGI300|MD_XGI315}, - { 0x6B, 0x0141, 0x0000, 1920, 1440, 32, 240, 75, + { 0x6B, 0x0141, 0x0000, 1920, 1440, 32, MD_XGI300|MD_XGI315}, - { 0x6c, 0x0000, 0x0000, 2048, 1536, 8, 256, 96, + { 0x6c, 0x0000, 0x0000, 2048, 1536, 8, MD_XGI315}, /* TW: 310/325 series only */ - { 0x6d, 0x0000, 0x0000, 2048, 1536, 16, 256, 96, + { 0x6d, 0x0000, 0x0000, 2048, 1536, 16, MD_XGI315}, - { 0x6e, 0x0000, 0x0000, 2048, 1536, 32, 256, 96, + { 0x6e, 0x0000, 0x0000, 2048, 1536, 32, MD_XGI315}, { 0 }, }; -- 2.7.4