summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-graphics/xorg-driver/xf86-video-omap/0001-drmmode_output_dpms-Replace-logical-with-bitwise-ope.patch31
-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 @@
1From fc653ca3b36435aea281ae409fb90f85e1bc0d81 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 7 Sep 2015 08:44:13 +0000
4Subject: [freedreno][PATCH] drmmode_output_dpms: Replace logical && with bitwise &
5 operation
6
7This is a mask calculation so bitbwise & should have been used
8
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10---
11Upstream-Status: Submitted
12
13 src/drmmode_display.c | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-)
15
16diff --git a/src/drmmode_display.c b/src/drmmode_display.c
17index c3cf4f8..eb54b59 100644
18--- a/src/drmmode_display.c
19+++ b/src/drmmode_display.c
20@@ -777,7 +777,7 @@ drmmode_output_dpms(xf86OutputPtr output, int mode)
21
22 for (i = 0; i < koutput->count_props; i++) {
23 props = drmModeGetProperty(drmmode->fd, koutput->props[i]);
24- if (props && (props->flags && DRM_MODE_PROP_ENUM)) {
25+ if (props && (props->flags & DRM_MODE_PROP_ENUM)) {
26 if (!strcmp(props->name, "DPMS")) {
27 mode_id = koutput->props[i];
28 drmModeFreeProperty(props);
29--
302.5.1
31
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+"
24LIC_FILES_CHKSUM = "file://COPYING;md5=10ce5de3b111315ea652a5f74ec0c602" 24LIC_FILES_CHKSUM = "file://COPYING;md5=10ce5de3b111315ea652a5f74ec0c602"
25DEPENDS += "virtual/libx11 libdrm xf86driproto" 25DEPENDS += "virtual/libx11 libdrm xf86driproto"
26 26
27SRC_URI += "file://0001-drmmode_output_dpms-Replace-logical-with-bitwise-ope.patch" 27SRC_URI[md5sum] = "a364e151a537948f75bb8c9b840a31da"
28 28SRC_URI[sha256sum] = "a7192690b8638f5c8d611a1bae07cc13081e22edd4070f37a2f5c3f8d79e7ebc"
29SRC_URI[md5sum] = "be35daf6fa4b75092cc4a8978c437bc5"
30SRC_URI[sha256sum] = "db1e0e69fd4c4c8fdca5ef2cb0447bccd7518a718495876a6904bef57b39986d"
31 29
32CFLAGS += " -I${STAGING_INCDIR}/xorg " 30CFLAGS += " -I${STAGING_INCDIR}/xorg "
33 31