From patchwork Wed Jan 9 06:42:25 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ajay Kumar X-Patchwork-Id: 210672 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 6CAC72C0079 for ; Wed, 9 Jan 2013 20:46:28 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 8B7D74A11E; Wed, 9 Jan 2013 10:46:18 +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 QIFNF4uufOMi; Wed, 9 Jan 2013 10:46:18 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 5A3604A0EF; Wed, 9 Jan 2013 10:46:00 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 88D2C4A0FD for ; Wed, 9 Jan 2013 07:20:36 +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 0CaVBc6hqlnh for ; Wed, 9 Jan 2013 07:20:35 +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 mailout1.samsung.com (mailout1.samsung.com [203.254.224.24]) by theia.denx.de (Postfix) with ESMTP id 009A64A0F9 for ; Wed, 9 Jan 2013 07:20:34 +0100 (CET) Received: from epcpsbgm1.samsung.com (epcpsbgm1 [203.254.230.26]) by mailout1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MGC00B5ZHLFOAL0@mailout1.samsung.com> for u-boot@lists.denx.de; Wed, 09 Jan 2013 15:20:30 +0900 (KST) Received: from epcpsbgm1.samsung.com ( [172.20.52.126]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id ED.F0.01231.E2C0DE05; Wed, 09 Jan 2013 15:20:30 +0900 (KST) X-AuditID: cbfee61a-b7fa66d0000004cf-fd-50ed0c2e6717 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 8D.F0.01231.E2C0DE05; Wed, 09 Jan 2013 15:20:30 +0900 (KST) Received: from chrome-ubuntu.sisodomain.com ([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 <0MGC00K7AHLXZW20@mmp1.samsung.com> for u-boot@lists.denx.de; Wed, 09 Jan 2013 15:20:30 +0900 (KST) From: Ajay Kumar To: u-boot@lists.denx.de, dh09.lee@samsung.com Date: Wed, 09 Jan 2013 01:42:25 -0500 Message-id: <1357713746-13193-4-git-send-email-ajaykumar.rs@samsung.com> X-Mailer: git-send-email 1.8.0 In-reply-to: <1357713746-13193-1-git-send-email-ajaykumar.rs@samsung.com> References: <1357713746-13193-1-git-send-email-ajaykumar.rs@samsung.com> DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrDLMWRmVeSWpSXmKPExsWyRsSkTleP522Awe1fWhZv93ayOzB6nL2z gzGAMYrLJiU1J7MstUjfLoEr4/vcZpaCqSIVG393MzcwbhPoYuTkkBAwkfjxtocFwhaTuHBv PVsXIxeHkMBSRonfDxYzwxRNmnuQGSKxiFGir3cSVNUyJokjq6+yg1SxCWhLbJt+E2yUiICe xK1V+8G6mQUcJFZcvQEU5+AQFvCXWPhACiTMIqAqsXfhQ7BWXgEPiacTr0Mtk5P4sOcRWJxT wFPi689dTCC2EFBN88UedoheAYlvkw+BjZQQkJXYdADsNgmBy2wSF1bMYoKYIylxcMUNlgmM wgsYGVYxiqYWJBcUJ6XnGuoVJ+YWl+al6yXn525iBAbh6X/PpHYwrmywOMQowMGoxMNrOfNN gBBrYllxZe4hRgkOZiUR3rveQCHelMTKqtSi/Pii0pzU4kOMPkCXTGSWEk3OB0ZIXkm8obGJ uamxqaWRkZmpKQ5hJXFexlNPAoQE0hNLUrNTUwtSi2DGMXFwSjUwLp92aHHP410+GnOvV/0+ c+eo3A2BbWqLv8v2qYlv9H/uuVt0gVv0mtJj4Sc6zhneFLptt31P6bzfC+Y/175dz3BJ5npq yR7V9QUJJQE3BXaaLE2uUl+pV1nxdb2Ojs3t6Rv8FN+/ZD/xpkhx+v8U9SefZT/MK8vLLZ4y 97xJT8nceca2Z8UvbFRiKc5INNRiLipOBAAZ/s/dbwIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupmkeLIzCtJLcpLzFFi42I5/e+xgK4ez9sAgxNXFC3e7u1kd2D0OHtn B2MAY1QDo01GamJKapFCal5yfkpmXrqtkndwvHO8qZmBoa6hpYW5kkJeYm6qrZKLT4CuW2YO 0FglhbLEnFKgUEBicbGSvh2mCaEhbroWMI0Rur4hQXA9RgZoIGENY8b3uc0sBVNFKjb+7mZu YNwm0MXIySEhYCIxae5BZghbTOLCvfVsXYxcHEICixgl+nonQTnLmCSOrL7KDlLFJqAtsW36 TRYQW0RAT+LWqv1g3cwCDhIrrt4AinNwCAv4Syx8IAUSZhFQldi78CFYK6+Ah8TTidehlslJ fNjzCCzOKeAp8fXnLiYQWwiopvliD/sERt4FjAyrGEVTC5ILipPScw31ihNzi0vz0vWS83M3 MYJD/JnUDsaVDRaHGAU4GJV4eC1nvgkQYk0sK67MPcQowcGsJMJ71xsoxJuSWFmVWpQfX1Sa k1p8iNEH6KqJzFKiyfnA+MsriTc0NjE3NTa1NLEwMbPEIawkzst46kmAkEB6YklqdmpqQWoR zDgmDk6pBsaCq+aTXY4yXq1rq3zw/ccpDk69XRkmq5V3rph0Ju+B2+dJGYLKndKPdapuR5vZ tpUVR8t+XxhoMjl8iXNR9sPn2cY/gpQr8wtv/DrDpJOo+ey27CXr1Lm7V9w9rb1fxV5Bfg17 NI/R+rtzZvy7+GT+Spe7fUY9t9vlOzU+bXBaG8ol7sU5x0yJpTgj0VCLuag4EQCfnXyEngIA AA== X-CFilter-Loop: Reflected X-Mailman-Approved-At: Wed, 09 Jan 2013 10:45:54 +0100 Cc: inki.dae@samsung.com Subject: [U-Boot] [PATCH V6 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. We use "logo_on" field inside vidinfo_t structure to decide whether user wants Logo or Console. Define CONFIG_CMD_BMP and make logo_on = 1 to get Logo on screen. Use logo_on = 0 to get output console on LCD. Signed-off-by: Ajay Kumar --- Changes in V2: -- Use CONFIG_CMD_BMP instead of CONFIG_TIZEN to distinguish between Proprietary logo support and LCD console support. Changes in V3: -- Create and use new config CONFIG_EXYNOS_LOGO instead of using CONFIG_CMD_BMP Changes in V4: -- Remove #ifdef CONFIG_EXYNOS_LOGO, instead use logo_on field to add LCD console support. Changes in V5: -- Remove dummy definition for bmp_display. Instead, place the call to bmp_display inside #ifdef CONFIG_CMD_BMP -- Added changelog in commit message. Changes in V6: -- Moved changelog to proper position drivers/video/exynos_fb.c | 2 ++ drivers/video/exynos_fimd.c | 12 ++++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/drivers/video/exynos_fb.c b/drivers/video/exynos_fb.c index aac74a3..25d73cf 100644 --- a/drivers/video/exynos_fb.c +++ b/drivers/video/exynos_fb.c @@ -88,7 +88,9 @@ static void draw_logo(void) } addr = panel_info.logo_addr; +#ifdef CONFIG_CMD_BMP bmp_display(addr, x, y); +#endif } static void lcd_panel_on(vidinfo_t *vid) diff --git a/drivers/video/exynos_fimd.c b/drivers/video/exynos_fimd.c index 06eae2e..2efe6a6 100644 --- a/drivers/video/exynos_fimd.c +++ b/drivers/video/exynos_fimd.c @@ -88,14 +88,18 @@ static void exynos_fimd_set_par(unsigned int win_id) /* DATAPATH is DMA */ cfg |= EXYNOS_WINCON_DATAPATH_DMA; - /* bpp is 32 */ - cfg |= EXYNOS_WINCON_WSWP_ENABLE; + if (pvid->logo_on) /* To get proprietary LOGO */ + cfg |= EXYNOS_WINCON_WSWP_ENABLE; + else /* To get output console on LCD */ + cfg |= EXYNOS_WINCON_HAWSWP_ENABLE; /* dma burst is 16 */ cfg |= EXYNOS_WINCON_BURSTLEN_16WORD; - /* pixel format is unpacked RGB888 */ - cfg |= EXYNOS_WINCON_BPPMODE_24BPP_888; + if (pvid->logo_on) /* To get proprietary LOGO */ + cfg |= EXYNOS_WINCON_BPPMODE_24BPP_888; + else /* To get output console on LCD */ + cfg |= EXYNOS_WINCON_BPPMODE_16BPP_565; writel(cfg, (unsigned int)&fimd_ctrl->wincon0 + EXYNOS_WINCON(win_id));