[arch-commits] Commit in xf86-video-openchrome/repos (6 files)
Andreas Radke
andyrtr at nymeria.archlinux.org
Sat Mar 9 15:44:01 UTC 2013
Date: Saturday, March 9, 2013 @ 16:44:00
Author: andyrtr
Revision: 179737
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
xf86-video-openchrome/repos/staging-i686/
xf86-video-openchrome/repos/staging-i686/PKGBUILD
(from rev 179736, xf86-video-openchrome/trunk/PKGBUILD)
xf86-video-openchrome/repos/staging-i686/fix_system_lock.diff
(from rev 179736, xf86-video-openchrome/trunk/fix_system_lock.diff)
xf86-video-openchrome/repos/staging-x86_64/
xf86-video-openchrome/repos/staging-x86_64/PKGBUILD
(from rev 179736, xf86-video-openchrome/trunk/PKGBUILD)
xf86-video-openchrome/repos/staging-x86_64/fix_system_lock.diff
(from rev 179736, xf86-video-openchrome/trunk/fix_system_lock.diff)
-------------------------------------+
staging-i686/PKGBUILD | 36 ++++++++++++++++++++
staging-i686/fix_system_lock.diff | 59 ++++++++++++++++++++++++++++++++++
staging-x86_64/PKGBUILD | 36 ++++++++++++++++++++
staging-x86_64/fix_system_lock.diff | 59 ++++++++++++++++++++++++++++++++++
4 files changed, 190 insertions(+)
Copied: xf86-video-openchrome/repos/staging-i686/PKGBUILD (from rev 179736, xf86-video-openchrome/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2013-03-09 15:44:00 UTC (rev 179737)
@@ -0,0 +1,36 @@
+# $Id$
+# Contributor: Paul Mattal <paul at mattal.com>
+# Maintainer: Juergen Hoetzel <juergen at hoetzel.info>
+
+pkgname=xf86-video-openchrome
+pkgver=0.3.1
+pkgrel=4
+pkgdesc="X.Org Openchrome drivers"
+arch=(i686 x86_64)
+license=('custom')
+url="http://www.openchrome.org"
+depends=('libdrm' 'libxvmc')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15' 'xf86-video-via' 'xf86-video-unichrome' 'openchrome' 'unichrome-dri')
+replaces=('openchrome' 'xf86-video-via')
+groups=('xorg-drivers' 'xorg')
+options=('!libtool' '!emptydirs' '!makeflags')
+source=(http://xorg.freedesktop.org/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2
+ fix_system_lock.diff)
+sha1sums=('89e56dcfe851345f72c61a95b4fa5ab6ad7e0d83'
+ '539ba65df1755af97799f49410e4091b8d222eca')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ # https://bugs.freedesktop.org/show_bug.cgi?id=53307
+ patch -Np1 -i ${srcdir}/fix_system_lock.diff
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+ install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+ install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+}
Copied: xf86-video-openchrome/repos/staging-i686/fix_system_lock.diff (from rev 179736, xf86-video-openchrome/trunk/fix_system_lock.diff)
===================================================================
--- staging-i686/fix_system_lock.diff (rev 0)
+++ staging-i686/fix_system_lock.diff 2013-03-09 15:44:00 UTC (rev 179737)
@@ -0,0 +1,59 @@
+From 76515c8a369346d76864e55610a6a747d9b152d8 Mon Sep 17 00:00:00 2001
+From: James Simmons <jsimmons at infradead.org>
+Date: Sat, 12 Jan 2013 21:02:12 +0000
+Subject: As the comment suggested in via_outputs.c probing the 3rd i2c bug locks up the P4M900. So we re-enable the via_card_id handling of what outputs to test for to get around this problem.
+
+---
+diff --git a/src/via_display.c b/src/via_display.c
+index 97473f0..aaf4267 100644
+--- a/src/via_display.c
++++ b/src/via_display.c
+@@ -395,7 +395,7 @@ ViaFirstCRTCSetMode(ScrnInfoPtr pScrn, DisplayModePtr mode)
+ hwp->writeCrtc(hwp, 0x18, 0xFF);
+ ViaCrtcMask(hwp, 0x07, 0x10, 0x10);
+ ViaCrtcMask(hwp, 0x09, 0x40, 0x40);
+- ViaCrtcMask(hwp, 0x33, 0x07, 0x06);
++ ViaCrtcMask(hwp, 0x33, 0x06, 0x07);
+ ViaCrtcMask(hwp, 0x35, 0x10, 0x10);
+
+ /* zero Maximum scan line */
+diff --git a/src/via_id.c b/src/via_id.c
+index 7764782..7321b26 100644
+--- a/src/via_id.c
++++ b/src/via_id.c
+@@ -297,6 +297,7 @@ ViaCheckCardId(ScrnInfoPtr pScrn)
+ (Id->Vendor == SUBVENDOR_ID(pVia->PciInfo)) &&
+ (Id->Device == SUBSYS_ID(pVia->PciInfo))) {
+ xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "Detected %s. Card-Ids (%4X|%4X)\n", Id->String, SUBVENDOR_ID(pVia->PciInfo), SUBSYS_ID(pVia->PciInfo));
++ pVia->ActiveDevice = Id->Outputs;
+ pVia->Id = Id;
+ return;
+ }
+diff --git a/src/via_outputs.c b/src/via_outputs.c
+index 808e570..c07b1d2 100644
+--- a/src/via_outputs.c
++++ b/src/via_outputs.c
+@@ -873,10 +873,10 @@ ViaOutputsDetect(ScrnInfoPtr pScrn)
+ /*
+ * FIXME: xf86I2CProbeAddress(pVia->pI2CBus3, 0x40)
+ * disables the panel on P4M900
+- * See via_tv_detect.
+ */
+ /* TV encoder */
+- via_tv_init(pScrn);
++ if (pVia->ActiveDevice & VIA_DEVICE_TV)
++ via_tv_init(pScrn);
+
+ if (pVia->ActiveDevice & VIA_DEVICE_DFP) {
+ switch (pVia->Chipset) {
+@@ -1195,7 +1195,7 @@ ViaModePrimaryLegacy(xf86CrtcPtr crtc, DisplayModePtr mode)
+ /* Enable MMIO & PCI burst (1 wait state) */
+ ViaSeqMask(hwp, 0x1A, 0x06, 0x06);
+
+- if (pBIOSInfo->analog->status == XF86OutputStatusConnected)
++ if (pBIOSInfo->analog->status == XF86OutputStatusConnected)
+ ViaCrtcMask(hwp, 0x36, 0x30, 0x30);
+ else
+ ViaSeqMask(hwp, 0x16, 0x00, 0x40);
+--
+cgit v0.9.0.2-2-gbebe
Copied: xf86-video-openchrome/repos/staging-x86_64/PKGBUILD (from rev 179736, xf86-video-openchrome/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2013-03-09 15:44:00 UTC (rev 179737)
@@ -0,0 +1,36 @@
+# $Id$
+# Contributor: Paul Mattal <paul at mattal.com>
+# Maintainer: Juergen Hoetzel <juergen at hoetzel.info>
+
+pkgname=xf86-video-openchrome
+pkgver=0.3.1
+pkgrel=4
+pkgdesc="X.Org Openchrome drivers"
+arch=(i686 x86_64)
+license=('custom')
+url="http://www.openchrome.org"
+depends=('libdrm' 'libxvmc')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15' 'xf86-video-via' 'xf86-video-unichrome' 'openchrome' 'unichrome-dri')
+replaces=('openchrome' 'xf86-video-via')
+groups=('xorg-drivers' 'xorg')
+options=('!libtool' '!emptydirs' '!makeflags')
+source=(http://xorg.freedesktop.org/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2
+ fix_system_lock.diff)
+sha1sums=('89e56dcfe851345f72c61a95b4fa5ab6ad7e0d83'
+ '539ba65df1755af97799f49410e4091b8d222eca')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ # https://bugs.freedesktop.org/show_bug.cgi?id=53307
+ patch -Np1 -i ${srcdir}/fix_system_lock.diff
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+ install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+ install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+}
Copied: xf86-video-openchrome/repos/staging-x86_64/fix_system_lock.diff (from rev 179736, xf86-video-openchrome/trunk/fix_system_lock.diff)
===================================================================
--- staging-x86_64/fix_system_lock.diff (rev 0)
+++ staging-x86_64/fix_system_lock.diff 2013-03-09 15:44:00 UTC (rev 179737)
@@ -0,0 +1,59 @@
+From 76515c8a369346d76864e55610a6a747d9b152d8 Mon Sep 17 00:00:00 2001
+From: James Simmons <jsimmons at infradead.org>
+Date: Sat, 12 Jan 2013 21:02:12 +0000
+Subject: As the comment suggested in via_outputs.c probing the 3rd i2c bug locks up the P4M900. So we re-enable the via_card_id handling of what outputs to test for to get around this problem.
+
+---
+diff --git a/src/via_display.c b/src/via_display.c
+index 97473f0..aaf4267 100644
+--- a/src/via_display.c
++++ b/src/via_display.c
+@@ -395,7 +395,7 @@ ViaFirstCRTCSetMode(ScrnInfoPtr pScrn, DisplayModePtr mode)
+ hwp->writeCrtc(hwp, 0x18, 0xFF);
+ ViaCrtcMask(hwp, 0x07, 0x10, 0x10);
+ ViaCrtcMask(hwp, 0x09, 0x40, 0x40);
+- ViaCrtcMask(hwp, 0x33, 0x07, 0x06);
++ ViaCrtcMask(hwp, 0x33, 0x06, 0x07);
+ ViaCrtcMask(hwp, 0x35, 0x10, 0x10);
+
+ /* zero Maximum scan line */
+diff --git a/src/via_id.c b/src/via_id.c
+index 7764782..7321b26 100644
+--- a/src/via_id.c
++++ b/src/via_id.c
+@@ -297,6 +297,7 @@ ViaCheckCardId(ScrnInfoPtr pScrn)
+ (Id->Vendor == SUBVENDOR_ID(pVia->PciInfo)) &&
+ (Id->Device == SUBSYS_ID(pVia->PciInfo))) {
+ xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "Detected %s. Card-Ids (%4X|%4X)\n", Id->String, SUBVENDOR_ID(pVia->PciInfo), SUBSYS_ID(pVia->PciInfo));
++ pVia->ActiveDevice = Id->Outputs;
+ pVia->Id = Id;
+ return;
+ }
+diff --git a/src/via_outputs.c b/src/via_outputs.c
+index 808e570..c07b1d2 100644
+--- a/src/via_outputs.c
++++ b/src/via_outputs.c
+@@ -873,10 +873,10 @@ ViaOutputsDetect(ScrnInfoPtr pScrn)
+ /*
+ * FIXME: xf86I2CProbeAddress(pVia->pI2CBus3, 0x40)
+ * disables the panel on P4M900
+- * See via_tv_detect.
+ */
+ /* TV encoder */
+- via_tv_init(pScrn);
++ if (pVia->ActiveDevice & VIA_DEVICE_TV)
++ via_tv_init(pScrn);
+
+ if (pVia->ActiveDevice & VIA_DEVICE_DFP) {
+ switch (pVia->Chipset) {
+@@ -1195,7 +1195,7 @@ ViaModePrimaryLegacy(xf86CrtcPtr crtc, DisplayModePtr mode)
+ /* Enable MMIO & PCI burst (1 wait state) */
+ ViaSeqMask(hwp, 0x1A, 0x06, 0x06);
+
+- if (pBIOSInfo->analog->status == XF86OutputStatusConnected)
++ if (pBIOSInfo->analog->status == XF86OutputStatusConnected)
+ ViaCrtcMask(hwp, 0x36, 0x30, 0x30);
+ else
+ ViaSeqMask(hwp, 0x16, 0x00, 0x40);
+--
+cgit v0.9.0.2-2-gbebe
More information about the arch-commits
mailing list