summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorYu Ke <ke.yu@intel.com>2011-01-25 15:15:09 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-01-28 16:49:13 +0000
commit0e879c25dc94bbd7c3fabcf1944de57350f5e68f (patch)
treeb7003e5f43d4ab2deece9c870d3a005251c5f18c /meta
parent4bda50f28919d62410feabae530e6f7186812938 (diff)
downloadpoky-0e879c25dc94bbd7c3fabcf1944de57350f5e68f.tar.gz
xf86-video-omapfb: upgrade to 044617665d6737f4909aab96
Also apply four patches from Koen to fix four issus: - The tv-out gets added last and the driver tries to reconfigure dvi to TV resolutions, which fails - The new DSS mode breaks XV, so force plain mode - Picture is garbled after switching resolutions - Virtual size too big CC: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Yu Ke <ke.yu@intel.com>
Diffstat (limited to 'meta')
-rw-r--r--meta/conf/distro/include/poky-default-revisions.inc2
-rw-r--r--meta/recipes-graphics/xorg-driver/xf86-video-omapfb/omap-blacklist-tv-out.patch25
-rw-r--r--meta/recipes-graphics/xorg-driver/xf86-video-omapfb/omap-force-plain-mode.patch23
-rw-r--r--meta/recipes-graphics/xorg-driver/xf86-video-omapfb/omap-revert-set-CRTC-limit.patch32
-rw-r--r--meta/recipes-graphics/xorg-driver/xf86-video-omapfb/omap-revert-set-virtual-size.patch23
-rw-r--r--meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb4
6 files changed, 108 insertions, 1 deletions
diff --git a/meta/conf/distro/include/poky-default-revisions.inc b/meta/conf/distro/include/poky-default-revisions.inc
index f9a0eef34b..14260853ad 100644
--- a/meta/conf/distro/include/poky-default-revisions.inc
+++ b/meta/conf/distro/include/poky-default-revisions.inc
@@ -182,7 +182,7 @@ SRCREV_pn-xcb-proto ??= "d81ca233e98be8fa59e8c90d262c0516944c5a66"
182SRCREV_pn-xcb-proto-native ??= "d81ca233e98be8fa59e8c90d262c0516944c5a66" 182SRCREV_pn-xcb-proto-native ??= "d81ca233e98be8fa59e8c90d262c0516944c5a66"
183SRCREV_pn-xf86-video-intel ??= "87ea531c5dc5b39809395b277c330854aaaaf019" 183SRCREV_pn-xf86-video-intel ??= "87ea531c5dc5b39809395b277c330854aaaaf019"
184SRCREV_pn-xf86-video-intel-dri2 ??= "3dd7f0f9423bb891bc99cd3b77dc3d57e057a7ef" 184SRCREV_pn-xf86-video-intel-dri2 ??= "3dd7f0f9423bb891bc99cd3b77dc3d57e057a7ef"
185SRCREV_pn-xf86-video-omapfb ??= "6cff996abcb305460e9fa2c75569b776f099c9d5" 185SRCREV_pn-xf86-video-omapfb ??= "044617665d6737f4909aab96f91b06261dff05d2"
186SRCREV_pn-xf86-input-keyboard ??= "3e28d68b50d291938734e9684b8296ca864f3892" 186SRCREV_pn-xf86-input-keyboard ??= "3e28d68b50d291938734e9684b8296ca864f3892"
187SRCREV_pn-xf86-input-mouse ??= "ea5cfe804e112f320f14ad896c7802d53551d3e6" 187SRCREV_pn-xf86-input-mouse ??= "ea5cfe804e112f320f14ad896c7802d53551d3e6"
188SRCREV_pn-xf86-input-synaptics ??= "934bc0012f948c52aadc8eda912f7728fb7394a2" 188SRCREV_pn-xf86-input-synaptics ??= "934bc0012f948c52aadc8eda912f7728fb7394a2"
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/omap-blacklist-tv-out.patch b/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/omap-blacklist-tv-out.patch
new file mode 100644
index 0000000000..506e174cb1
--- /dev/null
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/omap-blacklist-tv-out.patch
@@ -0,0 +1,25 @@
1commit 05efb061f1945425d214ff6b6050883e6d8633bf
2Author: Koen Kooi <koen@dominion.thruhere.net>
3Date: Wed Jan 26 13:21:12 2011 +0100
4
5 blacklist tv out
6
7 The tv-out gets added last and the driver tries to reconfigure dvi to TV resolutions, which fails. so blacklist it
8
9 Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
10
11diff --git a/src/omapfb-output-dss.c b/src/omapfb-output-dss.c
12index 6cc52de..83cb711 100644
13--- a/src/omapfb-output-dss.c
14+++ b/src/omapfb-output-dss.c
15@@ -205,6 +205,10 @@ OMAPFBDSSOutputDetect (xf86OutputPtr output)
16 if(ofb->timings[idx][0] == '\0')
17 return XF86OutputStatusDisconnected;
18
19+ // Hack to disable the tv out
20+ if (strncmp(output->name, "tv", 2) == 0)
21+ return XF86OutputStatusDisconnected;
22+
23 return XF86OutputStatusConnected;
24 }
25
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/omap-force-plain-mode.patch b/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/omap-force-plain-mode.patch
new file mode 100644
index 0000000000..201a8b9588
--- /dev/null
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/omap-force-plain-mode.patch
@@ -0,0 +1,23 @@
1commit d28a36bbadc360a9409bf9832f1d4171d7c33dad
2Author: Koen Kooi <koen@dominion.thruhere.net>
3Date: Wed Jan 26 13:20:20 2011 +0100
4
5 force 'plain' mode
6
7 The new DSS mode breaks XV, so force plain mode
8
9 Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
10
11diff --git a/src/omapfb-driver.c b/src/omapfb-driver.c
12index 018e040..48aa09c 100644
13--- a/src/omapfb-driver.c
14+++ b/src/omapfb-driver.c
15@@ -326,7 +326,7 @@ OMAPFBPreInit(ScrnInfoPtr pScrn, int flags)
16 OMAPFBProbeController(ofb->ctrl_name);
17
18 /* Do we have the DSS kernel API? */
19- if (stat(SYSFS_DSS_DIR, &st) == 0) {
20+ if (0) { //stat(SYSFS_DSS_DIR, &st) == 0) {
21 ofb->dss = TRUE;
22 } else {
23 ofb->dss = FALSE;
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/omap-revert-set-CRTC-limit.patch b/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/omap-revert-set-CRTC-limit.patch
new file mode 100644
index 0000000000..6a9e9058b9
--- /dev/null
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/omap-revert-set-CRTC-limit.patch
@@ -0,0 +1,32 @@
1commit 031516123d25a12808ab4e56ea8deda74946cdcd
2Author: Koen Kooi <koen@dominion.thruhere.net>
3Date: Wed Jan 26 12:04:36 2011 +0100
4
5 Revert "Set a large CRTC upper limit to not prune larger resolutions"
6
7 Picture is garbled after switching resolutions, so revert it.
8
9 Virtual size too big, revert the commit 9c4d7592dcb7dc20a48a6f941d9d94bd73d34153.
10
11diff --git a/src/omapfb-crtc.c b/src/omapfb-crtc.c
12index 9aaa52f..cbeff35 100644
13--- a/src/omapfb-crtc.c
14+++ b/src/omapfb-crtc.c
15@@ -190,13 +190,13 @@ OMAPFBCRTCInit(ScrnInfoPtr pScrn)
16 * In practise, this doesn't seem to be supported.
17 * (no way to setup the overlay offset/base address)
18 */
19- /* FIXME: figure out what makes sense here. A known max resolution?
20- * framebuffer size?
21- */
22 xf86CrtcSetSizeRange(pScrn,
23- 8, 8, 2048, 2048);
24+ 8, 8,
25+ ofb->state_info.xres_virtual,
26+ ofb->state_info.yres_virtual);
27
28 ofb->crtc = xf86CrtcCreate(pScrn, &OMAPFBCrtcFuncs);
29+
30 }
31
32
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/omap-revert-set-virtual-size.patch b/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/omap-revert-set-virtual-size.patch
new file mode 100644
index 0000000000..a3fd0d5f90
--- /dev/null
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/omap-revert-set-virtual-size.patch
@@ -0,0 +1,23 @@
1commit cbae688d7df59938ccb4af534ec2ff75cbbe9221
2Author: Koen Kooi <koen@dominion.thruhere.net>
3Date: Wed Jan 26 13:27:20 2011 +0100
4
5 Revert "Set virtual size when configuring framebuffer"
6
7 Virtual size too big, so revert it.
8
9 This reverts commit 2653ef07883fbd1a5e7025f9300cf89b79ba429a.
10
11diff --git a/src/omapfb-crtc.c b/src/omapfb-crtc.c
12index cbeff35..9655db2 100644
13--- a/src/omapfb-crtc.c
14+++ b/src/omapfb-crtc.c
15@@ -98,8 +98,6 @@ OMAPFBCrtcCommitChangeMode (xf86CrtcPtr crtc)
16 v = ofb->state_info;
17 v.xres = mode->HDisplay;
18 v.yres = mode->VDisplay;
19- v.xres_virtual = crtc->scrn->virtualX;
20- v.yres_virtual = crtc->scrn->virtualY;
21 v.activate = FB_ACTIVATE_NOW;
22 v.pixclock = KHZ2PICOS(mode->Clock ? mode->Clock : 56000);
23 v.left_margin = mode->HTotal - mode->HSyncEnd;
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 2d9875e7e0..054b96ab47 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb
@@ -10,6 +10,10 @@ PR = "r1"
10PV = "0.1.1+git${SRCPV}" 10PV = "0.1.1+git${SRCPV}"
11 11
12SRC_URI = "git://git.pingu.fi/xf86-video-omapfb.git;protocol=http \ 12SRC_URI = "git://git.pingu.fi/xf86-video-omapfb.git;protocol=http \
13 file://omap-revert-set-CRTC-limit.patch \
14 file://omap-revert-set-virtual-size.patch \
15 file://omap-force-plain-mode.patch \
16 file://omap-blacklist-tv-out.patch \
13 " 17 "
14 18
15S = "${WORKDIR}/git" 19S = "${WORKDIR}/git"