diff options
author | Koen Kooi <koen@openembedded.org> | 2009-04-07 09:46:06 +0200 |
---|---|---|
committer | Koen Kooi <koen@openembedded.org> | 2009-04-07 09:46:06 +0200 |
commit | fbf22c52a21c8f423d8c6683155be9248f21b31a (patch) | |
tree | 020f6d216374fd1826b15c0345676a1ef8bea269 /recipes/linux/linux-omap-2.6.29/dss2/0018-DSS2-check-for-ovl-paddr-only-when-enabling.patch | |
parent | 55dc76064537bdd27a8b6a538d0a0f49ea2dfc8c (diff) |
linux-omap 2.6.29: add patches to fix some bugs in the display driver, XV now works again
Diffstat (limited to 'recipes/linux/linux-omap-2.6.29/dss2/0018-DSS2-check-for-ovl-paddr-only-when-enabling.patch')
-rw-r--r-- | recipes/linux/linux-omap-2.6.29/dss2/0018-DSS2-check-for-ovl-paddr-only-when-enabling.patch | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0018-DSS2-check-for-ovl-paddr-only-when-enabling.patch b/recipes/linux/linux-omap-2.6.29/dss2/0018-DSS2-check-for-ovl-paddr-only-when-enabling.patch new file mode 100644 index 0000000000..088135c0a8 --- /dev/null +++ b/recipes/linux/linux-omap-2.6.29/dss2/0018-DSS2-check-for-ovl-paddr-only-when-enabling.patch @@ -0,0 +1,40 @@ +From 63e15ba8d5f95b13d3abf359da718537d769f112 Mon Sep 17 00:00:00 2001 +From: Tomi Valkeinen <tomi.valkeinen@nokia.com> +Date: Tue, 7 Apr 2009 10:01:58 +0300 +Subject: [PATCH] DSS2: check for ovl paddr only when enabling + +It seems Xvideo uses SETUP_PLANE ioctl even when +the fb memory has not been allocated. Sigh. +--- + drivers/video/omap2/dss/overlay.c | 8 +++++--- + 1 files changed, 5 insertions(+), 3 deletions(-) + +diff --git a/drivers/video/omap2/dss/overlay.c b/drivers/video/omap2/dss/overlay.c +index 9209acf..c047206 100644 +--- a/drivers/video/omap2/dss/overlay.c ++++ b/drivers/video/omap2/dss/overlay.c +@@ -281,6 +281,11 @@ int dss_check_overlay(struct omap_overlay *ovl, struct omap_display *display) + + info = &ovl->info; + ++ if (info->paddr == 0) { ++ DSSDBG("check_overlay failed: paddr 0\n"); ++ return -EINVAL; ++ } ++ + display->get_resolution(display, &dw, &dh); + + DSSDBG("check_overlay %d: (%d,%d %dx%d -> %dx%d) disp (%dx%d)\n", +@@ -331,9 +336,6 @@ static int dss_ovl_set_overlay_info(struct omap_overlay *ovl, + int r; + struct omap_overlay_info old_info; + +- if (info->paddr == 0) +- return -EINVAL; +- + old_info = ovl->info; + ovl->info = *info; + +-- +1.5.6.5 + |