summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0001-Prevents-omapfb-from-from-crashing-when-pixelclock-o.patch35
-rw-r--r--meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb5
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 @@
1From 28c006c94e57ea71df11ec4fff79d7ffcfc4860f Mon Sep 17 00:00:00 2001
2From: Far McKon <FarMcKon@buglabs.net>
3Date: Tue, 3 May 2011 20:59:04 +0300
4Subject: [PATCH] Prevents omapfb from from crashing when pixelclock of 0 is
5 sent to it.
6
7Due to a Linux design bug it is easy to get a pixelclock set to zero
8when changing displays at runtime.
9---
10 src/omapfb-output.c | 9 +++++++--
11 1 file changed, 7 insertions(+), 2 deletions(-)
12
13diff --git a/src/omapfb-output.c b/src/omapfb-output.c
14index 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--
342.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+"
9LIC_FILES_CHKSUM = "file://COPYING;md5=63e2cbac53863f60e2f43343fb34367f" 9LIC_FILES_CHKSUM = "file://COPYING;md5=63e2cbac53863f60e2f43343fb34367f"
10DEPENDS += "virtual/libx11" 10DEPENDS += "virtual/libx11"
11 11
12SRCREV = "28c006c94e57ea71df11ec4fff79d7ffcfc4860f" 12SRCREV = "33e36c12dde336edbdd34626dd8adfcaebc8fbb8"
13PR = "${INC_PR}.7" 13PR = "${INC_PR}.7"
14PV = "0.1.1+gitr${SRCPV}" 14PV = "0.1.1+gitr${SRCPV}"
15 15
16SRC_URI = "git://git.pingu.fi/xf86-video-omapfb;protocol=http \ 16SRC_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 \