summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0018-DSS2-check-for-ovl-paddr-only-when-enabling.patch
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-02-18 15:32:57 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-02-18 15:36:06 +0000
commit673abd92f999829bdd67d0273c43570a62123a63 (patch)
tree63132d1ffc1cb5bf50d244b184ca8d58a9cbc85c /meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0018-DSS2-check-for-ovl-paddr-only-when-enabling.patch
parentfed61beb31c47e2d96af905a7047fe78d64c9bd0 (diff)
downloadpoky-673abd92f999829bdd67d0273c43570a62123a63.tar.gz
conf/machine: Drop older machines with no recent updates
These are all moving to meta-extras. Ideally in the future machines such as these will be maintained to topic specific layers as we move to a more layer oriented model. If this causes a problem for anyone please discuss it on the mailing list. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0018-DSS2-check-for-ovl-paddr-only-when-enabling.patch')
-rw-r--r--meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0018-DSS2-check-for-ovl-paddr-only-when-enabling.patch40
1 files changed, 0 insertions, 40 deletions
diff --git a/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0018-DSS2-check-for-ovl-paddr-only-when-enabling.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0018-DSS2-check-for-ovl-paddr-only-when-enabling.patch
deleted file mode 100644
index 088135c0a8..0000000000
--- a/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0018-DSS2-check-for-ovl-paddr-only-when-enabling.patch
+++ /dev/null
@@ -1,40 +0,0 @@
1From 63e15ba8d5f95b13d3abf359da718537d769f112 Mon Sep 17 00:00:00 2001
2From: Tomi Valkeinen <tomi.valkeinen@nokia.com>
3Date: Tue, 7 Apr 2009 10:01:58 +0300
4Subject: [PATCH] DSS2: check for ovl paddr only when enabling
5
6It seems Xvideo uses SETUP_PLANE ioctl even when
7the fb memory has not been allocated. Sigh.
8---
9 drivers/video/omap2/dss/overlay.c | 8 +++++---
10 1 files changed, 5 insertions(+), 3 deletions(-)
11
12diff --git a/drivers/video/omap2/dss/overlay.c b/drivers/video/omap2/dss/overlay.c
13index 9209acf..c047206 100644
14--- a/drivers/video/omap2/dss/overlay.c
15+++ b/drivers/video/omap2/dss/overlay.c
16@@ -281,6 +281,11 @@ int dss_check_overlay(struct omap_overlay *ovl, struct omap_display *display)
17
18 info = &ovl->info;
19
20+ if (info->paddr == 0) {
21+ DSSDBG("check_overlay failed: paddr 0\n");
22+ return -EINVAL;
23+ }
24+
25 display->get_resolution(display, &dw, &dh);
26
27 DSSDBG("check_overlay %d: (%d,%d %dx%d -> %dx%d) disp (%dx%d)\n",
28@@ -331,9 +336,6 @@ static int dss_ovl_set_overlay_info(struct omap_overlay *ovl,
29 int r;
30 struct omap_overlay_info old_info;
31
32- if (info->paddr == 0)
33- return -EINVAL;
34-
35 old_info = ovl->info;
36 ovl->info = *info;
37
38--
391.5.6.5
40