gpu: android-display: DO NOT MERGE: android display compilation fixes

there are some compilation errors seen after enabling ion because
of lack of vram apis and dsscomp platform apis in kernel.
this patch should be reverted after support for those have been
added in the kernel.

Change-Id: I57d51204a726708075d4e8c65c207d6f750381b1
Signed-off-by: Sundar Raman <a0393242@ti.com>

diff --git a/arch/arm/plat-omap/android-display.c b/arch/arm/plat-omap/android-display.c
index c0a78ad70019fc2cb6e79077b73c82941fa7cac4..ee8765908ff53cc45257f53929867b949f4b10ac 100644 (file)
--- a/arch/arm/plat-omap/android-display.c
+++ b/arch/arm/plat-omap/android-display.c
@@ -24,7 +24,7 @@
 
 #include <plat/android-display.h>
 #include <plat/dsscomp.h>
-#include <plat/vram.h>
+//#include <plat/vram.h>
 
 struct omap_android_display_data {
        /* members with default values */
@@ -134,7 +134,7 @@ static void set_tiler1d_slot_size(struct dsscomp_platform_data *dsscomp,
 done:
        if (dsscomp)
                *dsscomp = data;
-       dsscomp_set_platform_data(&data);
+       //dsscomp_set_platform_data(&data);
 
        /* remember setting for ion carveouts */
        mem->tiler1d_mem =
@@ -177,7 +177,7 @@ static void set_vram_sizes(struct sgx_omaplfb_config *sgx_config,
        }
 
        pr_info("android_display: setting vram to %u\n", vram);
-       omap_vram_set_sdram_vram(vram, 0);
+       //omap_vram_set_sdram_vram(vram, 0);
 }
 
 /* coordinate between sgx, omapdss, dsscomp and ion needs */