From patchwork Tue Jan 8 07:32:07 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ajay Kumar X-Patchwork-Id: 210305 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 A1D742C00DB for ; Tue, 8 Jan 2013 18:20:40 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id BD1114A103; Tue, 8 Jan 2013 08:20:34 +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 v9eGE-FXiSxU; Tue, 8 Jan 2013 08:20:34 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 9F8924A120; Tue, 8 Jan 2013 08:20:18 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 385344A0EB for ; Tue, 8 Jan 2013 08:10:17 +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 PtJxrqgjWQfm for ; Tue, 8 Jan 2013 08:10:16 +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 mailout3.samsung.com (mailout3.samsung.com [203.254.224.33]) by theia.denx.de (Postfix) with ESMTP id D17C24A0ED for ; Tue, 8 Jan 2013 08:10:15 +0100 (CET) Received: from epcpsbgm2.samsung.com (epcpsbgm2 [203.254.230.27]) by mailout3.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MGA009TLP8NTGO0@mailout3.samsung.com> for u-boot@lists.denx.de; Tue, 08 Jan 2013 16:10:13 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [172.20.52.123]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 42.5F.12699.556CBE05; Tue, 08 Jan 2013 16:10:13 +0900 (KST) X-AuditID: cbfee61b-b7f616d00000319b-9f-50ebc655f7c5 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 81.5F.12699.556CBE05; Tue, 08 Jan 2013 16:10:13 +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 <0MGA002YCP8PDI60@mmp1.samsung.com> for u-boot@lists.denx.de; Tue, 08 Jan 2013 16:10:13 +0900 (KST) From: Ajay Kumar To: u-boot@lists.denx.de, dh09.lee@samsung.com Date: Tue, 08 Jan 2013 02:32:07 -0500 Message-id: <1357630328-16346-4-git-send-email-ajaykumar.rs@samsung.com> X-Mailer: git-send-email 1.8.0 In-reply-to: <1357630328-16346-1-git-send-email-ajaykumar.rs@samsung.com> References: <1357630328-16346-1-git-send-email-ajaykumar.rs@samsung.com> DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrLLMWRmVeSWpSXmKPExsWyRsSkWjf02OsAg/YfZhZv93ayOzB6nL2z gzGAMYrLJiU1J7MstUjfLoErY9GSdcwFd4Urtl1cwdzA2CXQxcjJISFgIrF85kxmCFtM4sK9 9WxdjFwcQgJLGSVmdfewwxS9WLqaFSKxiFHi9vQVUM4yJonJ8ztYQarYBLQltk2/yQJiiwjo SdxatR9sLLNAmMTize1gcWEBf4lDe48zgtgsAqoSn1etAOvlFfCQOLd2GyvENjmJD3segW3m FPCUuLvvI9gcIaCak6sus0P0Ckh8m3wIaCYHUL2sxKYDzCD3SAhcZpOYveEA1DuSEgdX3GCZ wCi8gJFhFaNoakFyQXFSeq6RXnFibnFpXrpecn7uJkZgGJ7+90x6B+OqBotDjAIcjEo8vJdi XgcIsSaWFVfmHmKU4GBWEuG13wcU4k1JrKxKLcqPLyrNSS0+xOgDdMlEZinR5HxgjOSVxBsa m5ibGptaGhmZmZriEFYS52U89SRASCA9sSQ1OzW1ILUIZhwTB6dUA2PE08iTV5SroliPX7fh yi3s2Jd4tHJeUv2uJtbnm+q+GJ/l/DFJJHe5TWlQtc32EmeT2z4WO37/lhVrmeV8IvGBRcvr Nbe9pIJKj8tMvidXdV/j/Kcv+QbH6vPcNrVNk1iZ8rxY6dAS7sOsP9aF3J35INcpYmbrf1nF l0m2d37s9f8sJ/LtrLkSS3FGoqEWc1FxIgBn6YSRcAIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFuphkeLIzCtJLcpLzFFi42I5/e+xgG7osdcBBv+bdSze7u1kd2D0OHtn B2MAY1QDo01GamJKapFCal5yfkpmXrqtkndwvHO8qZmBoa6hpYW5kkJeYm6qrZKLT4CuW2YO 0FglhbLEnFKgUEBicbGSvh2mCaEhbroWMI0Rur4hQXA9RgZoIGENY8aiJeuYC+4KV2y7uIK5 gbFLoIuRk0NCwETixdLVrBC2mMSFe+vZuhi5OIQEFjFK3J6+ghXCWcYkMXl+B1gVm4C2xLbp N1lAbBEBPYlbq/Yzg9jMAmESize3g8WFBfwlDu09zghiswioSnxetQKsl1fAQ+Lc2m1Q2+Qk Pux5xA5icwp4Stzd9xFsjhBQzclVl9knMPIuYGRYxSiaWpBcUJyUnmukV5yYW1yal66XnJ+7 iREc5M+kdzCuarA4xCjAwajEw3sp5nWAEGtiWXFl7iFGCQ5mJRFe+31AId6UxMqq1KL8+KLS nNTiQ4w+QFdNZJYSTc4HRmBeSbyhsYm5qbGppYmFiZklDmElcV7GU08ChATSE0tSs1NTC1KL YMYxcXBKNTC6l35Wvml39k5pWZ+GmcACj7KZc0K+bndZZa658c/V158lo/aunPuSoSRxzZpA DYekOBP/11eF00IS0zcu/LSsgvfn3nsXvzMUfi6/2j13baOe035r400GDf3ePYzV/zPDLvdq 1ZZ0beJZav9di+vc8TlTH2f9KDPvuNzRntCyZP2/yQteJO1WYinOSDTUYi4qTgQANssfpJ8C AAA= X-CFilter-Loop: Reflected X-Mailman-Approved-At: Tue, 08 Jan 2013 08:20:09 +0100 Cc: inki.dae@samsung.com Subject: [U-Boot] [PATCH V5 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. 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. Signed-off-by: Ajay Kumar --- 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 d9a3f9a..944e9fa 100644 --- a/drivers/video/exynos_fb.c +++ b/drivers/video/exynos_fb.c @@ -85,7 +85,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));