diff options
author | Fathi Boudra <fathi.boudra@linaro.org> | 2017-02-20 11:26:56 +0000 |
---|---|---|
committer | Linaro Code Review <review@review.linaro.org> | 2017-02-20 11:26:56 +0000 |
commit | 779cbe14316b8f4ba54520139eb0cc4556e558ef (patch) | |
tree | f399d72f0772f71003f7ac4c7ceefa1ece532060 | |
parent | 4e9c0806d6d1452a828e467597b254211603546b (diff) | |
parent | fe1ae0c7b90eba4e59e7565a213e2a8667d31dcb (diff) |
Merge "xserver-xorg: Upgrade 1.19.0 -> 1.19.1, and bug fixes" into morty
-rw-r--r-- | openembedded-layer/recipes-graphics/xorg-xserver/xserver-xf86-config/10-preload-modules.conf | 1 | ||||
-rw-r--r-- | openembedded-layer/recipes-graphics/xorg-xserver/xserver-xorg.inc | 3 | ||||
-rw-r--r-- | openembedded-layer/recipes-graphics/xorg-xserver/xserver-xorg/0003-Remove-check-for-useSIGIO-option.patch | 47 | ||||
-rw-r--r-- | openembedded-layer/recipes-graphics/xorg-xserver/xserver-xorg/0003-modesetting-Fix-16-bit-depth-bpp-mode.patch | 46 | ||||
-rw-r--r-- | openembedded-layer/recipes-graphics/xorg-xserver/xserver-xorg_1.19.1.bb (renamed from openembedded-layer/recipes-graphics/xorg-xserver/xserver-xorg_1.19.0.bb) | 6 |
5 files changed, 100 insertions, 3 deletions
diff --git a/openembedded-layer/recipes-graphics/xorg-xserver/xserver-xf86-config/10-preload-modules.conf b/openembedded-layer/recipes-graphics/xorg-xserver/xserver-xf86-config/10-preload-modules.conf index 72e4fbf..23fcdc7 100644 --- a/openembedded-layer/recipes-graphics/xorg-xserver/xserver-xf86-config/10-preload-modules.conf +++ b/openembedded-layer/recipes-graphics/xorg-xserver/xserver-xf86-config/10-preload-modules.conf @@ -6,4 +6,5 @@ Section "Module" Load "int10" Load "vbe" Load "vgahw" + Load "glamoregl" EndSection diff --git a/openembedded-layer/recipes-graphics/xorg-xserver/xserver-xorg.inc b/openembedded-layer/recipes-graphics/xorg-xserver/xserver-xorg.inc index 4a5f9a6..06071e7 100644 --- a/openembedded-layer/recipes-graphics/xorg-xserver/xserver-xorg.inc +++ b/openembedded-layer/recipes-graphics/xorg-xserver/xserver-xorg.inc @@ -121,8 +121,9 @@ EXTRA_OECONF += "--with-fop=no \ " EXTRA_OECONF[vardepsexclude] = "MACHINE" +OPENGL_PKGCONFIGS = "dri glx glamor dri3 xshmfence" PACKAGECONFIG ??= "dri2 udev ${XORG_CRYPTO} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'dri glx', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '${OPENGL_PKGCONFIGS}', '', d)} \ ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "xwayland", "", d)} \ ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "systemd", "", d)} \ " diff --git a/openembedded-layer/recipes-graphics/xorg-xserver/xserver-xorg/0003-Remove-check-for-useSIGIO-option.patch b/openembedded-layer/recipes-graphics/xorg-xserver/xserver-xorg/0003-Remove-check-for-useSIGIO-option.patch new file mode 100644 index 0000000..beed6cb --- /dev/null +++ b/openembedded-layer/recipes-graphics/xorg-xserver/xserver-xorg/0003-Remove-check-for-useSIGIO-option.patch @@ -0,0 +1,47 @@ +From cf407b16cd65ad6e26a9c8e5984e163409a5c0f7 Mon Sep 17 00:00:00 2001 +From: Prabhu Sundararaj <prabhu.sundararaj@nxp.com> +Date: Mon, 30 Jan 2017 16:32:06 -0600 +Subject: [PATCH] Remove check for useSIGIO option + +Commit 6a5a4e60373c1386b311b2a8bb666c32d68a9d99 removes the configure of useSIGIO +option. + +As the xfree86 SIGIO support is reworked to use internal versions of OsBlockSIGIO +and OsReleaseSIGIO. + +No longer the check for useSIGIO is needed + +Upstream-Status: Pending + +Signed-off-by: Prabhu Sundararaj <prabhu.sundararaj@nxp.com> +--- + hw/xfree86/os-support/shared/sigio.c | 6 ------ + 1 file changed, 6 deletions(-) + +diff --git a/hw/xfree86/os-support/shared/sigio.c b/hw/xfree86/os-support/shared/sigio.c +index 884a71c..be76498 100644 +--- a/hw/xfree86/os-support/shared/sigio.c ++++ b/hw/xfree86/os-support/shared/sigio.c +@@ -185,9 +185,6 @@ xf86InstallSIGIOHandler(int fd, void (*f) (int, void *), void *closure) + int i; + int installed = FALSE; + +- if (!xf86Info.useSIGIO) +- return 0; +- + for (i = 0; i < MAX_FUNCS; i++) { + if (!xf86SigIOFuncs[i].f) { + if (xf86IsPipe(fd)) +@@ -256,9 +253,6 @@ xf86RemoveSIGIOHandler(int fd) + int max; + int ret; + +- if (!xf86Info.useSIGIO) +- return 0; +- + max = 0; + ret = 0; + for (i = 0; i < MAX_FUNCS; i++) { +-- +2.7.4 + diff --git a/openembedded-layer/recipes-graphics/xorg-xserver/xserver-xorg/0003-modesetting-Fix-16-bit-depth-bpp-mode.patch b/openembedded-layer/recipes-graphics/xorg-xserver/xserver-xorg/0003-modesetting-Fix-16-bit-depth-bpp-mode.patch new file mode 100644 index 0000000..5243761 --- /dev/null +++ b/openembedded-layer/recipes-graphics/xorg-xserver/xserver-xorg/0003-modesetting-Fix-16-bit-depth-bpp-mode.patch @@ -0,0 +1,46 @@ +From 5028ef46ff4ab0930224b71024a7349b05610d42 Mon Sep 17 00:00:00 2001 +From: Stefan Agner <stefan@agner.ch> +Date: Thu, 22 Dec 2016 15:41:06 +0100 +Subject: [PATCH] modesetting: Fix 16 bit depth/bpp mode + +When setting DefaultDepth to 16 in the Screen section, the current +code requests a 32 bpp framebuffer, however the X-Server seems to +assumes 16 bpp. + +Fixes commit 21217d02168d ("modesetting: Implement 32->24 bpp +conversion in shadow update") + +Signed-off-by: Stefan Agner <stefan@agner.ch> + +Upstream-Status: Submitted [1] + +[1] https://lists.x.org/archives/xorg-devel/2016-December/052113.html +--- + hw/xfree86/drivers/modesetting/driver.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/hw/xfree86/drivers/modesetting/driver.c b/hw/xfree86/drivers/modesetting/driver.c +index d7030e5..647ad83 100644 +--- a/hw/xfree86/drivers/modesetting/driver.c ++++ b/hw/xfree86/drivers/modesetting/driver.c +@@ -930,7 +930,7 @@ PreInit(ScrnInfoPtr pScrn, int flags) + "Using 24bpp hw front buffer with 32bpp shadow\n"); + defaultbpp = 32; + } else { +- ms->drmmode.kbpp = defaultbpp; ++ ms->drmmode.kbpp = 0; + } + bppflags = PreferConvert24to32 | SupportConvert24to32 | Support32bppFb; + +@@ -950,6 +950,8 @@ PreInit(ScrnInfoPtr pScrn, int flags) + return FALSE; + } + xf86PrintDepthBpp(pScrn); ++ if (!ms->drmmode.kbpp) ++ ms->drmmode.kbpp = pScrn->bitsPerPixel; + + /* Process the options */ + xf86CollectOptions(pScrn, NULL); +-- +2.7.4 + diff --git a/openembedded-layer/recipes-graphics/xorg-xserver/xserver-xorg_1.19.0.bb b/openembedded-layer/recipes-graphics/xorg-xserver/xserver-xorg_1.19.1.bb index 8725382..0dc1028 100644 --- a/openembedded-layer/recipes-graphics/xorg-xserver/xserver-xorg_1.19.0.bb +++ b/openembedded-layer/recipes-graphics/xorg-xserver/xserver-xorg_1.19.1.bb @@ -3,9 +3,11 @@ require xserver-xorg.inc SRC_URI += "file://musl-arm-inb-outb.patch \ file://0001-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch \ file://0002-configure.ac-Fix-wayland-scanner-and-protocols-locat.patch \ + file://0003-modesetting-Fix-16-bit-depth-bpp-mode.patch \ + file://0003-Remove-check-for-useSIGIO-option.patch \ " -SRC_URI[md5sum] = "6a4d01e4e5047ab8f556960424ba1fa9" -SRC_URI[sha256sum] = "149a708b50befc2d5a40b98d45ddd2ebe0beec018e6d0c663c43bad6210e4da3" +SRC_URI[md5sum] = "caa8ee7b2950abbf734347d137529fb6" +SRC_URI[sha256sum] = "79ae2cf39d3f6c4a91201d8dad549d1d774b3420073c5a70d390040aa965a7fb" # These extensions are now integrated into the server, so declare the migration # path for in-place upgrades. |