diff options
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.patch | 40 |
1 files changed, 40 insertions, 0 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 new file mode 100644 index 0000000000..088135c0a8 --- /dev/null +++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0018-DSS2-check-for-ovl-paddr-only-when-enabling.patch | |||
@@ -0,0 +1,40 @@ | |||
1 | From 63e15ba8d5f95b13d3abf359da718537d769f112 Mon Sep 17 00:00:00 2001 | ||
2 | From: Tomi Valkeinen <tomi.valkeinen@nokia.com> | ||
3 | Date: Tue, 7 Apr 2009 10:01:58 +0300 | ||
4 | Subject: [PATCH] DSS2: check for ovl paddr only when enabling | ||
5 | |||
6 | It seems Xvideo uses SETUP_PLANE ioctl even when | ||
7 | the 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 | |||
12 | diff --git a/drivers/video/omap2/dss/overlay.c b/drivers/video/omap2/dss/overlay.c | ||
13 | index 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 | -- | ||
39 | 1.5.6.5 | ||
40 | |||