Commit 9f2e5548 authored by Martin Jansa's avatar Martin Jansa Committed by Koen Kooi

xf86-video-omapfb: merged to oe-core

Signed-off-by: default avatarMartin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: default avatarKoen Kooi <koen@dominion.thruhere.net>
parent 3afbbd36
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
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
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
require recipes-graphics/xorg-driver/xorg-driver-common.inc
DESCRIPTION = "X.Org X server -- OMAP display driver"
PV = "0.1.1+${PR}+gitr${SRCREV}"
PR = "r16"
LICENSE = "MIT-X"
LIC_FILES_CHKSUM = "file://src/omapfb-driver.c;beginline=1;endline=30;md5=a44c2a37e04d1c2c5f0313afb493f833"
SRC_URI = "git://git.pingu.fi/xf86-video-omapfb;protocol=http \
file://0001-blacklist-tv-out.patch \
file://0002-Revert-Set-virtual-size-when-configuring-framebuffer.patch \
file://0003-force-plain-mode.patch \
file://0004-Attempt-to-fix-VRFB.patch \
"
SRCREV_pn-${PN} = "28c006c94e57ea71df11ec4fff79d7ffcfc4860f"
S = "${WORKDIR}/git"
EXTRA_OECONF_armv7a = " --enable-neon "
# Use overlay 2 on omap3 to enable other apps to use overlay 1 (e.g. dmai or omapfbplay)
do_compile_prepend_armv7a () {
sed -i -e s:fb1:fb2:g ${S}/src/omapfb-xv.c
}
CFLAGS += " -I${STAGING_INCDIR}/xorg "
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment