From 4ca6274aff4c7c489f148f811267634a760c5b77 Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen Date: Wed, 11 Nov 2015 20:05:29 +0200 Subject: xf86-video-omap: Upgrade 0.4.3 -> 0.4.4 Remove backported patch. Signed-off-by: Jussi Kukkonen Signed-off-by: Ross Burton --- ...put_dpms-Replace-logical-with-bitwise-ope.patch | 31 ---------------- .../xorg-driver/xf86-video-omap_0.4.3.bb | 43 ---------------------- .../xorg-driver/xf86-video-omap_0.4.4.bb | 41 +++++++++++++++++++++ 3 files changed, 41 insertions(+), 74 deletions(-) delete mode 100644 meta/recipes-graphics/xorg-driver/xf86-video-omap/0001-drmmode_output_dpms-Replace-logical-with-bitwise-ope.patch delete mode 100644 meta/recipes-graphics/xorg-driver/xf86-video-omap_0.4.3.bb create mode 100644 meta/recipes-graphics/xorg-driver/xf86-video-omap_0.4.4.bb diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-omap/0001-drmmode_output_dpms-Replace-logical-with-bitwise-ope.patch b/meta/recipes-graphics/xorg-driver/xf86-video-omap/0001-drmmode_output_dpms-Replace-logical-with-bitwise-ope.patch deleted file mode 100644 index 41e77d3f16..0000000000 --- a/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 -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 ---- -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/meta/recipes-graphics/xorg-driver/xf86-video-omap_0.4.3.bb b/meta/recipes-graphics/xorg-driver/xf86-video-omap_0.4.3.bb deleted file mode 100644 index 76682ed57d..0000000000 --- a/meta/recipes-graphics/xorg-driver/xf86-video-omap_0.4.3.bb +++ /dev/null @@ -1,43 +0,0 @@ -require xorg-driver-video.inc - -SUMMARY = "X.Org X server -- Texas Instruments OMAP framebuffer driver" - -SUMMARY = "X.Org X server -- TI OMAP integrated graphics chipsets driver" - -DESCRIPTION = "Open-source X.org graphics driver for TI OMAP graphics \ -Currently relies on a closed-source submodule for EXA acceleration on \ -the following chipsets: \ - + OMAP3430 \ - + OMAP3630 \ - + OMAP4430 \ - + OMAP4460 \ - + OMAP5430 \ - + OMAP5432 \ -\ -NOTE: this driver is work in progress.. you probably don't want to try \ -and use it yet. The API/ABI between driver and kernel, and driver and \ -acceleration submodules is not stable yet. This driver requires the \ -omapdrm kernel driver w/ GEM support. \ -" - -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" - -CFLAGS += " -I${STAGING_INCDIR}/xorg " - -# Use overlay 2 on omap3 to enable other apps to use overlay 1 (e.g. dmai or omapfbplay) -do_compile_prepend_armv7a () { - sed -i -e s:fb1:fb2:g ${S}/src/omap_xv.c -} - -python () { - if not bb.utils.contains ('DISTRO_FEATURES', 'opengl', True, False, d): - raise bb.parse.SkipPackage("'opengl' not in DISTRO_FEATURES") -} - diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-omap_0.4.4.bb b/meta/recipes-graphics/xorg-driver/xf86-video-omap_0.4.4.bb new file mode 100644 index 0000000000..78954497a2 --- /dev/null +++ b/meta/recipes-graphics/xorg-driver/xf86-video-omap_0.4.4.bb @@ -0,0 +1,41 @@ +require xorg-driver-video.inc + +SUMMARY = "X.Org X server -- Texas Instruments OMAP framebuffer driver" + +SUMMARY = "X.Org X server -- TI OMAP integrated graphics chipsets driver" + +DESCRIPTION = "Open-source X.org graphics driver for TI OMAP graphics \ +Currently relies on a closed-source submodule for EXA acceleration on \ +the following chipsets: \ + + OMAP3430 \ + + OMAP3630 \ + + OMAP4430 \ + + OMAP4460 \ + + OMAP5430 \ + + OMAP5432 \ +\ +NOTE: this driver is work in progress.. you probably don't want to try \ +and use it yet. The API/ABI between driver and kernel, and driver and \ +acceleration submodules is not stable yet. This driver requires the \ +omapdrm kernel driver w/ GEM support. \ +" + +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=10ce5de3b111315ea652a5f74ec0c602" +DEPENDS += "virtual/libx11 libdrm xf86driproto" + +SRC_URI[md5sum] = "a364e151a537948f75bb8c9b840a31da" +SRC_URI[sha256sum] = "a7192690b8638f5c8d611a1bae07cc13081e22edd4070f37a2f5c3f8d79e7ebc" + +CFLAGS += " -I${STAGING_INCDIR}/xorg " + +# Use overlay 2 on omap3 to enable other apps to use overlay 1 (e.g. dmai or omapfbplay) +do_compile_prepend_armv7a () { + sed -i -e s:fb1:fb2:g ${S}/src/omap_xv.c +} + +python () { + if not bb.utils.contains ('DISTRO_FEATURES', 'opengl', True, False, d): + raise bb.parse.SkipPackage("'opengl' not in DISTRO_FEATURES") +} + -- cgit 1.2.3-korg