diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-02-13 01:08:38 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-02-13 01:08:38 -0300 |
| commit | 6b1c32bde545b9e47ab1fe83fdfb722ca6218393 (patch) | |
| tree | ac8f75aa35fc81be9eaffe905ab498e7713b2f84 /staging/xf86-video-siliconmotion/smi-1.7.5-vga.patch | |
| parent | 2c721caa534df76621bf07705ed0ea80efe44f8b (diff) | |
| parent | 0020cc650ff973f269f23332e82fc097254d0adc (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/ccze/PKGBUILD
community/remind/PKGBUILD
core/iw/PKGBUILD
core/less/PKGBUILD
extra/davfs2/PKGBUILD
extra/ettercap/PKGBUILD
extra/gtk-xfce-engine/PKGBUILD
extra/imagemagick/PKGBUILD
extra/kismet/PKGBUILD
extra/libmp3splt/PKGBUILD
extra/php/PKGBUILD
extra/xfce4-verve-plugin/PKGBUILD
multilib/lib32-glib2/PKGBUILD
multilib/lib32-pcre/PKGBUILD
multilib/wine/PKGBUILD
staging/xorg-server/PKGBUILD
Diffstat (limited to 'staging/xf86-video-siliconmotion/smi-1.7.5-vga.patch')
| -rw-r--r-- | staging/xf86-video-siliconmotion/smi-1.7.5-vga.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/staging/xf86-video-siliconmotion/smi-1.7.5-vga.patch b/staging/xf86-video-siliconmotion/smi-1.7.5-vga.patch new file mode 100644 index 000000000..ef353f0df --- /dev/null +++ b/staging/xf86-video-siliconmotion/smi-1.7.5-vga.patch @@ -0,0 +1,25 @@ +From 037b839c84ad6dcbe9aade420cf0d3bf06f23119 Mon Sep 17 00:00:00 2001 +From: Adam Jackson <ajax@redhat.com> +Date: Wed, 16 Nov 2011 20:03:25 +0000 +Subject: Adapt to missing PIOOffset in videoabi 12 + +Signed-off-by: Adam Jackson <ajax@redhat.com> +--- +diff --git a/src/smi_driver.c b/src/smi_driver.c +index 9c10e46..86644c7 100644 +--- a/src/smi_driver.c ++++ b/src/smi_driver.c +@@ -442,7 +442,11 @@ SMI_PreInit(ScrnInfoPtr pScrn, int flags) + LEAVE(FALSE); + + hwp = VGAHWPTR(pScrn); ++#if ABI_VIDEODRV_VERSION < 12 + pSmi->PIOBase = hwp->PIOOffset; ++#else ++ pSmi->PIOBase = 0; ++#endif + + xf86ErrorFVerb(VERBLEV, "\tSMI_PreInit vgaCRIndex=%x, vgaIOBase=%x, " + "MMIOBase=%p\n", hwp->IOBase + VGA_CRTC_INDEX_OFFSET, +-- +cgit v0.9.0.2-2-gbebe |