diff options
author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2015-07-10 15:26:35 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-08-11 09:28:51 -0700 |
commit | 5b1d7ca8543adc203fc9ea9c79237debb34ca481 (patch) | |
tree | 093a506d2ae527a80d2d3ae5b44384089fc28155 /meta/recipes-graphics/xorg-driver | |
parent | b638fb2fdb60b0c5d71f3307cf19cd4b3d0d0217 (diff) | |
download | poky-5b1d7ca8543adc203fc9ea9c79237debb34ca481.tar.gz |
xf86-video-omapfb: switch SRC_URI to debian git repo
The previous upstream is no longer available. Debian git repository
is one commit behind the original repository, so that commit is added
as a patch.
(From OE-Core rev: e7601797f2dee95f6658962f9aae4d9fb8d0689d)
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/xorg-driver')
-rw-r--r-- | meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0001-Prevents-omapfb-from-from-crashing-when-pixelclock-o.patch | 35 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb | 5 |
2 files changed, 38 insertions, 2 deletions
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0001-Prevents-omapfb-from-from-crashing-when-pixelclock-o.patch b/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0001-Prevents-omapfb-from-from-crashing-when-pixelclock-o.patch new file mode 100644 index 0000000000..c4cf16eb05 --- /dev/null +++ b/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0001-Prevents-omapfb-from-from-crashing-when-pixelclock-o.patch | |||
@@ -0,0 +1,35 @@ | |||
1 | From 28c006c94e57ea71df11ec4fff79d7ffcfc4860f Mon Sep 17 00:00:00 2001 | ||
2 | From: Far McKon <FarMcKon@buglabs.net> | ||
3 | Date: Tue, 3 May 2011 20:59:04 +0300 | ||
4 | Subject: [PATCH] Prevents omapfb from from crashing when pixelclock of 0 is | ||
5 | sent to it. | ||
6 | |||
7 | Due to a Linux design bug it is easy to get a pixelclock set to zero | ||
8 | when changing displays at runtime. | ||
9 | --- | ||
10 | src/omapfb-output.c | 9 +++++++-- | ||
11 | 1 file changed, 7 insertions(+), 2 deletions(-) | ||
12 | |||
13 | diff --git a/src/omapfb-output.c b/src/omapfb-output.c | ||
14 | index f8b4db3..4d59265 100644 | ||
15 | --- a/src/omapfb-output.c | ||
16 | +++ b/src/omapfb-output.c | ||
17 | @@ -125,8 +125,13 @@ OMAPFBOutputGetModes(xf86OutputPtr output) | ||
18 | /* Only populate the native (current) mode */ | ||
19 | mode = calloc(1, sizeof(DisplayModeRec)); | ||
20 | mode->type |= M_T_PREFERRED; | ||
21 | - mode->Clock = PICOS2KHZ(ofb->state_info.pixclock); | ||
22 | - mode->SynthClock = PICOS2KHZ(ofb->state_info.pixclock); | ||
23 | + if (ofb->state_info.pixclock == 0) { | ||
24 | + mode->Clock = 0; | ||
25 | + mode->SynthClock = 0; | ||
26 | + } else { | ||
27 | + mode->Clock = PICOS2KHZ(ofb->state_info.pixclock); | ||
28 | + mode->SynthClock = PICOS2KHZ(ofb->state_info.pixclock); | ||
29 | + } | ||
30 | mode->HDisplay = ofb->state_info.xres; | ||
31 | mode->HSyncStart = mode->HDisplay | ||
32 | + ofb->state_info.right_margin; | ||
33 | -- | ||
34 | 2.1.4 | ||
35 | |||
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb b/meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb index 4ad25389cd..0eeb870b35 100644 --- a/meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb +++ b/meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb | |||
@@ -9,11 +9,12 @@ LICENSE = "MIT-X & GPLv2+" | |||
9 | LIC_FILES_CHKSUM = "file://COPYING;md5=63e2cbac53863f60e2f43343fb34367f" | 9 | LIC_FILES_CHKSUM = "file://COPYING;md5=63e2cbac53863f60e2f43343fb34367f" |
10 | DEPENDS += "virtual/libx11" | 10 | DEPENDS += "virtual/libx11" |
11 | 11 | ||
12 | SRCREV = "28c006c94e57ea71df11ec4fff79d7ffcfc4860f" | 12 | SRCREV = "33e36c12dde336edbdd34626dd8adfcaebc8fbb8" |
13 | PR = "${INC_PR}.7" | 13 | PR = "${INC_PR}.7" |
14 | PV = "0.1.1+gitr${SRCPV}" | 14 | PV = "0.1.1+gitr${SRCPV}" |
15 | 15 | ||
16 | SRC_URI = "git://git.pingu.fi/xf86-video-omapfb;protocol=http \ | 16 | SRC_URI = "git://anonscm.debian.org/collab-maint/xf86-video-omapfb.git \ |
17 | file://0001-Prevents-omapfb-from-from-crashing-when-pixelclock-o.patch \ | ||
17 | file://0001-Revert-Set-a-large-CRTC-upper-limit-to-not-prune-lar.patch \ | 18 | file://0001-Revert-Set-a-large-CRTC-upper-limit-to-not-prune-lar.patch \ |
18 | file://0002-Revert-Set-virtual-size-when-configuring-framebuffer.patch \ | 19 | file://0002-Revert-Set-virtual-size-when-configuring-framebuffer.patch \ |
19 | file://0003-force-plain-mode.patch \ | 20 | file://0003-force-plain-mode.patch \ |