From 67eae8025dd101347077560b289ff479dc0704ce Mon Sep 17 00:00:00 2001
From: Archit Taneja <archit@ti.com>
Date: Wed, 14 Nov 2012 13:50:16 +0530
Subject: [PATCH] --- yaml --- r: 344649 b: refs/heads/master c:
 264236f82ea4ee5ee418f3e57c33d9d3fc37008f h: refs/heads/master i:   344647:
 2c6ef841eefef5963c8b068db7fd02c0584923ce v: v3

---
 [refs]                                |  2 +-
 trunk/drivers/video/omap2/dss/dispc.c | 19 ++++++++++++++++++-
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index a9ffca7eace3..459e16ba43f4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 33b89928f5a70eb8c97027765167a7cfcf405d0a
+refs/heads/master: 264236f82ea4ee5ee418f3e57c33d9d3fc37008f
diff --git a/trunk/drivers/video/omap2/dss/dispc.c b/trunk/drivers/video/omap2/dss/dispc.c
index 98e754b4a4d3..3d0ff5b0d0ec 100644
--- a/trunk/drivers/video/omap2/dss/dispc.c
+++ b/trunk/drivers/video/omap2/dss/dispc.c
@@ -4146,6 +4146,23 @@ static const struct dispc_features omap44xx_dispc_feats __initconst = {
 	.gfx_fifo_workaround	=	true,
 };
 
+static const struct dispc_features omap54xx_dispc_feats __initconst = {
+	.sw_start		=	7,
+	.fp_start		=	19,
+	.bp_start		=	31,
+	.sw_max			=	256,
+	.vp_max			=	4095,
+	.hp_max			=	4096,
+	.mgr_width_start	=	11,
+	.mgr_height_start	=	27,
+	.mgr_width_max		=	4096,
+	.mgr_height_max		=	4096,
+	.calc_scaling		=	dispc_ovl_calc_scaling_44xx,
+	.calc_core_clk		=	calc_core_clk_44xx,
+	.num_fifos		=	5,
+	.gfx_fifo_workaround	=	true,
+};
+
 static int __init dispc_init_features(struct platform_device *pdev)
 {
 	const struct dispc_features *src;
@@ -4179,7 +4196,7 @@ static int __init dispc_init_features(struct platform_device *pdev)
 		break;
 
 	case OMAPDSS_VER_OMAP5:
-		src = &omap44xx_dispc_feats;
+		src = &omap54xx_dispc_feats;
 		break;
 
 	default: