From patchwork Mon Oct 8 12:30:28 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomi Valkeinen X-Patchwork-Id: 1565241 Return-Path: X-Original-To: patchwork-linux-fbdev@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id DFA9640135 for ; Mon, 8 Oct 2012 12:30:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752083Ab2JHMap (ORCPT ); Mon, 8 Oct 2012 08:30:45 -0400 Received: from na3sys009aog136.obsmtp.com ([74.125.149.85]:35768 "EHLO na3sys009aog136.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751845Ab2JHMao (ORCPT ); Mon, 8 Oct 2012 08:30:44 -0400 Received: from mail-la0-f46.google.com ([209.85.215.46]) (using TLSv1) by na3sys009aob136.postini.com ([74.125.148.12]) with SMTP ID DSNKUHLHc2HO3tW01xK5kHhgxIbmDSl6y2UP@postini.com; Mon, 08 Oct 2012 05:30:44 PDT Received: by mail-la0-f46.google.com with SMTP id h6so2210330lag.19 for ; Mon, 08 Oct 2012 05:30:41 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:x-gm-message-state; bh=qAiQInMczDZJlQItIN8U2eTkShHIawWSbCTtO+RinBM=; b=Ciku4nKlwsGsDtToiiQt0DFN2WQ58Zs/7C3shIOohoaCFCELn/GLANa681Xw9YfE44 5dCF2U80SiZVKoV2r41RSStYZ6VHbfBkqipHJLvljH6byRyiynqemilQFlPLGoJfr9jN ll62uCWyPXRXATJKf0FYMUqArhIKczTPRIMMLXKk+uqZw5skte1UOQE2gs4d8PYVcSb1 w69P1sClYlCZjZ50t4qUg+2DhLSRfC86zhAg6FbJZ2kf5xVg6DZ7ebB8/uTuIj+1zhSt 0fKVTTt7rujvGBFmQWm3VWSYqr+4RvyhZlO5Pp+YXfUN8gEp62dYSXaA15j7bQI+S3e2 pMrQ== Received: by 10.112.100.9 with SMTP id eu9mr1455763lbb.62.1349699441803; Mon, 08 Oct 2012 05:30:41 -0700 (PDT) Received: from localhost.localdomain (a91-156-160-115.elisa-laajakaista.fi. [91.156.160.115]) by mx.google.com with ESMTPS id o7sm5449447lbg.4.2012.10.08.05.30.40 (version=SSLv3 cipher=OTHER); Mon, 08 Oct 2012 05:30:41 -0700 (PDT) From: Tomi Valkeinen To: linux-omap@vger.kernel.org, linux-fbdev@vger.kernel.org Cc: Archit Taneja , Tony Lindgren , Tomi Valkeinen Subject: [PATCH 1/2] OMAP: VRFB: convert vrfb to platform device Date: Mon, 8 Oct 2012 15:30:28 +0300 Message-Id: <1349699429-12736-1-git-send-email-tomi.valkeinen@ti.com> X-Mailer: git-send-email 1.7.9.5 X-Gm-Message-State: ALoCoQkSgGpdFYhZa/fEjbye0ZMGOx4LwWcpdBOo37ZPG8RgBj7qsMTToA0xR1OygURdAEQ32PDU Sender: linux-fbdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org This patch converts vrfb library into a platform device, in an effort to remove omap dependencies. The platform device is registered in arch/arm/plat-omap/fb.c and assigned resources depending on whether running on omap2 or omap3. The vrfb driver will parse those resources and use them to access vrfb configuration registers and the vrfb virtual rotation areas. Signed-off-by: Tomi Valkeinen Cc: Tony Lindgren --- arch/arm/plat-omap/fb.c | 53 +++++++++++++++++++ drivers/video/omap2/vrfb.c | 124 +++++++++++++++++++++++++++++++++++++------- 2 files changed, 157 insertions(+), 20 deletions(-) diff --git a/arch/arm/plat-omap/fb.c b/arch/arm/plat-omap/fb.c index dd6f92c..d231912 100644 --- a/arch/arm/plat-omap/fb.c +++ b/arch/arm/plat-omap/fb.c @@ -35,6 +35,59 @@ #include +#if defined(CONFIG_OMAP2_VRFB) +static const struct resource omap2_vrfb_resources[] = { + DEFINE_RES_MEM(0x68008000u, 0x40), + DEFINE_RES_MEM(0x70000000u, 0x4000000), + DEFINE_RES_MEM(0x74000000u, 0x4000000), + DEFINE_RES_MEM(0x78000000u, 0x4000000), + DEFINE_RES_MEM(0x7c000000u, 0x4000000), +}; + +static const struct resource omap3_vrfb_resources[] = { + DEFINE_RES_MEM(0x6C000180u, 0xc0), + DEFINE_RES_MEM(0x70000000u, 0x4000000), + DEFINE_RES_MEM(0x74000000u, 0x4000000), + DEFINE_RES_MEM(0x78000000u, 0x4000000), + DEFINE_RES_MEM(0x7c000000u, 0x4000000), + DEFINE_RES_MEM(0xe0000000u, 0x4000000), + DEFINE_RES_MEM(0xe4000000u, 0x4000000), + DEFINE_RES_MEM(0xe8000000u, 0x4000000), + DEFINE_RES_MEM(0xec000000u, 0x4000000), + DEFINE_RES_MEM(0xf0000000u, 0x4000000), + DEFINE_RES_MEM(0xf4000000u, 0x4000000), + DEFINE_RES_MEM(0xf8000000u, 0x4000000), + DEFINE_RES_MEM(0xfc000000u, 0x4000000), +}; + +static int __init omap_init_vrfb(void) +{ + struct platform_device *pdev; + const struct resource *res; + unsigned int num_res; + + if (cpu_is_omap24xx()) { + res = omap2_vrfb_resources; + num_res = ARRAY_SIZE(omap2_vrfb_resources); + } else if (cpu_is_omap34xx()) { + res = omap3_vrfb_resources; + num_res = ARRAY_SIZE(omap3_vrfb_resources); + } else { + return 0; + } + + pdev = platform_device_register_resndata(NULL, "omapvrfb", -1, + res, num_res, NULL, 0); + + if (IS_ERR(pdev)) + return PTR_ERR(pdev); + else + return 0; +} + +arch_initcall(omap_init_vrfb); +#endif + #if defined(CONFIG_FB_OMAP) || defined(CONFIG_FB_OMAP_MODULE) static bool omapfb_lcd_configured; diff --git a/drivers/video/omap2/vrfb.c b/drivers/video/omap2/vrfb.c index 7e99022..c072e37 100644 --- a/drivers/video/omap2/vrfb.c +++ b/drivers/video/omap2/vrfb.c @@ -26,9 +26,9 @@ #include #include #include +#include #include -#include #ifdef DEBUG #define DBG(format, ...) pr_debug("VRFB: " format, ## __VA_ARGS__) @@ -36,10 +36,10 @@ #define DBG(format, ...) #endif -#define SMS_ROT_VIRT_BASE(context, rot) \ - (((context >= 4) ? 0xD0000000 : 0x70000000) \ - + (0x4000000 * (context)) \ - + (0x1000000 * (rot))) +#define SMS_ROT_CONTROL(context) (0x0 + 0x10 * context) +#define SMS_ROT_SIZE(context) (0x4 + 0x10 * context) +#define SMS_ROT_PHYSICAL_BA(context) (0x8 + 0x10 * context) +#define SMS_ROT_VIRT_BASE(rot) (0x1000000 * (rot)) #define OMAP_VRFB_SIZE (2048 * 2048 * 4) @@ -53,10 +53,16 @@ #define SMS_PW_OFFSET 4 #define SMS_PS_OFFSET 0 -#define VRFB_NUM_CTXS 12 /* bitmap of reserved contexts */ static unsigned long ctx_map; +struct vrfb_ctx { + u32 base; + u32 physical_ba; + u32 control; + u32 size; +}; + static DEFINE_MUTEX(ctx_lock); /* @@ -65,17 +71,32 @@ static DEFINE_MUTEX(ctx_lock); * we don't need locking, since no drivers will run until after the wake-up * has finished. */ -static struct { - u32 physical_ba; - u32 control; - u32 size; -} vrfb_hw_context[VRFB_NUM_CTXS]; + +static void __iomem *vrfb_base; + +static int num_ctxs; +static struct vrfb_ctx *ctxs; + +static void omap2_sms_write_rot_control(u32 val, unsigned ctx) +{ + __raw_writel(val, vrfb_base + SMS_ROT_CONTROL(ctx)); +} + +static void omap2_sms_write_rot_size(u32 val, unsigned ctx) +{ + __raw_writel(val, vrfb_base + SMS_ROT_SIZE(ctx)); +} + +static void omap2_sms_write_rot_physical_ba(u32 val, unsigned ctx) +{ + __raw_writel(val, vrfb_base + SMS_ROT_PHYSICAL_BA(ctx)); +} static inline void restore_hw_context(int ctx) { - omap2_sms_write_rot_control(vrfb_hw_context[ctx].control, ctx); - omap2_sms_write_rot_size(vrfb_hw_context[ctx].size, ctx); - omap2_sms_write_rot_physical_ba(vrfb_hw_context[ctx].physical_ba, ctx); + omap2_sms_write_rot_control(ctxs[ctx].control, ctx); + omap2_sms_write_rot_size(ctxs[ctx].size, ctx); + omap2_sms_write_rot_physical_ba(ctxs[ctx].physical_ba, ctx); } static u32 get_image_width_roundup(u16 width, u8 bytespp) @@ -196,9 +217,9 @@ void omap_vrfb_setup(struct vrfb *vrfb, unsigned long paddr, control |= VRFB_PAGE_WIDTH_EXP << SMS_PW_OFFSET; control |= VRFB_PAGE_HEIGHT_EXP << SMS_PH_OFFSET; - vrfb_hw_context[ctx].physical_ba = paddr; - vrfb_hw_context[ctx].size = size; - vrfb_hw_context[ctx].control = control; + ctxs[ctx].physical_ba = paddr; + ctxs[ctx].size = size; + ctxs[ctx].control = control; omap2_sms_write_rot_physical_ba(paddr, ctx); omap2_sms_write_rot_size(size, ctx); @@ -274,11 +295,11 @@ int omap_vrfb_request_ctx(struct vrfb *vrfb) mutex_lock(&ctx_lock); - for (ctx = 0; ctx < VRFB_NUM_CTXS; ++ctx) + for (ctx = 0; ctx < num_ctxs; ++ctx) if ((ctx_map & (1 << ctx)) == 0) break; - if (ctx == VRFB_NUM_CTXS) { + if (ctx == num_ctxs) { pr_err("vrfb: no free contexts\n"); r = -EBUSY; goto out; @@ -293,7 +314,7 @@ int omap_vrfb_request_ctx(struct vrfb *vrfb) vrfb->context = ctx; for (rot = 0; rot < 4; ++rot) { - paddr = SMS_ROT_VIRT_BASE(ctx, rot); + paddr = ctxs[ctx].base + SMS_ROT_VIRT_BASE(rot); if (!request_mem_region(paddr, OMAP_VRFB_SIZE, "vrfb")) { pr_err("vrfb: failed to reserve VRFB " "area for ctx %d, rotation %d\n", @@ -314,3 +335,66 @@ out: return r; } EXPORT_SYMBOL(omap_vrfb_request_ctx); + +static int __init vrfb_probe(struct platform_device *pdev) +{ + struct resource *mem; + int i; + + /* first resource is the register res, the rest are vrfb contexts */ + + mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); + if (!mem) { + dev_err(&pdev->dev, "can't get vrfb base address\n"); + return -EINVAL; + } + + vrfb_base = devm_ioremap(&pdev->dev, mem->start, resource_size(mem)); + if (!vrfb_base) { + dev_err(&pdev->dev, "can't ioremap vrfb memory\n"); + return -ENOMEM; + } + + num_ctxs = pdev->num_resources - 1; + + ctxs = devm_kzalloc(&pdev->dev, + sizeof(struct vrfb_ctx) * num_ctxs, + GFP_KERNEL); + + if (!ctxs) + return -ENOMEM; + + for (i = 0; i < num_ctxs; ++i) { + mem = platform_get_resource(pdev, IORESOURCE_MEM, 1 + i); + if (!mem) { + dev_err(&pdev->dev, "can't get vrfb ctx %d address\n", + i); + return -EINVAL; + } + + ctxs[i].base = mem->start; + } + + return 0; +} + +static struct platform_driver vrfb_driver = { + .driver.name = "omapvrfb", +}; + +static int __init vrfb_init(void) +{ + return platform_driver_probe(&vrfb_driver, &vrfb_probe); +} + +static void __exit vrfb_exit(void) +{ + platform_driver_unregister(&vrfb_driver); +} + +module_init(vrfb_init); +module_exit(vrfb_exit); + +MODULE_AUTHOR("Tomi Valkeinen "); +MODULE_DESCRIPTION("OMAP VRFB"); +MODULE_LICENSE("GPL v2");