From patchwork Thu Dec 13 11:29:26 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ajay Kumar X-Patchwork-Id: 205812 X-Patchwork-Delegate: promsoft@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id F2F202C0089 for ; Thu, 13 Dec 2012 22:37:28 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id D99134A2D1; Thu, 13 Dec 2012 12:37:05 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id s7jksq7UdHAF; Thu, 13 Dec 2012 12:37:05 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 46E8F4A2A7; Thu, 13 Dec 2012 12:36:48 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 8A6A04A258 for ; Thu, 13 Dec 2012 12:17:00 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Uj2Qu+nbROZz for ; Thu, 13 Dec 2012 12:16:59 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mailout4.samsung.com (mailout4.samsung.com [203.254.224.34]) by theia.denx.de (Postfix) with ESMTP id A4CD84A245 for ; Thu, 13 Dec 2012 12:16:59 +0100 (CET) Received: from epcpsbgm1.samsung.com (epcpsbgm1 [203.254.230.26]) by mailout4.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MEY00EXHUVAODM0@mailout4.samsung.com> for u-boot@lists.denx.de; Thu, 13 Dec 2012 20:06:52 +0900 (KST) Received: from epcpsbgm1.samsung.com ( [172.20.52.123]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 9D.AE.01231.CC6B9C05; Thu, 13 Dec 2012 20:06:52 +0900 (KST) X-AuditID: cbfee61a-b7fa66d0000004cf-c0-50c9b6ccc5e7 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 4D.AE.01231.CC6B9C05; Thu, 13 Dec 2012 20:06:52 +0900 (KST) Received: from localhost.localdomain ([107.108.73.106]) by mmp1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MEY00JTJUV1SA30@mmp1.samsung.com> for u-boot@lists.denx.de; Thu, 13 Dec 2012 20:06:52 +0900 (KST) From: Ajay Kumar To: u-boot@lists.denx.de Date: Thu, 13 Dec 2012 16:59:26 +0530 Message-id: <1355398167-24845-4-git-send-email-ajaykumar.rs@samsung.com> X-Mailer: git-send-email 1.7.0.4 In-reply-to: <1355398167-24845-1-git-send-email-ajaykumar.rs@samsung.com> References: <1355398167-24845-1-git-send-email-ajaykumar.rs@samsung.com> DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrFLMWRmVeSWpSXmKPExsWyRsSkWvfMtpMBBjsv6Fu83dvJ7sDocfbO DsYAxigum5TUnMyy1CJ9uwSujD8rzrMXfBOsWN3TydjAeIqvi5GTQ0LAROLx9B52CFtM4sK9 9WwgtpDAUkaJbYtyYGqOfnoKFOcCii9ilOibc4cZwlnAJPHw43NmkCo2AW2JbdNvsoDYIgIS Er/6rzKC2MwCYRJdB/eC2cIC/hIz5r5lArFZBFQl7i/oBIvzCnhI/L79hg1im4JE67JDQBdx cHAKeErcmWoPYgoBlUz9BtUpIPFt8iEWkLCEgKzEpgNg10gIXGaT+PLjORPEFEmJgytusExg FF7AyLCKUTS1ILmgOCk911CvODG3uDQvXS85P3cTIzAAT/97JrWDcWWDxSFGAQ5GJR7egvCT AUKsiWXFlbmHGCU4mJVEeP2XA4V4UxIrq1KL8uOLSnNSiw8x+gBdMpFZSjQ5HxgdeSXxhsYm 5qbGppZGRmampjiElcR5mz1SAoQE0hNLUrNTUwtSi2DGMXFwSjUwmlyeV7lqg4w9s9g/s0Ad LvfOfflRTC5trTsr94eW8pYZnLnabP2RK2dJt19zg7b6X2cXqSXHRDhv5vVP5c27uqgizCTw 8m/zK/8PMk959ejET7GjqlzVPh88Uy9lNSV1PU26vVF6jdfyh9q9H44/PpK4iGWesob3RMYL Z6T1Dn1iNxUuaVRXYinOSDTUYi4qTgQAIDBgzG0CAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupikeLIzCtJLcpLzFFi42I5/e+xgO6ZbScDDM5e07B4u7eT3YHR4+yd HYwBjFENjDYZqYkpqUUKqXnJ+SmZeem2St7B8c7xpmYGhrqGlhbmSgp5ibmptkouPgG6bpk5 QGOVFMoSc0qBQgGJxcVK+naYJoSGuOlawDRG6PqGBMH1GBmggYQ1jBl/VpxnL/gmWLG6p5Ox gfEUXxcjJ4eEgInE0U9P2SBsMYkL99YD2VwcQgKLGCX65txhhnAWMEk8/PicGaSKTUBbYtv0 mywgtoiAhMSv/quMIDazQJhE18G9YLawgL/EjLlvmUBsFgFVifsLOsHivAIeEr9vv4HapiDR uuwQexcjBwengKfEnan2IKYQUMnUb0wTGHkXMDKsYhRNLUguKE5KzzXUK07MLS7NS9dLzs/d xAgO8GdSOxhXNlgcYhTgYFTi4S0IPxkgxJpYVlyZe4hRgoNZSYTXfzlQiDclsbIqtSg/vqg0 J7X4EKMP0E0TmaVEk/OB0ZdXEm9obGJuamxqaWJhYmaJQ1hJnLfZIyVASCA9sSQ1OzW1ILUI ZhwTB6dUA6NolqJn6z39+Vlmrxpy2x5IPI1/9pkjXX9jYteX6jurd00Mnb9fevLTwmsTlwlf DLt7eYqiyP/XH2xjd+gIdcg0dC/N3R75ce2EY4dypO/Pm3W9bZ+L4HunWsadrauKlnt//S+1 tb71hVlhi8Auu90ifGsk5WXeP7PY59vftTROvPA6gxq3aJwSS3FGoqEWc1FxIgD5NWOsnQIA AA== X-CFilter-Loop: Reflected X-Mailman-Approved-At: Thu, 13 Dec 2012 12:36:43 +0100 Cc: inki.dae@samsung.com, dh09.lee@samsung.com Subject: [U-Boot] [PATCH V2 3/4] video: Modify exynos_fimd driver to support LCD console X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de Currently, exynos FIMD driver is being used to support only TIZEN LOGOs. In order to get LCD console, we need to enable half word swap feature of FIMD and use 16 BPP. LCD console and proprietary Logo cannot be used simultaneously. You should define CONFIG_CMD_BMP for proprietary Logo, and if CONFIG_CMD_BMP is not defined you get output console on LCD. Signed-off-by: Ajay Kumar --- drivers/video/exynos_fb.c | 5 ++++- drivers/video/exynos_fimd.c | 10 ++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/drivers/video/exynos_fb.c b/drivers/video/exynos_fb.c index 39d3b74..cb19192 100644 --- a/drivers/video/exynos_fb.c +++ b/drivers/video/exynos_fb.c @@ -65,6 +65,7 @@ static void exynos_lcd_init(vidinfo_t *vid) exynos_fimd_lcd_init(vid); } +#ifdef CONFIG_CMD_BMP static void draw_logo(void) { int x, y; @@ -87,6 +88,7 @@ static void draw_logo(void) addr = panel_info.logo_addr; bmp_display(addr, x, y); } +#endif static void lcd_panel_on(vidinfo_t *vid) { @@ -146,12 +148,13 @@ void lcd_ctrl_init(void *lcdbase) void lcd_enable(void) { +#ifdef CONFIG_CMD_BMP if (panel_info.logo_on) { memset(lcd_base, 0, panel_width * panel_height * (NBITS(panel_info.vl_bpix) >> 3)); draw_logo(); } - +#endif lcd_panel_on(&panel_info); } diff --git a/drivers/video/exynos_fimd.c b/drivers/video/exynos_fimd.c index 06eae2e..0776b6d 100644 --- a/drivers/video/exynos_fimd.c +++ b/drivers/video/exynos_fimd.c @@ -88,14 +88,20 @@ static void exynos_fimd_set_par(unsigned int win_id) /* DATAPATH is DMA */ cfg |= EXYNOS_WINCON_DATAPATH_DMA; - /* bpp is 32 */ +#ifdef CONFIG_CMD_BMP /* To get proprietary LOGO */ cfg |= EXYNOS_WINCON_WSWP_ENABLE; +#else /* To get output console on LCD */ + cfg |= EXYNOS_WINCON_HAWSWP_ENABLE; +#endif /* dma burst is 16 */ cfg |= EXYNOS_WINCON_BURSTLEN_16WORD; - /* pixel format is unpacked RGB888 */ +#ifdef CONFIG_CMD_BMP /* To get proprietary LOGO */ cfg |= EXYNOS_WINCON_BPPMODE_24BPP_888; +#else /* To get output console on LCD */ + cfg |= EXYNOS_WINCON_BPPMODE_16BPP_565; +#endif writel(cfg, (unsigned int)&fimd_ctrl->wincon0 + EXYNOS_WINCON(win_id));