From patchwork Fri Dec 21 10:35:21 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ajay Kumar X-Patchwork-Id: 207779 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 9935B2C0090 for ; Fri, 21 Dec 2012 21:18:39 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id B184E4A0C5; Fri, 21 Dec 2012 11:18:31 +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 2SmSUA9oGVvl; Fri, 21 Dec 2012 11:18:31 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 6F1974A0C7; Fri, 21 Dec 2012 11:18:12 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 453194A08A for ; Fri, 21 Dec 2012 11:13:06 +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 gbu5lPUbL2pX for ; Fri, 21 Dec 2012 11:13:05 +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 031E64A08B for ; Fri, 21 Dec 2012 11:13:04 +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 <0MFD00E8WLO8VY01@mailout3.samsung.com> for u-boot@lists.denx.de; Fri, 21 Dec 2012 19:12:59 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [172.20.52.123]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 2E.10.12699.B2634D05; Fri, 21 Dec 2012 19:12:59 +0900 (KST) X-AuditID: cbfee61b-b7f616d00000319b-da-50d4362b6fb4 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id DD.10.12699.A2634D05; Fri, 21 Dec 2012 19:12:59 +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 <0MFD003DTLP9V6B0@mmp1.samsung.com> for u-boot@lists.denx.de; Fri, 21 Dec 2012 19:12:58 +0900 (KST) From: Ajay Kumar To: u-boot@lists.denx.de Date: Fri, 21 Dec 2012 16:05:21 +0530 Message-id: <1356086122-4489-4-git-send-email-ajaykumar.rs@samsung.com> X-Mailer: git-send-email 1.7.0.4 In-reply-to: <1356086122-4489-1-git-send-email-ajaykumar.rs@samsung.com> References: <1356086122-4489-1-git-send-email-ajaykumar.rs@samsung.com> DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrDLMWRmVeSWpSXmKPExsWyRsSkWlfb7EqAQeMzAYu3ezvZHRg9zt7Z wRjAGMVlk5Kak1mWWqRvl8CVcWXJXraCPfwVk2fdYG1gvMXTxcjJISFgInF4Uic7hC0mceHe erYuRi4OIYGljBJ7Ny5igSl6cXUxO0RiEaNE36bHrBDOAiaJFfc/gFWxCWhLbJt+E8wWEZCQ +NV/lRHEZhYIk+g6uBfMFhbwl7h8vh9sHYuAqsTU3n1A6zg4eAXcJWYeS4RYpiDRuuwQWAmn gIfEntVtYK1CQCUPt81jgWgVkPg2+RALSKuEgKzEpgPMIOdICJxhk3j54R8rxBxJiYMrbrBM YBRewMiwilE0tSC5oDgpPddIrzgxt7g0L10vOT93EyMwCE//eya9g3FVg8UhRgEORiUe3kiL ywFCrIllxZW5hxglOJiVRHiZvgKFeFMSK6tSi/Lji0pzUosPMfoAXTKRWUo0OR8YIXkl8YbG JuamxqaWRkZmpqY4hJXEeZs9UgKEBNITS1KzU1MLUotgxjFxcEo1ME6++V30cypf75x5D14d Vf8a4VPjdOVAKu+ykwdiKrQ3h718cSRapP7Gw10rNs5+ZnFFtiGd6XTGXXWFI8dNgnbxfFMo mLPROsgkJil87dlEWc6QRP4z/wI3cAieO8bxw3bq6mjxLDkL0Xd3pbm4704rmCuUN2lqyWGm 70Eb1vz/5SjPs+DSkdVKLMUZiYZazEXFiQCxMlcobwIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupmkeLIzCtJLcpLzFFi42I5/e+xgK622ZUAg3u72Sze7u1kd2D0OHtn B2MAY1QDo01GamJKapFCal5yfkpmXrqtkndwvHO8qZmBoa6hpYW5kkJeYm6qrZKLT4CuW2YO 0FglhbLEnFKgUEBicbGSvh2mCaEhbroWMI0Rur4hQXA9RgZoIGENY8aVJXvZCvbwV0yedYO1 gfEWTxcjJ4eEgInEi6uL2SFsMYkL99azdTFycQgJLGKU6Nv0mBXCWcAkseL+BxaQKjYBbYlt 02+C2SICEhK/+q8ygtjMAmESXQf3gtnCAv4Sl8/3g01lEVCVmNq7D2gqBwevgLvEzGOJEMsU JFqXHQIr4RTwkNizug2sVQio5OG2eSwTGHkXMDKsYhRNLUguKE5KzzXSK07MLS7NS9dLzs/d xAgO8WfSOxhXNVgcYhTgYFTi4Y20uBwgxJpYVlyZe4hRgoNZSYSX6StQiDclsbIqtSg/vqg0 J7X4EKMP0FETmaVEk/OB8ZdXEm9obGJuamxqaWJhYmaJQ1hJnLfZIyVASCA9sSQ1OzW1ILUI ZhwTB6dUA2NfWPSK77dmfoqxUtzS9npujIbfhwXLz3zb4nDb+KLaI8dd0bxRjyWjOC5enur5 YhFP1H7xe8aWHI7Fh3jbHc3f77EQ6XplwfdIpls3y/ffBN1/0a+t1Qp0OmZUmPr1FbwqdOhw qJ7D9GTmMmlzpoUz/9p11B+X1O0QfHzS8N0Lm8SPav6/PZVYijMSDbWYi4oTAVxEpQCeAgAA X-CFilter-Loop: Reflected X-Mailman-Approved-At: Fri, 21 Dec 2012 11:18:05 +0100 Cc: inki.dae@samsung.com, dh09.lee@samsung.com Subject: [U-Boot] [PATCH V4 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. Signed-off-by: Ajay Kumar --- drivers/video/exynos_fb.c | 7 +++++++ drivers/video/exynos_fimd.c | 12 ++++++++---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/drivers/video/exynos_fb.c b/drivers/video/exynos_fb.c index d9a3f9a..ee916be 100644 --- a/drivers/video/exynos_fb.c +++ b/drivers/video/exynos_fb.c @@ -45,6 +45,13 @@ short console_row; static unsigned int panel_width, panel_height; +#ifndef CONFIG_CMD_BMP +int bmp_display(ulong addr, int x, int y) +{ + return 0; +} +#endif + static void exynos_lcd_init_mem(void *lcdbase, vidinfo_t *vid) { unsigned long palette_size; diff --git a/drivers/video/exynos_fimd.c b/drivers/video/exynos_fimd.c index 06eae2e..f957dc8 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));