From patchwork Wed Jun 28 19:58:44 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergei Shtylyov X-Patchwork-Id: 9815295 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 4C34960383 for ; Wed, 28 Jun 2017 19:59:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3BC2A283BD for ; Wed, 28 Jun 2017 19:59:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2E646284AF; Wed, 28 Jun 2017 19:59:17 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.4 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B8DA0283BD for ; Wed, 28 Jun 2017 19:59:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751526AbdF1T7P (ORCPT ); Wed, 28 Jun 2017 15:59:15 -0400 Received: from mail-lf0-f47.google.com ([209.85.215.47]:33491 "EHLO mail-lf0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751523AbdF1T7O (ORCPT ); Wed, 28 Jun 2017 15:59:14 -0400 Received: by mail-lf0-f47.google.com with SMTP id m77so41150694lfe.0 for ; Wed, 28 Jun 2017 12:59:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cogentembedded-com.20150623.gappssmtp.com; s=20150623; h=from:message-id:user-agent:date:to:cc:subject:mime-version :content-disposition; bh=tmebYIAE7DZNkGf4lIynt+3w4VVYVkYMd6d5rmEPApI=; b=ny9LVWlS+kshLT4xZFwIFWgwknsn47mYfKFV5wWMYWiRZiaOixO+DPmo0fa8BRhqS+ m56UzWdzER+W8NFmf8aqjQhPgKP8F09HCujVtnp+eYi6r9IrFcsAoMPCr7z2tn2tLeck 5raeE7oBOkMxyRJM6zaNs1mgeqgkJRCzqaaMUn/l1jeRq4ow60UajSG9WckzkEb3XXWU m0kvzW6HG/nKw95JzYj6g9HSGy78yF9pSWjXOmYdJFp1cK0InJNWqZaRUeDTr+vL53F9 9Loo7H7v8v7zmXhDVCB0joDqkPk8XI/QbpG3ICQAIFb8XMJ2C8fgpmMRk0zH57y9l7u2 gOnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:message-id:user-agent:date:to:cc:subject :mime-version:content-disposition; bh=tmebYIAE7DZNkGf4lIynt+3w4VVYVkYMd6d5rmEPApI=; b=ZVpcavjYTUbLfIARDLpUx58RExqg1ln0/s6tLJwsK4ppPhlnZM2nVJiCh/oKHFOcM1 ew9E4iHWBKuTorVMYL7MKJ8YE/tt/5DN5XK+6l0/zYprW3dPRA3uKmSmt6BG9/LeH+dJ h5V8NnDY+QbmGR7GgT27/X1fNnccudPeuLe9G+ddtnXnwlWksjCgn53A2mPx+ftsXz7H lT8R3lGe4x5lfwfvbW67hrXXAkSu8CksyajkxDghTZDO/oKnbp1MJ4qiiLI7jAf8To2k RtYC7oVjCMVuMM9XPrljflyaGPcZsUQzidNa6A5WANRthS3SbJBp9q0Hl5VrFgilLnw5 VgdA== X-Gm-Message-State: AKS2vOzUTL57NlkG/B6flXvoQtRNVWGvYTeeWJ+zNhiaVuvr/7olz395 RZfKe50TEBzFNItw X-Received: by 10.25.18.220 with SMTP id 89mr4188867lfs.176.1498679952863; Wed, 28 Jun 2017 12:59:12 -0700 (PDT) Received: from wasted.cogentembedded.com ([31.173.85.68]) by smtp.gmail.com with ESMTPSA id w70sm747440lfi.14.2017.06.28.12.59.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 28 Jun 2017 12:59:11 -0700 (PDT) From: Sergei Shtylyov X-Google-Original-From: "Sergei Shtylyov" Received: by wasted.cogentembedded.com (sSMTP sendmail emulation); Wed, 28 Jun 2017 22:59:09 +0300 Message-Id: <20170628195909.167061456@cogentembedded.com> User-Agent: quilt/0.64 Date: Wed, 28 Jun 2017 22:58:44 +0300 To: Rob Herring , Mark Rutland , Mauro Carvalho Chehab , devicetree@vger.kernel.org, linux-media@vger.kernel.org Cc: linux-renesas-soc@vger.kernel.org, Sergei Shtylyov Subject: [PATCH v2] media: platform: rcar_imr: add IMR-LX3 support MIME-Version: 1.0 Content-Disposition: inline; filename=media-platform-rcar_imr-add-IMR-LX3-support-v2.patch Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add support for the image renderer light extended 3 (IMR-LX3) found only in the R-Car V2H (R8A7792) SoC. It's mostly the same as IMR-LSX3 but doesn't support video capture data as a source of 2D textures. Signed-off-by: Sergei Shtylyov Acked-by: Rob Herring --- This patch is against the 'media_tree.git' repo's 'master' branch plus the latest version of the Renesas IMR driver and the patch adding IMR-LSX3 support. Changes in version 2: - refreshed the patch atop of the IMR driver patch (version 6) and IMR-LSX3 patch (version 3). Documentation/devicetree/bindings/media/rcar_imr.txt | 4 ++ drivers/media/platform/rcar_imr.c | 27 ++++++++++++------- 2 files changed, 22 insertions(+), 9 deletions(-) Index: media_tree/Documentation/devicetree/bindings/media/rcar_imr.txt =================================================================== --- media_tree.orig/Documentation/devicetree/bindings/media/rcar_imr.txt +++ media_tree/Documentation/devicetree/bindings/media/rcar_imr.txt @@ -9,6 +9,10 @@ and drawing with respect to any shape th Required properties: - compatible: + "renesas,-imr-lx3", "renesas,imr-lx3" as a fallback for the image + renderer light extended 3 (IMR-LX3) found in the R-Car gen2 SoCs, where the + examples with are: + - "renesas,r8a7792-imr-lx3" for R-Car V2H; "renesas,-imr-lsx3", "renesas,imr-lsx3" as a fallback for the image renderer light SRAM extended 3 (IMR-LSX3) found in the R-Car gen2 SoCs, where the examples with are: Index: media_tree/drivers/media/platform/rcar_imr.c =================================================================== --- media_tree.orig/drivers/media/platform/rcar_imr.c +++ media_tree/drivers/media/platform/rcar_imr.c @@ -1,5 +1,5 @@ /* - * rcar_imr.c -- R-Car IMR-LSX3/LX4 Driver + * rcar_imr.c -- R-Car IMR-LX3/LSX3/LX4 Driver * * Copyright (C) 2015-2017 Cogent Embedded, Inc. * @@ -82,6 +82,7 @@ struct imr_format_info { }; enum imr_type { + IMR_LX3, IMR_LSX3, IMR_LX4, }; @@ -163,7 +164,7 @@ struct imr_ctx { #define IMR_SSAR 0x38 #define IMR_DSTR 0x3C #define IMR_SSTR 0x40 -#define IMR_DSOR 0x50 +#define IMR_DSOR 0x50 /* IMR-LSX3/LX4 only */ #define IMR_CMRCR 0x54 #define IMR_CMRCSR 0x58 #define IMR_CMRCCR 0x5C @@ -210,7 +211,7 @@ struct imr_ctx { #define IMR_CMRCR_DUV GENMASK(4, 3) #define IMR_CMRCR_SUV_SHIFT 5 #define IMR_CMRCR_SUV GENMASK(6, 5) -#define IMR_CMRCR_YISM BIT(7) +#define IMR_CMRCR_YISM BIT(7) /* IMR-LSX3/LX4 only */ #define IMR_CMRCR_Y10 BIT(8) #define IMR_CMRCR_Y12 BIT(9) #define IMR_CMRCR_SY10 BIT(11) @@ -224,7 +225,7 @@ struct imr_ctx { #define IMR_TRIMR_AUTOSG BIT(3) #define IMR_TRIMR_TCM BIT(6) -#define IMR_TRICR_YCFORM BIT(31) +#define IMR_TRICR_YCFORM BIT(31) /* IMR-LSX3/LX4 only */ #define IMR_UVDPOR_UVDPO_SHIFT 0 #define IMR_UVDPOR_UVDPO GENMASK(2, 0) @@ -306,7 +307,7 @@ static u32 __imr_flags_common(u32 iflags return iflags & oflags & IMR_F_PLANES_MASK; } -static const struct imr_format_info imr_lsx3_formats[] = { +static const struct imr_format_info imr_lx3_formats[] = { { .fourcc = V4L2_PIX_FMT_NV16, .flags = IMR_F_Y8 | IMR_F_UV8 | IMR_F_PLANAR, @@ -372,10 +373,16 @@ static const struct imr_format_info imr_ }, }; +static const struct imr_info imr_lx3 = { + .type = IMR_LX3, + .formats = imr_lx3_formats, + .num_formats = ARRAY_SIZE(imr_lx3_formats), +}; + static const struct imr_info imr_lsx3 = { .type = IMR_LSX3, - .formats = imr_lsx3_formats, - .num_formats = ARRAY_SIZE(imr_lsx3_formats), + .formats = imr_lx3_formats, + .num_formats = ARRAY_SIZE(imr_lx3_formats), }; static const struct imr_info imr_lx4 = { @@ -798,7 +805,8 @@ static void imr_dl_program_setup(struct *dl++ = IMR_OP_WTS(IMR_CPDPOR, __imr_cpdp(type)); /* reset rendering mode registers */ - *dl++ = IMR_OP_WTS(IMR_CMRCCR, 0xDBFE); + *dl++ = IMR_OP_WTS(IMR_CMRCCR, ctx->imr->info->type >= IMR_LSX3 ? + 0xDBFE : 0xDB7E); *dl++ = IMR_OP_WTS(IMR_CMRCCR2, ctx->imr->info->type == IMR_LX4 ? 0x9065 : IMR_CMRCR2_LUTE); @@ -1919,6 +1927,7 @@ static const struct dev_pm_ops imr_pm_op /* device table */ static const struct of_device_id imr_of_match[] = { + { .compatible = "renesas,imr-lx3", .data = &imr_lx3, }, { .compatible = "renesas,imr-lsx3", .data = &imr_lsx3, }, { .compatible = "renesas,imr-lx4", .data = &imr_lx4, }, { }, @@ -1940,5 +1949,5 @@ module_platform_driver(imr_platform_driv MODULE_ALIAS("imr"); MODULE_AUTHOR("Cogent Embedded Inc. "); -MODULE_DESCRIPTION("Renesas IMR-LSX3/LX4 Driver"); +MODULE_DESCRIPTION("Renesas IMR-LX3/LSX3/LX4 Driver"); MODULE_LICENSE("GPL");