diff options
author | Koen Kooi <koen@openembedded.org> | 2011-01-26 13:53:24 +0100 |
---|---|---|
committer | Koen Kooi <koen@openembedded.org> | 2011-01-26 13:54:08 +0100 |
commit | 78ffd08aa62667164caf58f816c38be4a9355f1d (patch) | |
tree | 79c37a3597dd2bb48a62dd2d48b38e273e533521 /recipes | |
parent | 8fae434ef89edc708894550ceb5c49494483b17d (diff) | |
download | openembedded-78ffd08aa62667164caf58f816c38be4a9355f1d.tar.gz |
xf86-video-omapfb: bump SRCREV to latest, apply patches to keep XV working
Removing patch #3 will get you working xrandr, but broken Xv
Signed-off-by: Koen Kooi <koen@openembedded.org>
Diffstat (limited to 'recipes')
4 files changed, 85 insertions, 2 deletions
diff --git a/recipes/xorg-driver/xf86-video-omapfb/0001-blacklist-tv-out.patch b/recipes/xorg-driver/xf86-video-omapfb/0001-blacklist-tv-out.patch new file mode 100644 index 0000000000..5ac3b7ae9e --- /dev/null +++ b/recipes/xorg-driver/xf86-video-omapfb/0001-blacklist-tv-out.patch @@ -0,0 +1,28 @@ +From 05efb061f1945425d214ff6b6050883e6d8633bf Mon Sep 17 00:00:00 2001 +From: Koen Kooi <koen@dominion.thruhere.net> +Date: Wed, 26 Jan 2011 13:21:12 +0100 +Subject: [PATCH 1/3] blacklist tv out + +Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> +--- + src/omapfb-output-dss.c | 4 ++++ + 1 files changed, 4 insertions(+), 0 deletions(-) + +diff --git a/src/omapfb-output-dss.c b/src/omapfb-output-dss.c +index 6cc52de..83cb711 100644 +--- a/src/omapfb-output-dss.c ++++ b/src/omapfb-output-dss.c +@@ -205,6 +205,10 @@ OMAPFBDSSOutputDetect (xf86OutputPtr output) + if(ofb->timings[idx][0] == '\0') + return XF86OutputStatusDisconnected; + ++ // Hack to disable the tv out ++ if (strncmp(output->name, "tv", 2) == 0) ++ return XF86OutputStatusDisconnected; ++ + return XF86OutputStatusConnected; + } + +-- +1.6.6.1 + diff --git a/recipes/xorg-driver/xf86-video-omapfb/0002-Revert-Set-virtual-size-when-configuring-framebuffer.patch b/recipes/xorg-driver/xf86-video-omapfb/0002-Revert-Set-virtual-size-when-configuring-framebuffer.patch new file mode 100644 index 0000000000..41d5f131a6 --- /dev/null +++ b/recipes/xorg-driver/xf86-video-omapfb/0002-Revert-Set-virtual-size-when-configuring-framebuffer.patch @@ -0,0 +1,26 @@ +From 316f31253902eb3567ef62faf52b3f0a5d6b0c93 Mon Sep 17 00:00:00 2001 +From: Koen Kooi <koen@dominion.thruhere.net> +Date: Wed, 26 Jan 2011 13:27:20 +0100 +Subject: [PATCH 2/3] Revert "Set virtual size when configuring framebuffer" + +This reverts commit 2653ef07883fbd1a5e7025f9300cf89b79ba429a. +--- + src/omapfb-crtc.c | 2 -- + 1 files changed, 0 insertions(+), 2 deletions(-) + +diff --git a/src/omapfb-crtc.c b/src/omapfb-crtc.c +index 9aaa52f..d321a5a 100644 +--- a/src/omapfb-crtc.c ++++ b/src/omapfb-crtc.c +@@ -98,8 +98,6 @@ OMAPFBCrtcCommitChangeMode (xf86CrtcPtr crtc) + v = ofb->state_info; + v.xres = mode->HDisplay; + v.yres = mode->VDisplay; +- v.xres_virtual = crtc->scrn->virtualX; +- v.yres_virtual = crtc->scrn->virtualY; + v.activate = FB_ACTIVATE_NOW; + v.pixclock = KHZ2PICOS(mode->Clock ? mode->Clock : 56000); + v.left_margin = mode->HTotal - mode->HSyncEnd; +-- +1.6.6.1 + diff --git a/recipes/xorg-driver/xf86-video-omapfb/0003-force-plain-mode.patch b/recipes/xorg-driver/xf86-video-omapfb/0003-force-plain-mode.patch new file mode 100644 index 0000000000..06eeca9d26 --- /dev/null +++ b/recipes/xorg-driver/xf86-video-omapfb/0003-force-plain-mode.patch @@ -0,0 +1,26 @@ +From b7acfade1ac15332ebfd24d4bf02b466858c8cf8 Mon Sep 17 00:00:00 2001 +From: Koen Kooi <koen@dominion.thruhere.net> +Date: Wed, 26 Jan 2011 13:20:20 +0100 +Subject: [PATCH 3/3] force 'plain' mode + +Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> +--- + src/omapfb-driver.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/src/omapfb-driver.c b/src/omapfb-driver.c +index 018e040..48aa09c 100644 +--- a/src/omapfb-driver.c ++++ b/src/omapfb-driver.c +@@ -326,7 +326,7 @@ OMAPFBPreInit(ScrnInfoPtr pScrn, int flags) + OMAPFBProbeController(ofb->ctrl_name); + + /* Do we have the DSS kernel API? */ +- if (stat(SYSFS_DSS_DIR, &st) == 0) { ++ if (0) { //stat(SYSFS_DSS_DIR, &st) == 0) { + ofb->dss = TRUE; + } else { + ofb->dss = FALSE; +-- +1.6.6.1 + diff --git a/recipes/xorg-driver/xf86-video-omapfb_git.bb b/recipes/xorg-driver/xf86-video-omapfb_git.bb index d0ef1ec414..fce8ff83a4 100644 --- a/recipes/xorg-driver/xf86-video-omapfb_git.bb +++ b/recipes/xorg-driver/xf86-video-omapfb_git.bb @@ -2,12 +2,15 @@ require xorg-driver-video.inc DESCRIPTION = "X.Org X server -- OMAP display driver" PE = "1" PV = "0.1.1+${PR}+gitr${SRCREV}" -PR = "${INC_PR}.1" +PR = "${INC_PR}.2" SRC_URI = "git://git.pingu.fi/xf86-video-omapfb.git;protocol=http \ + file://0001-blacklist-tv-out.patch \ + file://0002-Revert-Set-virtual-size-when-configuring-framebuffer.patch \ + file://0003-force-plain-mode.patch \ " -SRCREV = "6fd9caf9fd4a5b6105c45198eb6fdd98c451db14" +SRCREV = "044617665d6737f4909aab96f91b06261dff05d2" S = "${WORKDIR}/git" EXTRA_OECONF_armv7a = " --enable-neon " |