Skip to content

L
linux
Commit 354f49fa authored by Aaro Koskinen's avatar Aaro Koskinen Committed by Greg Kroah-Hartman
Browse files
Options

staging: xgifb: delete VB_ExtTVEdgeIndex 

Delete VB_ExtTVEdgeIndex. It's 0 for all video modes.
Signed-off-by: default avatarAaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 36ae035b
Show whitespace changes
Inline Side-by-side
Showing with 67 additions and 70 deletions
drivers/staging/xgifb/vb_setmode.c
View file @ 354f49fa
...@@ -5963,14 +5963,12 @@ static void XGI_SetEdgeEnhance(unsigned short ModeNo, ...@@ -5963,14 +5963,12 @@ static void XGI_SetEdgeEnhance(unsigned short ModeNo,
unsigned short ModeIdIndex, unsigned short ModeIdIndex,
struct vb_device_info *pVBInfo) struct vb_device_info *pVBInfo)
{ {
unsigned short tempbx, index; unsigned short tempbx;
unsigned char tempah; unsigned char tempah;
tempbx = XGI_GetTVPtrIndex(pVBInfo); tempbx = XGI_GetTVPtrIndex(pVBInfo);
tempbx &= 0xFE; tempbx &= 0xFE;
index = pVBInfo->EModeIDTable[ModeIdIndex].VB_ExtTVEdgeIndex;
tempbx += index;
tempah = TVEdgeList[tempbx]; tempah = TVEdgeList[tempbx];
tempah = tempah << 5; tempah = tempah << 5;
......
drivers/staging/xgifb/vb_struct.h
View file @ 354f49fa
...@@ -15,7 +15,6 @@ struct XGI_ExtStruct { ...@@ -15,7 +15,6 @@ struct XGI_ExtStruct {
unsigned short Ext_ModeFlag; unsigned short Ext_ModeFlag;
unsigned short Ext_ModeInfo; unsigned short Ext_ModeInfo;
unsigned char Ext_RESINFO; unsigned char Ext_RESINFO;
unsigned char VB_ExtTVEdgeIndex;
unsigned char VB_ExtTVYFilterIndex; unsigned char VB_ExtTVYFilterIndex;
unsigned char REFindex; unsigned char REFindex;
}; };
......
drivers/staging/xgifb/vb_table.h
View file @ 354f49fa
...@@ -129,75 +129,75 @@ static unsigned char XG40_CRCF = 0x13; ...@@ -129,75 +129,75 @@ static unsigned char XG40_CRCF = 0x13;
static unsigned char XG40_DRAMTypeDefinition = 0xFF ; static unsigned char XG40_DRAMTypeDefinition = 0xFF ;
static struct XGI_ExtStruct XGI330_EModeIDTable[] = { static struct XGI_ExtStruct XGI330_EModeIDTable[] = {
{0x2e, 0x0a1b, 0x0306, 0x06, 0x00, 0x05, 0x06}, {0x2e, 0x0a1b, 0x0306, 0x06, 0x05, 0x06},
{0x2f, 0x0a1b, 0x0305, 0x05, 0x00, 0x05, 0x05}, {0x2f, 0x0a1b, 0x0305, 0x05, 0x05, 0x05},
{0x30, 0x2a1b, 0x0407, 0x07, 0x00, 0x07, 0x0e}, {0x30, 0x2a1b, 0x0407, 0x07, 0x07, 0x0e},
{0x31, 0x0a1b, 0x030d, 0x0d, 0x00, 0x06, 0x3d}, {0x31, 0x0a1b, 0x030d, 0x0d, 0x06, 0x3d},
{0x32, 0x0a1b, 0x0a0e, 0x0e, 0x00, 0x06, 0x3e}, {0x32, 0x0a1b, 0x0a0e, 0x0e, 0x06, 0x3e},
{0x33, 0x0a1d, 0x0a0d, 0x0d, 0x00, 0x06, 0x3d}, {0x33, 0x0a1d, 0x0a0d, 0x0d, 0x06, 0x3d},
{0x34, 0x2a1d, 0x0a0e, 0x0e, 0x00, 0x06, 0x3e}, {0x34, 0x2a1d, 0x0a0e, 0x0e, 0x06, 0x3e},
{0x35, 0x0a1f, 0x0a0d, 0x0d, 0x00, 0x06, 0x3d}, {0x35, 0x0a1f, 0x0a0d, 0x0d, 0x06, 0x3d},
{0x36, 0x2a1f, 0x0a0e, 0x0e, 0x00, 0x06, 0x3e}, {0x36, 0x2a1f, 0x0a0e, 0x0e, 0x06, 0x3e},
{0x38, 0x0a1b, 0x0508, 0x08, 0x00, 0x00, 0x16}, {0x38, 0x0a1b, 0x0508, 0x08, 0x00, 0x16},
{0x3a, 0x0e3b, 0x0609, 0x09, 0x00, 0x00, 0x1e}, {0x3a, 0x0e3b, 0x0609, 0x09, 0x00, 0x1e},
{0x3c, 0x0e3b, 0x070a, 0x0a, 0x00, 0x00, 0x22}, /* mode 1600x1200 {0x3c, 0x0e3b, 0x070a, 0x0a, 0x00, 0x22}, /* mode 1600x1200
add CRT2MODE [2003/10/07] */ add CRT2MODE [2003/10/07] */
{0x3d, 0x0e7d, 0x070a, 0x0a, 0x00, 0x00, 0x22}, /* mode 1600x1200 {0x3d, 0x0e7d, 0x070a, 0x0a, 0x00, 0x22}, /* mode 1600x1200
add CRT2MODE */ add CRT2MODE */
{0x40, 0x9a1c, 0x0000, 0x00, 0x00, 0x04, 0x00}, {0x40, 0x9a1c, 0x0000, 0x00, 0x04, 0x00},
{0x41, 0x9a1d, 0x0000, 0x00, 0x00, 0x04, 0x00}, {0x41, 0x9a1d, 0x0000, 0x00, 0x04, 0x00},
{0x43, 0x0a1c, 0x0306, 0x06, 0x00, 0x05, 0x06}, {0x43, 0x0a1c, 0x0306, 0x06, 0x05, 0x06},
{0x44, 0x0a1d, 0x0306, 0x06, 0x00, 0x05, 0x06}, {0x44, 0x0a1d, 0x0306, 0x06, 0x05, 0x06},
{0x46, 0x2a1c, 0x0407, 0x07, 0x00, 0x07, 0x0e}, {0x46, 0x2a1c, 0x0407, 0x07, 0x07, 0x0e},
{0x47, 0x2a1d, 0x0407, 0x07, 0x00, 0x07, 0x0e}, {0x47, 0x2a1d, 0x0407, 0x07, 0x07, 0x0e},
{0x49, 0x0a3c, 0x0508, 0x08, 0x00, 0x00, 0x16}, {0x49, 0x0a3c, 0x0508, 0x08, 0x00, 0x16},
{0x4a, 0x0a3d, 0x0508, 0x08, 0x00, 0x00, 0x16}, {0x4a, 0x0a3d, 0x0508, 0x08, 0x00, 0x16},
{0x4c, 0x0e7c, 0x0609, 0x09, 0x00, 0x00, 0x1e}, {0x4c, 0x0e7c, 0x0609, 0x09, 0x00, 0x1e},
{0x4d, 0x0e7d, 0x0609, 0x09, 0x00, 0x00, 0x1e}, {0x4d, 0x0e7d, 0x0609, 0x09, 0x00, 0x1e},
{0x50, 0x9a1b, 0x0001, 0x01, 0x00, 0x04, 0x02}, {0x50, 0x9a1b, 0x0001, 0x01, 0x04, 0x02},
{0x51, 0xba1b, 0x0103, 0x03, 0x00, 0x07, 0x03}, {0x51, 0xba1b, 0x0103, 0x03, 0x07, 0x03},
{0x52, 0x9a1b, 0x0204, 0x04, 0x00, 0x00, 0x04}, {0x52, 0x9a1b, 0x0204, 0x04, 0x00, 0x04},
{0x56, 0x9a1d, 0x0001, 0x01, 0x00, 0x04, 0x02}, {0x56, 0x9a1d, 0x0001, 0x01, 0x04, 0x02},
{0x57, 0xba1d, 0x0103, 0x03, 0x00, 0x07, 0x03}, {0x57, 0xba1d, 0x0103, 0x03, 0x07, 0x03},
{0x58, 0x9a1d, 0x0204, 0x04, 0x00, 0x00, 0x04}, {0x58, 0x9a1d, 0x0204, 0x04, 0x00, 0x04},
{0x59, 0x9a1b, 0x0000, 0x00, 0x00, 0x04, 0x00}, {0x59, 0x9a1b, 0x0000, 0x00, 0x04, 0x00},
{0x5A, 0x021b, 0x0014, 0x01, 0x00, 0x04, 0x3f}, {0x5A, 0x021b, 0x0014, 0x01, 0x04, 0x3f},
{0x5B, 0x0a1d, 0x0014, 0x01, 0x00, 0x04, 0x3f}, {0x5B, 0x0a1d, 0x0014, 0x01, 0x04, 0x3f},
{0x5d, 0x0a1d, 0x0305, 0x05, 0x00, 0x07, 0x05}, {0x5d, 0x0a1d, 0x0305, 0x05, 0x07, 0x05},
{0x62, 0x0a3f, 0x0306, 0x06, 0x00, 0x05, 0x06}, {0x62, 0x0a3f, 0x0306, 0x06, 0x05, 0x06},
{0x63, 0x2a3f, 0x0407, 0x07, 0x00, 0x07, 0x0e}, {0x63, 0x2a3f, 0x0407, 0x07, 0x07, 0x0e},
{0x64, 0x0a7f, 0x0508, 0x08, 0x00, 0x00, 0x16}, {0x64, 0x0a7f, 0x0508, 0x08, 0x00, 0x16},
{0x65, 0x0eff, 0x0609, 0x09, 0x00, 0x00, 0x1e}, {0x65, 0x0eff, 0x0609, 0x09, 0x00, 0x1e},
{0x66, 0x0eff, 0x070a, 0x0a, 0x00, 0x00, 0x22}, /* mode 1600x1200 {0x66, 0x0eff, 0x070a, 0x0a, 0x00, 0x22}, /* mode 1600x1200
add CRT2MODE */ add CRT2MODE */
{0x68, 0x067b, 0x080b, 0x0b, 0x00, 0x00, 0x29}, {0x68, 0x067b, 0x080b, 0x0b, 0x00, 0x29},
{0x69, 0x06fd, 0x080b, 0x0b, 0x00, 0x00, 0x29}, {0x69, 0x06fd, 0x080b, 0x0b, 0x00, 0x29},
{0x6b, 0x07ff, 0x080b, 0x0b, 0x00, 0x00, 0x29}, {0x6b, 0x07ff, 0x080b, 0x0b, 0x00, 0x29},
{0x6c, 0x067b, 0x090c, 0x0c, 0x00, 0x00, 0x2f}, {0x6c, 0x067b, 0x090c, 0x0c, 0x00, 0x2f},
{0x6d, 0x06fd, 0x090c, 0x0c, 0x00, 0x00, 0x2f}, {0x6d, 0x06fd, 0x090c, 0x0c, 0x00, 0x2f},
{0x6e, 0x07ff, 0x090c, 0x0c, 0x00, 0x00, 0x2f}, {0x6e, 0x07ff, 0x090c, 0x0c, 0x00, 0x2f},
{0x70, 0x2a1b, 0x0410, 0x10, 0x00, 0x07, 0x34}, {0x70, 0x2a1b, 0x0410, 0x10, 0x07, 0x34},
{0x71, 0x0a1b, 0x0511, 0x11, 0x00, 0x00, 0x37}, {0x71, 0x0a1b, 0x0511, 0x11, 0x00, 0x37},
{0x74, 0x0a1d, 0x0511, 0x11, 0x00, 0x00, 0x37}, {0x74, 0x0a1d, 0x0511, 0x11, 0x00, 0x37},
{0x75, 0x0a3d, 0x0612, 0x12, 0x00, 0x00, 0x3a}, {0x75, 0x0a3d, 0x0612, 0x12, 0x00, 0x3a},
{0x76, 0x2a1f, 0x0410, 0x10, 0x00, 0x07, 0x34}, {0x76, 0x2a1f, 0x0410, 0x10, 0x07, 0x34},
{0x77, 0x0a1f, 0x0511, 0x11, 0x00, 0x00, 0x37}, {0x77, 0x0a1f, 0x0511, 0x11, 0x00, 0x37},
{0x78, 0x0a3f, 0x0612, 0x12, 0x00, 0x00, 0x3a}, {0x78, 0x0a3f, 0x0612, 0x12, 0x00, 0x3a},
{0x79, 0x0a3b, 0x0612, 0x12, 0x00, 0x00, 0x3a}, {0x79, 0x0a3b, 0x0612, 0x12, 0x00, 0x3a},
{0x7a, 0x2a1d, 0x0410, 0x10, 0x00, 0x07, 0x34}, {0x7a, 0x2a1d, 0x0410, 0x10, 0x07, 0x34},
{0x7b, 0x0e3b, 0x060f, 0x0f, 0x00, 0x00, 0x1d}, {0x7b, 0x0e3b, 0x060f, 0x0f, 0x00, 0x1d},
{0x7c, 0x0e7d, 0x060f, 0x0f, 0x00, 0x00, 0x1d}, {0x7c, 0x0e7d, 0x060f, 0x0f, 0x00, 0x1d},
{0x7d, 0x0eff, 0x060f, 0x0f, 0x00, 0x00, 0x1d}, {0x7d, 0x0eff, 0x060f, 0x0f, 0x00, 0x1d},
{0x20, 0x0e3b, 0x0D16, 0x16, 0x00, 0x00, 0x43}, {0x20, 0x0e3b, 0x0D16, 0x16, 0x00, 0x43},
{0x21, 0x0e7d, 0x0D16, 0x16, 0x00, 0x00, 0x43}, {0x21, 0x0e7d, 0x0D16, 0x16, 0x00, 0x43},
{0x22, 0x0eff, 0x0D16, 0x16, 0x00, 0x00, 0x43}, {0x22, 0x0eff, 0x0D16, 0x16, 0x00, 0x43},
{0x23, 0x0e3b, 0x0614, 0x14, 0x00, 0x00, 0x41}, {0x23, 0x0e3b, 0x0614, 0x14, 0x00, 0x41},
{0x24, 0x0e7d, 0x0614, 0x14, 0x00, 0x00, 0x41}, {0x24, 0x0e7d, 0x0614, 0x14, 0x00, 0x41},
{0x25, 0x0eff, 0x0614, 0x14, 0x00, 0x00, 0x41}, {0x25, 0x0eff, 0x0614, 0x14, 0x00, 0x41},
{0x26, 0x063b, 0x0c15, 0x15, 0x00, 0x00, 0x42}, {0x26, 0x063b, 0x0c15, 0x15, 0x00, 0x42},
{0x27, 0x067d, 0x0c15, 0x15, 0x00, 0x00, 0x42}, {0x27, 0x067d, 0x0c15, 0x15, 0x00, 0x42},
{0x28, 0x06ff, 0x0c15, 0x15, 0x00, 0x00, 0x42}, {0x28, 0x06ff, 0x0c15, 0x15, 0x00, 0x42},
{0xff, 0x0000, 0x0000, 0x00, 0x00, 0x00, 0x00} {0xff, 0x0000, 0x0000, 0x00, 0x00, 0x00}
}; };
static struct SiS_StandTable_S XGI330_StandTable = { static struct SiS_StandTable_S XGI330_StandTable = {
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7