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:04:30 -0700 |
| commit | e7601797f2dee95f6658962f9aae4d9fb8d0689d (patch) | |
| tree | a3556278ce9e9e3993d07219e5991226778565cd /meta | |
| parent | 035c1d565a2e035ea2781d0ac83a3919ad74150e (diff) | |
| download | openembedded-core-e7601797f2dee95f6658962f9aae4d9fb8d0689d.tar.gz openembedded-core-e7601797f2dee95f6658962f9aae4d9fb8d0689d.tar.bz2 openembedded-core-e7601797f2dee95f6658962f9aae4d9fb8d0689d.zip | |
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.
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta')
| -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 @@ +From 28c006c94e57ea71df11ec4fff79d7ffcfc4860f Mon Sep 17 00:00:00 2001 +From: Far McKon <FarMcKon@buglabs.net> +Date: Tue, 3 May 2011 20:59:04 +0300 +Subject: [PATCH] Prevents omapfb from from crashing when pixelclock of 0 is + sent to it. + +Due to a Linux design bug it is easy to get a pixelclock set to zero +when changing displays at runtime. +--- + src/omapfb-output.c | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +diff --git a/src/omapfb-output.c b/src/omapfb-output.c +index f8b4db3..4d59265 100644 +--- a/src/omapfb-output.c ++++ b/src/omapfb-output.c +@@ -125,8 +125,13 @@ OMAPFBOutputGetModes(xf86OutputPtr output) + /* Only populate the native (current) mode */ + mode = calloc(1, sizeof(DisplayModeRec)); + mode->type |= M_T_PREFERRED; +- mode->Clock = PICOS2KHZ(ofb->state_info.pixclock); +- mode->SynthClock = PICOS2KHZ(ofb->state_info.pixclock); ++ if (ofb->state_info.pixclock == 0) { ++ mode->Clock = 0; ++ mode->SynthClock = 0; ++ } else { ++ mode->Clock = PICOS2KHZ(ofb->state_info.pixclock); ++ mode->SynthClock = PICOS2KHZ(ofb->state_info.pixclock); ++ } + mode->HDisplay = ofb->state_info.xres; + mode->HSyncStart = mode->HDisplay + + ofb->state_info.right_margin; +-- +2.1.4 + 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+" LIC_FILES_CHKSUM = "file://COPYING;md5=63e2cbac53863f60e2f43343fb34367f" DEPENDS += "virtual/libx11" -SRCREV = "28c006c94e57ea71df11ec4fff79d7ffcfc4860f" +SRCREV = "33e36c12dde336edbdd34626dd8adfcaebc8fbb8" PR = "${INC_PR}.7" PV = "0.1.1+gitr${SRCPV}" -SRC_URI = "git://git.pingu.fi/xf86-video-omapfb;protocol=http \ +SRC_URI = "git://anonscm.debian.org/collab-maint/xf86-video-omapfb.git \ + file://0001-Prevents-omapfb-from-from-crashing-when-pixelclock-o.patch \ file://0001-Revert-Set-a-large-CRTC-upper-limit-to-not-prune-lar.patch \ file://0002-Revert-Set-virtual-size-when-configuring-framebuffer.patch \ file://0003-force-plain-mode.patch \ |