diff options
Diffstat (limited to 'meta-emenlow/packages/xserver-xorg-video-psb')
14 files changed, 0 insertions, 451 deletions
diff --git a/meta-emenlow/packages/xserver-xorg-video-psb/xserver-xorg-video-psb-0.32.1/01_disable_lid_timer.patch b/meta-emenlow/packages/xserver-xorg-video-psb/xserver-xorg-video-psb-0.32.1/01_disable_lid_timer.patch deleted file mode 100644 index 47da3bce04..0000000000 --- a/meta-emenlow/packages/xserver-xorg-video-psb/xserver-xorg-video-psb-0.32.1/01_disable_lid_timer.patch +++ /dev/null | |||
@@ -1,12 +0,0 @@ | |||
1 | diff -Nurp xserver-xorg-video-psb-0.30.0+repack.orig/src/psb_driver.c xserver-xorg-video-psb-0.30.0+repack/src/psb_driver.c | ||
2 | --- xserver-xorg-video-psb-0.30.0+repack.orig/src/psb_driver.c 2009-04-17 00:00:46.000000000 +0200 | ||
3 | +++ xserver-xorg-video-psb-0.30.0+repack/src/psb_driver.c 2009-08-06 18:13:43.000000000 +0200 | ||
4 | @@ -753,7 +753,7 @@ psbInitOutputs(ScrnInfoPtr pScrn) | ||
5 | |||
6 | xf86GetOptValBool(pPsb->options, OPTION_NOPANEL, &pPsb->noPanel); | ||
7 | |||
8 | - pPsb->lidTimer = TRUE; | ||
9 | + pPsb->lidTimer = FALSE; | ||
10 | xf86GetOptValBool(pPsb->options, OPTION_LIDTIMER, &pPsb->lidTimer); | ||
11 | |||
12 | xf86GetOptValBool(pPsb->options, OPTION_NOFITTING, &pPsb->noFitting); | ||
diff --git a/meta-emenlow/packages/xserver-xorg-video-psb/xserver-xorg-video-psb-0.32.1/dri-h.patch b/meta-emenlow/packages/xserver-xorg-video-psb/xserver-xorg-video-psb-0.32.1/dri-h.patch deleted file mode 100644 index 98ffa27199..0000000000 --- a/meta-emenlow/packages/xserver-xorg-video-psb/xserver-xorg-video-psb-0.32.1/dri-h.patch +++ /dev/null | |||
@@ -1,20 +0,0 @@ | |||
1 | Index: xserver-xorg-video-psb-0.32.1/configure.ac | ||
2 | =================================================================== | ||
3 | --- xserver-xorg-video-psb-0.32.1.orig/configure.ac | ||
4 | +++ xserver-xorg-video-psb-0.32.1/configure.ac | ||
5 | @@ -75,12 +75,9 @@ AM_CONDITIONAL(BUILD_EXA, [test "$build_ | ||
6 | AC_HEADER_STDC | ||
7 | |||
8 | if test "$DRI" != no; then | ||
9 | - AC_CHECK_FILE([${sdkdir}/dri.h], | ||
10 | - [have_dri_h="yes"], [have_dri_h="no"]) | ||
11 | - AC_CHECK_FILE([${sdkdir}/sarea.h], | ||
12 | - [have_sarea_h="yes"], [have_sarea_h="no"]) | ||
13 | - AC_CHECK_FILE([${sdkdir}/dristruct.h], | ||
14 | - [have_dristruct_h="yes"], [have_dristruct_h="no"]) | ||
15 | + have_dri_h="yes" | ||
16 | + have_sarea_h="yes" | ||
17 | + have_dristruct_h="yes" | ||
18 | fi | ||
19 | |||
20 | AC_MSG_CHECKING([whether to include DRI support]) | ||
diff --git a/meta-emenlow/packages/xserver-xorg-video-psb/xserver-xorg-video-psb-0.32.1/libdrm-poulsbo.patch b/meta-emenlow/packages/xserver-xorg-video-psb/xserver-xorg-video-psb-0.32.1/libdrm-poulsbo.patch deleted file mode 100644 index 0ecc880c02..0000000000 --- a/meta-emenlow/packages/xserver-xorg-video-psb/xserver-xorg-video-psb-0.32.1/libdrm-poulsbo.patch +++ /dev/null | |||
@@ -1,13 +0,0 @@ | |||
1 | Index: xserver-xorg-video-psb-0.32.1/configure.ac | ||
2 | =================================================================== | ||
3 | --- xserver-xorg-video-psb-0.32.1.orig/configure.ac | ||
4 | +++ xserver-xorg-video-psb-0.32.1/configure.ac | ||
5 | @@ -94,7 +94,7 @@ AC_MSG_RESULT([$DRI]) | ||
6 | |||
7 | AM_CONDITIONAL(DRI, test x$DRI = xyes) | ||
8 | if test "$DRI" = yes; then | ||
9 | - PKG_CHECK_MODULES(DRI, [libdrm-poulsbo >= 2.0 xf86driproto]) | ||
10 | + PKG_CHECK_MODULES(DRI, [libdrm_poulsbo >= 2.0 xf86driproto]) | ||
11 | AC_DEFINE(XF86DRI,1,[Enable DRI driver support]) | ||
12 | AC_DEFINE(XF86DRI_DEVEL,1,[Enable developmental DRI driver support]) | ||
13 | fi | ||
diff --git a/meta-emenlow/packages/xserver-xorg-video-psb/xserver-xorg-video-psb-0.32.1/psb_mixed.patch b/meta-emenlow/packages/xserver-xorg-video-psb/xserver-xorg-video-psb-0.32.1/psb_mixed.patch deleted file mode 100644 index 6065fa5cac..0000000000 --- a/meta-emenlow/packages/xserver-xorg-video-psb/xserver-xorg-video-psb-0.32.1/psb_mixed.patch +++ /dev/null | |||
@@ -1,35 +0,0 @@ | |||
1 | --- xserver-xorg-video-psb-0.32.1/src/psb_accel.c.orig 2010-07-04 19:27:48.691227698 +0200 | ||
2 | +++ xserver-xorg-video-psb-0.32.1/src/psb_accel.c 2010-07-04 19:27:15.338230809 +0200 | ||
3 | @@ -308,6 +308,14 @@ | ||
4 | } | ||
5 | #endif | ||
6 | |||
7 | +static void* | ||
8 | +psbExaCreatePixmap(ScreenPtr pScreen, int w, int h, int depth, int usage_hint, int bpp, int* new_pitch ) | ||
9 | +{ | ||
10 | + return NULL; | ||
11 | +} | ||
12 | +static void | ||
13 | +psbExaDestroyPixmap(ScreenPtr pScreen, void* driverPriv ){ | ||
14 | +} | ||
15 | static Bool | ||
16 | psbExaPixmapIsOffscreen(PixmapPtr p) | ||
17 | { | ||
18 | @@ -1313,6 +1321,7 @@ | ||
19 | pExa->pixmapOffsetAlign = 8; | ||
20 | pExa->pixmapPitchAlign = 32 * 4; | ||
21 | pExa->flags = EXA_OFFSCREEN_PIXMAPS; | ||
22 | + pExa->flags |= EXA_HANDLES_PIXMAPS | EXA_MIXED_PIXMAPS; | ||
23 | pExa->maxX = 2047; | ||
24 | pExa->maxY = 2047; | ||
25 | pExa->WaitMarker = psbExaWaitMarker; | ||
26 | @@ -1328,6 +1337,9 @@ | ||
27 | pExa->Composite = psbExaSuperComposite; | ||
28 | pExa->DoneComposite = psbExaDoneComposite; | ||
29 | pExa->PixmapIsOffscreen = psbExaPixmapIsOffscreen; | ||
30 | + pExa->CreatePixmap = NULL; | ||
31 | + pExa->CreatePixmap2 = psbExaCreatePixmap; | ||
32 | + pExa->DestroyPixmap = psbExaDestroyPixmap; | ||
33 | pExa->PrepareAccess = psbExaPrepareAccess; | ||
34 | pExa->FinishAccess = psbExaFinishAccess; | ||
35 | pExa->UploadToScreen = psbExaUploadToScreen; | ||
diff --git a/meta-emenlow/packages/xserver-xorg-video-psb/xserver-xorg-video-psb-0.32.1/psb_xvtempfix.patch b/meta-emenlow/packages/xserver-xorg-video-psb/xserver-xorg-video-psb-0.32.1/psb_xvtempfix.patch deleted file mode 100644 index 34798c07e9..0000000000 --- a/meta-emenlow/packages/xserver-xorg-video-psb/xserver-xorg-video-psb-0.32.1/psb_xvtempfix.patch +++ /dev/null | |||
@@ -1,17 +0,0 @@ | |||
1 | --- xserver-xorg-video-psb-0.36.0-ref/src/psb_video.c 2010-06-07 22:17:46.302760345 +0200 | ||
2 | +++ xserver-xorg-video-psb-0.32/src/psb_video.c 2010-06-10 17:29:23.400003434 +0200 | ||
3 | @@ -686,8 +684,13 @@ | ||
4 | * coordinates) to the backing pixmap. | ||
5 | */ | ||
6 | |||
7 | - while (!psbExaGetSuperOffset(pPixmap, &pre_add, &dstBuf)) | ||
8 | + if(!psbExaGetSuperOffset(pPixmap, &pre_add, &dstBuf)){ | ||
9 | exaMoveInPixmap(pPixmap); | ||
10 | + if(!psbExaGetSuperOffset(pPixmap, &pre_add, &dstBuf)){ | ||
11 | + return FALSE; | ||
12 | + } | ||
13 | + } | ||
14 | + | ||
15 | |||
16 | dst.buffer = mmKernelBuf(dstBuf); | ||
17 | dst.offset = pre_add; | ||
diff --git a/meta-emenlow/packages/xserver-xorg-video-psb/xserver-xorg-video-psb-0.32.1/stubs.patch b/meta-emenlow/packages/xserver-xorg-video-psb/xserver-xorg-video-psb-0.32.1/stubs.patch deleted file mode 100644 index b201d7e314..0000000000 --- a/meta-emenlow/packages/xserver-xorg-video-psb/xserver-xorg-video-psb-0.32.1/stubs.patch +++ /dev/null | |||
@@ -1,23 +0,0 @@ | |||
1 | diff -p -up xserver-xorg-video-psb-0.31.0/src/psb_driver.c.orig xserver-xorg-video-psb-0.31.0/src/psb_driver.c | ||
2 | --- xserver-xorg-video-psb-0.31.0/src/psb_driver.c.orig 2010-04-30 08:58:06.798598457 +0200 | ||
3 | +++ xserver-xorg-video-psb-0.31.0/src/psb_driver.c 2010-04-30 09:03:04.186597975 +0200 | ||
4 | @@ -643,6 +643,19 @@ psbPreInitDRI(ScrnInfoPtr pScrn) | ||
5 | return TRUE; | ||
6 | } | ||
7 | |||
8 | +/* removed in Xserver 1.7, add it again so that proprietary Xpsb can be loaded */ | ||
9 | +void | ||
10 | +xf86AddModuleInfo(pointer info, pointer module) | ||
11 | +{ | ||
12 | +} | ||
13 | + | ||
14 | +/* removed in mesa, add it again so that proprietary Xpsb can be loaded */ | ||
15 | +typedef void (*_glapi_warning_func)(void *ctx, const char *str, ...); | ||
16 | +void | ||
17 | +_glapi_set_warning_func( _glapi_warning_func func ) | ||
18 | +{ | ||
19 | +} | ||
20 | + | ||
21 | static Bool | ||
22 | psbPreInitXpsb(ScrnInfoPtr pScrn) | ||
23 | { | ||
diff --git a/meta-emenlow/packages/xserver-xorg-video-psb/xserver-xorg-video-psb-0.32.1/visibility.patch b/meta-emenlow/packages/xserver-xorg-video-psb/xserver-xorg-video-psb-0.32.1/visibility.patch deleted file mode 100644 index 2c68805871..0000000000 --- a/meta-emenlow/packages/xserver-xorg-video-psb/xserver-xorg-video-psb-0.32.1/visibility.patch +++ /dev/null | |||
@@ -1,12 +0,0 @@ | |||
1 | Index: xserver-xorg-video-psb-0.32.1/configure.ac | ||
2 | =================================================================== | ||
3 | --- xserver-xorg-video-psb-0.32.1.orig/configure.ac | ||
4 | +++ xserver-xorg-video-psb-0.32.1/configure.ac | ||
5 | @@ -107,6 +107,7 @@ AC_DEFINE(INTEL_PSB_DRIVER, 1, [Compatib | ||
6 | |||
7 | AC_SUBST([DRI_CFLAGS]) | ||
8 | AC_SUBST([XORG_CFLAGS]) | ||
9 | +XORG_CFLAGS = `echo $XORG_CFLAGS | sed 's/hidden/default/'` | ||
10 | AC_SUBST([moduledir]) | ||
11 | |||
12 | DRIVER_NAME=psb | ||
diff --git a/meta-emenlow/packages/xserver-xorg-video-psb/xserver-xorg-video-psb-0.32.1/xorg-x11-drv-psb-0.31.0-ignoreacpi.patch b/meta-emenlow/packages/xserver-xorg-video-psb/xserver-xorg-video-psb-0.32.1/xorg-x11-drv-psb-0.31.0-ignoreacpi.patch deleted file mode 100644 index a73a493ec1..0000000000 --- a/meta-emenlow/packages/xserver-xorg-video-psb/xserver-xorg-video-psb-0.32.1/xorg-x11-drv-psb-0.31.0-ignoreacpi.patch +++ /dev/null | |||
@@ -1,11 +0,0 @@ | |||
1 | --- xserver-xorg-video-psb-0.31.0/src/psb_driver.c 2009-04-17 11:22:26.000000000 -0700 | ||
2 | +++ xserver-xorg-video-psb-0.31.0/src/psb_driver.c.new 2009-08-14 15:41:35.047596131 -0700 | ||
3 | @@ -909,7 +909,7 @@ | ||
4 | xf86DrvMsg(pScrn->scrnIndex, from, "Use %s cursor.\n", | ||
5 | pPsb->sWCursor ? "software" : "hardware"); | ||
6 | |||
7 | - pPsb->ignoreACPI = FALSE; | ||
8 | + pPsb->ignoreACPI = TRUE; | ||
9 | from = | ||
10 | xf86GetOptValBool(pPsb->options, OPTION_IGNORE_ACPI, | ||
11 | &pPsb->ignoreACPI) | ||
diff --git a/meta-emenlow/packages/xserver-xorg-video-psb/xserver-xorg-video-psb-0.32.1/xorg-x11-drv-psb-0.31.0-xserver17.patch b/meta-emenlow/packages/xserver-xorg-video-psb/xserver-xorg-video-psb-0.32.1/xorg-x11-drv-psb-0.31.0-xserver17.patch deleted file mode 100644 index defed50363..0000000000 --- a/meta-emenlow/packages/xserver-xorg-video-psb/xserver-xorg-video-psb-0.32.1/xorg-x11-drv-psb-0.31.0-xserver17.patch +++ /dev/null | |||
@@ -1,85 +0,0 @@ | |||
1 | --- xserver-xorg-video-psb-0.31.0/src/Xpsb.h 2009-04-17 11:22:26.000000000 -0700 | ||
2 | +++ xserver-xorg-video-psb-0.31.0/src/Xpsb.h.new 2009-08-28 09:24:16.333677591 -0700 | ||
3 | @@ -38,7 +38,9 @@ | ||
4 | #include "xf86drm.h" | ||
5 | #include "xf86.h" | ||
6 | #include "xf86_OSproc.h" | ||
7 | +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6 | ||
8 | #include "xf86Resources.h" | ||
9 | +#endif | ||
10 | #include "compiler.h" | ||
11 | |||
12 | #define XPSB_VOFFSET_X 0 | ||
13 | --- xserver-xorg-video-psb-0.31.0/src/psb_driver.h 2009-04-17 11:22:25.000000000 -0700 | ||
14 | +++ xserver-xorg-video-psb-0.31.0/src/psb_driver.h.new 2009-08-28 09:24:11.822679667 -0700 | ||
15 | @@ -34,7 +34,6 @@ | ||
16 | |||
17 | #include "xf86.h" | ||
18 | #include "xf86_OSproc.h" | ||
19 | -#include "xf86Resources.h" | ||
20 | #include "compiler.h" | ||
21 | #include "xf86PciInfo.h" | ||
22 | #include "vgaHW.h" | ||
23 | @@ -46,8 +45,10 @@ | ||
24 | #include "xf86int10.h" | ||
25 | #include "mibank.h" | ||
26 | #include "dgaproc.h" | ||
27 | +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6 | ||
28 | #include "xf86Resources.h" | ||
29 | #include "xf86RAC.h" | ||
30 | +#endif | ||
31 | #include "fb.h" | ||
32 | #include "xaa.h" | ||
33 | #include "xf86xv.h" | ||
34 | --- xserver-xorg-video-psb-0.31.0/src/i830_i2c.c 2009-04-17 11:22:24.000000000 -0700 | ||
35 | +++ xserver-xorg-video-psb-0.31.0/src/i830_i2c.c.new 2009-08-28 09:33:06.789804272 -0700 | ||
36 | @@ -31,8 +31,10 @@ | ||
37 | |||
38 | #include "xf86.h" | ||
39 | #include "xf86_OSproc.h" | ||
40 | +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6 | ||
41 | #include "xf86Resources.h" | ||
42 | #include "xf86RAC.h" | ||
43 | +#endif | ||
44 | #include "xf86cmap.h" | ||
45 | #include "compiler.h" | ||
46 | #include "mibstore.h" | ||
47 | --- xserver-xorg-video-psb-0.31.0/src/psb_video.c 2009-04-17 11:22:26.000000000 -0700 | ||
48 | +++ xserver-xorg-video-psb-0.31.0/src/psb_video.c.new 2009-08-28 09:35:03.874805663 -0700 | ||
49 | @@ -36,7 +36,9 @@ | ||
50 | |||
51 | #include "xf86.h" | ||
52 | #include "xf86_OSproc.h" | ||
53 | +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6 | ||
54 | #include "xf86Resources.h" | ||
55 | +#endif | ||
56 | #include "compiler.h" | ||
57 | |||
58 | #include "xf86xv.h" | ||
59 | --- xserver-xorg-video-psb-0.31.0/src/psb_driver.c 2009-04-17 11:22:26.000000000 -0700 | ||
60 | +++ xserver-xorg-video-psb-0.31.0/src/psb_driver.c.new 2009-08-28 10:30:32.325553685 -0700 | ||
61 | @@ -317,7 +317,7 @@ | ||
62 | * This data is accessed by the loader. The name must be the module name | ||
63 | * followed by "ModuleData". | ||
64 | */ | ||
65 | -XF86ModuleData psbModuleData = { &psbVersionRec, psbSetup, NULL }; | ||
66 | +_X_EXPORT XF86ModuleData psbModuleData = { &psbVersionRec, psbSetup, NULL }; | ||
67 | |||
68 | static pointer | ||
69 | psbSetup(pointer Module, pointer Options, int *ErrorMajor, int *ErrorMinor) | ||
70 | @@ -1023,11 +1023,13 @@ | ||
71 | |||
72 | PSB_DEBUG(scrnIndex, 3, "Initializing device\n"); | ||
73 | |||
74 | +#ifndef XSERVER_LIBPCIACCESS | ||
75 | if (xf86RegisterResources(pDevice->pEnt->index, NULL, ResExclusive)) { | ||
76 | xf86DrvMsg(scrnIndex, X_ERROR, | ||
77 | "Could not registrer device. Resource conflict.\n"); | ||
78 | return FALSE; | ||
79 | } | ||
80 | +#endif | ||
81 | |||
82 | if (!xf86LoadSubModule(pDevice->pScrns[0], "vgahw")) | ||
83 | return FALSE; | ||
84 | |||
85 | |||
diff --git a/meta-emenlow/packages/xserver-xorg-video-psb/xserver-xorg-video-psb-0.32.1/xserver-xorg-video-psb-0.31.0-assert.patch b/meta-emenlow/packages/xserver-xorg-video-psb/xserver-xorg-video-psb-0.32.1/xserver-xorg-video-psb-0.31.0-assert.patch deleted file mode 100644 index 5137a59041..0000000000 --- a/meta-emenlow/packages/xserver-xorg-video-psb/xserver-xorg-video-psb-0.32.1/xserver-xorg-video-psb-0.31.0-assert.patch +++ /dev/null | |||
@@ -1,11 +0,0 @@ | |||
1 | diff -p -up xserver-xorg-video-psb-0.31.0/libmm/mm_drm.c.assert xserver-xorg-video-psb-0.31.0/libmm/mm_drm.c | ||
2 | --- xserver-xorg-video-psb-0.31.0/libmm/mm_drm.c.assert 2010-04-26 13:40:50.000000000 +0200 | ||
3 | +++ xserver-xorg-video-psb-0.31.0/libmm/mm_drm.c 2010-04-26 13:48:28.000000000 +0200 | ||
4 | @@ -30,6 +30,7 @@ | ||
5 | #include "xf86mm.h" | ||
6 | #include "xf86drm.h" | ||
7 | #include "stdio.h" | ||
8 | +#include <assert.h> | ||
9 | |||
10 | /* | ||
11 | * This is a simple wrapper around libdrm's buffer interface to be used | ||
diff --git a/meta-emenlow/packages/xserver-xorg-video-psb/xserver-xorg-video-psb-0.32.1/xserver-xorg-video-psb-0.31.0-comment_unused.patch b/meta-emenlow/packages/xserver-xorg-video-psb/xserver-xorg-video-psb-0.32.1/xserver-xorg-video-psb-0.31.0-comment_unused.patch deleted file mode 100644 index ca811b6967..0000000000 --- a/meta-emenlow/packages/xserver-xorg-video-psb/xserver-xorg-video-psb-0.32.1/xserver-xorg-video-psb-0.31.0-comment_unused.patch +++ /dev/null | |||
@@ -1,75 +0,0 @@ | |||
1 | diff -p -up xserver-xorg-video-psb-0.31.0/libmm/mm_drm.c.comment_unused xserver-xorg-video-psb-0.31.0/libmm/mm_drm.c | ||
2 | --- xserver-xorg-video-psb-0.31.0/libmm/mm_drm.c.comment_unused 2009-04-17 20:22:26.000000000 +0200 | ||
3 | +++ xserver-xorg-video-psb-0.31.0/libmm/mm_drm.c 2010-04-26 13:40:50.000000000 +0200 | ||
4 | @@ -277,6 +277,7 @@ createFence(struct _MMManager *mm, | ||
5 | return &dFence->mf; | ||
6 | } | ||
7 | |||
8 | +/* | ||
9 | static void | ||
10 | fenceDestroy(struct _MMFence *mf) | ||
11 | { | ||
12 | @@ -288,6 +289,7 @@ fenceDestroy(struct _MMFence *mf) | ||
13 | assert(ret == 0); | ||
14 | free(dFence); | ||
15 | } | ||
16 | +*/ | ||
17 | |||
18 | static int | ||
19 | fenceEmit(struct _MMFence *mf, unsigned fence_class, | ||
20 | @@ -369,7 +371,7 @@ mmCreateDRM(int drmFD) | ||
21 | mm->fenceSignaled = fenceSignaled; | ||
22 | mm->fenceWait = fenceWait; | ||
23 | mm->fenceError = NULL; | ||
24 | - mm->fenceDestroy = fenceDestroy; | ||
25 | + /* mm->fenceDestroy = fenceDestroy; */ | ||
26 | mm->destroy = destroy; | ||
27 | return mm; | ||
28 | |||
29 | diff -p -up xserver-xorg-video-psb-0.31.0/libmm/mm_interface.h.comment_unused xserver-xorg-video-psb-0.31.0/libmm/mm_interface.h | ||
30 | --- xserver-xorg-video-psb-0.31.0/libmm/mm_interface.h.comment_unused 2009-04-17 20:22:26.000000000 +0200 | ||
31 | +++ xserver-xorg-video-psb-0.31.0/libmm/mm_interface.h 2010-04-26 13:45:22.000000000 +0200 | ||
32 | @@ -141,7 +141,7 @@ typedef struct _MMManager | ||
33 | int (*fenceWait) (struct _MMFence * mf, unsigned flushMask, | ||
34 | unsigned flags); | ||
35 | unsigned (*fenceError) (struct _MMFence * mf); | ||
36 | - void (*fenceDestroy) (struct _MMFence * mf); | ||
37 | + /* void (*fenceDestroy) (struct _MMFence * mf); */ | ||
38 | } MMManager; | ||
39 | |||
40 | /* | ||
41 | @@ -204,6 +204,7 @@ mmFenceEmit(struct _MMFence *mf, unsigne | ||
42 | return mf->man->fenceEmit(mf, class, type, flags); | ||
43 | } | ||
44 | |||
45 | +/* | ||
46 | static inline void | ||
47 | mmFenceUnReference(struct _MMFence **mfP) | ||
48 | { | ||
49 | @@ -214,6 +215,7 @@ mmFenceUnReference(struct _MMFence **mfP | ||
50 | } | ||
51 | *mfP = NULL; | ||
52 | } | ||
53 | +*/ | ||
54 | |||
55 | static inline struct _MMFence * | ||
56 | mmFenceReference(struct _MMFence *mf) | ||
57 | diff -p -up xserver-xorg-video-psb-0.31.0/libmm/mm_user.c.comment_unused xserver-xorg-video-psb-0.31.0/libmm/mm_user.c | ||
58 | --- xserver-xorg-video-psb-0.31.0/libmm/mm_user.c.comment_unused 2009-04-17 20:22:26.000000000 +0200 | ||
59 | +++ xserver-xorg-video-psb-0.31.0/libmm/mm_user.c 2010-04-26 13:05:15.000000000 +0200 | ||
60 | @@ -77,6 +77,7 @@ typedef struct _UserSignal | ||
61 | UserManager *man; | ||
62 | } UserSignal; | ||
63 | |||
64 | +/* | ||
65 | void | ||
66 | mmFenceSignal(struct _MMSignal *signal, unsigned class, | ||
67 | unsigned type, unsigned sequence, unsigned error, | ||
68 | @@ -148,6 +149,7 @@ mmFenceSignal(struct _MMSignal *signal, | ||
69 | type |= fence->signalPrevious; | ||
70 | } | ||
71 | } | ||
72 | +*/ | ||
73 | |||
74 | static int | ||
75 | fenceEmit(struct _MMFence *mf, unsigned class, unsigned type, unsigned flags) | ||
diff --git a/meta-emenlow/packages/xserver-xorg-video-psb/xserver-xorg-video-psb-0.32.1/xserver-xorg-video-psb-0.31.0-greedy.patch b/meta-emenlow/packages/xserver-xorg-video-psb/xserver-xorg-video-psb-0.32.1/xserver-xorg-video-psb-0.31.0-greedy.patch deleted file mode 100644 index 8758911c71..0000000000 --- a/meta-emenlow/packages/xserver-xorg-video-psb/xserver-xorg-video-psb-0.32.1/xserver-xorg-video-psb-0.31.0-greedy.patch +++ /dev/null | |||
@@ -1,19 +0,0 @@ | |||
1 | diff -p -up xserver-xorg-video-psb-0.31.0/src/psb_accel.c.greedy xserver-xorg-video-psb-0.31.0/src/psb_accel.c | ||
2 | --- xserver-xorg-video-psb-0.31.0/src/psb_accel.c.greedy 2009-04-17 20:22:24.000000000 +0200 | ||
3 | +++ xserver-xorg-video-psb-0.31.0/src/psb_accel.c 2010-04-23 14:52:47.000000000 +0200 | ||
4 | @@ -1331,6 +1331,15 @@ psbExaInit(ScrnInfoPtr pScrn) | ||
5 | pExa->FinishAccess = psbExaFinishAccess; | ||
6 | pExa->UploadToScreen = psbExaUploadToScreen; | ||
7 | |||
8 | + if (!xf86FindOptionValue(pScrn->options, "MigrationHeuristic")) { | ||
9 | + const char *default_migration = "greedy"; | ||
10 | + xf86DrvMsg(pScrn->scrnIndex, X_INFO, | ||
11 | + "Using default MigrationHeuristic: %s\n", | ||
12 | + default_migration); | ||
13 | + xf86ReplaceStrOption(pScrn->options, "MigrationHeuristic", default_migration); | ||
14 | + } | ||
15 | + | ||
16 | + | ||
17 | if (!exaDriverInit(pScrn->pScreen, pExa)) { | ||
18 | goto out_err; | ||
19 | } | ||
diff --git a/meta-emenlow/packages/xserver-xorg-video-psb/xserver-xorg-video-psb-0.32.1/xserver-xorg-video-psb-0.31.0-loader.patch b/meta-emenlow/packages/xserver-xorg-video-psb/xserver-xorg-video-psb-0.32.1/xserver-xorg-video-psb-0.31.0-loader.patch deleted file mode 100644 index 24cbc0d30e..0000000000 --- a/meta-emenlow/packages/xserver-xorg-video-psb/xserver-xorg-video-psb-0.32.1/xserver-xorg-video-psb-0.31.0-loader.patch +++ /dev/null | |||
@@ -1,84 +0,0 @@ | |||
1 | diff -p -up xserver-xorg-video-psb-0.31.0/src/psb_dri.c.loader xserver-xorg-video-psb-0.31.0/src/psb_dri.c | ||
2 | --- xserver-xorg-video-psb-0.31.0/src/psb_dri.c.loader 2009-04-17 20:22:24.000000000 +0200 | ||
3 | +++ xserver-xorg-video-psb-0.31.0/src/psb_dri.c 2010-03-12 15:03:33.000000000 +0100 | ||
4 | @@ -548,8 +548,6 @@ psbDRIScreenInit(ScreenPtr pScreen) | ||
5 | |||
6 | PSB_DEBUG(pScrn->scrnIndex, 3, "psbDRIScreenInit\n"); | ||
7 | |||
8 | - xf86LoaderReqSymLists(driReqSymbols, NULL); | ||
9 | - | ||
10 | pPsb->pDRIInfo = NULL; | ||
11 | |||
12 | /* | ||
13 | diff -p -up xserver-xorg-video-psb-0.31.0/src/psb_driver.c.loader xserver-xorg-video-psb-0.31.0/src/psb_driver.c | ||
14 | --- xserver-xorg-video-psb-0.31.0/src/psb_driver.c.loader 2010-03-12 13:48:52.000000000 +0100 | ||
15 | +++ xserver-xorg-video-psb-0.31.0/src/psb_driver.c 2010-03-12 15:03:26.000000000 +0100 | ||
16 | @@ -329,12 +329,6 @@ psbSetup(pointer Module, pointer Options | ||
17 | if (!Initialised) { | ||
18 | Initialised = TRUE; | ||
19 | xf86AddDriver(&psb, Module, 0); | ||
20 | - LoaderRefSymLists(fbSymbols, ddcSymbols, shadowSymbols, | ||
21 | - psbvgahwSymbols, | ||
22 | -#ifdef XF86DRI | ||
23 | - psbDRMSymbols, psbDRISymbols, | ||
24 | -#endif | ||
25 | - NULL); | ||
26 | return (pointer) TRUE; | ||
27 | } | ||
28 | |||
29 | @@ -639,7 +633,6 @@ psbPreInitDRI(ScrnInfoPtr pScrn) | ||
30 | if (!xf86LoadSubModule(pScrn, "dri")) | ||
31 | return FALSE; | ||
32 | |||
33 | - xf86LoaderReqSymLists(psbDRISymbols, psbDRMSymbols, NULL); | ||
34 | return TRUE; | ||
35 | } | ||
36 | |||
37 | @@ -660,7 +653,6 @@ psbPreInitXpsb(ScrnInfoPtr pScrn) | ||
38 | |||
39 | pPsb->xpsb = TRUE; | ||
40 | |||
41 | - xf86LoaderReqSymLists(psbXpsbSymbols, NULL); | ||
42 | return TRUE; | ||
43 | } | ||
44 | #endif | ||
45 | @@ -680,7 +672,6 @@ psbPreInitAccel(ScrnInfoPtr pScrn) | ||
46 | if (!xf86LoadSubModule(pScrn, "exa")) | ||
47 | return FALSE; | ||
48 | |||
49 | - xf86LoaderReqSymLists(exaSymbols, NULL); | ||
50 | } | ||
51 | |||
52 | xf86DrvMsg(pScrn->scrnIndex, from, "Acceleration %sabled\n", | ||
53 | @@ -720,7 +711,6 @@ psbPreInitShadowFB(ScrnInfoPtr pScrn) | ||
54 | if (!xf86LoadSubModule(pScrn, "shadow")) | ||
55 | return FALSE; | ||
56 | |||
57 | - xf86LoaderReqSymLists(shadowSymbols, NULL); | ||
58 | } | ||
59 | |||
60 | xf86DrvMsg(pScrn->scrnIndex, from, "Shadow framebuffer %sabled\n", | ||
61 | @@ -854,7 +844,6 @@ psbPreInit(ScrnInfoPtr pScrn, int flags) | ||
62 | |||
63 | if (!xf86LoadSubModule(pScrn, "vbe")) | ||
64 | return FALSE; | ||
65 | - xf86LoaderReqSymLists(vbeSymbols, NULL); | ||
66 | |||
67 | /* | ||
68 | * Parse options and load required modules here. | ||
69 | @@ -874,7 +863,6 @@ psbPreInit(ScrnInfoPtr pScrn, int flags) | ||
70 | |||
71 | if (!xf86LoadSubModule(pScrn, "fb")) | ||
72 | return (FALSE); | ||
73 | - xf86LoaderReqSymLists(fbSymbols, NULL); | ||
74 | |||
75 | pScrn->chipset = "Intel GMA500"; | ||
76 | pScrn->monitor = pScrn->confScreen->monitor; | ||
77 | @@ -1033,7 +1021,6 @@ psbDeviceInit(PsbDevicePtr pDevice, int | ||
78 | |||
79 | if (!xf86LoadSubModule(pDevice->pScrns[0], "vgahw")) | ||
80 | return FALSE; | ||
81 | - xf86LoaderReqSymLists(psbvgahwSymbols, NULL); | ||
82 | |||
83 | if (!vgaHWGetHWRec(pDevice->pScrns[0])) | ||
84 | return FALSE; | ||
diff --git a/meta-emenlow/packages/xserver-xorg-video-psb/xserver-xorg-video-psb_0.32.1.bb b/meta-emenlow/packages/xserver-xorg-video-psb/xserver-xorg-video-psb_0.32.1.bb deleted file mode 100644 index 1ff92bbc61..0000000000 --- a/meta-emenlow/packages/xserver-xorg-video-psb/xserver-xorg-video-psb_0.32.1.bb +++ /dev/null | |||
@@ -1,34 +0,0 @@ | |||
1 | DESCRIPTION = "2D graphics driver for Poulsbo" | ||
2 | LICENSE = "MIT" | ||
3 | LIC_FILES_CHKSUM = "file://MIT_License.txt;md5=732825ecdcf420261531d935fcd914a7" | ||
4 | PR = "r2" | ||
5 | |||
6 | inherit autotools | ||
7 | |||
8 | SRC_URI = "https://launchpad.net/~gma500/+archive/ppa/+files/xserver-xorg-video-psb_0.36.0-0ubuntu3~1004um9.tar.gz \ | ||
9 | file://xorg-x11-drv-psb-0.31.0-ignoreacpi.patch;patch=1 \ | ||
10 | file://xorg-x11-drv-psb-0.31.0-xserver17.patch;patch=1 \ | ||
11 | file://xserver-xorg-video-psb-0.31.0-assert.patch;patch=1 \ | ||
12 | file://xserver-xorg-video-psb-0.31.0-comment_unused.patch;patch=1 \ | ||
13 | file://xserver-xorg-video-psb-0.31.0-greedy.patch;patch=1 \ | ||
14 | file://xserver-xorg-video-psb-0.31.0-loader.patch;patch=1 \ | ||
15 | file://stubs.patch;patch=1 \ | ||
16 | file://01_disable_lid_timer.patch;patch=1 \ | ||
17 | file://psb_xvtempfix.patch;patch=1 \ | ||
18 | file://psb_mixed.patch;patch=1 \ | ||
19 | file://dri-h.patch \ | ||
20 | file://libdrm-poulsbo.patch" | ||
21 | |||
22 | export DRI_CFLAGS="-I${STAGING_INCDIR}/psb -I${STAGING_INCDIR}/psb/drm \ | ||
23 | -I${STAGING_INCDIR}/X11/dri" | ||
24 | |||
25 | export CFLAGS = "-fvisibility=default" | ||
26 | export XORG_CFLAGS="-fvisibility=default -I${STAGING_INCDIR}/xorg \ | ||
27 | -I${STAGING_INCDIR}/pixman-1" | ||
28 | |||
29 | FILES_${PN} += "${libdir}/xorg/modules/drivers/libmm.so \ | ||
30 | ${libdir}/xorg/modules/drivers/psb_drv.so" | ||
31 | |||
32 | DEPENDS += "virtual/libgl virtual/xserver" | ||
33 | |||
34 | COMPATIBLE_MACHINE = "emenlow" | ||