From patchwork Thu Sep 13 12:14:49 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: archit taneja X-Patchwork-Id: 1451661 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 DC784DF24C for ; Thu, 13 Sep 2012 12:15:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757940Ab2IMMPU (ORCPT ); Thu, 13 Sep 2012 08:15:20 -0400 Received: from arroyo.ext.ti.com ([192.94.94.40]:52110 "EHLO arroyo.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757937Ab2IMMPS (ORCPT ); Thu, 13 Sep 2012 08:15:18 -0400 Received: from dlelxv30.itg.ti.com ([172.17.2.17]) by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id q8DCFIbi001115; Thu, 13 Sep 2012 07:15:18 -0500 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 q8DCFI2c030593; Thu, 13 Sep 2012 07:15:18 -0500 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; Thu, 13 Sep 2012 07:15:17 -0500 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 q8DCFHch026583; Thu, 13 Sep 2012 07:15:17 -0500 Received: from localhost (a0393947pc.apr.dhcp.ti.com [172.24.137.248]) by legion.dal.design.ti.com (8.11.7p1+Sun/8.11.7) with ESMTP id q8DCFFw07742; Thu, 13 Sep 2012 07:15:16 -0500 (CDT) From: Archit Taneja To: CC: , , Archit Taneja Subject: [PATCH 05/21] OMAPDSS: DISPC: Simplify function names for setting pipeline input and output sizes Date: Thu, 13 Sep 2012 17:44:49 +0530 Message-ID: <1347538505-25359-6-git-send-email-archit@ti.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1347538505-25359-1-git-send-email-archit@ti.com> References: <1347538505-25359-1-git-send-email-archit@ti.com> 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 pipeline register names in the TRM for setting the buffer size and the output size are a bit misleading, for example, there are different register names for setting the buffer size for VID and GFX pipes. Things get more confusing when considering writeback pipeline. Rename the functions so that they tell whether they are configuring the input to the scalar or the output. These will be extended later to support writeback registers. Signed-off-by: Archit Taneja --- drivers/video/omap2/dss/dispc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/video/omap2/dss/dispc.c b/drivers/video/omap2/dss/dispc.c index 9ecdd44..f60fcf4 100644 --- a/drivers/video/omap2/dss/dispc.c +++ b/drivers/video/omap2/dss/dispc.c @@ -710,7 +710,7 @@ static void dispc_plane_set_pos(enum omap_plane plane, int x, int y) dispc_write_reg(DISPC_OVL_POSITION(plane), val); } -static void dispc_plane_set_pic_size(enum omap_plane plane, int width, +static void dispc_plane_set_input_size(enum omap_plane plane, int width, int height) { u32 val = FLD_VAL(height - 1, 26, 16) | FLD_VAL(width - 1, 10, 0); @@ -721,7 +721,7 @@ static void dispc_plane_set_pic_size(enum omap_plane plane, int width, dispc_write_reg(DISPC_OVL_PICTURE_SIZE(plane), val); } -static void dispc_plane_set_vid_size(enum omap_plane plane, int width, +static void dispc_plane_set_output_size(enum omap_plane plane, int width, int height) { u32 val; @@ -2393,13 +2393,13 @@ int dispc_ovl_setup(enum omap_plane plane, const struct omap_overlay_info *oi, dispc_plane_set_pos(plane, oi->pos_x, pos_y); - dispc_plane_set_pic_size(plane, in_width, in_height); + dispc_plane_set_input_size(plane, in_width, in_height); if (ovl->caps & OMAP_DSS_OVL_CAP_SCALE) { dispc_plane_set_scaling(plane, in_width, in_height, out_width, out_height, ilace, five_taps, fieldmode, oi->color_mode, oi->rotation); - dispc_plane_set_vid_size(plane, out_width, out_height); + dispc_plane_set_output_size(plane, out_width, out_height); dispc_plane_set_vid_color_conv(plane, cconv); }