diff options
-rw-r--r-- | drivers/video/omap2/dss/dispc.c | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/drivers/video/omap2/dss/dispc.c b/drivers/video/omap2/dss/dispc.c index 98e754b4a4d3..3d0ff5b0d0ec 100644 --- a/drivers/video/omap2/dss/dispc.c +++ b/drivers/video/omap2/dss/dispc.c | |||
@@ -4146,6 +4146,23 @@ static const struct dispc_features omap44xx_dispc_feats __initconst = { | |||
4146 | .gfx_fifo_workaround = true, | 4146 | .gfx_fifo_workaround = true, |
4147 | }; | 4147 | }; |
4148 | 4148 | ||
4149 | static const struct dispc_features omap54xx_dispc_feats __initconst = { | ||
4150 | .sw_start = 7, | ||
4151 | .fp_start = 19, | ||
4152 | .bp_start = 31, | ||
4153 | .sw_max = 256, | ||
4154 | .vp_max = 4095, | ||
4155 | .hp_max = 4096, | ||
4156 | .mgr_width_start = 11, | ||
4157 | .mgr_height_start = 27, | ||
4158 | .mgr_width_max = 4096, | ||
4159 | .mgr_height_max = 4096, | ||
4160 | .calc_scaling = dispc_ovl_calc_scaling_44xx, | ||
4161 | .calc_core_clk = calc_core_clk_44xx, | ||
4162 | .num_fifos = 5, | ||
4163 | .gfx_fifo_workaround = true, | ||
4164 | }; | ||
4165 | |||
4149 | static int __init dispc_init_features(struct platform_device *pdev) | 4166 | static int __init dispc_init_features(struct platform_device *pdev) |
4150 | { | 4167 | { |
4151 | const struct dispc_features *src; | 4168 | const struct dispc_features *src; |
@@ -4179,7 +4196,7 @@ static int __init dispc_init_features(struct platform_device *pdev) | |||
4179 | break; | 4196 | break; |
4180 | 4197 | ||
4181 | case OMAPDSS_VER_OMAP5: | 4198 | case OMAPDSS_VER_OMAP5: |
4182 | src = &omap44xx_dispc_feats; | 4199 | src = &omap54xx_dispc_feats; |
4183 | break; | 4200 | break; |
4184 | 4201 | ||
4185 | default: | 4202 | default: |