From patchwork Wed Nov 28 10:41:26 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chandrabhanu Mahapatra X-Patchwork-Id: 1815391 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 0BB0DDF26F for ; Wed, 28 Nov 2012 10:46:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754351Ab2K1Kqf (ORCPT ); Wed, 28 Nov 2012 05:46:35 -0500 Received: from bear.ext.ti.com ([192.94.94.41]:34962 "EHLO bear.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754181Ab2K1Kqe (ORCPT ); Wed, 28 Nov 2012 05:46:34 -0500 Received: from dlelxv30.itg.ti.com ([172.17.2.17]) by bear.ext.ti.com (8.13.7/8.13.7) with ESMTP id qASAkXB3011765; Wed, 28 Nov 2012 04:46:33 -0600 Received: from DFLE73.ent.ti.com (dfle73.ent.ti.com [128.247.5.110]) by dlelxv30.itg.ti.com (8.13.8/8.13.8) with ESMTP id qASAkXko008996; Wed, 28 Nov 2012 04:46:33 -0600 Received: from dlelxv24.itg.ti.com (172.17.1.199) by dfle73.ent.ti.com (128.247.5.110) with Microsoft SMTP Server id 14.1.323.3; Wed, 28 Nov 2012 04:46:33 -0600 Received: from legion.dal.design.ti.com (legion.dal.design.ti.com [128.247.22.53]) by dlelxv24.itg.ti.com (8.13.8/8.13.8) with ESMTP id qASAkXgS030237; Wed, 28 Nov 2012 04:46:33 -0600 Received: from localhost (uda0131936.apr.dhcp.ti.com [172.24.137.243]) by legion.dal.design.ti.com (8.11.7p1+Sun/8.11.7) with ESMTP id qASAkVw03411; Wed, 28 Nov 2012 04:46:32 -0600 (CST) From: Chandrabhanu Mahapatra To: CC: , , Chandrabhanu Mahapatra Subject: [PATCH 3/7] OMAPDSS: DISPC: Move DISPC specific dss_params to dispc_features Date: Wed, 28 Nov 2012 16:11:26 +0530 Message-ID: X-Mailer: git-send-email 1.7.10 In-Reply-To: References: MIME-Version: 1.0 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org The DISPC specific dss_param_range are moved from struct omap_dss_features to corresponding DSS version specific dispc_param_range struct, initialized in dispc_features thereby enabling local access. The mgr_width_max and mgr_height_max, members of dispc_features, are also moved to dispc_param_range. Signed-off-by: Chandrabhanu Mahapatra --- drivers/video/omap2/dss/dispc.c | 80 +++++++++++++++++++++++--------- drivers/video/omap2/dss/dss.h | 4 ++ drivers/video/omap2/dss/dss_features.c | 16 ------- drivers/video/omap2/dss/dss_features.h | 3 -- 4 files changed, 63 insertions(+), 40 deletions(-) diff --git a/drivers/video/omap2/dss/dispc.c b/drivers/video/omap2/dss/dispc.c index 21fc522..0b7388d 100644 --- a/drivers/video/omap2/dss/dispc.c +++ b/drivers/video/omap2/dss/dispc.c @@ -90,6 +90,14 @@ enum dispc_feat_reg_field { FEAT_REG_VERTICALACCU, }; +enum dispc_range_param { + FEAT_PARAM_PCD, + FEAT_PARAM_DOWNSCALE, + FEAT_PARAM_LINEWIDTH, + FEAT_PARAM_MGR_WIDTH, + FEAT_PARAM_MGR_HEIGHT, +}; + struct dispc_features { u8 sw_start; u8 fp_start; @@ -99,8 +107,6 @@ struct dispc_features { u16 hp_max; u8 mgr_width_start; u8 mgr_height_start; - u16 mgr_width_max; - u16 mgr_height_max; int (*calc_scaling) (enum omap_plane plane, const struct omap_video_timings *mgr_timings, u16 width, u16 height, u16 out_width, u16 out_height, @@ -119,6 +125,7 @@ struct dispc_features { u32 burst_size_unit; struct register_field *reg_fields; + struct param_range *params; }; #define DISPC_MAX_NR_FIFOS 5 @@ -2185,7 +2192,7 @@ static int dispc_ovl_calc_scaling_24xx(enum omap_plane plane, u16 in_width, in_height; int min_factor = min(*decim_x, *decim_y); const int maxsinglelinewidth = - dss_feat_get_param_max(FEAT_PARAM_LINEWIDTH); + dispc.feat->params[FEAT_PARAM_LINEWIDTH].max; *five_taps = false; @@ -2226,7 +2233,7 @@ static int dispc_ovl_calc_scaling_34xx(enum omap_plane plane, u16 in_width, in_height; int min_factor = min(*decim_x, *decim_y); const int maxsinglelinewidth = - dss_feat_get_param_max(FEAT_PARAM_LINEWIDTH); + dispc.feat->params[FEAT_PARAM_LINEWIDTH].max; do { in_height = DIV_ROUND_UP(height, *decim_y); @@ -2292,8 +2299,8 @@ static int dispc_ovl_calc_scaling_44xx(enum omap_plane plane, int decim_x_min = *decim_x; u16 in_height = DIV_ROUND_UP(height, *decim_y); const int maxsinglelinewidth = - dss_feat_get_param_max(FEAT_PARAM_LINEWIDTH); - const int maxdownscale = dss_feat_get_param_max(FEAT_PARAM_DOWNSCALE); + dispc.feat->params[FEAT_PARAM_LINEWIDTH].max; + const int maxdownscale = dispc.feat->params[FEAT_PARAM_DOWNSCALE].max; if (mem_to_mem) { in_width_max = out_width * maxdownscale; @@ -2333,7 +2340,7 @@ static int dispc_ovl_calc_scaling(enum omap_plane plane, int *x_predecim, int *y_predecim, u16 pos_x, enum omap_dss_rotation_type rotation_type, bool mem_to_mem) { - const int maxdownscale = dss_feat_get_param_max(FEAT_PARAM_DOWNSCALE); + const int maxdownscale = dispc.feat->params[FEAT_PARAM_DOWNSCALE].max; const int max_decim_limit = 16; unsigned long core_clk = 0; int decim_x, decim_y, ret; @@ -3029,8 +3036,8 @@ void dispc_mgr_set_lcd_config(enum omap_channel channel, static bool _dispc_mgr_size_ok(u16 width, u16 height) { - return width <= dispc.feat->mgr_width_max && - height <= dispc.feat->mgr_height_max; + return width <= dispc.feat->params[FEAT_PARAM_MGR_WIDTH].max && + height <= dispc.feat->params[FEAT_PARAM_MGR_HEIGHT].max; } static bool _dispc_lcd_timings_ok(int hsw, int hfp, int hbp, @@ -3592,8 +3599,8 @@ void dispc_find_clk_divs(unsigned long req_pck, unsigned long fck, u16 best_ld, cur_ld; u16 best_pd, cur_pd; - pcd_min = dss_feat_get_param_min(FEAT_PARAM_DSS_PCD); - pcd_max = dss_feat_get_param_max(FEAT_PARAM_DSS_PCD); + pcd_min = dispc.feat->params[FEAT_PARAM_PCD].min; + pcd_max = dispc.feat->params[FEAT_PARAM_PCD].max; best_pck = 0; best_ld = 0; @@ -4144,6 +4151,42 @@ static struct register_field omap5_dispc_reg_fields[] = { [FEAT_REG_VERTICALACCU] = { 26, 16 }, }; +static struct param_range omap2_dispc_param_range[] = { + [FEAT_PARAM_PCD] = { 2, 255 }, + [FEAT_PARAM_DOWNSCALE] = { 1, 2 }, + /* + * Assuming the line width buffer to be 768 pixels as OMAP2 DISPC + * scaler cannot scale a image with width more than 768. + */ + [FEAT_PARAM_LINEWIDTH] = { 1, 768 }, + [FEAT_PARAM_MGR_WIDTH] = { 1, 2048 }, + [FEAT_PARAM_MGR_HEIGHT] = { 1, 2048 }, +}; + +static struct param_range omap3_dispc_param_range[] = { + [FEAT_PARAM_PCD] = { 1, 255 }, + [FEAT_PARAM_DOWNSCALE] = { 1, 4 }, + [FEAT_PARAM_LINEWIDTH] = { 1, 1024 }, + [FEAT_PARAM_MGR_WIDTH] = { 1, 2048 }, + [FEAT_PARAM_MGR_HEIGHT] = { 1, 2048 }, +}; + +static struct param_range omap4_dispc_param_range[] = { + [FEAT_PARAM_PCD] = { 1, 255 }, + [FEAT_PARAM_DOWNSCALE] = { 1, 4 }, + [FEAT_PARAM_LINEWIDTH] = { 1, 2048 }, + [FEAT_PARAM_MGR_WIDTH] = { 1, 2048 }, + [FEAT_PARAM_MGR_HEIGHT] = { 1, 2048 }, +}; + +static struct param_range omap5_dispc_param_range[] = { + [FEAT_PARAM_PCD] = { 1, 255 }, + [FEAT_PARAM_DOWNSCALE] = { 1, 4 }, + [FEAT_PARAM_LINEWIDTH] = { 1, 2048 }, + [FEAT_PARAM_MGR_WIDTH] = { 1, 2048 }, + [FEAT_PARAM_MGR_HEIGHT] = { 1, 2048 }, +}; + static const struct dispc_features omap24xx_dispc_feats __initconst = { .sw_start = 5, .fp_start = 15, @@ -4153,14 +4196,13 @@ static const struct dispc_features omap24xx_dispc_feats __initconst = { .hp_max = 256, .mgr_width_start = 10, .mgr_height_start = 26, - .mgr_width_max = 2048, - .mgr_height_max = 2048, .calc_scaling = dispc_ovl_calc_scaling_24xx, .calc_core_clk = calc_core_clk_24xx, .num_fifos = 3, .buffer_size_unit = 1, .burst_size_unit = 8, .reg_fields = omap2_dispc_reg_fields, + .params = omap2_dispc_param_range, }; static const struct dispc_features omap34xx_rev1_0_dispc_feats __initconst = { @@ -4172,14 +4214,13 @@ static const struct dispc_features omap34xx_rev1_0_dispc_feats __initconst = { .hp_max = 256, .mgr_width_start = 10, .mgr_height_start = 26, - .mgr_width_max = 2048, - .mgr_height_max = 2048, .calc_scaling = dispc_ovl_calc_scaling_34xx, .calc_core_clk = calc_core_clk_34xx, .num_fifos = 3, .buffer_size_unit = 1, .burst_size_unit = 8, .reg_fields = omap3_dispc_reg_fields, + .params = omap3_dispc_param_range, }; static const struct dispc_features omap34xx_rev3_0_dispc_feats __initconst = { @@ -4191,14 +4232,13 @@ static const struct dispc_features omap34xx_rev3_0_dispc_feats __initconst = { .hp_max = 4096, .mgr_width_start = 10, .mgr_height_start = 26, - .mgr_width_max = 2048, - .mgr_height_max = 2048, .calc_scaling = dispc_ovl_calc_scaling_34xx, .calc_core_clk = calc_core_clk_34xx, .num_fifos = 3, .buffer_size_unit = 1, .burst_size_unit = 8, .reg_fields = omap3_dispc_reg_fields, + .params = omap3_dispc_param_range, }; static const struct dispc_features omap44xx_dispc_feats __initconst = { @@ -4210,8 +4250,6 @@ static const struct dispc_features omap44xx_dispc_feats __initconst = { .hp_max = 4096, .mgr_width_start = 10, .mgr_height_start = 26, - .mgr_width_max = 2048, - .mgr_height_max = 2048, .calc_scaling = dispc_ovl_calc_scaling_44xx, .calc_core_clk = calc_core_clk_44xx, .num_fifos = 5, @@ -4219,6 +4257,7 @@ static const struct dispc_features omap44xx_dispc_feats __initconst = { .buffer_size_unit = 16, .burst_size_unit = 16, .reg_fields = omap4_dispc_reg_fields, + .params = omap4_dispc_param_range, }; static const struct dispc_features omap54xx_dispc_feats __initconst = { @@ -4230,8 +4269,6 @@ static const struct dispc_features omap54xx_dispc_feats __initconst = { .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, @@ -4239,6 +4276,7 @@ static const struct dispc_features omap54xx_dispc_feats __initconst = { .buffer_size_unit = 16, .burst_size_unit = 16, .reg_fields = omap5_dispc_reg_fields, + .params = omap5_dispc_param_range, }; static int __init dispc_init_features(struct platform_device *pdev) diff --git a/drivers/video/omap2/dss/dss.h b/drivers/video/omap2/dss/dss.h index aa273d8..da6cf81 100644 --- a/drivers/video/omap2/dss/dss.h +++ b/drivers/video/omap2/dss/dss.h @@ -147,6 +147,10 @@ struct register_field { u8 start, end; }; +struct param_range { + int min, max; +}; + struct dss_lcd_mgr_config { enum dss_io_pad_mode io_pad_mode; diff --git a/drivers/video/omap2/dss/dss_features.c b/drivers/video/omap2/dss/dss_features.c index defdfc0..3a9d1df 100644 --- a/drivers/video/omap2/dss/dss_features.c +++ b/drivers/video/omap2/dss/dss_features.c @@ -385,24 +385,16 @@ static const char * const omap5_dss_clk_source_names[] = { static const struct dss_param_range omap2_dss_param_range[] = { [FEAT_PARAM_DSS_FCK] = { 0, 173000000 }, - [FEAT_PARAM_DSS_PCD] = { 2, 255 }, [FEAT_PARAM_DSIPLL_REGN] = { 0, 0 }, [FEAT_PARAM_DSIPLL_REGM] = { 0, 0 }, [FEAT_PARAM_DSIPLL_REGM_DISPC] = { 0, 0 }, [FEAT_PARAM_DSIPLL_REGM_DSI] = { 0, 0 }, [FEAT_PARAM_DSIPLL_FINT] = { 0, 0 }, [FEAT_PARAM_DSIPLL_LPDIV] = { 0, 0 }, - [FEAT_PARAM_DOWNSCALE] = { 1, 2 }, - /* - * Assuming the line width buffer to be 768 pixels as OMAP2 DISPC - * scaler cannot scale a image with width more than 768. - */ - [FEAT_PARAM_LINEWIDTH] = { 1, 768 }, }; static const struct dss_param_range omap3_dss_param_range[] = { [FEAT_PARAM_DSS_FCK] = { 0, 173000000 }, - [FEAT_PARAM_DSS_PCD] = { 1, 255 }, [FEAT_PARAM_DSIPLL_REGN] = { 0, (1 << 7) - 1 }, [FEAT_PARAM_DSIPLL_REGM] = { 0, (1 << 11) - 1 }, [FEAT_PARAM_DSIPLL_REGM_DISPC] = { 0, (1 << 4) - 1 }, @@ -410,13 +402,10 @@ static const struct dss_param_range omap3_dss_param_range[] = { [FEAT_PARAM_DSIPLL_FINT] = { 750000, 2100000 }, [FEAT_PARAM_DSIPLL_LPDIV] = { 1, (1 << 13) - 1}, [FEAT_PARAM_DSI_FCK] = { 0, 173000000 }, - [FEAT_PARAM_DOWNSCALE] = { 1, 4 }, - [FEAT_PARAM_LINEWIDTH] = { 1, 1024 }, }; static const struct dss_param_range omap4_dss_param_range[] = { [FEAT_PARAM_DSS_FCK] = { 0, 186000000 }, - [FEAT_PARAM_DSS_PCD] = { 1, 255 }, [FEAT_PARAM_DSIPLL_REGN] = { 0, (1 << 8) - 1 }, [FEAT_PARAM_DSIPLL_REGM] = { 0, (1 << 12) - 1 }, [FEAT_PARAM_DSIPLL_REGM_DISPC] = { 0, (1 << 5) - 1 }, @@ -424,13 +413,10 @@ static const struct dss_param_range omap4_dss_param_range[] = { [FEAT_PARAM_DSIPLL_FINT] = { 500000, 2500000 }, [FEAT_PARAM_DSIPLL_LPDIV] = { 0, (1 << 13) - 1 }, [FEAT_PARAM_DSI_FCK] = { 0, 170000000 }, - [FEAT_PARAM_DOWNSCALE] = { 1, 4 }, - [FEAT_PARAM_LINEWIDTH] = { 1, 2048 }, }; static const struct dss_param_range omap5_dss_param_range[] = { [FEAT_PARAM_DSS_FCK] = { 0, 200000000 }, - [FEAT_PARAM_DSS_PCD] = { 1, 255 }, [FEAT_PARAM_DSIPLL_REGN] = { 0, (1 << 8) - 1 }, [FEAT_PARAM_DSIPLL_REGM] = { 0, (1 << 12) - 1 }, [FEAT_PARAM_DSIPLL_REGM_DISPC] = { 0, (1 << 5) - 1 }, @@ -438,8 +424,6 @@ static const struct dss_param_range omap5_dss_param_range[] = { [FEAT_PARAM_DSIPLL_FINT] = { 500000, 2500000 }, [FEAT_PARAM_DSIPLL_LPDIV] = { 0, (1 << 13) - 1 }, [FEAT_PARAM_DSI_FCK] = { 0, 170000000 }, - [FEAT_PARAM_DOWNSCALE] = { 1, 4 }, - [FEAT_PARAM_LINEWIDTH] = { 1, 2048 }, }; static const enum dss_feat_id omap2_dss_feat_list[] = { diff --git a/drivers/video/omap2/dss/dss_features.h b/drivers/video/omap2/dss/dss_features.h index 42a1bd1..40b98ff 100644 --- a/drivers/video/omap2/dss/dss_features.h +++ b/drivers/video/omap2/dss/dss_features.h @@ -81,7 +81,6 @@ enum dss_feat_reg_field { enum dss_range_param { FEAT_PARAM_DSS_FCK, - FEAT_PARAM_DSS_PCD, FEAT_PARAM_DSIPLL_REGN, FEAT_PARAM_DSIPLL_REGM, FEAT_PARAM_DSIPLL_REGM_DISPC, @@ -89,8 +88,6 @@ enum dss_range_param { FEAT_PARAM_DSIPLL_FINT, FEAT_PARAM_DSIPLL_LPDIV, FEAT_PARAM_DSI_FCK, - FEAT_PARAM_DOWNSCALE, - FEAT_PARAM_LINEWIDTH, }; /* DSS Feature Functions */