diff options
| author | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2008-10-28 19:45:31 -0200 |
|---|---|---|
| committer | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2008-10-28 19:45:31 -0200 |
| commit | 2671776999a5add36e1aeaad4080bfccedc2b1a5 (patch) | |
| tree | 3242361542ee889970b4c594a67a97cfe24ea74d /src/smi_video.c | |
| parent | 91b5613fb07fec0f319623ca7ec1efd67f04379b (diff) | |
Update msoc to use randr cursor routines
pSmi->IsSecondary was not used, and there should not exist two
instances of the driver managing the same card.
Macro CHECK_SECONDARY() was dependant on a second instance of the driver
for the same card, and also removed.
Some rework should still be done in the cursor code, as it sometimes,
when displaying different data, will leave the hw cursor visible, while
using an argb cursor.
Diffstat (limited to 'src/smi_video.c')
| -rw-r--r-- | src/smi_video.c | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/src/smi_video.c b/src/smi_video.c index 4a06d75..89b41ca 100644 --- a/src/smi_video.c +++ b/src/smi_video.c @@ -128,9 +128,6 @@ static void SMI_DisplayVideo0730(ScrnInfoPtr pScrn, int id, int offset, BoxPtr dstBox, short vid_w, short vid_h, short drw_w, short drw_h); static void SMI_BlockHandler(int i, pointer blockData, pointer pTimeout, pointer pReadMask); -#if 0 -static void SMI_WaitForSync(ScrnInfoPtr pScrn); -#endif /*static int SMI_SendI2C(ScrnInfoPtr pScrn, CARD8 device, char *devName, SMI_I2CDataPtr i2cData);*/ @@ -626,11 +623,6 @@ SMI_InitVideo(ScreenPtr pScreen) ENTER(); - if (IS_MSOC(psmi) && psmi->IsSecondary) { - LEAVE(); - return; - } - numAdaptors = xf86XVListGenericAdaptors(pScrn, &ptrAdaptors); DEBUG("numAdaptors=%d\n", numAdaptors); @@ -1259,9 +1251,6 @@ SMI_PutVideo( VGAIN8_INDEX(pSmi, VGA_SEQ_INDEX, VGA_SEQ_DATA, 0x21) & ~0x04); WRITE_VPR(pSmi, 0x54, READ_VPR(pSmi, 0x54) | 0x00200000); -#if 0 - SMI_WaitForSync(pScrn); -#endif /* Video Window I Left and Top Boundaries */ WRITE_VPR(pSmi, 0x14, dstBox.x1 + (dstBox.y1 << 16)); /* Video Window I Right and Bottom Boundaries */ @@ -1778,9 +1767,7 @@ SMI_DisplayVideo( } else { vstretch = 0; } -#if 0 - SMI_WaitForSync(pScrn); -#endif + WRITE_VPR(pSmi, 0x00, vpr00 | (1 << 3) | (1 << 20)); WRITE_VPR(pSmi, 0x14, (dstBox->x1) | (dstBox->y1 << 16)); WRITE_VPR(pSmi, 0x18, (dstBox->x2) | (dstBox->y2 << 16)); @@ -1849,10 +1836,6 @@ SMI_DisplayVideo0501(ScrnInfoPtr pScrn, vstretch = (4096 * drw_h / vid_h) | 0x8000; } -#if 0 - SMI_WaitForSync(pScrn); -#endif - /* Set Color Key Enable bit */ WRITE_DCR(pSmi, 0x0000, READ_DCR(pSmi, 0x0000) | (1 << 9)); |