libdrm 2.4.47 update
This diff updates libdrm to the latest upstream release. Might do
with some testing, especially on radeondrm. You'll need the kernel
header changes that I just committed to be able to build this.
Index: Makefile.inc
===
RCS file: /home/cvs/xenocara/lib/libdrm/Makefile.inc,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile.inc
--- Makefile.inc8 Jul 2013 09:10:05 - 1.7
+++ Makefile.inc15 Nov 2013 14:00:11 -
@@ -1,6 +1,6 @@
# $OpenBSD: Makefile.inc,v 1.7 2013/07/08 09:10:05 jsg Exp $
-PACKAGE_VERSION= 2.4.46
+PACKAGE_VERSION= 2.4.47
NOPROFILE=
Index: xf86drm.c
===
RCS file: /home/cvs/xenocara/lib/libdrm/xf86drm.c,v
retrieving revision 1.9
diff -u -p -r1.9 xf86drm.c
--- xf86drm.c 20 Jun 2013 09:55:30 - 1.9
+++ xf86drm.c 15 Nov 2013 13:59:50 -
@@ -830,6 +830,13 @@ int drmGetCap(int fd, uint64_t capabilit
return 0;
}
+int drmSetClientCap(int fd, uint64_t capability, uint64_t value)
+{
+ struct drm_set_client_cap cap = { capability, value };
+
+ return drmIoctl(fd, DRM_IOCTL_SET_CLIENT_CAP, cap);
+}
+
/**
* Free the bus ID information.
*
Index: xf86drm.h
===
RCS file: /home/cvs/xenocara/lib/libdrm/xf86drm.h,v
retrieving revision 1.7
diff -u -p -r1.7 xf86drm.h
--- xf86drm.h 25 Mar 2013 02:32:20 - 1.7
+++ xf86drm.h 15 Nov 2013 13:59:50 -
@@ -609,6 +609,8 @@ extern int drmUpdateDrawableIn
unsigned int num, void *data);
extern int drmCtlInstHandler(int fd, int irq);
extern int drmCtlUninstHandler(int fd);
+extern int drmSetClientCap(int fd, uint64_t capability,
+uint64_t value);
/* General user-level programmer's API: authenticated client and/or X */
extern int drmMap(int fd,
Index: xf86drmMode.h
===
RCS file: /home/cvs/xenocara/lib/libdrm/xf86drmMode.h,v
retrieving revision 1.5
diff -u -p -r1.5 xf86drmMode.h
--- xf86drmMode.h 8 Jul 2013 09:10:05 - 1.5
+++ xf86drmMode.h 15 Nov 2013 13:59:50 -
@@ -81,20 +81,30 @@ extern C {
/* Video mode flags */
/* bit compatible with the xorg definitions. */
-#define DRM_MODE_FLAG_PHSYNC(10)
-#define DRM_MODE_FLAG_NHSYNC(11)
-#define DRM_MODE_FLAG_PVSYNC(12)
-#define DRM_MODE_FLAG_NVSYNC(13)
-#define DRM_MODE_FLAG_INTERLACE (14)
-#define DRM_MODE_FLAG_DBLSCAN (15)
-#define DRM_MODE_FLAG_CSYNC (16)
-#define DRM_MODE_FLAG_PCSYNC(17)
-#define DRM_MODE_FLAG_NCSYNC(18)
-#define DRM_MODE_FLAG_HSKEW (19) /* hskew provided */
-#define DRM_MODE_FLAG_BCAST (110)
-#define DRM_MODE_FLAG_PIXMUX(111)
-#define DRM_MODE_FLAG_DBLCLK(112)
-#define DRM_MODE_FLAG_CLKDIV2 (113)
+#define DRM_MODE_FLAG_PHSYNC (10)
+#define DRM_MODE_FLAG_NHSYNC (11)
+#define DRM_MODE_FLAG_PVSYNC (12)
+#define DRM_MODE_FLAG_NVSYNC (13)
+#define DRM_MODE_FLAG_INTERLACE(14)
+#define DRM_MODE_FLAG_DBLSCAN (15)
+#define DRM_MODE_FLAG_CSYNC(16)
+#define DRM_MODE_FLAG_PCSYNC (17)
+#define DRM_MODE_FLAG_NCSYNC (18)
+#define DRM_MODE_FLAG_HSKEW(19) /* hskew provided */
+#define DRM_MODE_FLAG_BCAST(110)
+#define DRM_MODE_FLAG_PIXMUX (111)
+#define DRM_MODE_FLAG_DBLCLK (112)
+#define DRM_MODE_FLAG_CLKDIV2 (113)
+#define DRM_MODE_FLAG_3D_MASK (0x1f14)
+#define DRM_MODE_FLAG_3D_NONE (014)
+#define DRM_MODE_FLAG_3D_FRAME_PACKING(114)
+#define DRM_MODE_FLAG_3D_FIELD_ALTERNATIVE(214)
+#define DRM_MODE_FLAG_3D_LINE_ALTERNATIVE (314)
+#define DRM_MODE_FLAG_3D_SIDE_BY_SIDE_FULL(414)
+#define DRM_MODE_FLAG_3D_L_DEPTH (514)
+#define DRM_MODE_FLAG_3D_L_DEPTH_GFX_GFX_DEPTH(614)
+#define DRM_MODE_FLAG_3D_TOP_AND_BOTTOM (714)
+#define DRM_MODE_FLAG_3D_SIDE_BY_SIDE_HALF(814)
/* DPMS flags */
/* bit compatible with the xorg definitions. */
@@ -218,11 +228,11 @@ typedef struct _drmModeProperty {
uint32_t flags;
char name[DRM_PROP_NAME_LEN];
int count_values;
- uint64_t *values; // store the blob lengths
+ uint64_t *values; /* store the blob lengths */
int count_enums;
struct drm_mode_property_enum *enums;
int count_blobs;
- uint32_t *blob_ids; // store the blob IDs
+ uint32_t *blob_ids; /* store the blob IDs */
} drmModePropertyRes, *drmModePropertyPtr;
typedef struct _drmModeCrtc {
Index: intel/intel_bufmgr_gem.c
Re: rfc: acpi wmi diff
Kyle R W Milz kyle at getaddrinfo.net writes: tech at , Here is an initial implementation of a generic acpi wmi framework and a single consumer for the framework that lets the volume adjustment keys on an asus ux31e work. The generic framework could be used to support hotkeys found in different acer, dell, hp, msi, other laptops. This is by no means complete as wmi can do all sorts of other stupid things like blink leds, toggle radios, control backlights, etc. The code has some style(9) issues. Looking for feedback before I go any further. Index: arch/amd64/conf/GENERIC === RCS file: /cvs/src/sys/arch/amd64/conf/GENERIC,v retrieving revision 1.352 diff -u -p -r1.352 GENERIC --- arch/amd64/conf/GENERIC 4 Nov 2013 14:07:15 - 1.352 +++ arch/amd64/conf/GENERIC 17 Nov 2013 05:53:40 - at at -58,6 +58,8 at at acpitoshiba*at acpi? acpivideo* at acpi? acpivout*at acpivideo? acpipwrres* at acpi? +acpiwmi* at acpi? +acpiwmi_asus*at acpiwmi? afaik, using underscore in device name is against OpenBSD conventions. also, if WMI maybe used to implement different vendors' features, would it be useful to use acpiwmi* at acpi? wmiasus* at acpiwmi? model to have common WMI abstraction under acpiwmi and vendor-specific stuff under wmivendor (like acpi(4) and acpiasus(4) for instance)?
Re: libdrm 2.4.47 update
On Sun, Nov 17, 2013 at 03:28:30PM +0100, Mark Kettenis wrote: This diff updates libdrm to the latest upstream release. Might do with some testing, especially on radeondrm. You'll need the kernel header changes that I just committed to be able to build this. No regression on my Radeon HD 3300. -- Matthieu Herrb
fix shadowfb in xf86-video-nv
Hi,
the patch below fixes shadowfb in the xf86-video-nv driver. It should
be useable without an xorg.conf to disable shadowfb now.
Those who are stuck to using nVidia cards with -current, please test.
Apply in /usr/xenocara/driver/xf86-video-nv then rebuid using
make -f Makefile.bsd-wrapper obj
make -f Makefile.bsd-wrapper build
and restart X.
Index: src/nv_driver.c
===
RCS file: /cvs/OpenBSD/xenocara/driver/xf86-video-nv/src/nv_driver.c,v
retrieving revision 1.15
diff -u -r1.15 nv_driver.c
--- src/nv_driver.c 12 May 2013 13:06:25 - 1.15
+++ src/nv_driver.c 17 Nov 2013 18:28:05 -
@@ -2070,7 +2070,7 @@
/* Load shadowfb if needed */
if (pNv-ShadowFB) {
- if (!xf86LoadSubModule(pScrn, shadowfb)) {
+ if (!xf86LoadSubModule(pScrn, shadow)) {
xf86FreeInt10(pNv-pInt);
NVFreeRec(pScrn);
return FALSE;
@@ -2378,6 +2378,44 @@
hwp-writeCrtc(hwp, 0x1A, crtc1A);
}
+static Bool
+NVCreateScreenResources(ScreenPtr pScreen)
+{
+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
+ NVPtr pNv = NVPTR(pScrn);
+ PixmapPtr pPixmap;
+ Bool ret;
+
+ pScreen-CreateScreenResources = pNv-CreateScreenResources;
+ ret = pScreen-CreateScreenResources(pScreen);
+ pScreen-CreateScreenResources = NVCreateScreenResources;
+
+ if (!ret)
+ return FALSE;
+
+ pPixmap = pScreen-GetScreenPixmap(pScreen);
+
+ if (!shadowAdd(pScreen, pPixmap, NVShadowUpdate,
+ NULL, 0, NULL)) {
+ return FALSE;
+ }
+ return TRUE;
+}
+
+static Bool
+NVShadowInit(ScreenPtr pScreen)
+{
+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
+ NVPtr pNv = NVPTR(pScrn);
+
+ if (!shadowSetup(pScreen))
+ return FALSE;
+ pNv-CreateScreenResources = pScreen-CreateScreenResources;
+ pScreen-CreateScreenResources = NVCreateScreenResources;
+
+ return TRUE;
+}
+
/* Mandatory */
@@ -2599,8 +2637,8 @@
Driver rotation enabled, RandR disabled\n);
}
}
-
- ShadowFBInit(pScreen, refreshArea);
+pNv-refreshArea = refreshArea;
+ NVShadowInit(pScreen);
}
if(pNv-FlatPanel)
Index: src/nv_local.h
===
RCS file: /cvs/OpenBSD/xenocara/driver/xf86-video-nv/src/nv_local.h,v
retrieving revision 1.2
diff -u -r1.2 nv_local.h
--- src/nv_local.h 29 Jul 2008 20:04:57 - 1.2
+++ src/nv_local.h 17 Nov 2013 18:28:05 -
@@ -32,6 +32,7 @@
#include compiler.h
#include xf86_OSproc.h
+#include shadow.h
/*
* Typedefs to force certain sized values.
*/
Index: src/nv_proto.h
===
RCS file: /cvs/OpenBSD/xenocara/driver/xf86-video-nv/src/nv_proto.h,v
retrieving revision 1.2
diff -u -r1.2 nv_proto.h
--- src/nv_proto.h 16 Aug 2012 16:35:27 - 1.2
+++ src/nv_proto.h 17 Nov 2013 18:28:05 -
@@ -49,6 +49,7 @@
void NVLockUnlock(NVPtr,int);
/* in nv_shadow.c */
+void NVShadowUpdate (ScreenPtr pScreen, shadowBufPtr pBuf);
void NVRefreshArea(ScrnInfoPtr pScrn, int num, BoxPtr pbox);
void NVRefreshArea8(ScrnInfoPtr pScrn, int num, BoxPtr pbox);
void NVRefreshArea16(ScrnInfoPtr pScrn, int num, BoxPtr pbox);
Index: src/nv_shadow.c
===
RCS file: /cvs/OpenBSD/xenocara/driver/xf86-video-nv/src/nv_shadow.c,v
retrieving revision 1.2
diff -u -r1.2 nv_shadow.c
--- src/nv_shadow.c 16 Aug 2012 16:35:27 - 1.2
+++ src/nv_shadow.c 17 Nov 2013 18:28:05 -
@@ -13,6 +13,17 @@
#include shadowfb.h
#include servermd.h
+void
+NVShadowUpdate (ScreenPtr pScreen, shadowBufPtr pBuf)
+{
+RegionPtr damage = DamageRegion(pBuf-pDamage);
+ScrnInfoPtr pScrn;
+pScrn = xf86ScreenToScrn(pScreen);
+
+(NVPTR(pScrn))-refreshArea (pScrn, REGION_NUM_RECTS(damage),
+ REGION_RECTS(damage));
+}
+
void
NVRefreshArea(ScrnInfoPtr pScrn, int num, BoxPtr pbox)
Index: src/nv_type.h
===
RCS file: /cvs/OpenBSD/xenocara/driver/xf86-video-nv/src/nv_type.h,v
retrieving revision 1.3
diff -u -r1.3 nv_type.h
--- src/nv_type.h 16 Aug 2012 16:35:27 - 1.3
+++ src/nv_type.h 17 Nov 2013 18:28:05 -
@@ -133,6 +133,8 @@
int numDGAModes;
BoolDGAactive;
int DGAViewportStatus;
+CreateScreenResourcesProcPtr CreateScreenResources;
+RefreshAreaFuncPtr refreshArea;
void (*PointerMoved)(SCRN_ARG_TYPE arg, int x, int y);
ScreenBlockHandlerProcPtr BlockHandler;
CloseScreenProcPtr CloseScreen;
--
Matthieu Herrb
inteldrm diff
The diff below is a fairly large diff that moves the gtt management
into the inteldrm driver. While this diff might fix some of the
issues people have been reporting with inteldrm, I don't expect it to
fix most of those issues. This brings our codebase closer to what
Linux has though, and this will enable other changes that will address
those issues.
There is one functional change though. This will take over the gtt
entries that are mapping stolen graphics memory. This is what Linux
does as well, so it should be safe. And it will give you a bit more
space to map graphics objects into the aperture.
If you didn't understand all that, don't worry. Just give this diff a
try and test for regressions. And that means I just want to know
about things that stopped working with this diff applied.
Thanks,
Mark
Index: agp_i810.c
===
RCS file: /home/cvs/src/sys/dev/pci/agp_i810.c,v
retrieving revision 1.78
diff -u -p -r1.78 agp_i810.c
--- agp_i810.c 6 Jun 2013 16:14:26 - 1.78
+++ agp_i810.c 17 Nov 2013 20:42:36 -
@@ -570,6 +570,8 @@ agp_i810_attach(struct device *parent, s
printf(: no preallocated video memory\n);
#endif
+ isc-stolen = 0;
+
/* GATT address is already in there, make sure it's enabled */
gatt-ag_physical = READ4(AGP_I810_PGTBL_CTL) ~1;
break;
Index: drm/drmP.h
===
RCS file: /home/cvs/src/sys/dev/pci/drm/drmP.h,v
retrieving revision 1.152
diff -u -p -r1.152 drmP.h
--- drm/drmP.h 7 Nov 2013 05:33:05 - 1.152
+++ drm/drmP.h 17 Nov 2013 18:28:25 -
@@ -71,6 +71,7 @@
#include drm_linux_list.h
#include drm.h
+#include drm_mm.h
#include drm_atomic.h
#include agp.h
@@ -778,7 +779,6 @@ struct drm_device {
atomic_t obj_count;
u_intobj_name;
atomic_t obj_memory;
- uint32_t gtt_total;
SPLAY_HEAD(drm_name_tree, drm_obj) name_tree;
struct pool objpl;
Index: drm/i915/i915_dma.c
===
RCS file: /home/cvs/src/sys/dev/pci/drm/i915/i915_dma.c,v
retrieving revision 1.10
diff -u -p -r1.10 i915_dma.c
--- drm/i915/i915_dma.c 7 Aug 2013 19:49:05 - 1.10
+++ drm/i915/i915_dma.c 17 Nov 2013 18:31:49 -
@@ -371,8 +371,6 @@ cleanup_gem_stolen:
void
i915_driver_lastclose(struct drm_device *dev)
{
- struct inteldrm_softc *dev_priv = dev-dev_private;
- struct vm_page *p;
int ret;
if (drm_core_check_feature(dev, DRIVER_MODESET)) {
@@ -383,21 +381,6 @@ i915_driver_lastclose(struct drm_device
ret = i915_gem_idle(dev);
if (ret)
DRM_ERROR(failed to idle hardware: %d\n, ret);
-
- if (dev_priv-agpdmat != NULL) {
- /*
-* make sure we nuke everything, we may have mappings that we've
-* unrefed, but uvm has a reference to them for maps. Make sure
-* they get unbound and any accesses will segfault.
-* XXX only do ones in GEM.
-*/
- for (p = dev_priv-pgs; p dev_priv-pgs +
- (dev-agp-info.ai_aperture_size / PAGE_SIZE); p++)
- pmap_page_protect(p, VM_PROT_NONE);
- agp_bus_dma_destroy((struct agp_softc *)dev-agp-agpdev,
- dev_priv-agpdmat);
- }
- dev_priv-agpdmat = NULL;
}
int
Index: drm/i915/i915_drv.c
===
RCS file: /home/cvs/src/sys/dev/pci/drm/i915/i915_drv.c,v
retrieving revision 1.47
diff -u -p -r1.47 i915_drv.c
--- drm/i915/i915_drv.c 17 Nov 2013 18:47:13 - 1.47
+++ drm/i915/i915_drv.c 17 Nov 2013 19:08:38 -
@@ -1035,6 +1035,7 @@ inteldrm_attach(struct device *parent, s
*/
if (INTEL_INFO(dev)-gen 3 || IS_I915G(dev) || IS_I915GM(dev))
ri-ri_flg |= RI_WRONLY;
+ ri-ri_flg |= RI_WRONLY;
inteldrm_stdscreen.capabilities = ri-ri_caps;
inteldrm_stdscreen.nrows = ri-ri_rows;
Index: drm/i915/i915_drv.h
===
RCS file: /home/cvs/src/sys/dev/pci/drm/i915/i915_drv.h,v
retrieving revision 1.33
diff -u -p -r1.33 i915_drv.h
--- drm/i915/i915_drv.h 17 Nov 2013 18:47:13 - 1.33
+++ drm/i915/i915_drv.h 17 Nov 2013 19:56:32 -
@@ -248,6 +248,8 @@ struct intel_opregion {
#define I915_FENCE_REG_NONE -1
#define I915_MAX_NUM_FENCES 16
+/* 16 fences + sign bit for FENCE_REG_NONE */
+#define I915_MAX_NUM_FENCE_BITS 5
struct drm_i915_fence_reg {
struct list_head lru_list;
@@ -505,7 +507,6 @@ struct intel_l3_parity {
struct inteldrm_softc {
struct device
Re: inteldrm diff
Date: Sun, 17 Nov 2013 22:48:41 +0100 (CET) From: Mark Kettenis mark.kette...@xs4all.nl The diff below is a fairly large diff that moves the gtt management into the inteldrm driver. While this diff might fix some of the issues people have been reporting with inteldrm, I don't expect it to fix most of those issues. Actually, this does seem to make the newer xf86-video-intel driver with SNA work on i945 and i965 now, so this defenitely makes things better. All the more reason to test this.
Re: inteldrm diff
I tried this diff and at least one thing changed -- neverball now works (previously it immediately hung the GPU on start). There is still corruption and GPU hanging in chromium. There is corruption in mplayer -vo gl too (and it is still much slower than it is on 5.4). With a lot of help from Stefan Sperling I tried to do experiments. Since I am too unskilled I was not able to do it properly and build xenocara from the same point in time (date-based CVS checkouts do not compile for me) but I built kernel on 5.3 from 2013-07-06 with just this patch applied: http://freshbsd.org/commit/openbsd/304417ea27d0874895cc4e65c30324b7bd14ac22 (as I am 80% sure it's when problems started) and the screen became totally corrupted in X but computer did not hang. It looked very similar to what is seen now. If that helps that is all I could find out.
Re: Unexpected match set prio behaviour
On Thu, Nov 14, 2013 at 12:03:21AM +0200, Alexey Suslikov wrote:
This is on 5.4-stable. vlan is only used to see what resulting prio is.
#match on { $int_if } inet proto icmp all icmp-type echoreq set prio 5
pass quick on { $ext_if, $int_if }
Can you test wether this diff matches your expected behaviour?
Please try various combinations of pass and match rules.
bluhm
Index: net/pf.c
===
RCS file: /data/mirror/openbsd/cvs/src/sys/net/pf.c,v
retrieving revision 1.861
diff -u -p -r1.861 pf.c
--- net/pf.c16 Nov 2013 00:36:01 - 1.861
+++ net/pf.c18 Nov 2013 00:56:55 -
@@ -3110,8 +3110,10 @@ pf_rule_to_actions(struct pf_rule *r, st
a-max_mss = r-max_mss;
a-flags |= (r-scrub_flags (PFSTATE_NODF|PFSTATE_RANDOMID|
PFSTATE_SETTOS|PFSTATE_SCRUB_TCP|PFSTATE_SETPRIO));
- a-set_prio[0] = r-set_prio[0];
- a-set_prio[1] = r-set_prio[1];
+ if (r-scrub_flags PFSTATE_SETPRIO) {
+ a-set_prio[0] = r-set_prio[0];
+ a-set_prio[1] = r-set_prio[1];
+ }
}
#define PF_TEST_ATTRIB(t, a) \
Mesa 9.2.3 update
Here is a diff that updates Mesa to 9.2.3 a bug fix release.
Release notes can be found at http://www.mesa3d.org/relnotes/9.2.3.html
Index: dist/Mesa/Android.common.mk
===
RCS file: /cvs/xenocara/dist/Mesa/Android.common.mk,v
retrieving revision 1.1.1.3
diff -u -p -r1.1.1.3 Android.common.mk
--- dist/Mesa/Android.common.mk 9 Nov 2013 02:25:51 - 1.1.1.3
+++ dist/Mesa/Android.common.mk 18 Nov 2013 00:49:24 -
@@ -35,7 +35,7 @@ LOCAL_C_INCLUDES += \
# define ANDROID_VERSION (e.g., 4.0.x = 0x0400)
LOCAL_CFLAGS += \
- -DPACKAGE_VERSION=\9.2.2\ \
+ -DPACKAGE_VERSION=\9.2.3\ \
-DPACKAGE_BUGREPORT=\https://bugs.freedesktop.org/enter_bug.cgi?product=Mesa\;
\
-DANDROID_VERSION=0x0$(MESA_ANDROID_MAJOR_VERSION)0$(MESA_ANDROID_MINOR_VERSION)
Index: dist/Mesa/SConstruct
===
RCS file: /cvs/xenocara/dist/Mesa/SConstruct,v
retrieving revision 1.6
diff -u -p -r1.6 SConstruct
--- dist/Mesa/SConstruct9 Nov 2013 02:46:54 - 1.6
+++ dist/Mesa/SConstruct18 Nov 2013 00:49:24 -
@@ -70,7 +70,7 @@ if env['gles']:
# Environment setup
env.Append(CPPDEFINES = [
-('PACKAGE_VERSION', '\\9.2.2\\'),
+('PACKAGE_VERSION', '\\9.2.3\\'),
('PACKAGE_BUGREPORT',
'\\https://bugs.freedesktop.org/enter_bug.cgi?product=Mesa\\;'),
])
Index: dist/Mesa/configure.ac
===
RCS file: /cvs/xenocara/dist/Mesa/configure.ac,v
retrieving revision 1.9
diff -u -p -r1.9 configure.ac
--- dist/Mesa/configure.ac 9 Nov 2013 02:46:54 - 1.9
+++ dist/Mesa/configure.ac 18 Nov 2013 00:49:28 -
@@ -6,7 +6,7 @@ dnl Tell the user about autoconf.html in
m4_divert_once([HELP_END], [
See docs/autoconf.html for more details on the options for Mesa.])
-AC_INIT([Mesa], [9.2.2],
+AC_INIT([Mesa], [9.2.3],
[https://bugs.freedesktop.org/enter_bug.cgi?product=Mesa])
AC_CONFIG_AUX_DIR([bin])
AC_CONFIG_MACRO_DIR([m4])
Index: dist/Mesa/bin/get-pick-list.sh
===
RCS file: /cvs/xenocara/dist/Mesa/bin/get-pick-list.sh,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 get-pick-list.sh
--- dist/Mesa/bin/get-pick-list.sh 5 Sep 2013 13:09:11 - 1.1.1.1
+++ dist/Mesa/bin/get-pick-list.sh 18 Nov 2013 00:49:28 -
@@ -14,7 +14,7 @@ git log --reverse --grep=cherry picked
sed -e 's/^[[:space:]]*(cherry picked from commit[[:space:]]*//' -e
's/)//' already_picked
# Grep for commits that were marked as a candidate for the stable tree.
-git log --reverse --pretty=%H -i --grep='^\([[:space:]]*NOTE:
.*[Cc]andidate\|CC:.*mesa-stable\)' HEAD..origin/master |\
+git log --reverse --pretty=%H -i --grep='^\([[:space:]]*NOTE:
.*[Cc]andidate.*9\.2\|CC:.*9\.2.*mesa-stable\)' HEAD..origin/master |\
while read sha
do
# Check to see whether the patch is on the ignore list.
Index: dist/Mesa/docs/relnotes/9.2.2.html
===
RCS file: /cvs/xenocara/dist/Mesa/docs/relnotes/9.2.2.html,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 9.2.2.html
--- dist/Mesa/docs/relnotes/9.2.2.html 9 Nov 2013 02:37:06 - 1.1.1.1
+++ dist/Mesa/docs/relnotes/9.2.2.html 18 Nov 2013 00:49:28 -
@@ -31,6 +31,9 @@ because GL_ARB_compatibility is not supp
h2MD5 checksums/h2
pre
+df801a975045150790e10e2ccf32193f MesaLib-9.2.2.tar.gz
+20887f8020db7d1736a01ae9cd5d8c38 MesaLib-9.2.2.tar.bz2
+1676f4f1b157c838d077dadd31ba6c84 MesaLib-9.2.2.zip
/pre
Index: dist/Mesa/include/c99/stdbool.h
===
RCS file: /cvs/xenocara/dist/Mesa/include/c99/stdbool.h,v
retrieving revision 1.1
diff -u -p -r1.1 stdbool.h
--- dist/Mesa/include/c99/stdbool.h 22 May 2010 20:05:54 - 1.1
+++ dist/Mesa/include/c99/stdbool.h 18 Nov 2013 00:49:28 -
@@ -35,7 +35,8 @@
#define bool_Bool
/* For compilers that don't have the builtin _Bool type. */
-#if defined(_MSC_VER) || (__STDC_VERSION__ 199901L __GNUC__ 3)
+#if (defined(_MSC_VER) _MSC_VER 1800) || \
+(defined __GNUC__ __STDC_VERSION__ 199901L __GNUC__ 3)
typedef unsigned char _Bool;
#endif
Index: dist/Mesa/src/egl/drivers/dri2/egl_dri2.c
===
RCS file: /cvs/xenocara/dist/Mesa/src/egl/drivers/dri2/egl_dri2.c,v
retrieving revision 1.4
diff -u -p -r1.4 egl_dri2.c
--- dist/Mesa/src/egl/drivers/dri2/egl_dri2.c 5 Sep 2013 13:59:22 -
1.4
+++ dist/Mesa/src/egl/drivers/dri2/egl_dri2.c 18 Nov 2013 00:49:28 -
@@ -1203,7 +1203,7 @@ dri2_create_image_wayland_wl_buffer(_EGL
EGLint err;
int32_t plane;
- if (!wayland_buffer_is_drm(buffer-buffer))
+ if (!wayland_buffer_is_drm(dri2_dpy-wl_server_drm, buffer-buffer))
return NULL;
