rpms/xorg-x11-drv-openchrome/F-11 openchrome-0.2.903-XO-1.5-panel.patch, NONE, 1.1 openchrome-0.2.903-remove_loader_symbol_lists.patch, NONE, 1.1 openchrome-vt1625.patch, NONE, 1.1 openchrome-0.2.903-latest_snapshot.patch, 1.7, 1.8 xorg-x11-drv-openchrome.spec, 1.44, 1.45 openchrome-0.2.903-fix_cursor_on_secondary.patch, 1.1, NONE openchrome-0.2.903-pll_rework.patch, 1.1, NONE openchrome-0.2.903-vx855_support.patch, 1.1, NONE
Xavier Bachelot
xavierb at fedoraproject.org
Sun Jul 19 14:40:48 UTC 2009
- Previous message: rpms/perl-Config-JFDI/F-11 .cvsignore, 1.2, 1.3 perl-Config-JFDI.spec, 1.1, 1.2 sources, 1.2, 1.3
- Next message: rpms/xorg-x11-drv-openchrome/F-10 openchrome-0.2.903-XO-1.5-panel.patch, NONE, 1.1 openchrome-0.2.903-remove_loader_symbol_lists.patch, NONE, 1.1 openchrome-vt1625.patch, NONE, 1.1 openchrome-0.2.903-latest_snapshot.patch, 1.5, 1.6 xorg-x11-drv-openchrome.spec, 1.38, 1.39 openchrome-0.2.903-fix_cursor_on_secondary.patch, 1.1, NONE openchrome-0.2.903-pll_rework.patch, 1.1, NONE openchrome-0.2.903-vx855_support.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: xavierb
Update of /cvs/pkgs/rpms/xorg-x11-drv-openchrome/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30545
Modified Files:
openchrome-0.2.903-latest_snapshot.patch
xorg-x11-drv-openchrome.spec
Added Files:
openchrome-0.2.903-XO-1.5-panel.patch
openchrome-0.2.903-remove_loader_symbol_lists.patch
openchrome-vt1625.patch
Removed Files:
openchrome-0.2.903-fix_cursor_on_secondary.patch
openchrome-0.2.903-pll_rework.patch
openchrome-0.2.903-vx855_support.patch
Log Message:
Sync with devel branch
openchrome-0.2.903-XO-1.5-panel.patch:
via_bios.h | 1 +
via_mode.h | 4 ++++
via_panel.c | 3 ++-
3 files changed, 7 insertions(+), 1 deletion(-)
--- NEW FILE openchrome-0.2.903-XO-1.5-panel.patch ---
Index: src/via_panel.c
===================================================================
--- src/via_panel.c (revision 758)
+++ src/via_panel.c (working copy)
@@ -54,7 +54,8 @@ static ViaPanelModeRec ViaPanelNativeModes[] = {
{1920, 1200},
{1024, 600},
{1440, 900},
- {1280, 720}
+ {1280, 720},
+ {1200, 900}
};
static int
Index: src/via_mode.h
===================================================================
--- src/via_mode.h (revision 758)
+++ src/via_mode.h (working copy)
@@ -70,6 +70,7 @@ static struct ViaDotClock {
{ 49500, 0xC353, /* 0xa48c04 */ { 3, 3, 5, 138 } },
{ 50000, 0xC354, /* 0x368c00 */ { 1, 3, 2, 56 } },
{ 56300, 0x4F76, /* 0x3d8c00 */ { 1, 3, 2, 63 } },
+ { 57275, 0x4E70, /* 0x3e8c00 */ { 1, 3, 6, 299 } },
{ 57284, 0x4E70, /* 0x3e8c00 */ { 1, 3, 2, 64 } },
{ 64995, 0x0D3B, /* 0x6b8c01 */ { 1, 3, 3, 109 } },
{ 65000, 0x0D3B, /* 0x6b8c01 */ { 1, 3, 3, 109 } }, /* Slightly unstable on PM800 */
@@ -135,6 +136,7 @@ static DisplayModeRec ViaPanelModes[] = {
{ MODEPREFIX("1152x864"), 81613, 1152, 1216, 1336, 1520, 0, 864, 864, 867, 895, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX },
{ MODEPREFIX("1280x768"), 81135, 1280, 1328, 1440, 1688, 0, 768, 770, 776, 802, 0, V_PHSYNC | V_NVSYNC, MODESUFFIX },
{ MODEPREFIX("1280x720"), 74600, 1280, 1341, 1474, 1688, 0, 720, 721, 724, 746, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX },
+ { MODEPREFIX("1200x900"), 57200, 1200, 1206, 1214, 1240, 0, 900, 905, 907, 912, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX },
{ MODEPREFIX("1280x960"), 108280, 1280, 1376, 1488, 1800, 0, 960, 960, 963, 1000, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX },
{ MODEPREFIX("1280x1024"), 108280, 1280, 1328, 1440, 1688, 0, 1024, 1024, 1027, 1066, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX },
{ MODEPREFIX("1360x768"), 85500, 1360, 1392, 1712, 1744, 0, 768, 783, 791, 807, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX },
@@ -168,6 +170,7 @@ static DisplayModeRec ViaPanelModes[] = {
#define VIA_RES_1280X720 19
#define VIA_RES_1920X1080 20
#define VIA_RES_1366X768 22
+#define VIA_RES_1200X900 23
#define VIA_RES_INVALID 0xFF
/*
@@ -199,6 +202,7 @@ static struct {
{VIA_RES_856X480, VIA_PANEL_INVALID, 856, 480},
{VIA_RES_1024X576, VIA_PANEL_INVALID, 1024, 576},
{VIA_RES_800X480, VIA_PANEL8X4, 800, 480},
+ {VIA_RES_1200X900, VIA_PANEL12X9, 1200, 900},
{VIA_RES_INVALID, VIA_PANEL_INVALID, 0, 0}
};
Index: src/via_bios.h
===================================================================
--- src/via_bios.h (revision 758)
+++ src/via_bios.h (working copy)
@@ -42,6 +42,7 @@
#define VIA_PANEL10X6 13
#define VIA_PANEL14X9 14
#define VIA_PANEL1280X720 15
+#define VIA_PANEL12X9 16
#define VIA_PANEL_INVALID 255
#define TVTYPE_NONE 0x00
openchrome-0.2.903-remove_loader_symbol_lists.patch:
via_driver.c | 210 -----------------------------------------------------------
1 file changed, 210 deletions(-)
--- NEW FILE openchrome-0.2.903-remove_loader_symbol_lists.patch ---
Index: src/via_driver.c
===================================================================
--- src/via_driver.c (revision 753)
+++ src/via_driver.c (working copy)
@@ -259,184 +259,7 @@
};
-static const char *vgaHWSymbols[] = {
- "vgaHWGetHWRec",
- "vgaHWSetMmioFuncs",
- "vgaHWSetStdFuncs",
- "vgaHWGetIOBase",
- "vgaHWSave",
- "vgaHWProtect",
- "vgaHWRestore",
- "vgaHWMapMem",
- "vgaHWUnmapMem",
- "vgaHWInit",
- "vgaHWSaveScreen",
- "vgaHWLock",
- "vgaHWUnlock",
- "vgaHWFreeHWRec",
- "vgaHWGetIndex", /* Through VGAHWPTR() */
- NULL
-};
-
-static const char *ramdacSymbols[] = {
- "xf86InitCursor",
- "xf86CreateCursorInfoRec",
- "xf86DestroyCursorInfoRec",
- NULL
-};
-
-static const char *vbeSymbols[] = {
- "vbeDoEDID",
- "VBEDPMSSet",
- "VBEExtendedInit",
- "vbeFree",
- "VBEGetVBEInfo",
- "VBEGetVBEMode",
- "VBEGetModePool",
- "VBEInit",
- "VBEPrintModes",
- "VBESaveRestore",
- "VBESetDisplayStart",
- "VBESetGetLogicalScanlineLength",
- "VBESetLogicalScanline",
- "VBESetModeNames",
- "VBESetModeParameters",
- "VBESetVBEMode",
- "VBEValidateModes",
- "xf86ExecX86int10",
- "xf86Int10AllocPages",
- "xf86Int10FreePages",
- NULL
-};
-
-static const char *ddcSymbols[] = {
- "xf86PrintEDID",
- "xf86DoEDID_DDC2",
- "xf86SetDDCproperties",
- NULL
-};
-
-static const char *i2cSymbols[] = {
- "xf86CreateI2CBusRec",
- "xf86I2CBusInit",
- "xf86CreateI2CDevRec",
- "xf86I2CDevInit",
- "xf86I2CWriteRead",
- "xf86I2CProbeAddress",
- "xf86DestroyI2CDevRec",
- "xf86I2CReadByte",
- "xf86I2CWriteByte",
- NULL
-};
-
-static const char *xaaSymbols[] = {
-#ifdef X_HAVE_XAAGETROP
- "XAAGetCopyROP",
- "XAAGetCopyROP_PM",
- "XAAGetPatternROP",
-#else
- "XAACopyROP",
- "XAACopyROP_PM",
- "XAAPatternROP",
-#endif
- "XAACreateInfoRec",
- "XAADestroyInfoRec",
- "XAAInit",
- "XAAFillSolidRects",
- NULL
-};
-
-static const char *exaSymbols[] = {
- "exaGetVersion",
- "exaDriverInit",
- "exaDriverFini",
- "exaOffscreenAlloc",
- "exaOffscreenFree",
- "exaGetPixmapPitch",
- "exaGetPixmapOffset",
- "exaWaitSync",
- "exaDriverAlloc",
- NULL
-};
-
-static const char *shadowSymbols[] = {
- "ShadowFBInit",
- NULL
-};
-
-#ifdef USE_FB
-static const char *fbSymbols[] = {
- "fbScreenInit",
- "fbPictureInit",
- NULL
-};
-#else
-static const char *cfbSymbols[] = {
- "cfbScreenInit",
- "cfb16ScreenInit",
- "cfb24ScreenInit",
- "cfb24_32ScreenInit",
- "cfb32ScreenInit",
- "cfb16BresS",
- "cfb24BresS",
- NULL
-};
-#endif
-
#ifdef XFree86LOADER
-#ifdef XF86DRI
-static const char *drmSymbols[] = {
- "drmAddBufs",
- "drmAddMap",
- "drmAgpAcquire",
- "drmAgpAlloc",
- "drmAgpBase",
- "drmAgpBind",
- "drmAgpDeviceId",
- "drmAgpEnable",
- "drmAgpFree",
- "drmAgpGetMode",
- "drmAgpRelease",
- "drmAgpVendorId",
- "drmCtlInstHandler",
- "drmCtlUninstHandler",
- "drmCommandNone",
- "drmCommandWrite",
- "drmCommandWriteRead",
- "drmFreeVersion",
- "drmGetInterruptFromBusID",
- "drmGetLibVersion",
- "drmGetVersion",
- "drmMap",
- "drmMapBufs",
- "drmUnmap",
- "drmUnmapBufs",
- "drmAgpUnbind",
- "drmRmMap",
- "drmCreateContext",
- "drmAuthMagic",
- "drmDestroyContext",
- "drmSetContextFlags",
- NULL
-};
-
-static const char *driSymbols[] = {
- "DRICloseScreen",
- "DRICreateInfoRec",
- "DRIDestroyInfoRec",
- "DRIFinishScreenInit",
- "DRIGetSAREAPrivate",
- "DRILock",
- "DRIQueryVersion",
- "DRIScreenInit",
- "DRIUnlock",
- "DRIOpenConnection",
- "DRICloseConnection",
- "GlxSetVisualConfigs",
- NULL
-};
-#endif
-
static MODULESETUPPROTO(VIASetup);
static XF86ModuleVersionInfo VIAVersRec = {
@@ -472,24 +295,6 @@
0
#endif
);
- LoaderRefSymLists(vgaHWSymbols,
-#ifdef USE_FB
- fbSymbols,
-#else
- cfbSymbols,
-#endif
- ramdacSymbols,
- xaaSymbols,
- exaSymbols,
- shadowSymbols,
- vbeSymbols,
- i2cSymbols,
- ddcSymbols,
-#ifdef XF86DRI
- drmSymbols,
- driSymbols,
-#endif
- NULL);
return (pointer) 1;
} else {
@@ -826,7 +631,6 @@
vbeInfoPtr pVbe;
if (xf86LoadSubModule(pScrn, "vbe")) {
- xf86LoaderReqSymLists(vbeSymbols, NULL);
pVbe = VBEInit(NULL, index);
ConfiguredMonitor = vbeDoEDID(pVbe, NULL);
vbeFree(pVbe);
@@ -931,7 +735,6 @@
#ifndef USE_FB
char *mod = NULL;
- const char *reqSym = NULL;
#endif
vgaHWPtr hwp;
int i, bMemSize = 0;
@@ -952,7 +755,6 @@
if (!xf86LoadSubModule(pScrn, "vgahw"))
return FALSE;
- xf86LoaderReqSymLists(vgaHWSymbols, NULL);
if (!vgaHWGetHWRec(pScrn))
return FALSE;
@@ -1624,7 +1426,6 @@
VIAFreeRec(pScrn);
return FALSE;
} else {
- xf86LoaderReqSymLists(i2cSymbols, NULL);
ViaI2CInit(pScrn);
}
@@ -1632,7 +1433,6 @@
VIAFreeRec(pScrn);
return FALSE;
} else {
- xf86LoaderReqSymLists(ddcSymbols, NULL);
if (pVia->pI2CBus1) {
pVia->DDC1 = xf86DoEDID_DDC2(pScrn->scrnIndex, pVia->pI2CBus1);
@@ -1674,7 +1474,6 @@
/* VBE doesn't properly initialise int10 itself. */
if (xf86LoadSubModule(pScrn, "int10")
&& xf86LoadSubModule(pScrn, "vbe")) {
- xf86LoaderReqSymLists(vbeSymbols, NULL);
pVia->pVbe = VBEExtendedInit(NULL, pVia->EntityIndex,
SET_BIOS_SCRATCH |
RESTORE_BIOS_SCRATCH);
@@ -1773,22 +1572,18 @@
return FALSE;
}
- xf86LoaderReqSymLists(fbSymbols, NULL);
#else
/* Load bpp-specific modules. */
switch (pScrn->bitsPerPixel) {
case 8:
mod = "cfb";
- reqSym = "cfbScreenInit";
break;
case 16:
mod = "cfb16";
- reqSym = "cfb16ScreenInit";
break;
case 32:
mod = "cfb32";
- reqSym = "cfb32ScreenInit";
break;
}
@@ -1797,7 +1592,6 @@
return FALSE;
}
- xf86LoaderReqSymbols(reqSym, NULL);
#endif
if (!pVia->NoAccel) {
@@ -1814,13 +1608,11 @@
VIAFreeRec(pScrn);
return FALSE;
}
- xf86LoaderReqSymLists(exaSymbols, NULL);
}
if (!xf86LoadSubModule(pScrn, "xaa")) {
VIAFreeRec(pScrn);
return FALSE;
}
- xf86LoaderReqSymLists(xaaSymbols, NULL);
}
if (pVia->hwcursor) {
@@ -1828,7 +1620,6 @@
VIAFreeRec(pScrn);
return FALSE;
}
- xf86LoaderReqSymLists(ramdacSymbols, NULL);
}
if (pVia->shadowFB) {
@@ -1836,7 +1627,6 @@
VIAFreeRec(pScrn);
return FALSE;
}
- xf86LoaderReqSymLists(shadowSymbols, NULL);
}
VIAUnmapMem(pScrn);
openchrome-vt1625.patch:
via_bios.h | 8 +++++++
via_crtc.c | 3 +-
via_display.c | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
via_driver.c | 32 ++++++++++++++++++++++++++++++
via_mode.c | 13 ++++++++++++
via_vt162x.c | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++--
via_vt162x.h | 38 ++++++++++++++++++------------------
7 files changed, 189 insertions(+), 22 deletions(-)
--- NEW FILE openchrome-vt1625.patch ---
Index: src/via_mode.c
===================================================================
--- src/via_mode.c (revision 758)
+++ src/via_mode.c (working copy)
@@ -250,6 +250,10 @@ ViaTVSetMode(ScrnInfoPtr pScrn, DisplayModePtr mod
if (pBIOSInfo->TVModeCrtc)
pBIOSInfo->TVModeCrtc(pScrn, mode);
+
+ /* TV reset. */
+ xf86I2CWriteByte(pBIOSInfo->TVI2CDev, 0x1D, 0x00);
+ xf86I2CWriteByte(pBIOSInfo->TVI2CDev, 0x1D, 0x80);
}
void
@@ -491,6 +495,8 @@ ViaOutputsSelect(ScrnInfoPtr pScrn)
pBIOSInfo->CrtPresent = TRUE;
pBIOSInfo->CrtActive = TRUE;
}
+ if (pBIOSInfo->TVActive)
+ pBIOSInfo->FirstCRTC->IsActive = TRUE ;
}
if (!pVia->UseLegacyModeSwitch) {
if (pBIOSInfo->CrtActive)
@@ -1693,6 +1699,13 @@ ViaModeSet(ScrnInfoPtr pScrn, DisplayModePtr mode)
ViaDisplaySetStreamOnDFP(pScrn, TRUE);
ViaDFPPower(pScrn, TRUE);
}
+
+ if (pBIOSInfo->TVActive) {
+ /* TV on FirstCrtc */
+ ViaDisplaySetStreamOnDVO(pScrn, pBIOSInfo->TVDIPort, TRUE);
+ ViaDisplayEnableDVO(pScrn, pBIOSInfo->TVDIPort);
+ ViaTVSetMode(pScrn, mode);
+ }
ViaModeFirstCRTC(pScrn, mode);
} else {
Index: src/via_driver.c
===================================================================
--- src/via_driver.c (revision 758)
+++ src/via_driver.c (working copy)
@@ -211,6 +211,7 @@ typedef enum
OPTION_TVDOTCRAWL,
OPTION_TVTYPE,
OPTION_TVOUTPUT,
+ OPTION_TVDIPORT,
OPTION_DISABLEVQ,
OPTION_DISABLEIRQ,
OPTION_TVDEFLICKER,
@@ -249,6 +250,7 @@ static OptionInfoRec VIAOptions[] = {
{OPTION_TVDEFLICKER, "TVDeflicker", OPTV_INTEGER, {0}, FALSE},
{OPTION_TVTYPE, "TVType", OPTV_ANYSTR, {0}, FALSE},
{OPTION_TVOUTPUT, "TVOutput", OPTV_ANYSTR, {0}, FALSE},
+ {OPTION_TVDIPORT, "TVPort", OPTV_ANYSTR, {0}, FALSE},
{OPTION_DISABLEVQ, "DisableVQ", OPTV_BOOLEAN, {0}, FALSE},
{OPTION_DISABLEIRQ, "DisableIRQ", OPTV_BOOLEAN, {0}, FALSE},
{OPTION_AGP_DMA, "EnableAGPDMA", OPTV_BOOLEAN, {0}, FALSE},
@@ -840,6 +842,7 @@ static Bool
VIASetupDefaultOptions(ScrnInfoPtr pScrn)
{
VIAPtr pVia = VIAPTR(pScrn);
+ VIABIOSInfoPtr pBIOSInfo = pVia->pBIOSInfo;
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, "VIASetupDefaultOptions\n"));
@@ -890,6 +893,7 @@ VIASetupDefaultOptions(ScrnInfoPtr pScrn)
pVia->agpEnable = FALSE;
pVia->dmaXV = FALSE;
pVia->UseLegacyModeSwitch = FALSE;
+ pBIOSInfo->TVDIPort = VIA_DI_PORT_DVP0;
break;
case VIA_P4M900:
pVia->VideoEngine = VIDEO_ENGINE_CME;
@@ -898,17 +902,20 @@ VIASetupDefaultOptions(ScrnInfoPtr pScrn)
/* FIXME: this needs to be tested */
pVia->dmaXV = FALSE;
pVia->UseLegacyModeSwitch = FALSE;
+ pBIOSInfo->TVDIPort = VIA_DI_PORT_DVP0;
break;
case VIA_CX700:
pVia->VideoEngine = VIDEO_ENGINE_CME;
pVia->swov.maxWInterp = 1920;
pVia->swov.maxHInterp = 1080;
pVia->UseLegacyModeSwitch = FALSE;
+ pBIOSInfo->TVDIPort = VIA_DI_PORT_DVP1;
break;
case VIA_P4M890:
pVia->VideoEngine = VIDEO_ENGINE_CME;
pVia->dmaXV = FALSE;
pVia->UseLegacyModeSwitch = FALSE;
+ pBIOSInfo->TVDIPort = VIA_DI_PORT_DVP1;
break;
case VIA_VX800:
case VIA_VX855:
@@ -916,6 +923,7 @@ VIASetupDefaultOptions(ScrnInfoPtr pScrn)
/* pVia->agpEnable = FALSE;
pVia->dmaXV = FALSE;*/
pVia->UseLegacyModeSwitch = FALSE;
+ pBIOSInfo->TVDIPort = VIA_DI_PORT_DVP1;
break;
}
@@ -1540,6 +1548,30 @@ VIAPreInit(ScrnInfoPtr pScrn, int flags)
"No default TV output signal type is set.\n");
}
+ /* TV DI Port */
+ if ((s = xf86GetOptValString(VIAOptions, OPTION_TVDIPORT))) {
+ if (!xf86NameCmp(s, "DVP0")) {
+ pBIOSInfo->TVDIPort = VIA_DI_PORT_DVP0;
+ xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
+ "TV Output Port is DVP0.\n");
+ } else if (!xf86NameCmp(s, "DVP1")) {
+ pBIOSInfo->TVDIPort = VIA_DI_PORT_DVP1;
+ xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
+ "TV Output Port is DVP1.\n");
+ } else if (!xf86NameCmp(s, "DFPHigh")) {
+ pBIOSInfo->TVDIPort = VIA_DI_PORT_DFPHIGH;
+ xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
+ "TV Output Port is DFPHigh.\n");
+ } else if (!xf86NameCmp(s, "DFPLow")) {
+ pBIOSInfo->TVDIPort = VIA_DI_PORT_DFPLOW;
+ xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
+ "TV Output Port is DFPLow.\n");
+ }
+ } else {
+ xf86DrvMsg(pScrn->scrnIndex, X_DEFAULT,
+ "No default TV output port is set.\n");
+ }
+
VIAVidHWDiffInit(pScrn);
/* maybe throw in some more sanity checks here */
Index: src/via_crtc.c
===================================================================
--- src/via_crtc.c (revision 758)
+++ src/via_crtc.c (working copy)
@@ -304,7 +304,8 @@ ViaFirstCRTCSetMode(ScrnInfoPtr pScrn, DisplayMode
temp += 0x03;
temp &= ~0x03;
}
- hwp->writeSeq(hwp, 0x1C, (temp >> 1) & 0xFF);
+
+ hwp->writeSeq(hwp, 0x1C, ((temp >> 1)+1) & 0xFF);
ViaSeqMask(hwp, 0x1D, temp >> 9, 0x03);
switch (pVia->ChipId) {
Index: src/via_bios.h
===================================================================
--- src/via_bios.h (revision 758)
+++ src/via_bios.h (working copy)
@@ -98,6 +98,13 @@
#define VIA_DI_12BIT 0x00
#define VIA_DI_24BIT 0x01
+/* Digital Port */
+#define VIA_DI_PORT_NONE 0x0
+#define VIA_DI_PORT_DVP0 0x1
+#define VIA_DI_PORT_DVP1 0x2
+#define VIA_DI_PORT_DFPLOW 0x4
+#define VIA_DI_PORT_DFPHIGH 0x8
+
typedef struct ViaPanelMode {
int Width ;
int Height ;
@@ -187,6 +194,7 @@ typedef struct _VIABIOSINFO {
int TVDeflicker;
CARD8 TVRegs[0xFF];
int TVNumRegs;
+ int TVDIPort;
/* TV Callbacks */
void (*TVSave) (ScrnInfoPtr pScrn);
Index: src/via_display.c
===================================================================
--- src/via_display.c (revision 758)
+++ src/via_display.c (working copy)
@@ -111,6 +111,38 @@ ViaDisplayDisableCRT(ScrnInfoPtr pScrn)
ViaCrtcMask(hwp, 0x36, 0x30, 0x30);
}
+void
+ViaDisplayEnableDVO(ScrnInfoPtr pScrn, int port)
+{
+ vgaHWPtr hwp = VGAHWPTR(pScrn);
+
+ DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, "ViaDisplayEnableDVO\n"));
+ switch (port) {
+ case VIA_DI_PORT_DVP0:
+ ViaSeqMask(hwp, 0x1E, 0xC0, 0xC0);
+ break;
+ case VIA_DI_PORT_DVP1:
+ ViaSeqMask(hwp, 0x1E, 0x30, 0x30);
+ break;
+ }
+}
+
+void
+ViaDisplayDisableDVO(ScrnInfoPtr pScrn, int port)
+{
+ vgaHWPtr hwp = VGAHWPTR(pScrn);
+
+ DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, "ViaDisplayEnableDVO\n"));
+ switch (port) {
+ case VIA_DI_PORT_DVP0:
+ ViaSeqMask(hwp, 0x1E, 0x00, 0xC0);
+ break;
+ case VIA_DI_PORT_DVP1:
+ ViaSeqMask(hwp, 0x1E, 0x00, 0x30);
+ break;
+ }
+}
+
/*
* Sets the primary or secondary display stream on CRT.
*/
@@ -143,3 +175,32 @@ ViaDisplaySetStreamOnDFP(ScrnInfoPtr pScrn, Bool p
ViaCrtcMask(hwp, 0x99, 0x10, 0x10);
}
+void
+ViaDisplaySetStreamOnDVO(ScrnInfoPtr pScrn, int port, Bool primary)
+{
+ vgaHWPtr hwp = VGAHWPTR(pScrn);
+ int regNum;
+
+ DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, "ViaDisplaySetStreamOnDVO\n"));
+
+ switch (port) {
+ case VIA_DI_PORT_DVP0:
+ regNum = 0x96;
+ break;
+ case VIA_DI_PORT_DVP1:
+ regNum = 0x9B;
+ break;
+ case VIA_DI_PORT_DFPLOW:
+ regNum = 0x97;
+ break;
+ case VIA_DI_PORT_DFPHIGH:
+ regNum = 0x99;
+ break;
+ }
+
+ if (primary)
+ ViaCrtcMask(hwp, regNum, 0x00, 0x10);
+ else
+ ViaCrtcMask(hwp, regNum, 0x10, 0x10);
+}
+
Index: src/via_vt162x.c
===================================================================
--- src/via_vt162x.c (revision 758)
+++ src/via_vt162x.c (working copy)
@@ -32,7 +32,41 @@
#include "via_vt162x.h"
#include "via_id.h"
+static void
+ViaSetTVClockSource(ScrnInfoPtr pScrn)
+{
+ DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, "ViaSetTVClockSource\n"));
+ VIAPtr pVia = VIAPTR(pScrn);
+ VIABIOSInfoPtr pBIOSInfo = pVia->pBIOSInfo;
+ vgaHWPtr hwp = VGAHWPTR(pScrn);
+
+ /* External TV: */
+ switch(pVia->Chipset) {
+ case VIA_CX700:
+ case VIA_VX800:
+ if (pBIOSInfo->FirstCRTC->IsActive) {
+ if(pBIOSInfo->TVDIPort == VIA_DI_PORT_DVP1)
+ ViaCrtcMask(hwp, 0x6C, 0xB0, 0xF0);
+ else if(pBIOSInfo->TVDIPort == VIA_DI_PORT_DVP0)
+ ViaCrtcMask(hwp, 0x6C, 0x90, 0xF0);
+ } else {
+ /* IGA2 */
+ if(pBIOSInfo->TVDIPort == VIA_DI_PORT_DVP1)
+ ViaCrtcMask(hwp, 0x6C, 0x0B, 0x0F);
+ else if(pBIOSInfo->TVDIPort == VIA_DI_PORT_DVP0)
+ ViaCrtcMask(hwp, 0x6C, 0x09, 0x0F);
+ }
+ break;
+ default:
+ if (pBIOSInfo->FirstCRTC->IsActive)
+ ViaCrtcMask(hwp, 0x6C, 0x21, 0x21);
+ else
+ ViaCrtcMask(hwp, 0x6C, 0xA1, 0xA1);
+ break;
+ }
+}
+
static void
VT162xPrintRegs(ScrnInfoPtr pScrn)
{
@@ -650,11 +684,30 @@ VT1622ModeI2C(ScrnInfoPtr pScrn, DisplayModePtr mo
xf86I2CWriteByte(pBIOSInfo->TVI2CDev, 0x2B, Table.RGB[4]);
if (Table.RGB[5])
xf86I2CWriteByte(pBIOSInfo->TVI2CDev, 0x2C, Table.RGB[5]);
+ if (pBIOSInfo->TVEncoder == VIA_VT1625) {
+ if (pBIOSInfo->TVType < TVTYPE_480P) {
+ xf86I2CWriteByte(pBIOSInfo->TVI2CDev, 0x02, 0x12);
+ xf86I2CWriteByte(pBIOSInfo->TVI2CDev, 0x23, 0x7E);
+ xf86I2CWriteByte(pBIOSInfo->TVI2CDev, 0x4A, 0x85);
+ xf86I2CWriteByte(pBIOSInfo->TVI2CDev, 0x4B, 0x0A);
+ xf86I2CWriteByte(pBIOSInfo->TVI2CDev, 0x4E, 0x00);
+ } else {
+ xf86I2CWriteByte(pBIOSInfo->TVI2CDev, 0x02, 0x12);
+ xf86I2CWriteByte(pBIOSInfo->TVI2CDev, 0x4A, 0x85);
+ xf86I2CWriteByte(pBIOSInfo->TVI2CDev, 0x4B, 0x0A);
+ }
+ }
} else if (pBIOSInfo->TVOutput == TVOUTPUT_YCBCR) {
xf86I2CWriteByte(pBIOSInfo->TVI2CDev, 0x02, 0x03);
xf86I2CWriteByte(pBIOSInfo->TVI2CDev, 0x65, Table.YCbCr[0]);
xf86I2CWriteByte(pBIOSInfo->TVI2CDev, 0x66, Table.YCbCr[1]);
xf86I2CWriteByte(pBIOSInfo->TVI2CDev, 0x67, Table.YCbCr[2]);
+ if (pBIOSInfo->TVEncoder == VIA_VT1625) {
+ if (pBIOSInfo->TVType < TVTYPE_480P) {
+ xf86I2CWriteByte(pBIOSInfo->TVI2CDev, 0x23, 0x7E);
+ xf86I2CWriteByte(pBIOSInfo->TVI2CDev, 0x4E, 0x00);
+ }
+ }
}
/* Configure flicker filter. */
@@ -721,8 +774,7 @@ VT1622ModeCrtc(ScrnInfoPtr pScrn, DisplayModePtr m
}
pBIOSInfo->ClockExternal = TRUE;
ViaCrtcMask(hwp, 0x6A, 0x40, 0x40);
- ViaCrtcMask(hwp, 0x6C, 0x01, 0x01);
- ViaSeqMask(hwp, 0x1E, 0xF0, 0xF0); /* enable DI0/DVP0 */
+ ViaSetTVClockSource(pScrn);
}
Index: src/via_vt162x.h
===================================================================
--- src/via_vt162x.h (revision 758)
+++ src/via_vt162x.h (working copy)
@@ -755,19 +755,19 @@ static DisplayModeRec VT1625Modes[] = {
{ MODEPREFIX("1024x768Over"), ... , MODESUFFIXPAL },
{ MODEPREFIX("720x576Over"), ... , MODESUFFIXPAL },*/
/* clock HR SH1 SH2 HFL VR SV1 SV2 VFL*/
- { MODEPREFIX("640x480"), 30000, 640, 680, 808, 1000, 0, 480, 520, 523, 600, 0, V_NHSYNC | V_NVSYNC, MODESUFFIXPAL },
+ { MODEPREFIX("640x480"), 30000, 640, 688, 744, 784, 0, 480, 488, 495, 600, 0, V_NHSYNC | V_NVSYNC, MODESUFFIXPAL },
{ MODEPREFIX("800x600"), 34500, 800, 816, 880, 920, 0, 600, 604, 620, 750, 0, V_PHSYNC | V_PVSYNC, MODESUFFIXPAL },
{ MODEPREFIX("1024x768"), 57000, 1024, 1040, 1112, 1200, 0, 768, 829, 840, 950, 0, V_NHSYNC | V_NVSYNC, MODESUFFIXPAL },
- { MODEPREFIX("720x576"), 34500, 720, 766, 800, 1000, 0, 576, 576, 579, 690, 0, V_NHSYNC | V_PVSYNC, MODESUFFIXPAL },
+ { MODEPREFIX("720x576"), 34500, 720, 760, 800, 1000, 0, 576, 577, 580, 690, 0, V_NHSYNC | V_PVSYNC, MODESUFFIXPAL },
{ MODEPREFIX("720x576Over"), 27000, 720, 768, 800, 864, 0, 576, 577, 579, 625, 0, V_NHSYNC | V_PVSYNC, MODESUFFIXPAL },
{ MODEPREFIX("1280x720"), 74250, 1280, 1320, 1376, 1650, 0, 720, 722, 728, 750, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX720P },
- { MODEPREFIX("1920x1080"), 74250, 1920, 1960, 2016, 2200, 0, 1080, 1082, 1088, 1125, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX1080I },
+ { MODEPREFIX("1920x1080"), 74250, 1920, 1960, 2064, 2200, 0, 1080, 1083, 1087, 1125, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX1080I },
{ MODEPREFIX("640x480"), 24696, 640, 656, 744, 784, 0, 480, 482, 483, 525, 0, V_NHSYNC | V_NVSYNC, MODESUFFIXNTSC },
{ MODEPREFIX("720x480Under"), 34000, 720, 728, 744, 784, 0, 480, 490, 496, 600, 0, V_NHSYNC | V_NVSYNC, MODESUFFIXNTSC },
- { MODEPREFIX("720x480Fit"), 28980, 720, 728, 744, 784, 0, 480, 490, 496, 600, 0, V_NHSYNC | V_NVSYNC, MODESUFFIXNTSC },
- { MODEPREFIX("720x480Over"), 27025, 720, 728, 744, 784, 0, 480, 490, 496, 600, 0, V_NHSYNC | V_NVSYNC, MODESUFFIXNTSC },
+ { MODEPREFIX("720x480Fit"), 28980, 720, 728, 776, 840, 0, 480, 484, 499, 575, 0, V_NHSYNC | V_NVSYNC, MODESUFFIXNTSC },
+ { MODEPREFIX("720x480Over"), 27025, 720, 752, 792, 800, 0, 480, 482, 485, 525, 0, V_NHSYNC | V_NVSYNC, MODESUFFIXNTSC },
{ MODEPREFIX("720x480Under"), 28224, 720, 728, 744, 784, 0, 480, 490, 496, 600, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX480P },
{ MODEPREFIX("720x480Fit"), 28980, 720, 728, 776, 840, 0, 480, 484, 499, 575, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX480P },
@@ -828,13 +828,13 @@ VT1625Table[] = {
},
{ "720x480Over", 720, 480, TVTYPE_NTSC, 0, 0,
/* 00 0F */
- { 0x03, 0, 0x10, 0x1F, 0x00, 0, 0, 0x33, 0x1C, 0x06, 0x7B, 0x15, 0x50, 0x57, 0, 0x9E,
- 0, 0x80, 0x04, 0x08, 0x08, 0x10, 0xD6, 0x7B, 0xF0, 0x21, 0x00, 0x50, 0x43, 0x80, 0, 0x10,
- 0x1C, 0x08, 0xDC, 0x77, 0x02, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+ { 0x03, 0, 0x10, 0x1F, 0x00, 0, 0, 0x02, 0x10, 0x00, 0x7B, 0x15, 0x50, 0x57, 0, 0xB7,
+ 0, 0x80, 0xAD, 0x21, 0x64, 0x34, 0xD6, 0x7B, 0xF0, 0x21, 0x00, 0x50, 0x00, 0x80, 0, 0x10,
+ 0x1C, 0x08, 0xE5, 0x77, 0x02, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
/* 4A 4F 50 59 */
- { 0xC5, 0x0F, 0, 0x01, 0x10, 0x4A, 0x59, 0xCF, 0x23, 0x0C, 0x22, 0x59, 0xCF, 0x7F, 0x23, 0x91,
+ { 0xC5, 0x0F, 0, 0x01, 0x10, 0x4A, 0x1F, 0xD2, 0x23, 0x0C, 0x22, 0x59, 0xC0, 0x7E, 0x23, 0x8C,
/* 5A 5F 60 64 */
- 0xD2, 0xE1, 0x7D, 0x06, 0, 0, 0x80, 0x28, 0xFF, 0x59, 0x03 },
+ 0xD0, 0xF6, 0x7C, 0x06, 0, 0x34, 0x80, 0x28, 0xFF, 0x1F, 0x03 },
/* RBG 65,66,67,27,2b,2c */
{ 0x55, 0x37, 0x5C, 0, 0, 0 },
/* Y-Cb-Cr 65,66,67 */
@@ -876,8 +876,8 @@ VT1625Table[] = {
},
{ "720x480Over", 720, 480, TVTYPE_480P, 0, 0,
/* 00 0F */
- { 0x03, 0, 0x10, 0x40, 0x10, 0, 0, 0x33, 0x20, 0xFF, 0x7B, 0, 0x50, 0x57, 0, 0x9E,
- 0, 0x80, 0x04, 0x08, 0x08, 0x10, 0xD6, 0x7B, 0xF0, 0x21, 0x02, 0x50, 0x43, 0x80, 0, 0x01,
+ { 0x03, 0, 0x10, 0x40, 0x10, 0, 0, 0x01, 0x20, 0, 0x7B, 0, 0x50, 0x57, 0, 0x9E,
+ 0, 0x80, 0x04, 0x08, 0x08, 0x10, 0xD6, 0x7B, 0xF0, 0x21, 0x02, 0x50, 0x00, 0x80, 0, 0x01,
0x2F, 0x08, 0xDC, 0x7E, 0x02, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
/* 4A 4F 50 59 */
{ 0xC5, 0x0F, 0, 0x01, 0, 0x4A, 0x59, 0xCF, 0x23, 0x0C, 0x22, 0x59, 0xCF, 0x7F, 0x23, 0x91,
@@ -909,15 +909,15 @@ VT1625Table[] = {
0x0, 0x0,
},
- { "1920x1080", 1920, 540, TVTYPE_1080I, 0, 0,
+ { "1920x1080", 1920, 1080, TVTYPE_1080I, 0, 0,
/* 00 0F */
- { 0x83, 0, 0x10, 0x4A, 0x86, 0x39, 0, 0x8B, 0x3D, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9E,
- 0x00, 0x80, 0x4A, 0x08, 0x37, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x44, 0x80, 0x00, 0x03,
+ { 0x83, 0, 0x10, 0x4A, 0x86, 0x32, 0, 0x8B, 0x3D, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9E,
+ 0x00, 0x80, 0x4A, 0x08, 0x37, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x04, 0x80, 0x00, 0x03,
0x25, 0x00, 0x00, 0x7E, 0x00, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
/* 4A 4F 50 59 */
{ 0xC5, 0x0F, 0, 0x01, 0, 0x00, 0x97, 0x7F, 0x78, 0x64, 0x14, 0x97, 0x7f, 0x59, 0x78, 0xb0,
/* 5A 5F 60 64 */
- 0x1a, 0xec, 0xfa, 0x08, 0x00, 0x00, 0x80, 0x20, 0xFF, 0x97, 0x28 },
+ 0x1a, 0xdc, 0x5d, 0x08, 0x00, 0x00, 0x80, 0x28, 0xFF, 0x97, 0x28 },
/* RBG 65,66,67,27,2b,2c */
{ 0x55, 0x39, 0x66, 0, 0, 0 },
/* Y-Cb-Cr 65,66,67 */
@@ -945,9 +945,9 @@ VT1625Table[] = {
{ "720x576", 720, 576, TVTYPE_PAL, 0, 0,
/* 00 0F */
- { 0x03, 0x00, 0x10, 0x1f, 0x03, 0x00, 0x00, 0xc9, 0x4c, 0x11, 0x7c, 0x00, 0x56, 0x57, 0x07, 0xbf,
- 0x00, 0x80, 0x09, 0x08, 0x17, 0x24, 0xcb, 0x8a, 0x09, 0x2a, 0x06, 0x50, 0x01, 0x80, 0x00, 0x10,
- 0x14, 0x0c, 0x32, 0x7e, 0x00, 0x5f, 0x34, 0x8c, 0x4f, 0x5e, 0x15, 0xa2, 0x22, 0x80, 0xd3, 0x10
+ { 0x03, 0x00, 0x10, 0x1f, 0x03, 0x00, 0x00, 0xc9, 0x4c, 0x10, 0x7c, 0x00, 0x56, 0x57, 0x07, 0xbf,
+ 0x00, 0x80, 0x09, 0x08, 0x17, 0x24, 0xcb, 0x8a, 0x09, 0x2a, 0x06, 0x50, 0x00, 0x80, 0x00, 0x10,
+ 0x14, 0x0c, 0x32, 0x7e, 0x00, 0x5f, 0x34, 0x8c, 0x4f, 0x5e, 0x15, 0xa2, 0x22, 0x80, 0xd3, 0x10
},
/* 4A 4F 50 59 */
{ 0xc5, 0x0f, 0x00, 0x01, 0x00, 0x4b, 0xe7, 0xd2, 0x23, 0xb1, 0x22, 0x5f, 0x61, 0x7f, 0x23, 0x90,
openchrome-0.2.903-latest_snapshot.patch:
ChangeLog | 320 +++++++++++
configure.ac | 27
libxvmc/Makefile.am | 8
libxvmc/viaLowLevel.c | 4
libxvmc/viaLowLevelPro.c | 6
libxvmc/viaXvMC.c | 62 +-
src/Makefile.am | 6
src/via.h | 22
src/via_accel.c | 505 ++++++++++--------
src/via_bandwidth.c | 34 +
src/via_bios.h | 112 +++-
src/via_crtc.c | 664 ++++++++++++++++++++++++
src/via_cursor.c | 580 +++++++++++++++++----
src/via_dga.c | 4
src/via_display.c | 145 +++++
src/via_dri.c | 11
src/via_driver.c | 672 +++++++++++++++---------
src/via_driver.h | 68 +-
src/via_id.c | 17
src/via_id.h | 4
src/via_lvds.c | 117 ++++
src/via_memory.c | 8
src/via_mode.c | 1277 +++++++++++++++++------------------------------
src/via_mode.h | 125 ++--
src/via_panel.c | 461 ++++++++++++++++
src/via_priv.h | 4
src/via_regs.h | 79 ++
src/via_swov.c | 88 ++-
src/via_timing.c | 398 ++++++++++++++
src/via_timing.h | 51 +
src/via_vbe.c | 6
src/via_video.c | 61 --
src/via_vt162x.h | 17
src/via_xvmc.c | 23
34 files changed, 4383 insertions(+), 1603 deletions(-)
View full diff with command:
/usr/bin/cvs -f diff -kk -u -p -N -r 1.7 -r 1.8 openchrome-0.2.903-latest_snapshot.patchIndex: openchrome-0.2.903-latest_snapshot.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-openchrome/F-11/openchrome-0.2.903-latest_snapshot.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- openchrome-0.2.903-latest_snapshot.patch 18 Jun 2009 23:43:53 -0000 1.7
+++ openchrome-0.2.903-latest_snapshot.patch 19 Jul 2009 14:40:46 -0000 1.8
@@ -1,7 +1,7 @@
Index: configure.ac
===================================================================
---- configure.ac (.../tags/release_0_2_903) (revision 751)
-+++ configure.ac (.../trunk) (revision 751)
+--- configure.ac (.../tags/release_0_2_903) (revision 758)
++++ configure.ac (.../trunk) (revision 758)
@@ -70,7 +70,7 @@
XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
@@ -63,8 +63,8 @@ Index: configure.ac
AC_SUBST([DRIVER_MAN_SUFFIX])
Index: libxvmc/Makefile.am
===================================================================
---- libxvmc/Makefile.am (.../tags/release_0_2_903) (revision 751)
-+++ libxvmc/Makefile.am (.../trunk) (revision 751)
+--- libxvmc/Makefile.am (.../tags/release_0_2_903) (revision 758)
++++ libxvmc/Makefile.am (.../trunk) (revision 758)
@@ -24,13 +24,13 @@
xf86dristr.h \
vldXvMC.h
@@ -85,8 +85,8 @@ Index: libxvmc/Makefile.am
driDrawable.c \
Index: libxvmc/viaLowLevel.c
===================================================================
---- libxvmc/viaLowLevel.c (.../tags/release_0_2_903) (revision 751)
-+++ libxvmc/viaLowLevel.c (.../trunk) (revision 751)
+--- libxvmc/viaLowLevel.c (.../tags/release_0_2_903) (revision 758)
++++ libxvmc/viaLowLevel.c (.../trunk) (revision 758)
@@ -276,8 +276,8 @@
xl->tsMem.context = *(xl->drmcontext);
xl->tsMem.size = 64;
@@ -100,8 +100,8 @@ Index: libxvmc/viaLowLevel.c
return -1;
Index: libxvmc/viaLowLevelPro.c
===================================================================
---- libxvmc/viaLowLevelPro.c (.../tags/release_0_2_903) (revision 751)
-+++ libxvmc/viaLowLevelPro.c (.../trunk) (revision 751)
+--- libxvmc/viaLowLevelPro.c (.../tags/release_0_2_903) (revision 758)
++++ libxvmc/viaLowLevelPro.c (.../trunk) (revision 758)
@@ -1460,13 +1460,13 @@
if (size != mem->size) {
@@ -129,8 +129,8 @@ Index: libxvmc/viaLowLevelPro.c
Index: libxvmc/viaXvMC.c
===================================================================
---- libxvmc/viaXvMC.c (.../tags/release_0_2_903) (revision 751)
-+++ libxvmc/viaXvMC.c (.../trunk) (revision 751)
+--- libxvmc/viaXvMC.c (.../tags/release_0_2_903) (revision 758)
++++ libxvmc/viaXvMC.c (.../trunk) (revision 758)
@@ -248,7 +248,7 @@
return errType;
}
@@ -407,8 +407,8 @@ Index: libxvmc/viaXvMC.c
Index: ChangeLog
===================================================================
---- ChangeLog (.../tags/release_0_2_903) (revision 751)
-+++ ChangeLog (.../trunk) (revision 751)
+--- ChangeLog (.../tags/release_0_2_903) (revision 758)
++++ ChangeLog (.../trunk) (revision 758)
@@ -1,3 +1,323 @@
+2009-03-21 Xavier Bachelot <xavier at bachelot.org>
+
@@ -736,7 +736,7 @@ Index: ChangeLog
Index: src/via_panel.c
===================================================================
--- src/via_panel.c (.../tags/release_0_2_903) (revision 0)
-+++ src/via_panel.c (.../trunk) (revision 751)
++++ src/via_panel.c (.../trunk) (revision 758)
@@ -0,0 +1,461 @@
+/*
+ * Copyright 2007 The Openchrome Project [openchrome.org]
@@ -1201,28 +1201,30 @@ Index: src/via_panel.c
+}
Index: src/via_id.h
===================================================================
---- src/via_id.h (.../tags/release_0_2_903) (revision 751)
-+++ src/via_id.h (.../trunk) (revision 751)
-@@ -37,6 +37,7 @@
+--- src/via_id.h (.../tags/release_0_2_903) (revision 758)
++++ src/via_id.h (.../trunk) (revision 758)
+@@ -37,6 +37,8 @@
VIA_P4M900,
VIA_CX700,
VIA_P4M890,
+ VIA_VX800,
++ VIA_VX855,
VIA_LAST
};
-@@ -52,6 +53,7 @@
+@@ -52,6 +54,8 @@
#define PCI_CHIP_VT3364 0x3371 /* P4M900 */
#define PCI_CHIP_VT3324 0x3157 /* CX700 */
#define PCI_CHIP_VT3327 0x3343 /* P4M890 */
+#define PCI_CHIP_VT3353 0x1122 /* VX800 */
++#define PCI_CHIP_VT3409 0x5122 /* VX855/VX875 */
/* There is some conflicting information about the two major revisions of
* the CLE266, often labelled Ax and Cx. The dividing line seems to be
Index: src/via_video.c
===================================================================
---- src/via_video.c (.../tags/release_0_2_903) (revision 751)
-+++ src/via_video.c (.../trunk) (revision 751)
+--- src/via_video.c (.../tags/release_0_2_903) (revision 758)
++++ src/via_video.c (.../trunk) (revision 758)
@@ -112,11 +112,7 @@
static int viaSetPortAttribute(ScrnInfoPtr, Atom, INT32, pointer);
static int viaPutImage(ScrnInfoPtr, short, short, short, short, short, short,
@@ -1236,9 +1238,11 @@ Index: src/via_video.c
static void nv12Blit(unsigned char *nv12Chroma,
const unsigned char *uBuffer,
const unsigned char *vBuffer,
-@@ -282,7 +278,8 @@
+@@ -281,8 +277,10 @@
+ pVia->ChipId != PCI_CHIP_VT3314 &&
pVia->ChipId != PCI_CHIP_VT3327 &&
pVia->ChipId != PCI_CHIP_VT3336 &&
++ pVia->ChipId != PCI_CHIP_VT3409 &&
pVia->ChipId != PCI_CHIP_VT3364 &&
- pVia->ChipId != PCI_CHIP_VT3324) {
+ pVia->ChipId != PCI_CHIP_VT3324 &&
@@ -1246,7 +1250,7 @@ Index: src/via_video.c
CARD32 bandwidth = (mode->HDisplay >> 4) * (mode->VDisplay >> 5) *
pScrn->bitsPerPixel * mode->VRefresh;
-@@ -370,14 +367,14 @@
+@@ -370,14 +368,14 @@
if (pVia->pVbe) {
refresh = 100;
@@ -1265,7 +1269,7 @@ Index: src/via_video.c
if ((width == 1400) && (height == 1050)) {
width = 1280;
height = 1024;
-@@ -476,6 +473,10 @@
+@@ -476,6 +474,10 @@
{
VIAPtr pVia = VIAPTR(pScrn);
vmmtr viaVidEng = (vmmtr) pVia->VidMapBase;
@@ -1276,7 +1280,7 @@ Index: src/via_video.c
pVia->dwV1 = ((vmmtr) viaVidEng)->video1_ctl;
pVia->dwV3 = ((vmmtr) viaVidEng)->video3_ctl;
-@@ -490,6 +491,10 @@
+@@ -490,6 +492,10 @@
{
VIAPtr pVia = VIAPTR(pScrn);
vmmtr viaVidEng = (vmmtr) pVia->VidMapBase;
@@ -1287,7 +1291,7 @@ Index: src/via_video.c
viaVidEng->video1_ctl = pVia->dwV1;
viaVidEng->video3_ctl = pVia->dwV3;
-@@ -568,6 +573,7 @@
+@@ -568,6 +574,7 @@
(pVia->Chipset == VIA_K8M890) ||
(pVia->Chipset == VIA_P4M900) ||
(pVia->Chipset == VIA_CX700) ||
@@ -1295,7 +1299,7 @@ Index: src/via_video.c
(pVia->Chipset == VIA_P4M890));
if ((pVia->drmVerMajor < 2) ||
((pVia->drmVerMajor == 2) && (pVia->drmVerMinor < 9)))
-@@ -586,7 +592,7 @@
+@@ -586,13 +593,14 @@
(pVia->Chipset == VIA_K8M800) || (pVia->Chipset == VIA_PM800) ||
(pVia->Chipset == VIA_VM800) || (pVia->Chipset == VIA_K8M890) ||
(pVia->Chipset == VIA_P4M900) || (pVia->Chipset == VIA_CX700) ||
@@ -1304,7 +1308,14 @@ Index: src/via_video.c
num_new = viaSetupAdaptors(pScreen, &newAdaptors);
num_adaptors = xf86XVListGenericAdaptors(pScrn, &adaptors);
} else {
-@@ -650,8 +656,6 @@
+ xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
+ "[Xv] Unsupported Chipset. X video functionality disabled.\n");
+ num_adaptors = 0;
++ memset(viaAdaptPtr, 0, sizeof(viaAdaptPtr));
+ }
+
+ DBG_DD(ErrorF(" via_video.c : num_adaptors : %d\n", num_adaptors));
+@@ -650,8 +658,6 @@
return TRUE;
}
@@ -1313,7 +1324,7 @@ Index: src/via_video.c
static void
viaVideoFillPixmap(ScrnInfoPtr pScrn,
char *base,
-@@ -662,7 +666,7 @@
+@@ -662,7 +668,7 @@
{
[...2537 lines suppressed...]
return vx->PutImage(pScrn, src_x, src_y, drw_x, drw_y, src_w, src_h,
drw_w, drw_h, id, buf, width, height, sync, clipBoxes,
@@ -7330,8 +7849,8 @@ Index: src/via_xvmc.c
unsigned long
Index: src/via_dri.c
===================================================================
---- src/via_dri.c (.../tags/release_0_2_903) (revision 751)
-+++ src/via_dri.c (.../trunk) (revision 751)
+--- src/via_dri.c (.../tags/release_0_2_903) (revision 758)
++++ src/via_dri.c (.../trunk) (revision 758)
@@ -588,7 +588,16 @@
pDRIInfo = pVia->pDRIInfo;
@@ -7352,8 +7871,8 @@ Index: src/via_dri.c
#ifdef XSERVER_LIBPCIACCESS
Index: src/via_vt162x.h
===================================================================
---- src/via_vt162x.h (.../tags/release_0_2_903) (revision 751)
-+++ src/via_vt162x.h (.../trunk) (revision 751)
+--- src/via_vt162x.h (.../tags/release_0_2_903) (revision 758)
++++ src/via_vt162x.h (.../trunk) (revision 758)
@@ -926,6 +926,23 @@
0x0, 0x0,
},
@@ -7380,9 +7899,22 @@ Index: src/via_vt162x.h
{ 0x03, 0x00, 0x10, 0x1f, 0x03, 0x00, 0x00, 0xc9, 0x4c, 0x11, 0x7c, 0x00, 0x56, 0x57, 0x07, 0xbf,
Index: src/via.h
===================================================================
---- src/via.h (.../tags/release_0_2_903) (revision 751)
-+++ src/via.h (.../trunk) (revision 751)
-@@ -561,9 +561,6 @@
+--- src/via.h (.../tags/release_0_2_903) (revision 758)
++++ src/via.h (.../trunk) (revision 758)
+@@ -327,6 +327,12 @@
+ #define VIDEO_FIFO_PRETHRESHOLD_VT3336 250
+ #define VIDEO_EXPIRE_NUM_VT3336 31
+
++/* Those values are only valid for IGA1 */
++#define VIDEO_FIFO_DEPTH_VT3409 400
++#define VIDEO_FIFO_THRESHOLD_VT3409 320
++#define VIDEO_FIFO_PRETHRESHOLD_VT3409 230
++#define VIDEO_EXPIRE_NUM_VT3409 160
++
+ /* ALPHA_V3_FIFO_CONTROL 0x278
+ * IA2 has 32 level FIFO for packet mode video format
+ * 32 level FIFO for planar mode video YV12. with extension reg 230 bit 21 enable
+@@ -561,9 +567,6 @@
#define HQV_V_FILTER_DEFAULT 0x00420000
#define HQV_H_FILTER_DEFAULT 0x00000040
@@ -7392,7 +7924,7 @@ Index: src/via.h
/* HQV_MINI_CONTROL 0x3E8 */
#define HQV_H_MINIFY_ENABLE 0x00000800
#define HQV_H_MINIFY_DOWN 0x00001000
-@@ -572,6 +569,19 @@
+@@ -572,6 +575,19 @@
#define HQV_VDEBLOCK_FILTER 0x80000000
#define HQV_HDEBLOCK_FILTER 0x00008000
@@ -7414,8 +7946,8 @@ Index: src/via.h
#define CHROMA_KEY_HIGH 0x00FFFFFF
Index: src/via_priv.h
===================================================================
---- src/via_priv.h (.../tags/release_0_2_903) (revision 751)
-+++ src/via_priv.h (.../trunk) (revision 751)
+--- src/via_priv.h (.../tags/release_0_2_903) (revision 758)
++++ src/via_priv.h (.../trunk) (revision 758)
@@ -29,9 +29,7 @@
#ifdef XF86DRI
#include "via_drm.h"
@@ -7439,7 +7971,7 @@ Index: src/via_priv.h
Index: src/via_timing.c
===================================================================
--- src/via_timing.c (.../tags/release_0_2_903) (revision 0)
-+++ src/via_timing.c (.../trunk) (revision 751)
++++ src/via_timing.c (.../trunk) (revision 758)
@@ -0,0 +1,398 @@
+/*
+ * Copyright 2007-2008 Gabriel Mansi.
@@ -7841,8 +8373,8 @@ Index: src/via_timing.c
+}
Index: src/Makefile.am
===================================================================
---- src/Makefile.am (.../tags/release_0_2_903) (revision 751)
-+++ src/Makefile.am (.../trunk) (revision 751)
+--- src/Makefile.am (.../tags/release_0_2_903) (revision 758)
++++ src/Makefile.am (.../trunk) (revision 758)
@@ -43,23 +43,29 @@
via_ch7xxx.c \
via_ch7xxx.h \
@@ -7875,8 +8407,8 @@ Index: src/Makefile.am
via_vgahw.h \
Index: src/via_dga.c
===================================================================
---- src/via_dga.c (.../tags/release_0_2_903) (revision 751)
-+++ src/via_dga.c (.../trunk) (revision 751)
+--- src/via_dga.c (.../tags/release_0_2_903) (revision 758)
++++ src/via_dga.c (.../trunk) (revision 758)
@@ -248,7 +248,7 @@
pScrn->SwitchMode(index, pScrn->currentMode, 0);
@@ -7897,9 +8429,9 @@ Index: src/via_dga.c
pVia->DGAOldDisplayWidth = pScrn->displayWidth;
Index: src/via_id.c
===================================================================
---- src/via_id.c (.../tags/release_0_2_903) (revision 751)
-+++ src/via_id.c (.../trunk) (revision 751)
-@@ -87,6 +87,7 @@
+--- src/via_id.c (.../tags/release_0_2_903) (revision 758)
++++ src/via_id.c (.../trunk) (revision 758)
+@@ -87,10 +87,12 @@
{"Asustek K8V-MX", VIA_K8M800, 0x1043, 0x8129, VIA_DEVICE_CRT},
{"Mitac 8399", VIA_K8M800, 0x1071, 0x8399, VIA_DEVICE_CRT | VIA_DEVICE_LCD | VIA_DEVICE_TV}, /* aka "Pogolinux Konabook 3100" */
{"Mitac 8889", VIA_K8M800, 0x1071, 0x8889, VIA_DEVICE_CRT | VIA_DEVICE_LCD | VIA_DEVICE_TV},
@@ -7907,7 +8439,12 @@ Index: src/via_id.c
{"VIA VT3108 (K8M800)", VIA_K8M800, 0x1106, 0x3108, VIA_DEVICE_CRT}, /* borrowed by Asustek A8V-MX */
{"Shuttle FX21", VIA_K8M800, 0x1297, 0x3052, VIA_DEVICE_CRT},
{"Shuttle FX83", VIA_K8M800, 0x1297, 0xF683, VIA_DEVICE_CRT | VIA_DEVICE_TV},
-@@ -113,6 +114,7 @@
+ {"Sharp Actius AL27", VIA_K8M800, 0x13BD, 0x1044, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
++ {"Sharp PC-AE30J", VIA_K8M800, 0x13BD, 0x104B, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
+ {"Giga-byte GA-K8VM800M", VIA_K8M800, 0x1458, 0xD000, VIA_DEVICE_CRT},
+ {"MSI K8M Neo-V", VIA_K8M800, 0x1462, 0x0320, VIA_DEVICE_CRT},
+ {"MSI K8MM-V", VIA_K8M800, 0x1462, 0x7142, VIA_DEVICE_CRT},
+@@ -113,6 +115,7 @@
{"Packard Bell Imedia 2097", VIA_K8M800, 0x1631, 0xD007, VIA_DEVICE_CRT},
{"Fujitsu-Siemens Amilo K7610", VIA_K8M800, 0x1734, 0x10B3, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
{"ASRock K8Upgrade-VM800", VIA_K8M800, 0x1849, 0x3108, VIA_DEVICE_CRT},
@@ -7915,7 +8452,7 @@ Index: src/via_id.c
/*** PM800, PM880, PN800, CN400 ***/
{"VIA VT3118 (PM800)", VIA_PM800, 0x1106, 0x3118, VIA_DEVICE_CRT}, /* borrowed by ECS PM800-M2 */
-@@ -138,6 +140,7 @@
+@@ -138,6 +141,7 @@
{"PCChips V21G", VIA_VM800, 0x1019, 0xAA51, VIA_DEVICE_CRT},
{"Asustek P5VDC-MX", VIA_VM800, 0x1043, 0x3344, VIA_DEVICE_CRT},
{"Asustek P5VDC-TVM", VIA_VM800, 0x1043, 0x81CE, VIA_DEVICE_CRT},
@@ -7923,7 +8460,7 @@ Index: src/via_id.c
{"Gateway MX3210", VIA_VM800, 0x107B, 0x0216, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
{"VIA VT3344 (VM800) - EPIA EN", VIA_VM800, 0x1106, 0x3344, VIA_DEVICE_CRT | VIA_DEVICE_TV},
{"Gigabyte GA-8VM800M-775", VIA_VM800, 0x1458, 0xD000, VIA_DEVICE_CRT},
-@@ -145,6 +148,7 @@
+@@ -145,6 +149,7 @@
{"MSI Fuzzy CN700/CN700T/CN700G", VIA_VM800, 0x1462, 0x7199, VIA_DEVICE_CRT | VIA_DEVICE_TV},
{"MSI PM8M3-V", VIA_VM800, 0x1462, 0x7211, VIA_DEVICE_CRT},
{"MSI PM8PM", VIA_VM800, 0x1462, 0x7222, VIA_DEVICE_CRT},
@@ -7931,7 +8468,7 @@ Index: src/via_id.c
{"RoverBook Partner W500", VIA_VM800, 0x1509, 0x4330, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
{"Clevo/RoverBook Voyager V511L", VIA_VM800, 0x1558, 0x0662, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
{"Clevo M5xxS", VIA_VM800, 0x1558, 0x5406, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
-@@ -158,6 +162,7 @@
+@@ -158,6 +163,7 @@
{"Asustek P5V800-MX", VIA_VM800, 0x3344, 0x1122, VIA_DEVICE_CRT},
/*** K8M890 ***/
@@ -7939,7 +8476,7 @@ Index: src/via_id.c
{"Asustek A8V-VM", VIA_K8M890, 0x1043, 0x81B5, VIA_DEVICE_CRT},
{"Asustek M2V-MX SE", VIA_K8M890, 0x1043, 0x8297, VIA_DEVICE_CRT},
{"Foxconn K8M890M2MA-RS2H", VIA_K8M890, 0x105B, 0x0C84, VIA_DEVICE_CRT},
-@@ -179,6 +184,7 @@
+@@ -179,6 +185,7 @@
{"Gigabyte GA-VM900M", VIA_P4M900, 0x1458, 0xD000, VIA_DEVICE_CRT},
{"MSI VR321", VIA_P4M900, 0x1462, 0x3355, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
{"MSI P4M900M / P4M900M2-F/L", VIA_P4M900, 0x1462, 0x7255, VIA_DEVICE_CRT},
@@ -7947,7 +8484,7 @@ Index: src/via_id.c
{"Everex NC1501/NC1503", VIA_P4M900, 0x1509, 0x1E30, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
{"Clevo M660SE", VIA_P4M900, 0x1558, 0x0664, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
{"Clevo M660SR", VIA_P4M900, 0x1558, 0x0669, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
-@@ -196,6 +202,7 @@
+@@ -196,6 +203,7 @@
{"Samsung Q1B", VIA_CX700, 0x144D, 0xC02C, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
{"FIC CE260", VIA_CX700, 0x1509, 0x2D30, VIA_DEVICE_LCD},
{"FIC CE261", VIA_CX700, 0x1509, 0x2F07, VIA_DEVICE_LCD},
@@ -7955,7 +8492,7 @@ Index: src/via_id.c
{"Packard Bell EasyNote XS", VIA_CX700, 0x1631, 0xC201, VIA_DEVICE_LCD}, /* aka Everex Cloudbook CE1200V */
/*** P4M890, VN890 ***/
-@@ -204,11 +211,17 @@
+@@ -204,11 +212,20 @@
{"Asustek P5V-VM ULTRA", VIA_P4M890, 0x1043, 0x81B5, VIA_DEVICE_CRT},
{"Asustek P5V-VM DH", VIA_P4M890, 0x1043, 0x81CE, VIA_DEVICE_CRT},
{"Mitac 8615", VIA_P4M890, 0x1071, 0x8615, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
@@ -7970,13 +8507,16 @@ Index: src/via_id.c
+ {"Samsung NC20", VIA_VX800, 0x144d, 0xc04e, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
+ {"Quanta DreamBook Light IL1", VIA_VX800, 0x152d, 0x0771, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
+
++ /*** VX855 ***/
++ {"VIA VT8562C", VIA_VX855, 0x1106, 0x5122, VIA_DEVICE_CRT},
++
/* keep this */
{NULL, VIA_UNKNOWN, 0x0000, 0x0000, VIA_DEVICE_NONE}
};
Index: src/via_timing.h
===================================================================
--- src/via_timing.h (.../tags/release_0_2_903) (revision 0)
-+++ src/via_timing.h (.../trunk) (revision 751)
++++ src/via_timing.h (.../trunk) (revision 758)
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2007-2008 Gabriel Mansi.
Index: xorg-x11-drv-openchrome.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-openchrome/F-11/xorg-x11-drv-openchrome.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- xorg-x11-drv-openchrome.spec 19 Jun 2009 00:04:45 -0000 1.44
+++ xorg-x11-drv-openchrome.spec 19 Jul 2009 14:40:46 -0000 1.45
@@ -10,7 +10,7 @@
Summary: Xorg X11 openchrome video driver
Name: xorg-x11-drv-openchrome
Version: 0.2.903
-Release: 11%{?dist}
+Release: 12%{?dist}
URL: http://www.openchrome.org
License: MIT
Group: User Interface/X Hardware Support
@@ -25,10 +25,15 @@ Patch99: openchrome-0.2.903-late
# Fedora specific patches :
#Patch100: openchrome-0.2.903-disable_hwcursor.patch
# Experimental patches (branch backport, etc...):
-Patch200: openchrome-0.2.903-vx855_support.patch
-Patch201: openchrome-0.2.903-pll_rework.patch
-Patch202: openchrome-0.2.903-fix_cursor_on_secondary.patch
+#Patch200: openchrome-0.2.903-vx855_support.patch
+#Patch201: openchrome-0.2.903-pll_rework.patch
+#Patch202: openchrome-0.2.903-fix_cursor_on_secondary.patch
Patch203: openchrome-0.2.903-disable_TMDS_by_default.patch
+#Patch204: openchrome-switch-on-lvds-pads-only-for-active-channels.patch
+Patch205: openchrome-0.2.903-XO-1.5-panel.patch
+Patch206: openchrome-0.2.903-remove_loader_symbol_lists.patch
+#Patch207: openchrome-0.2.903-fix_null_pointer_deref_in_viaExaCheckComposite.patch
+Patch208: openchrome-vt1625.patch
ExclusiveArch: %{ix86} x86_64
@@ -69,10 +74,10 @@ X.Org X11 openchrome video driver XvMC d
%prep
%setup -q -n %{tarball}-%{version}
%patch99 -p0 -b .latest
-%patch200 -p0
-%patch201 -p0
-%patch202 -p0
-%patch203 -p0
+%patch203 -p0 -b .tmds
+%patch205 -p0 -b .XO_1.5_panel
+%patch206 -p0 -b .loader_symbol
+%patch208 -p0 -b .vt1625
%build
@@ -130,6 +135,16 @@ fi
%changelog
+* Mon Jul 18 2009 Xavier Bachelot <xavier at bachelot.org> - 0.2.903-12
+- Update to latest snapshot (svn 758) :
+ - Basic VX855 support.
+ - Fix pci space corruption on P4M900 (RHBZ#506622).
+ - Fix null pointer dereference in viaExaCheckComposite (RHBZ#449034).
+- Add patch to allow 1200x900 panel (X0-1.5).
+- Add patch to remove loader symbol lists, needed for xserver 1.7 (RHBZ#510206).
+- Add experimental patch for better VT1625 support.
+- Drop upstreamed patches.
+
* Thu Jun 18 2009 Xavier Bachelot <xavier at bachelot.org> - 0.2.903-11
- Update to latest snapshot (svn 751) :
- Add support for VX800 integrated TMDS encoder.
--- openchrome-0.2.903-fix_cursor_on_secondary.patch DELETED ---
--- openchrome-0.2.903-pll_rework.patch DELETED ---
--- openchrome-0.2.903-vx855_support.patch DELETED ---
- Previous message: rpms/perl-Config-JFDI/F-11 .cvsignore, 1.2, 1.3 perl-Config-JFDI.spec, 1.1, 1.2 sources, 1.2, 1.3
- Next message: rpms/xorg-x11-drv-openchrome/F-10 openchrome-0.2.903-XO-1.5-panel.patch, NONE, 1.1 openchrome-0.2.903-remove_loader_symbol_lists.patch, NONE, 1.1 openchrome-vt1625.patch, NONE, 1.1 openchrome-0.2.903-latest_snapshot.patch, 1.5, 1.6 xorg-x11-drv-openchrome.spec, 1.38, 1.39 openchrome-0.2.903-fix_cursor_on_secondary.patch, 1.1, NONE openchrome-0.2.903-pll_rework.patch, 1.1, NONE openchrome-0.2.903-vx855_support.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list