diff options
Diffstat (limited to 'yocto-poky/meta/recipes-graphics/xorg-driver')
12 files changed, 122 insertions, 46 deletions
diff --git a/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-input-evdev_2.9.2.bb b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-input-evdev_2.10.1.bb index 66428df55..cf77ad209 100644 --- a/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-input-evdev_2.9.2.bb +++ b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-input-evdev_2.10.1.bb @@ -16,5 +16,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fefe33b1cf0cacba0e72e3b0fa0f0e16" DEPENDS += "mtdev libevdev" -SRC_URI[md5sum] = "99eebf171e6c7bffc42d4fc430d47454" -SRC_URI[sha256sum] = "792329b531afc6928ccda94e4b51a5520d4ddf8ef9a00890a5d0d31898acefec" +SRC_URI[md5sum] = "96d89d9406a02f5e36bdaa4edd9a243a" +SRC_URI[sha256sum] = "af9c2b47f5b272ae56b45da6bd84610fc9a3d80a4b32c8215842a39d862de017" diff --git a/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-input-libinput_0.16.0.bb b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-input-libinput_0.16.0.bb new file mode 100644 index 000000000..0252baff1 --- /dev/null +++ b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-input-libinput_0.16.0.bb @@ -0,0 +1,11 @@ +require xorg-driver-input.inc + +SUMMARY = "Generic input driver for the X.Org server based on libinput" +LIC_FILES_CHKSUM = "file://COPYING;md5=5e6b20ea2ef94a998145f0ea3f788ee0" + +DEPENDS += "libinput" + +SRC_URI[md5sum] = "2c8cb520f88da7bafaceebc0b34ea1d4" +SRC_URI[sha256sum] = "fdade531e91e79acf6dce8ac55fa4f65abe3f1358c5d3d777ae48dbc74b76f49" + +FILES_${PN} += "${datadir}/X11/xorg.conf.d" diff --git a/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.8.2.bb b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.8.3.bb index 19c122fdf..b47c82cc6 100644 --- a/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.8.2.bb +++ b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.8.3.bb @@ -10,9 +10,7 @@ advanced features of the touchpad to become available." LIC_FILES_CHKSUM = "file://COPYING;md5=55aacd3535a741824955c5eb8f061398" -SRC_URI[md5sum] = "8ed68e8cc674dd61adb280704764aafb" -SRC_URI[sha256sum] = "7b0e164ebd02a680e0c695955e783059f37edb0c2656398e0a972adc8e698c80" +SRC_URI[md5sum] = "4e3c8bed1ab4a67db2160c2c3d7e2a34" +SRC_URI[sha256sum] = "d39f100c74f3673778b53f17bab7690161925e25dd998a15dd8cc69b52e83f01" DEPENDS += "libxi mtdev libxtst libevdev" - -FILES_${PN} += "${datadir}/X11/xorg.conf.d" diff --git a/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-gen8-Fix-the-YUV-RGB-shader.patch b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-gen8-Fix-the-YUV-RGB-shader.patch new file mode 100644 index 000000000..35762192f --- /dev/null +++ b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-gen8-Fix-the-YUV-RGB-shader.patch @@ -0,0 +1,65 @@ +From c43617b739e358064396912c7a7a8028ca91d201 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= <ville.syrjala@linux.intel.com> +Date: Thu, 16 Apr 2015 20:40:39 +0300 +Subject: [PATCH] gen8: Fix the YUV->RGB shader +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Use the correct register (Yn_01) with first half of the +Y samples instead of using the register (Yn_23) with the +second half twice when computing the green channel. + +Also use the Yn_01 register name instead of Yn for the red +channel as well, just for a bit of extra consistency. + +Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=89807 +Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> +Tested-by: Chris Wilson <chris@chris-wilson.co.uk> + +Upstream-Status: Backport +Signed-off-by: Saul Wold <sgw@linux.intel.com> + +--- + src/render_program/exa_wm_yuv_rgb.g8a | 4 ++-- + src/render_program/exa_wm_yuv_rgb.g8b | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/render_program/exa_wm_yuv_rgb.g8a b/src/render_program/exa_wm_yuv_rgb.g8a +index 7def093..34973ba 100644 +--- a/src/render_program/exa_wm_yuv_rgb.g8a ++++ b/src/render_program/exa_wm_yuv_rgb.g8a +@@ -76,7 +76,7 @@ add (16) Cbn<1>F Cb<8,8,1>F -0.501961F { compr align1 }; + /* + * R = Y + Cr * 1.596 + */ +-mov (8) acc0<1>F Yn<8,8,1>F { compr align1 }; ++mov (8) acc0<1>F Yn_01<8,8,1>F { compr align1 }; + mac.sat(8) src_sample_r_01<1>F Crn_01<8,8,1>F 1.596F { compr align1 }; + + mov (8) acc0<1>F Yn_23<8,8,1>F { compr align1 }; +@@ -84,7 +84,7 @@ mac.sat(8) src_sample_r_23<1>F Crn_23<8,8,1>F 1.596F { compr align1 }; + /* + * G = Crn * -0.813 + Cbn * -0.392 + Y + */ +-mov (8) acc0<1>F Yn_23<8,8,1>F { compr align1 }; ++mov (8) acc0<1>F Yn_01<8,8,1>F { compr align1 }; + mac (8) acc0<1>F Crn_01<8,8,1>F -0.813F { compr align1 }; + mac.sat(8) src_sample_g_01<1>F Cbn_01<8,8,1>F -0.392F { compr align1 }; + +diff --git a/src/render_program/exa_wm_yuv_rgb.g8b b/src/render_program/exa_wm_yuv_rgb.g8b +index 4494953..2cd6fc4 100644 +--- a/src/render_program/exa_wm_yuv_rgb.g8b ++++ b/src/render_program/exa_wm_yuv_rgb.g8b +@@ -6,7 +6,7 @@ + { 0x80600048, 0x21c03ae8, 0x3e8d02c0, 0x3fcc49ba }, + { 0x00600001, 0x24003ae0, 0x008d0320, 0x00000000 }, + { 0x80600048, 0x21e03ae8, 0x3e8d02e0, 0x3fcc49ba }, +- { 0x00600001, 0x24003ae0, 0x008d0320, 0x00000000 }, ++ { 0x00600001, 0x24003ae0, 0x008d0300, 0x00000000 }, + { 0x00600048, 0x24003ae0, 0x3e8d02c0, 0xbf5020c5 }, + { 0x80600048, 0x22003ae8, 0x3e8d0340, 0xbec8b439 }, + { 0x00600001, 0x24003ae0, 0x008d0320, 0x00000000 }, +-- +2.5.0 + diff --git a/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-uxa-fix-the-call-to-PixmapSyncDirtyHelper-broken-by-.patch b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-uxa-fix-the-call-to-PixmapSyncDirtyHelper-broken-by-.patch new file mode 100644 index 000000000..29924bb90 --- /dev/null +++ b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-uxa-fix-the-call-to-PixmapSyncDirtyHelper-broken-by-.patch @@ -0,0 +1,30 @@ +From 2c5063938cc809f624e56efd4673041fa8141e81 Mon Sep 17 00:00:00 2001 +From: Martin Peres <martin.peres@linux.intel.com> +Date: Thu, 9 Jul 2015 11:26:38 +0300 +Subject: [PATCH] uxa: fix the call to PixmapSyncDirtyHelper, broken by + xserver's 90db5ed + +[ickle: switch to HAS_DIRTYTRACKING_ROTATION as suggested by Dave Airlie] +Signed-off-by: Martin Peres <martin.peres@linux.intel.com> + +Upstream-Status: Backport +Signed-off-by: Saul Wold <sgw@linux.intel.com> +--- + src/compat-api.h | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/compat-api.h b/src/compat-api.h +index aa93bee..293e9d7 100644 +--- a/src/compat-api.h ++++ b/src/compat-api.h +@@ -247,3 +247,7 @@ static inline void FreePixmap(PixmapPtr pixmap) + #endif + + #endif ++ ++#if HAS_DIRTYTRACKING_ROTATION ++#define PixmapSyncDirtyHelper(d, dd) PixmapSyncDirtyHelper(d) ++#endif +-- +2.5.0 + diff --git a/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.99.917.bb b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.99.917.bb index a2f145659..d75b44f17 100644 --- a/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.99.917.bb +++ b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.99.917.bb @@ -13,6 +13,8 @@ SRC_URI += "file://disable-x11-dri3.patch \ file://always_include_xorg_server.h.patch \ file://sna-Protect-against-ABI-breakage-in-recent-versions-.patch \ file://udev-fstat.patch \ + file://0001-uxa-fix-the-call-to-PixmapSyncDirtyHelper-broken-by-.patch \ + file://0001-gen8-Fix-the-YUV-RGB-shader.patch \ " SRC_URI[md5sum] = "fa196a66e52c0c624fe5d350af7a5e7b" diff --git a/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-omap/0001-drmmode_output_dpms-Replace-logical-with-bitwise-ope.patch b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-omap/0001-drmmode_output_dpms-Replace-logical-with-bitwise-ope.patch deleted file mode 100644 index 41e77d3f1..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-omap/0001-drmmode_output_dpms-Replace-logical-with-bitwise-ope.patch +++ /dev/null @@ -1,31 +0,0 @@ -From fc653ca3b36435aea281ae409fb90f85e1bc0d81 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Mon, 7 Sep 2015 08:44:13 +0000 -Subject: [freedreno][PATCH] drmmode_output_dpms: Replace logical && with bitwise & - operation - -This is a mask calculation so bitbwise & should have been used - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Submitted - - src/drmmode_display.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/drmmode_display.c b/src/drmmode_display.c -index c3cf4f8..eb54b59 100644 ---- a/src/drmmode_display.c -+++ b/src/drmmode_display.c -@@ -777,7 +777,7 @@ drmmode_output_dpms(xf86OutputPtr output, int mode) - - for (i = 0; i < koutput->count_props; i++) { - props = drmModeGetProperty(drmmode->fd, koutput->props[i]); -- if (props && (props->flags && DRM_MODE_PROP_ENUM)) { -+ if (props && (props->flags & DRM_MODE_PROP_ENUM)) { - if (!strcmp(props->name, "DPMS")) { - mode_id = koutput->props[i]; - drmModeFreeProperty(props); --- -2.5.1 - diff --git a/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-omap_0.4.3.bb b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-omap_0.4.4.bb index 76682ed57..78954497a 100644 --- a/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-omap_0.4.3.bb +++ b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-omap_0.4.4.bb @@ -24,10 +24,8 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=10ce5de3b111315ea652a5f74ec0c602" DEPENDS += "virtual/libx11 libdrm xf86driproto" -SRC_URI += "file://0001-drmmode_output_dpms-Replace-logical-with-bitwise-ope.patch" - -SRC_URI[md5sum] = "be35daf6fa4b75092cc4a8978c437bc5" -SRC_URI[sha256sum] = "db1e0e69fd4c4c8fdca5ef2cb0447bccd7518a718495876a6904bef57b39986d" +SRC_URI[md5sum] = "a364e151a537948f75bb8c9b840a31da" +SRC_URI[sha256sum] = "a7192690b8638f5c8d611a1bae07cc13081e22edd4070f37a2f5c3f8d79e7ebc" CFLAGS += " -I${STAGING_INCDIR}/xorg " diff --git a/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb index 0eeb870b3..7ebb960f1 100644 --- a/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb +++ b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb @@ -13,6 +13,9 @@ SRCREV = "33e36c12dde336edbdd34626dd8adfcaebc8fbb8" PR = "${INC_PR}.7" PV = "0.1.1+gitr${SRCPV}" +# Blacklist debian-specific tags in upstream version check +UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)(?!-)" + SRC_URI = "git://anonscm.debian.org/collab-maint/xf86-video-omapfb.git \ file://0001-Prevents-omapfb-from-from-crashing-when-pixelclock-o.patch \ file://0001-Revert-Set-a-large-CRTC-upper-limit-to-not-prune-lar.patch \ @@ -26,7 +29,6 @@ SRC_URI = "git://anonscm.debian.org/collab-maint/xf86-video-omapfb.git \ S = "${WORKDIR}/git" -EXTRA_OECONF_armv7a = " --enable-neon " CFLAGS += " -I${STAGING_INCDIR}/xorg " # Use overlay 2 on omap3 to enable other apps to use overlay 1 (e.g. dmai or omapfbplay) diff --git a/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.1.0.bb b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.1.0.bb index 89b98eefc..8c891e6ae 100644 --- a/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.1.0.bb +++ b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.1.0.bb @@ -15,4 +15,5 @@ SRC_URI[sha256sum] = "3c1d244e4b1b77e92126957965cdc9fb82de4c215c0706a3a8aaff6939 COMPATIBLE_HOST = '(i.86.*-linux|x86_64.*-linux)' -EXTRA_OECONF += "--disable-vmwgfx" +PACKAGECONFIG ?= "" +PACKAGECONFIG[vmwgfx] = "--enable-vmwgfx, --disable-vmwgfx, libdrm virtual/mesa" diff --git a/yocto-poky/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc b/yocto-poky/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc index 7ddd1c7da..57a4c827d 100644 --- a/yocto-poky/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc +++ b/yocto-poky/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc @@ -12,7 +12,6 @@ DEPENDS = "virtual/xserver xproto randrproto util-macros" SRC_URI = "${XORG_MIRROR}/individual/driver/${BPN}-${PV}.tar.bz2" FILES_${PN} += " ${libdir}/xorg/modules/drivers/*.so" -FILES_${PN}-dbg += " ${libdir}/xorg/modules/drivers/.debug" inherit autotools pkgconfig distro_features_check # depends on virtual/xserver diff --git a/yocto-poky/meta/recipes-graphics/xorg-driver/xorg-driver-input.inc b/yocto-poky/meta/recipes-graphics/xorg-driver/xorg-driver-input.inc index fbec0643f..c4dba1b19 100644 --- a/yocto-poky/meta/recipes-graphics/xorg-driver/xorg-driver-input.inc +++ b/yocto-poky/meta/recipes-graphics/xorg-driver/xorg-driver-input.inc @@ -7,5 +7,6 @@ python add_xorg_abi_depends() { } PACKAGEFUNCS =+ "add_xorg_abi_depends" -FILES_${PN} += " ${libdir}/xorg/modules/input/*.so" -FILES_${PN}-dbg += " ${libdir}/xorg/modules/input/.debug" +FILES_${PN} += " ${libdir}/xorg/modules/input/*.so \ + ${datadir}/X11/xorg.conf.d \ + " |
