diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2015-09-07 08:54:15 +0000 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-09-14 10:44:04 +0100 |
| commit | f64a18a1c0fb9f3cd1bde2dc4b55d721ae06ca1d (patch) | |
| tree | c6fff4f725a91f23dfed7533113db1534ae4efaa /meta | |
| parent | 1902645cb0a5eb11a19126a8b22fbbfee13e0c40 (diff) | |
| download | openembedded-core-contrib-f64a18a1c0fb9f3cd1bde2dc4b55d721ae06ca1d.tar.gz | |
xorg-driver: Fix logical && with bitwise and operation
This must have been a typo which is a bug infact we should have used
bitwise & in first place.
(From OE-Core rev: 697c6cba6a3d8d2b942c4758a115a063f65febe9)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -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.3.bb | 2 |
2 files changed, 33 insertions, 0 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 new file mode 100644 index 0000000000..41e77d3f16 --- /dev/null +++ b/meta/recipes-graphics/xorg-driver/xf86-video-omap/0001-drmmode_output_dpms-Replace-logical-with-bitwise-ope.patch @@ -0,0 +1,31 @@ +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.3.bb index 5f3a5323a1..76682ed57d 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.3.bb @@ -24,6 +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" |