[arch-commits] Commit in xf86-video-intel/repos (3 files)
Jan de Groot
jgc at archlinux.org
Wed Mar 4 19:17:18 UTC 2009
Date: Wednesday, March 4, 2009 @ 14:17:17
Author: jgc
Revision: 29004
Merged revisions 29002 via svnmerge from
svn+ssh://svn.archlinux.org/srv/svn-packages/xf86-video-intel/trunk
........
r29002 | jgc | 2009-03-04 18:46:46 +0000 (Wed, 04 Mar 2009) | 2 lines
upgpkg: xf86-video-intel 2.6.3-1
Remove upstream patch
........
Modified:
xf86-video-intel/repos/testing-i686/ (properties)
xf86-video-intel/repos/testing-i686/PKGBUILD
Deleted:
xf86-video-intel/repos/testing-i686/pixmap-only-align-dri2.patch
------------------------------+
PKGBUILD | 9 --
pixmap-only-align-dri2.patch | 138 -----------------------------------------
2 files changed, 3 insertions(+), 144 deletions(-)
Property changes on: xf86-video-intel/repos/testing-i686
___________________________________________________________________
Modified: svnmerge-integrated
- /xf86-video-intel/trunk:1-28888
+ /xf86-video-intel/trunk:1-29003
Modified: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD 2009-03-04 18:46:59 UTC (rev 29003)
+++ testing-i686/PKGBUILD 2009-03-04 19:17:17 UTC (rev 29004)
@@ -2,7 +2,7 @@
# Maintainer: Alexander Baldeck <alexander at archlinux.org>
# Maintainer: Jan de Groot <jgc at archlinux.org>
pkgname=xf86-video-intel
-pkgver=2.6.2
+pkgver=2.6.3
pkgrel=1
pkgdesc="X.org Intel i810/i830/i915/945G/G965+ video drivers"
arch=(i686 x86_64)
@@ -13,14 +13,11 @@
replaces=('xf86-video-i810')
options=('!libtool' 'force')
groups=('xorg-video-drivers')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
- pixmap-only-align-dri2.patch)
-md5sums=('c171bb4175cfcea2662079ef20ee2020'
- '4b402259220dbee0ab5fe24945445670')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('440c014bbd3072b5d379fe1bdb861918')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
- patch -Np1 -i "${srcdir}/pixmap-only-align-dri2.patch" || return 1
./configure --prefix=/usr --enable-dri || return 1
make || return 1
make DESTDIR="${pkgdir}" install || return 1
Deleted: testing-i686/pixmap-only-align-dri2.patch
===================================================================
--- testing-i686/pixmap-only-align-dri2.patch 2009-03-04 18:46:59 UTC (rev 29003)
+++ testing-i686/pixmap-only-align-dri2.patch 2009-03-04 19:17:17 UTC (rev 29004)
@@ -1,138 +0,0 @@
-From 5bfd73cd31ba197a62f549cdbad1a1270b571027 Mon Sep 17 00:00:00 2001
-From: Eric Anholt <eric at anholt.net>
-Date: Sat, 28 Feb 2009 03:09:49 +0000
-Subject: Only allocate pixmaps aligned for tiling when requested by DRI2 GetBuffers.
-
-This saves massive quantities of memory on pre-965 since the DRI2 tiling
-enable caused the minimum size of any pixmap to be 1MB.
----
-diff --git a/src/i830.h b/src/i830.h
-index a0ae571..cd9c38a 100644
---- a/src/i830.h
-+++ b/src/i830.h
-@@ -1090,4 +1090,15 @@ extern const int I830CopyROP[16];
- #define QUIRK_BROKEN_ACPI_LID 0x00000100
- extern void i830_fixup_devices(ScrnInfoPtr);
-
-+/**
-+ * Hints to CreatePixmap to tell the driver how the pixmap is going to be
-+ * used.
-+ *
-+ * Compare to CREATE_PIXMAP_USAGE_* in the server.
-+ */
-+enum {
-+ INTEL_CREATE_PIXMAP_TILING_X = 0x10000000,
-+ INTEL_CREATE_PIXMAP_TILING_Y,
-+};
-+
- #endif /* _I830_H_ */
-diff --git a/src/i830_dri.c b/src/i830_dri.c
-index 540bf5e..96c711e 100644
---- a/src/i830_dri.c
-+++ b/src/i830_dri.c
-@@ -1561,36 +1561,33 @@ I830DRI2CreateBuffers(DrawablePtr pDraw, unsigned int *attachments, int count)
- pPixmap = pDepthPixmap;
- pPixmap->refcnt++;
- } else {
-- uint32_t tiling = I915_TILING_NONE;
-+ unsigned int hint = 0;
-
-- pPixmap = (*pScreen->CreatePixmap)(pScreen,
-- pDraw->width,
-- pDraw->height,
-- pDraw->depth, 0);
- switch (attachments[i]) {
- case DRI2BufferDepth:
- if (SUPPORTS_YTILING(pI830))
-- tiling = I915_TILING_Y;
-+ hint = INTEL_CREATE_PIXMAP_TILING_Y;
- else
-- tiling = I915_TILING_X;
-+ hint = INTEL_CREATE_PIXMAP_TILING_X;
- break;
- case DRI2BufferFakeFrontLeft:
- case DRI2BufferFakeFrontRight:
- case DRI2BufferBackLeft:
- case DRI2BufferBackRight:
-- tiling = I915_TILING_X;
-+ hint = INTEL_CREATE_PIXMAP_TILING_X;
- break;
- }
-
- if (!pI830->tiling ||
- (!IS_I965G(pI830) && !pI830->kernel_exec_fencing))
-- tiling = I915_TILING_NONE;
-+ hint = 0;
-+
-+ pPixmap = (*pScreen->CreatePixmap)(pScreen,
-+ pDraw->width,
-+ pDraw->height,
-+ pDraw->depth,
-+ hint);
-
-- if (tiling != I915_TILING_NONE) {
-- bo = i830_get_pixmap_bo(pPixmap);
-- drm_intel_bo_set_tiling(bo, &tiling,
-- intel_get_pixmap_pitch(pPixmap));
-- }
- }
-
- if (attachments[i] == DRI2BufferDepth)
-diff --git a/src/i830_exa.c b/src/i830_exa.c
-index b9d6c64..0a22486 100644
---- a/src/i830_exa.c
-+++ b/src/i830_exa.c
-@@ -935,29 +935,38 @@ i830_uxa_create_pixmap (ScreenPtr screen, int w, int h, int depth, unsigned usag
- if (w && h)
- {
- unsigned int size;
-+ uint32_t tiling = I915_TILING_NONE;
-
- stride = ROUND_TO((w * pixmap->drawable.bitsPerPixel + 7) / 8,
- i830->accel_pixmap_pitch_alignment);
-
-- /* Use the I915_FENCE_TILING_X even if it may end up being TILING_Y,
-- * as it just results in larger alignment. Really, we need to use the
-- * usage hint to tell what the pixmap's going to be.
-- */
-- stride = i830_get_fence_pitch(i830, stride, I915_TILING_X);
-- /* Round the object up to the size of the fence it will live in
-- * if necessary. We could potentially make the kernel allocate
-- * a larger aperture space and just bind the subset of pages in,
-- * but this is easier and also keeps us out of trouble (as much)
-- * with drm_intel_bufmgr_check_aperture().
-- */
-- size = i830_get_fence_size(i830, stride * h);
-+ if (usage == INTEL_CREATE_PIXMAP_TILING_X)
-+ tiling = I915_TILING_X;
-+ else if (usage == INTEL_CREATE_PIXMAP_TILING_Y)
-+ tiling = I915_TILING_Y;
-+
-+ if (tiling == I915_TILING_NONE) {
-+ size = stride * h;
-+ } else {
-+ stride = i830_get_fence_pitch(i830, stride, tiling);
-+ /* Round the object up to the size of the fence it will live in
-+ * if necessary. We could potentially make the kernel allocate
-+ * a larger aperture space and just bind the subset of pages in,
-+ * but this is easier and also keeps us out of trouble (as much)
-+ * with drm_intel_bufmgr_check_aperture().
-+ */
-+ size = i830_get_fence_size(i830, stride * h);
-+ }
-
- bo = drm_intel_bo_alloc_for_render(i830->bufmgr, "pixmap", size, 0);
- if (!bo) {
- fbDestroyPixmap (pixmap);
- return NullPixmap;
- }
--
-+
-+ if (tiling != I915_TILING_NONE)
-+ drm_intel_bo_set_tiling(bo, &tiling, stride);
-+
- screen->ModifyPixmapHeader (pixmap, w, h, 0, 0, stride, NULL);
-
- i830_uxa_set_pixmap_bo (pixmap, bo);
---
-cgit v0.8.2
More information about the arch-commits
mailing list