aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLajos Molnar <molnar@ti.com>2011-09-29 21:22:01 -0500
committerBrian Swetland <swetland@google.com>2011-10-07 18:33:21 -0700
commit5d40cd79dfc473585dbee2a50ab44bc059497a36 (patch)
treecca806b1198928d04a61586a14faaee9aeba432f
parent2580b20e5e8bdaad1535f11d1a8cf1728fad9535 (diff)
downloadkernel_samsung_tuna-5d40cd79dfc473585dbee2a50ab44bc059497a36.zip
kernel_samsung_tuna-5d40cd79dfc473585dbee2a50ab44bc059497a36.tar.gz
kernel_samsung_tuna-5d40cd79dfc473585dbee2a50ab44bc059497a36.tar.bz2
OMAP: OMAPLFB: Allocate framebuffer from nonsecure carveout
Allocate framebuffer swap-chain from nonsecure carveout if possible. Change-Id: I23415f0c0061f62e662a653b6edbe0974e1e882c Signed-off-by: Lajos Molnar <molnar@ti.com>
-rw-r--r--drivers/gpu/pvr/omaplfb/omaplfb_displayclass.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/gpu/pvr/omaplfb/omaplfb_displayclass.c b/drivers/gpu/pvr/omaplfb/omaplfb_displayclass.c
index 5ccfc04..40d6a63 100644
--- a/drivers/gpu/pvr/omaplfb/omaplfb_displayclass.c
+++ b/drivers/gpu/pvr/omaplfb/omaplfb_displayclass.c
@@ -1131,7 +1131,11 @@ static OMAPLFB_ERROR OMAPLFBInitFBDev(OMAPLFB_DEVINFO *psDevInfo)
psPVRFBInfo->uiBytesPerPixel = psLINFBInfo->var.bits_per_pixel >> 3;
psPVRFBInfo->bIs2D = OMAPLFB_TRUE;
- res = omap_ion_tiler_alloc(gpsIONClient, &sAllocData);
+ res = omap_ion_nonsecure_tiler_alloc(gpsIONClient, &sAllocData);
+ if (res < 0)
+ {
+ res = omap_ion_tiler_alloc(gpsIONClient, &sAllocData);
+ }
psPVRFBInfo->psIONHandle = sAllocData.handle;
if (res < 0)
{