rpms/xorg-x11-drv-openchrome/devel openchrome-0.2.902-panel.patch, 1.3, 1.4 xorg-x11-drv-openchrome.spec, 1.25, 1.26
Xavier Bachelot (xavierb)
fedora-extras-commits at redhat.com
Sun Aug 3 16:15:56 UTC 2008
- Previous message (by thread): rpms/openoffice.org/devel redhat-agreement.xsl, NONE, 1.1 openoffice.org.spec, 1.1600, 1.1601
- Next message (by thread): rpms/libv4l/devel .cvsignore, 1.3, 1.4 libv4l.spec, 1.2, 1.3 sources, 1.3, 1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: xavierb
Update of /cvs/pkgs/rpms/xorg-x11-drv-openchrome/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29415
Modified Files:
openchrome-0.2.902-panel.patch xorg-x11-drv-openchrome.spec
Log Message:
new version of the hw cursor and panel patch
openchrome-0.2.902-panel.patch:
Index: openchrome-0.2.902-panel.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-openchrome/devel/openchrome-0.2.902-panel.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- openchrome-0.2.902-panel.patch 27 Jun 2008 20:04:26 -0000 1.3
+++ openchrome-0.2.902-panel.patch 3 Aug 2008 16:15:25 -0000 1.4
@@ -73,8 +73,8 @@
===================================================================
--- src/via_panel.c (revision 0)
+++ src/via_panel.c (revision 0)
-@@ -0,0 +1,456 @@
-+/*
+@@ -0,0 +1,461 @@
++/*
+ * Copyright 2007 The Openchrome Project [openchrome.org]
+ * Copyright (c) 1997-2003 by The XFree86 Project, Inc.
+ * Copyright 1998-2007 VIA Technologies, Inc. All Rights Reserved.
@@ -306,6 +306,8 @@
+
+ /* TODO: fix refresh rate and check malloc */
+ DisplayModePtr p = malloc( sizeof(DisplayModeRec) ) ;
++ memset(p, 0, sizeof(DisplayModeRec));
++
+ float refresh = 60.0f ;
+
+ /* The following code is borrowed from xf86SetModeCrtc. */
@@ -351,8 +353,8 @@
+ Bool ret;
+
+ ret = ViaPanelGetSizeFromDDCv1(pScrn, &width, &height);
-+/*
-+ if (!ret)
++/*
++ if (!ret)
+ ret = ViaPanelGetSizeFromDDCv2(pScrn, &width, &height);
+*/
+ if (ret) {
@@ -369,6 +371,9 @@
+
+ if (panel->NativeModeIndex != VIA_PANEL_INVALID)
+ ViaPanelGetNativeDisplayMode(pScrn);
++
++ DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, "NativeModeIndex: %d", panel->NativeModeIndex )) ;
++
+}
+
+void
@@ -766,6 +771,15 @@
/*
*
* TV specific code.
+@@ -277,7 +326,7 @@
+ pBIOSInfo->CrtPresent = TRUE;
+ }
+
+- /*
++ /*
+ * FIXME: xf86I2CProbeAddress(pVia->pI2CBus3, 0x40)
+ * disables the panel on P4M900
+ * See ViaTVDetect.
@@ -347,14 +396,14 @@
" Initialised register: 0x%02x\n",
VIAGetActiveDisplay(pScrn)));
@@ -1047,6 +1061,15 @@
}
/*
+@@ -656,7 +582,7 @@
+
+ /*
+ *
+- * ViaResolutionTable[i].PanelIndex is pBIOSInfo->PanelSize
++ * ViaResolutionTable[i].PanelIndex is pBIOSInfo->PanelSize
+ * pBIOSInfo->PanelIndex is the index to lcdTable.
+ *
+ */
@@ -670,9 +596,9 @@
pBIOSInfo->PanelIndex = VIA_BIOS_NUM_PANEL;
@@ -1099,7 +1122,7 @@
-ViaModePrimaryVGAValid(ScrnInfoPtr pScrn, DisplayModePtr mode)
-{
- DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, "ViaModePrimaryVGAValid\n"));
-+static CARD32
++static CARD32
+ViaModeDotClockTranslate(ScrnInfoPtr pScrn, DisplayModePtr mode);
- if (mode->CrtcHTotal > 4100) {
@@ -1319,6 +1342,24 @@
temp = mode->CrtcHDisplay * mode->CrtcVDisplay * mode->VRefresh
* (pScrn->bitsPerPixel >> 3);
if (pBIOSInfo->Bandwidth < temp) {
+@@ -1051,7 +865,7 @@
+ hwp->writeMiscOut(hwp, data | 0x0C);
+ }
+
+-/*
++/*
+ *
+ */
+ static void
+@@ -1076,7 +890,7 @@
+ ViaSeqMask(hwp, 0x40, 0x00, 0x02);
+ }
+
+-/*
++/*
+ *
+ */
+ static void
@@ -1118,7 +932,7 @@
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, "VIASetLCDMode\n"));
@@ -2084,7 +2125,16 @@
switch (pVia->Chipset) {
case VIA_KM400:
/* IRQ is not broken on KM400A, but testing (pVia->ChipRev < 0x80)
-@@ -828,6 +896,7 @@
+@@ -821,13 +888,16 @@
+ break;
+ case VIA_K8M800:
+ pVia->DRIIrqEnable = FALSE;
++ pVia->UseLegacyModeSwitch = FALSE;
+ break;
+ case VIA_VM800:
++ pVia->UseLegacyModeSwitch = FALSE;
+ break;
+ case VIA_K8M890:
pVia->VideoEngine = VIDEO_ENGINE_CME;
pVia->agpEnable = FALSE;
pVia->dmaXV = FALSE;
@@ -2092,7 +2142,7 @@
break;
case VIA_P4M900:
pVia->VideoEngine = VIDEO_ENGINE_CME;
-@@ -835,16 +904,19 @@
+@@ -835,16 +905,19 @@
pVia->useLegacyVBE = FALSE;
/* FIXME: this needs to be tested */
pVia->dmaXV = FALSE;
@@ -2819,8 +2869,8 @@
===================================================================
--- src/via_crtc.c (revision 0)
+++ src/via_crtc.c (revision 0)
-@@ -0,0 +1,607 @@
-+/*
+@@ -0,0 +1,612 @@
++/*
+ * Copyright 2005-2007 The Openchrome Project [openchrome.org]
+ * Copyright 2004-2005 The Unichrome Project [unichrome.sf.net]
+ * Copyright 1998-2003 VIA Technologies, Inc. All Rights Reserved.
@@ -3202,6 +3252,11 @@
+ vgaHWPtr hwp = VGAHWPTR(pScrn);
+ CARD16 temp;
+
++ xf86DrvMsg(pScrn->scrnIndex, X_INFO, "mode: %p\n", mode);
++ xf86DrvMsg(pScrn->scrnIndex, X_INFO, "mode->name: %p\n", mode->name);
++ xf86DrvMsg(pScrn->scrnIndex, X_INFO, "mode->name: %s\n", mode->name);
++
++
+ DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, "ViaSecondCRTCSetMode\n"));
+ DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Setting up %s\n", mode->name));
+ /* bpp */
@@ -3431,7 +3486,17 @@
===================================================================
--- src/via_swov.c (revision 569)
+++ src/via_swov.c (working copy)
-@@ -1674,6 +1674,7 @@
+@@ -95,7 +95,8 @@
+ pdwState = (CARD32 volatile *)(pVia->VidMapBase + (HQV_CONTROL + proReg));
+
+ if (pVia->VideoEngine == VIDEO_ENGINE_CME) {
+- while (*pdwState & (HQV_SUBPIC_FLIP | HQV_SW_FLIP)) ;
++ // while (*pdwState & (HQV_SUBPIC_FLIP | HQV_SW_FLIP)) ;
++ while (*pdwState & HQV_SUBPIC_FLIP);
+ } else {
+ while (!(*pdwState & HQV_FLIP_STATUS)) ;
+ }
+@@ -1674,6 +1675,7 @@
unsigned long chromaKeyLow, unsigned long chromaKeyHigh)
{
VIAPtr pVia = VIAPTR(pScrn);
@@ -3439,7 +3504,7 @@
vgaHWPtr hwp = VGAHWPTR(pScrn);
VIAHWDiff *hwDiff = &pVia->HWDiff;
-@@ -1707,8 +1708,15 @@
+@@ -1707,8 +1709,15 @@
pUpdate->DstLeft, pUpdate->DstRight,
pUpdate->DstTop, pUpdate->DstBottom));
@@ -3457,7 +3522,7 @@
pVia->swov.overlayRecordV1.dwHeight = dstHeight =
pUpdate->DstBottom - pUpdate->DstTop;
srcWidth = (unsigned long)pUpdate->SrcRight - pUpdate->SrcLeft;
-@@ -1727,10 +1735,10 @@
+@@ -1727,10 +1736,10 @@
* FIXME:
* Enable video on secondary
*/
@@ -4642,7 +4707,7 @@
+ * GTF and CVT timing calculator
+ *
+ * Based on
-+ * GTF spreadsheet developed by Andy Morrish
++ * GTF spreadsheet developed by Andy Morrish
+ * http://www.vesa.org/Public/GTF/GTF_V1R1.xls
+ * and
+ * CVT spreadsheet developed by Graham Loveridge
@@ -4652,7 +4717,7 @@
+
+#include <stdio.h>
+#include <stdlib.h>
-+#include <math.h>
++#include <math.h>
+#include "via_timing.h"
+
+__inline__ static float froundf(Bool gtf, float f) {
@@ -4661,9 +4726,9 @@
+
+#define MODE_NAME_LENGTH 20
+static int timingGenerateMode(DisplayModePtr mode, Bool gtf, int width, int height, float refresh, Bool interlaced, Bool reducedBlanking) {
-+
++
+ if (!mode) return TIMING_ERR_BAD_ALLOC ;
-+
++
+ int ret = 0 ;
+ float H_PIXELS = width ;
+ float V_LINES = height ;
@@ -4671,28 +4736,28 @@
+ Bool INT_RQD = interlaced ;
+ float IP_FREQ_RQD = refresh ;
+ Bool RED_BLANK_RQD = reducedBlanking && !gtf ;
-+
++
+ if (!gtf) {
+ if (refresh != 50.0f
+ && refresh != 60.0f
+ && refresh != 75.0f
+ && refresh != 85.0f )
+ ret |= TIMING_CVT_WARN_REFRESH_RATE ;
-+
++
+ if (reducedBlanking && refresh != 60.0f)
-+ ret |= TIMING_CVT_WARN_REFRESH_RATE_NOT_RB ;
++ ret |= TIMING_CVT_WARN_REFRESH_RATE_NOT_RB ;
+
+ }
+ /* 1) These are the default values that define the MARGIN size: */
+ /* Top/ bottom MARGIN size as % of height (%) {DEFAULT = 1.8} */
+ float TOP_BOTTOM_MARGIN = 1.8f ;
-+
++
+ /* 2) This default value defines the horizontal timing boundaries: */
+ /* Character cell horizontal granularity (pixels) {DEFAULT = 8} */
+ float CELL_GRAN = 8.0f ;
+
+ /* 3) These default values define analog system sync pulse width limitations: */
-+ /* 4:3 -> 4, 16:9 -> 5, 16: -> 6, 5:4 -> 7, 15:9 -> 7,
++ /* 4:3 -> 4, 16:9 -> 5, 16: -> 6, 5:4 -> 7, 15:9 -> 7,
+ * Reserved -> 8, Reserved -> 9, Custom -> 10
+ */
+ float V_SYNC_RQD = 3.0f ;
@@ -4709,21 +4774,21 @@
+ vSync = 10 ;
+ ret |= TIMING_CVT_WARN_ASPECT_RATIO ;
+ }
-+ }
-+
++ }
++
+ /* Nominal H sync width (% of line period) {DEFAULT = 8} */
+ float NOMINAL_H_SYNC_WIDTH = 8.0f ;
-+
-+ /* 4) These default values define analog scan system vertical blanking time limitations: */
++
++ /* 4) These default values define analog scan system vertical blanking time limitations: */
+ /* Minimum time of vertical sync+back porch interval (us) */
+ float MIN_V_SYNC_BP_INTERVAL = 550.0f ;
+ /* Minimum number of vertical back porch lines {DEFAULT = 6} */
+ float MIN_V_BPORCH = 6 ;
-+ /* Minimum vertical porch (no of lines) {DEFAULT = 3} */
++ /* Minimum vertical porch (no of lines) {DEFAULT = 3} */
+ float MIN_V_PORCH = gtf ? 1.0f : 3.0f ;
+ /* 5) Definition of Horizontal blanking time limitation: */
+ /* Generalized blanking limitation formula used of the form:
-+ * <H BLANKING TIME (%)> =C - ( M / Fh)
++ * <H BLANKING TIME (%)> =C - ( M / Fh)
+ * Where:
+ * M (gradient) (%/kHz) {DEFAULT = 600}
+ * C (offset) (%) {DEFAULT = 40}
@@ -4734,7 +4799,7 @@
+ float GTF_C_VAR = 40 ;
+ float GTF_K_VAR = 128 ;
+ float GTF_J_VAR = 20 ;
-+
++
+ /* M' = K / 256 * M */
+ float mPrime = GTF_K_VAR / 256 * GTF_M_VAR ;
+ /* C' = ( ( C - J ) * K / 256 ) + J */
@@ -4747,27 +4812,27 @@
+ float K133 = 460 ;
+ /* Fixed number of lines for vertical front porch {DEFAULT = 3} */
+ float RB_V_FPORCH = 3 ;
-+
++
+ /* Minimum number of vertical back porch lines {DEFAULT = 6} */
+ /* float RB_MIN_V_BPORCH = 6 ; */
-+
++
+ float CLOCK_STEP = 0.25f ;
-+
++
+ /* CONSTANTS */
-+
++
+ float cellGranRnd = floorf(CELL_GRAN) ;
+ float marginPer = TOP_BOTTOM_MARGIN;
+ float minVPorchRnd = floorf(MIN_V_PORCH) ;
-+
++
+ /* STANDARD CRT TIMING SCRATCH PAD: */
+ float minVSyncBP = MIN_V_SYNC_BP_INTERVAL ;
+ float hSyncPer = NOMINAL_H_SYNC_WIDTH ;
-+
++
+ /* REDUCED BLANKING SCRATCH PAD: */
+ float rbMinVBlank = K133 ;
+ float rbHSync = K131 ;
+ float rbHBlank = K130 ;
-+
++
+ /* COMMON TIMING PARAMETERS: */
+ /* 1 REQUIRED FIELD RATE */
+ float vFieldRateRqd = INT_RQD ? IP_FREQ_RQD * 2.0f : IP_FREQ_RQD ;
@@ -4783,57 +4848,57 @@
+ /* 6 FIND TOP & BOTTOM MARGINS */
+ float topMargin = MARGINS_RQD ? froundf( gtf, marginPer/100.0f*vLinesRnd ) : 0 ;
+ float botMargin = topMargin ;
-+
++
+ float interlace = INT_RQD ? 0.5f : 0 ;
-+
-+
++
++
+ /* 8 ESTIMATE HORIZ. PERIOD (us): */
-+ float U23 = ( ( 1.0f / vFieldRateRqd ) - minVSyncBP / 1000000.0f )
++ float U23 = ( ( 1.0f / vFieldRateRqd ) - minVSyncBP / 1000000.0f )
+ / ( vLinesRnd + ( 2.0f * topMargin ) + minVPorchRnd + interlace ) * 1000000.0f ;
-+
++
+ /* 8.1 Reduced blanking */
+ float Y23 = ( ( 1000000.0f / vFieldRateRqd ) - rbMinVBlank ) / ( vLinesRnd + topMargin + botMargin ) ;
-+
++
+ /* RESULTS Estimated Horizontal Frequency (kHz): */
-+ float hPeriodEst = RED_BLANK_RQD ? Y23 : U23 ;
++ float hPeriodEst = RED_BLANK_RQD ? Y23 : U23 ;
+
+ /* 9 FIND NUMBER OF LINES IN (SYNC + BACK PORCH): */
+ /* Estimated V_SYNC_BP */
+ float U26 = froundf( gtf, minVSyncBP / hPeriodEst ) ;
+ if ( !gtf ) U26 += 1.0f ;
-+
++
+ /* float U27 = MIN_VSYNC_BP/H_PERIOD_EST ; */
-+
++
+ /* 9.1 RB */
+ float vbiLines = floorf( rbMinVBlank/hPeriodEst ) + 1.0f ;
+ /* float Y27 = RB_MIN_V_BLANK/H_PERIOD_EST ; */
-+
++
+ float vSyncBP ;
+ if (gtf)
+ vSyncBP = rintf( MIN_V_SYNC_BP_INTERVAL / hPeriodEst ) ;
+ else
+ vSyncBP = U26 < ( vSync + MIN_V_BPORCH ) ? vSync + MIN_V_BPORCH : U26 ;
-+
++
+ /* RESULTS Ver Sync */
+ float vSyncRnd = (int) vSync ;
-+
++
+ /* 10 FIND NUMBER OF LINES IN BACK PORCH (Lines): */
+ /* float U31 = V_SYNC_BP-V_SYNC_RND ; */
+ /* 10.1 RB */
+ float rbMinVbi = RB_V_FPORCH + vSyncRnd + MIN_V_BPORCH ;
+ float actVbiLines = vbiLines < rbMinVbi ? rbMinVbi : vbiLines ;
-+
++
+ /*11 FIND TOTAL NUMBER OF LINES IN VERTICAL FIELD: */
+ float U34 = vLinesRnd + topMargin + botMargin + vSyncBP + interlace + minVPorchRnd ;
+ /* 11.1 RB FIND TOTAL NUMBER OF LINES IN VERTICAL FIELD: */
+ float Y34 = actVbiLines + vLinesRnd + topMargin + botMargin + interlace ;
-+
++
+ /* RESULTS */
+ float totalVLines = RED_BLANK_RQD ? Y34 : U34 ;
-+
++
+ /* 12 FIND IDEAL BLANKING DUTY CYCLE FROM FORMULA (%): */
+ float idealDutyCicle = cPrime - ( mPrime * hPeriodEst / 1000.0f ) ;
-+
++
+ float hPeriod ;
+ float vFieldRateEst ;
+ if (gtf) {
@@ -4841,12 +4906,12 @@
+ hPeriod = hPeriodEst / ( vFieldRateRqd / vFieldRateEst ) ;
+ } else
+ hPeriod = idealDutyCicle ;
-+
++
+ /* 12.1 RB FIND TOTAL NUMBER OF PIXELS IN A LINE (Pixels): */
+ float Y37 = rbHBlank + totalActivePixels ;
-+
++
+ /* 13 FIND BLANKING TIME TO NEAREST CHAR CELL (Pixels): */
-+
++
+ float vFieldRate ;
+ if (gtf) {
+ vFieldRate = rintf( totalActivePixels * idealDutyCicle / ( 100.0f - idealDutyCicle ) / ( 2.0f * cellGranRnd ) ) * ( 2.0f * cellGranRnd ) ;
@@ -4855,78 +4920,78 @@
+ floorf( totalActivePixels * 20.0f / ( 100.0f - 20.0f ) / ( 2.0f * cellGranRnd ) ) * (2.0f * cellGranRnd ) :
+ floorf( totalActivePixels * idealDutyCicle / ( 100.0f - idealDutyCicle ) / ( 2.0f * cellGranRnd ) ) * ( 2.0f * cellGranRnd ) ;
+ }
-+
++
+ /* RESULTS Horizontal Blanking (Pixels): */
+ float hBlank = RED_BLANK_RQD ? rbHBlank : vFieldRate ;
-+
++
+ /* 14 FIND TOTAL NUMBER OF PIXELS IN A LINE (Pixels): */
+ float vFrameRate = totalActivePixels + hBlank ;
-+
++
+ float totalPixels = RED_BLANK_RQD ? Y37 : vFrameRate ;
-+
++
+ /* 15 FIND PIXEL CLOCK FREQUENCY (MHz): */
+ float pixelFreq ;
+ if (gtf)
+ pixelFreq = totalPixels / hPeriodEst ;
+ else
+ pixelFreq = CLOCK_STEP * floorf( ( totalPixels / hPeriodEst ) / CLOCK_STEP ) ;
-+
++
+ /* float U47 = TOTAL_PIXELS/H_PERIOD_EST ; */
-+
++
+ /* 13 RB FIND PIXEL CLOCK FREQUENCY (MHz): Y40*/
+ float Y40 = CLOCK_STEP * floorf( ( vFieldRateRqd * totalVLines * totalPixels / 1000000.0f ) / CLOCK_STEP ) ;
+ /* float Y41 = V_FIELD_RATE_RQD*TOTAL_V_LINES*TOTAL_PIXELS/1000000.0f ; */
-+
++
+ /* RESULTS Actual Pixel Clock (MHz): */
+ float actPixelFreq = RED_BLANK_RQD ? Y40 : pixelFreq ;
-+
++
+ /* 16 FIND ACTUAL HORIZONTAL FREQUENCY (kHz): */
+ //float U50 = 1000.0f*ACT_PIXEL_FREQ/TOTAL_PIXELS ;
-+
++
+ /* 14 RB FIND ACTUAL HORIZONTAL FREQUENCY (kHz): */
+ //float Y44 = 1000.0f*ACT_PIXEL_FREQ/TOTAL_PIXELS ;
-+
++
+ /* RESULTS Actual Horizontal Frequency (kHz): */
+ //float ACT_H_FREQ = RED_BLANK_RQD ? Y44 : U50 ;
-+
++
+ float actHFreq ;
-+ if (gtf)
++ if (gtf)
+ actHFreq = 1000.0f / hPeriod ;
+ else
+ actHFreq = 1000.0f * actPixelFreq / totalPixels ;
-+
++
+ /* 17 FIND ACTUAL FIELD RATE (Hz): */
+ // float U53 = 1000.0f*ACT_H_FREQ/TOTAL_V_LINES ;
-+
++
+ /* 15 RB FIND ACTUAL FIELD RATE (Hz): */
+ // float Y47 = 1000.0f*ACT_H_FREQ/TOTAL_V_LINES ;
-+
++
+ /* RESULTS Actual Vertical Frequency (Hz): */
+ // float ACT_FIELD_RATE = RED_BLANK_RQD ? Y47 : U53 ;
+ float actFieldRate = 1000.0f * actHFreq / totalVLines ;
-+
++
+ /* 16 RB FIND ACTUAL VERTICAL FRAME FREQUENCY (Hz): */
+ //float Y50 = INT_RQD ? ACT_FIELD_RATE/2.0f : ACT_FIELD_RATE ;
+
+ /* 18 FIND ACTUAL VERTICAL FRAME FREQUENCY (Hz): */
+ //float U56 = INT_RQD ? ACT_FIELD_RATE/2.0f : ACT_FIELD_RATE ;
-+
++
+ /* RESULTS Actual Vertical Frequency (Hz): */
+ //float ACT_FRAME_RATE = RED_BLANK_RQD ? Y50 : U56 ;
+ float actFrameRat = INT_RQD ? actFieldRate / 2.0f : actFieldRate ;
-+
++
+ /* RESULTS Hor Back porch*/
+ float hBackPorch = hBlank / 2 ;
+
+ /* RESULTS Ver Blank */
+// float vBlank = RED_BLANK_RQD ? actVbiLines : vSyncBP + minVPorchRnd ;
-+
++
+ /* RESULTS Ver Front Porch*/
+ float vFrontPorch = RED_BLANK_RQD ? RB_V_FPORCH : minVPorchRnd ;
-+
++
+ /* RESULTS Ver back porch */
+// float vBackPorch = vBlank - vFrontPorch - vSyncRnd ;
-+
++
+ /* RESULTS Hor Sync */
+ float hSyncRnd = RED_BLANK_RQD ? rbHSync : froundf( gtf, ( hSyncPer / 100.0f * totalPixels / cellGranRnd ) ) * cellGranRnd ;
+
@@ -4936,7 +5001,7 @@
+ hFrontPorch = ( hBlank / 2.0f ) - hSyncRnd ;
+ else
+ hFrontPorch = hBlank - hBackPorch - hSyncRnd ;
-+
++
+#if DEBUG
+ fprintf( stderr, "hFrontPorch:\t\t%f\n", hFrontPorch ) ;
+ fprintf( stderr, "totalActivePixels:\t\t%f\n", totalActivePixels ) ;
@@ -4965,7 +5030,7 @@
+ if (mode->name == NULL) {
+ mode->name = malloc(MODE_NAME_LENGTH);
+ if (mode->name) {
-+ memset(mode->name, 0, MODE_NAME_LENGTH) ;
++ memset(mode->name, 0, MODE_NAME_LENGTH) ;
+ char c = 0 ;
+ if (RED_BLANK_RQD) c = 'r' ;
+ if (INT_RQD) c = 'i' ;
@@ -4975,18 +5040,18 @@
+
+ mode->Clock = actPixelFreq * 1000.0f ;
+ mode->VRefresh = actFrameRat ;
-+
++
+ mode->HDisplay = width ;
+ mode->HSyncStart = width + hFrontPorch ;
+ mode->HSyncEnd = width + ( hFrontPorch + hSyncRnd ) ;
+ mode->HTotal = totalPixels ;
-+
++
+ mode->VDisplay = height ;
+ mode->VSyncStart = height + vFrontPorch ;
+ mode->VSyncEnd = height + (vFrontPorch + vSyncRnd) ;
+ mode->VTotal = INT_RQD ? totalVLines * 2 : totalVLines ;
+ mode->Flags = 0 ;
-+
++
+ if (RED_BLANK_RQD) {
+ mode->Flags |= V_PHSYNC ;
+ mode->Flags |= V_NVSYNC ;
@@ -4994,7 +5059,7 @@
+ mode->Flags |= V_NHSYNC ;
+ mode->Flags |= V_PVSYNC ;
+ }
-+
++
+ if (!(mode->Flags & V_PHSYNC)) mode->Flags |= V_NHSYNC ;
+ if (!(mode->Flags & V_NHSYNC)) mode->Flags |= V_PHSYNC ;
+ if (!(mode->Flags & V_PVSYNC)) mode->Flags |= V_NVSYNC ;
@@ -5004,7 +5069,7 @@
+ } else {
+ ret |= TIMING_ERR_BAD_ALLOC ;
+ }
-+
++
+ return ret ;
+}
+
Index: xorg-x11-drv-openchrome.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-openchrome/devel/xorg-x11-drv-openchrome.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- xorg-x11-drv-openchrome.spec 27 Jun 2008 20:04:26 -0000 1.25
+++ xorg-x11-drv-openchrome.spec 3 Aug 2008 16:15:25 -0000 1.26
@@ -9,7 +9,7 @@
Summary: Xorg X11 openchrome video driver
Name: xorg-x11-drv-openchrome
Version: 0.2.902
-Release: 8%{?dist}
+Release: 9%{?dist}
URL: http://www.openchrome.org
License: MIT
Group: User Interface/X Hardware Support
@@ -121,6 +121,9 @@
%changelog
+* Sun Aug 03 2008 Xavier Bachelot <xavier AT bachelot DOT org> - 0.2.902-9
+- New version of the panel and hw cursor patch.
+
* Mon Jun 23 2008 Xavier Bachelot <xavier AT bachelot DOT org> - 0.2.902-8
- New version of the panel and hw cursor patch.
- Previous message (by thread): rpms/openoffice.org/devel redhat-agreement.xsl, NONE, 1.1 openoffice.org.spec, 1.1600, 1.1601
- Next message (by thread): rpms/libv4l/devel .cvsignore, 1.3, 1.4 libv4l.spec, 1.2, 1.3 sources, 1.3, 1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list