diff options
| author |   Jussi Kukkonen <jussi.kukkonen@intel.com> | 2015-11-11 20:05:29 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-11-25 08:04:30 +0000 |
| commit | 4ca6274aff4c7c489f148f811267634a760c5b77 (patch) | |
| tree | 525c1e86f022a97c5e246513465059531f411e67 | |
| parent | 15b4e5d2ab0ac117979cb367f07f444b8e123b64 (diff) | |
| download | openembedded-core-contrib-4ca6274aff4c7c489f148f811267634a760c5b77.tar.gz | |
xf86-video-omap: Upgrade 0.4.3 -> 0.4.4
Remove backported patch.
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
| -rw-r--r-- | meta/recipes-graphics/xorg-driver/xf86-video-omap/0001-drmmode_output_dpms-Replace-logical-with-bitwise-ope.patch | 31 | ||||
| -rw-r--r-- | meta/recipes-graphics/xorg-driver/xf86-video-omap_0.4.4.bb (renamed from meta/recipes-graphics/xorg-driver/xf86-video-omap_0.4.3.bb) | 6 |
2 files changed, 2 insertions, 35 deletions
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 <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/meta/recipes-graphics/xorg-driver/xf86-video-omap_0.4.3.bb b/meta/recipes-graphics/xorg-driver/xf86-video-omap_0.4.4.bb index 76682ed57d..78954497a2 100644 --- a/meta/recipes-graphics/xorg-driver/xf86-video-omap_0.4.3.bb +++ b/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 " |