diff --git a/openchrome-0.2.902-CX700_Xv_on_LCD.patch b/openchrome-0.2.902-CX700_Xv_on_LCD.patch deleted file mode 100644 index a33ca10..0000000 --- a/openchrome-0.2.902-CX700_Xv_on_LCD.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: src/via_swov.c -=================================================================== ---- src/via_swov.c (revision 536) -+++ src/via_swov.c (revision 568) -@@ -1728,5 +1728,7 @@ - * Enable video on secondary - */ -- if ((pVia->Chipset == VIA_P4M900 || pVia->Chipset == VIA_VM800) -+ if ((pVia->Chipset == VIA_P4M900 || -+ pVia->Chipset == VIA_VM800 || -+ pVia->Chipset == VIA_CX700) - && pVia->pBIOSInfo->PanelActive) { - /* V1_ON_SND_DISPLAY */ diff --git a/openchrome-0.2.902-Xv_on_LCD.patch b/openchrome-0.2.902-Xv_on_LCD.patch new file mode 100644 index 0000000..42a1dea --- /dev/null +++ b/openchrome-0.2.902-Xv_on_LCD.patch @@ -0,0 +1,14 @@ +Index: src/via_swov.c +=================================================================== +--- src/via_swov.c (revision 536) ++++ src/via_swov.c (revision 568) +@@ -1728,5 +1728,8 @@ + * Enable video on secondary + */ +- if ((pVia->Chipset == VIA_P4M900 || pVia->Chipset == VIA_VM800) ++ if ((pVia->Chipset == VIA_P4M900 || ++ pVia->Chipset == VIA_K8M890 || ++ pVia->Chipset == VIA_VM800 || ++ pVia->Chipset == VIA_CX700) + && pVia->pBIOSInfo->PanelActive) { + /* V1_ON_SND_DISPLAY */ diff --git a/openchrome-0.2.902-re_enable_AGPDMA.patch b/openchrome-0.2.902-re_enable_AGPDMA.patch new file mode 100644 index 0000000..036e2b2 --- /dev/null +++ b/openchrome-0.2.902-re_enable_AGPDMA.patch @@ -0,0 +1,17 @@ +Index: src/via_driver.c +=================================================================== +--- src/via_driver.c (revision 562) ++++ src/via_driver.c (working copy) +@@ -817,12 +817,10 @@ + pVia->DRIIrqEnable = FALSE; + break; + case VIA_K8M800: +- pVia->agpEnable = FALSE; + pVia->DRIIrqEnable = FALSE; + break; + case VIA_VM800: +- pVia->agpEnable = FALSE; + break; + case VIA_K8M890: + pVia->VideoEngine = VIDEO_ENGINE_CME; + pVia->agpEnable = FALSE; diff --git a/xorg-x11-drv-openchrome.spec b/xorg-x11-drv-openchrome.spec index 2e1017b..e899b74 100644 --- a/xorg-x11-drv-openchrome.spec +++ b/xorg-x11-drv-openchrome.spec @@ -9,7 +9,7 @@ Summary: Xorg X11 openchrome video driver Name: xorg-x11-drv-openchrome Version: 0.2.902 -Release: 2%{?dist} +Release: 3%{?dist} URL: http://www.openchrome.org License: MIT Group: User Interface/X Hardware Support @@ -17,11 +17,12 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: http://www.openchrome.org/releases/%{tarball}-%{version}.tar.bz2 Source1: openchrome.xinf -#Patch1: openchrome-0.2.902-re_enable_AGPDMA.patch + +Patch1: openchrome-0.2.902-re_enable_AGPDMA.patch #Patch2: openchrome-0.2.902-report_version.patch #Patch3: openchrome-0.2.902-chipset_revision.patch Patch4: openchrome-0.2.902-unbreak_ActiveDevice.patch -Patch5: openchrome-0.2.902-CX700_Xv_on_LCD.patch +Patch5: openchrome-0.2.902-Xv_on_LCD.patch Patch6: openchrome-0.2.902-disable_XvDMA_P4M890_K8M890.patch Patch7: openchrome-0.2.902-sync_pciids.patch @@ -55,11 +56,11 @@ X.Org X11 openchrome video driver XvMC development package. %prep %setup -q -n %{tarball}-%{version} -#%patch1 -p0 -b .agpdma +%patch1 -p0 -b .agpdma #%patch2 -p0 -b .version #%patch3 -p0 -b .chiprev %patch4 -p0 -b .activedevice -%patch5 -p0 -b .cx700_xv_lcd +%patch5 -p0 -b .xv_lcd %patch6 -p0 -b .XvDMA %patch7 -p0 -b .pciids @@ -104,6 +105,11 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Jun 07 2008 Xavier Bachelot - 0.2.902-3 +- Re-enable AGPDMA for K8M800 and VM800, as the drm bug is fixed in kernel + >= 2.6.25rc7 (Patch #1). +- Fix Xv on LCD for K8M890. + * Sun Jun 01 2008 Xavier Bachelot - 0.2.902-2 - Add patch to fix Xv on LCD for CX700. - Unbreak ActiveDevice option.