From patchwork Wed Aug 1 18:51:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Jourdan X-Patchwork-Id: 10552807 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 93C0415E2 for ; Wed, 1 Aug 2018 18:52:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8C2F22B9F8 for ; Wed, 1 Aug 2018 18:52:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 808A32BA7A; Wed, 1 Aug 2018 18:52:21 +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=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id DD3802B9F8 for ; Wed, 1 Aug 2018 18:52:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=J+6vHBAbcicp+n6ck5Zu7WNHj6kakK4zoYTt62XkyRk=; b=e/ESo77si5aUOdlD25a1SPCalY iNDGmMyC4guzZThfEMrm3Qx4og4JM8dn9E8hmzJhZ7wsmJ/NHhrNn0UX7HOQk761wHe4xRRC9mkgF 3FxvrQsTyrPhgfpFaw/oUfRkCKP4hOVE8uAWyMYETBpSQuOIibM18upUf2Si1tPUzZgigKz7EF7zm ITq2iA7jhuMapmPT5cvtUVEs6c6cgnFER3/tBz21jU9PmVej5PcddF0Qa1HT1/VO3u0UPxBzU9WXc 9inF9MYfeVmePb+fRZnTt+EI+lTcs1gdPOOZ5V5AV9lp9LMRvh+9XiftMyDuDVoMFUrqWwnX3BlDo VAbUENdg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fkwEM-0003A2-O4; Wed, 01 Aug 2018 18:52:18 +0000 Received: from smtp10.smtpout.orange.fr ([80.12.242.132] helo=smtp.smtpout.orange.fr) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fkwEB-0002xo-RK for linux-amlogic@lists.infradead.org; Wed, 01 Aug 2018 18:52:10 +0000 Received: from localhost.localdomain ([81.67.76.113]) by mwinf5d86 with ME id Huro1y0012Sg6Vd03ury0j; Wed, 01 Aug 2018 20:51:58 +0200 X-ME-Helo: localhost.localdomain X-ME-Auth: bWF4aS5qb3VyZGFuQHdhbmFkb28uZnI= X-ME-Date: Wed, 01 Aug 2018 20:51:58 +0200 X-ME-IP: 81.67.76.113 From: Maxime Jourdan To: Kevin Hilman Subject: [PATCH 1/4] soc: amlogic: add meson-canvas driver Date: Wed, 1 Aug 2018 20:51:25 +0200 Message-Id: <20180801185128.23440-2-maxi.jourdan@wanadoo.fr> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180801185128.23440-1-maxi.jourdan@wanadoo.fr> References: <20180801185128.23440-1-maxi.jourdan@wanadoo.fr> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180801_115208_401686_B95F63F1 X-CRM114-Status: GOOD ( 20.91 ) X-BeenThere: linux-amlogic@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-amlogic@lists.infradead.org, Maxime Jourdan , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Neil Armstrong MIME-Version: 1.0 Sender: "linux-amlogic" Errors-To: linux-amlogic-bounces+patchwork-linux-amlogic=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Amlogic SoCs have a repository of 256 canvas which they use to describe pixel buffers. They contain metadata like width, height, block mode, endianness [..] Many IPs within those SoCs like vdec/vpu rely on those canvas to read/write pixels. Signed-off-by: Maxime Jourdan Tested-by: Neil Armstrong --- drivers/soc/amlogic/Kconfig | 7 + drivers/soc/amlogic/Makefile | 1 + drivers/soc/amlogic/meson-canvas.c | 182 +++++++++++++++++++++++ include/linux/soc/amlogic/meson-canvas.h | 37 +++++ 4 files changed, 227 insertions(+) create mode 100644 drivers/soc/amlogic/meson-canvas.c create mode 100644 include/linux/soc/amlogic/meson-canvas.h diff --git a/drivers/soc/amlogic/Kconfig b/drivers/soc/amlogic/Kconfig index b04f6e4aedbc..5bd049899d88 100644 --- a/drivers/soc/amlogic/Kconfig +++ b/drivers/soc/amlogic/Kconfig @@ -1,5 +1,12 @@ menu "Amlogic SoC drivers" +config MESON_CANVAS + bool "Amlogic Meson Canvas driver" + depends on ARCH_MESON || COMPILE_TEST + default ARCH_MESON + help + Say yes to support the canvas IP within Amlogic Meson Soc family. + config MESON_GX_SOCINFO bool "Amlogic Meson GX SoC Information driver" depends on ARCH_MESON || COMPILE_TEST diff --git a/drivers/soc/amlogic/Makefile b/drivers/soc/amlogic/Makefile index 8fa321893928..0ab16d35ac36 100644 --- a/drivers/soc/amlogic/Makefile +++ b/drivers/soc/amlogic/Makefile @@ -1,3 +1,4 @@ +obj-$(CONFIG_MESON_CANVAS) += meson-canvas.o obj-$(CONFIG_MESON_GX_SOCINFO) += meson-gx-socinfo.o obj-$(CONFIG_MESON_GX_PM_DOMAINS) += meson-gx-pwrc-vpu.o obj-$(CONFIG_MESON_MX_SOCINFO) += meson-mx-socinfo.o diff --git a/drivers/soc/amlogic/meson-canvas.c b/drivers/soc/amlogic/meson-canvas.c new file mode 100644 index 000000000000..671eb89c8904 --- /dev/null +++ b/drivers/soc/amlogic/meson-canvas.c @@ -0,0 +1,182 @@ +/* + * Copyright (C) 2018 Maxime Jourdan + * Copyright (C) 2016 BayLibre, SAS + * Author: Neil Armstrong + * Copyright (C) 2015 Amlogic, Inc. All rights reserved. + * Copyright (C) 2014 Endless Mobile + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see . + */ + +#include +#include +#include +#include +#include +#include +#include +#include + +#define NUM_CANVAS 256 + +/* DMC Registers */ +#define DMC_CAV_LUT_DATAL 0x48 /* 0x12 offset in data sheet */ + #define CANVAS_WIDTH_LBIT 29 + #define CANVAS_WIDTH_LWID 3 +#define DMC_CAV_LUT_DATAH 0x4c /* 0x13 offset in data sheet */ + #define CANVAS_WIDTH_HBIT 0 + #define CANVAS_HEIGHT_BIT 9 + #define CANVAS_BLKMODE_BIT 24 +#define DMC_CAV_LUT_ADDR 0x50 /* 0x14 offset in data sheet */ + #define CANVAS_LUT_WR_EN (0x2 << 8) + #define CANVAS_LUT_RD_EN (0x1 << 8) + +struct meson_canvas { + struct device *dev; + struct regmap *regmap_dmc; + struct mutex lock; + u8 used[NUM_CANVAS]; +}; + +static struct meson_canvas canvas = { 0 }; + +static int meson_canvas_setup(uint8_t canvas_index, uint32_t addr, + uint32_t stride, uint32_t height, + unsigned int wrap, + unsigned int blkmode, + unsigned int endian) +{ + struct regmap *regmap = canvas.regmap_dmc; + u32 val; + + mutex_lock(&canvas.lock); + + if (!canvas.used[canvas_index]) { + dev_err(canvas.dev, + "Trying to setup non allocated canvas %u\n", + canvas_index); + mutex_unlock(&canvas.lock); + return -EINVAL; + } + + regmap_write(regmap, DMC_CAV_LUT_DATAL, + ((addr + 7) >> 3) | + (((stride + 7) >> 3) << CANVAS_WIDTH_LBIT)); + + regmap_write(regmap, DMC_CAV_LUT_DATAH, + ((((stride + 7) >> 3) >> CANVAS_WIDTH_LWID) << + CANVAS_WIDTH_HBIT) | + (height << CANVAS_HEIGHT_BIT) | + (wrap << 22) | + (blkmode << CANVAS_BLKMODE_BIT) | + (endian << 26)); + + regmap_write(regmap, DMC_CAV_LUT_ADDR, + CANVAS_LUT_WR_EN | canvas_index); + + /* Force a read-back to make sure everything is flushed. */ + regmap_read(regmap, DMC_CAV_LUT_DATAH, &val); + mutex_unlock(&canvas.lock); + + return 0; +} + +static int meson_canvas_alloc(uint8_t *canvas_index) +{ + int i; + + mutex_lock(&canvas.lock); + for (i = 0; i < NUM_CANVAS; ++i) { + if (!canvas.used[i]) { + canvas.used[i] = 1; + mutex_unlock(&canvas.lock); + *canvas_index = i; + return 0; + } + } + mutex_unlock(&canvas.lock); + dev_err(canvas.dev, "No more canvas available\n"); + + return -ENODEV; +} + +static int meson_canvas_free(uint8_t canvas_index) +{ + mutex_lock(&canvas.lock); + if (!canvas.used[canvas_index]) { + dev_err(canvas.dev, + "Trying to free unused canvas %u\n", canvas_index); + mutex_unlock(&canvas.lock); + return -EINVAL; + } + canvas.used[canvas_index] = 0; + mutex_unlock(&canvas.lock); + + return 0; +} + +static struct meson_canvas_platform_data canvas_platform_data = { + .alloc = meson_canvas_alloc, + .free = meson_canvas_free, + .setup = meson_canvas_setup, +}; + +static int meson_canvas_probe(struct platform_device *pdev) +{ + struct regmap *regmap_dmc; + struct device *dev; + + dev = &pdev->dev; + + regmap_dmc = syscon_node_to_regmap(of_get_parent(dev->of_node)); + if (IS_ERR(regmap_dmc)) { + dev_err(&pdev->dev, "failed to get DMC regmap\n"); + return PTR_ERR(regmap_dmc); + } + + canvas.dev = dev; + canvas.regmap_dmc = regmap_dmc; + mutex_init(&canvas.lock); + + dev->platform_data = &canvas_platform_data; + + return 0; +} + +static int meson_canvas_remove(struct platform_device *pdev) +{ + mutex_destroy(&canvas.lock); + return 0; +} + +static const struct of_device_id canvas_dt_match[] = { + { .compatible = "amlogic,meson-canvas" }, + {} +}; +MODULE_DEVICE_TABLE(of, canvas_dt_match); + +static struct platform_driver meson_canvas_driver = { + .probe = meson_canvas_probe, + .remove = meson_canvas_remove, + .driver = { + .name = "meson-canvas", + .of_match_table = canvas_dt_match, + }, +}; +module_platform_driver(meson_canvas_driver); + +MODULE_ALIAS("platform:meson-canvas"); +MODULE_DESCRIPTION("AMLogic Meson Canvas driver"); +MODULE_AUTHOR("Maxime Jourdan "); +MODULE_LICENSE("GPL v2"); diff --git a/include/linux/soc/amlogic/meson-canvas.h b/include/linux/soc/amlogic/meson-canvas.h new file mode 100644 index 000000000000..af9e2415056a --- /dev/null +++ b/include/linux/soc/amlogic/meson-canvas.h @@ -0,0 +1,37 @@ +/* + * Copyright (c) 2018 Maxime Jourdan + * Author: Maxime Jourdan + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ +#ifndef MESON_CANVAS_H +#define MESON_CANVAS_H + +#include + +#define MESON_CANVAS_WRAP_NONE 0x00 +#define MESON_CANVAS_WRAP_X 0x01 +#define MESON_CANVAS_WRAP_Y 0x02 + +#define MESON_CANVAS_BLKMODE_LINEAR 0x00 +#define MESON_CANVAS_BLKMODE_32x32 0x01 +#define MESON_CANVAS_BLKMODE_64x64 0x02 + +struct meson_canvas_platform_data { + int (*alloc)(uint8_t *canvas_index); + int (*free) (uint8_t canvas_index); + int (*setup)(uint8_t canvas_index, uint32_t addr, + uint32_t stride, uint32_t height, + unsigned int wrap, + unsigned int blkmode, + unsigned int endian); +}; + +#endif From patchwork Wed Aug 1 18:51:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Jourdan X-Patchwork-Id: 10552915 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A973D13B8 for ; Wed, 1 Aug 2018 19:53:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 918472A1B3 for ; Wed, 1 Aug 2018 19:53:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 859272B7C9; Wed, 1 Aug 2018 19:53:23 +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=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 38F7B2A1B3 for ; Wed, 1 Aug 2018 19:53:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=BPcGUpeHDZPqmQGA2j0+4a76mmFmICx1Fhm2zNx28XQ=; b=Y0sSwHGpopysUEtTi8FzC1pV8U WrA2vrUP6VNf3s2OhnTQE1G8UR3ziFlSgLj73kf5409ysCvlHhpZZ9PF1/HSysabe5aoyodZX+YnN uwtpTVmSiiTIZot+iT6+Objfob2VHoLNPb4733LMGGohGWaUmtkgaeS0jWYZLYRuvdGmL3hCo2Co6 uYoyya/ximjWcwE1hQps3agNzef9LLUYhc5ANHNaZuTyZ9jyPW9s5UYtLhP7DMTQ/KoPVRxj0YGRn J97ZrjkKTr/WK6VufkqQI6noGRs/91r1Q1qvVvG5Q8dut1dDGmyPRJAZ2ZX5Y1jTQaokWBvlLXk7J aSaJbO9A==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fkxBR-000827-10; Wed, 01 Aug 2018 19:53:21 +0000 Received: from merlin.infradead.org ([2001:8b0:10b:1231::1]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fkxBJ-0007s2-W2 for linux-amlogic@bombadil.infradead.org; Wed, 01 Aug 2018 19:53:13 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.20170209; h=References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=eg8Lo98Bg4ZBJ2lS2/s61PgrZj8TA4urTWnoecQk6ck=; b=jdOVhyN6ZKoXL4OH/Qr/Jp46e 8ISR1HS18H1yVm9+I8CayfaJNwHA6e7UKtTKk5SLfyA4DPLqaWeRUGfTHZYNH+C2slWr4ir6naqX9 LMArq4dzCO4fBgdzJCg9UawSJzAZYAf2TxpUTtDqjNH36UQS2ImKQzCDoc9Meu/5ICS0CdLZ6RwDB 50KFROKvS7bs3O6+tzh8RpGgS1Gn+b6Phj92Iadq2qTweAs7Xgwuxmn+UUj/RadluISfvL+sA9lYq rUjxpYhvZLk1I2nZUXdqoDKruS9HIaZvioqS07z0Mmr3ySG8pAHMTeFhKuv/zzeTh5vvs/fMUfBK1 yP1I1lX4Q==; Received: from smtp10.smtpout.orange.fr ([80.12.242.132] helo=smtp.smtpout.orange.fr) by merlin.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fkwEZ-0000q9-5r for linux-amlogic@lists.infradead.org; Wed, 01 Aug 2018 18:52:32 +0000 Received: from localhost.localdomain ([81.67.76.113]) by mwinf5d86 with ME id Huro1y0012Sg6Vd03us00u; Wed, 01 Aug 2018 20:52:00 +0200 X-ME-Helo: localhost.localdomain X-ME-Auth: bWF4aS5qb3VyZGFuQHdhbmFkb28uZnI= X-ME-Date: Wed, 01 Aug 2018 20:52:00 +0200 X-ME-IP: 81.67.76.113 From: Maxime Jourdan To: Kevin Hilman Subject: [PATCH 2/4] dt-bindings: soc: amlogic: add meson-canvas documentation Date: Wed, 1 Aug 2018 20:51:26 +0200 Message-Id: <20180801185128.23440-3-maxi.jourdan@wanadoo.fr> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180801185128.23440-1-maxi.jourdan@wanadoo.fr> References: <20180801185128.23440-1-maxi.jourdan@wanadoo.fr> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180801_145231_440691_97289875 X-CRM114-Status: GOOD ( 13.79 ) X-BeenThere: linux-amlogic@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, Neil Armstrong , linux-kernel@vger.kernel.org, Maxime Jourdan , linux-amlogic@lists.infradead.org, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-amlogic" Errors-To: linux-amlogic-bounces+patchwork-linux-amlogic=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP DT bindings doc for amlogic,meson-canvas Signed-off-by: Maxime Jourdan --- .../soc/amlogic/amlogic,meson-canvas.txt | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 Documentation/devicetree/bindings/soc/amlogic/amlogic,meson-canvas.txt diff --git a/Documentation/devicetree/bindings/soc/amlogic/amlogic,meson-canvas.txt b/Documentation/devicetree/bindings/soc/amlogic/amlogic,meson-canvas.txt new file mode 100644 index 000000000000..96e14374b9dd --- /dev/null +++ b/Documentation/devicetree/bindings/soc/amlogic/amlogic,meson-canvas.txt @@ -0,0 +1,36 @@ +Amlogic Meson Canvas +================================ + +A canvas is a collection of metadata that describes a pixel buffer. +Those metadata include: width, height, phyaddr, wrapping, block mode +and endianness. + +Many IPs within Amlogic SoCs rely on canvas indexes to read/write pixel data +rather than use the phy addresses directly. For instance, this is the case for +the video decoders and the display. + +Amlogic SoCs have 256 canvas. + +Device Tree Bindings: +--------------------- + +Canvas Provider +-------------------------- + +Required properties: +- compatible: "amlogic,meson-canvas" + +Parent node should have the following properties : +- compatible: "amlogic,meson-gx-dmc-sysctrl", "syscon", "simple-mfd" +- reg: base address and size of the DMC system control register space. + +Example: + +sysctrl_DMC: system-controller@0 { + compatible = "amlogic,meson-gx-dmc-sysctrl", "syscon", "simple-mfd"; + reg = <0x0 0x0 0x0 0x1000>; + + canvas: canvas-provider@0 { + compatible = "amlogic,meson-canvas"; + }; +}; From patchwork Wed Aug 1 18:51:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Jourdan X-Patchwork-Id: 10552813 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B28B01708 for ; Wed, 1 Aug 2018 18:52:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AC2172580E for ; Wed, 1 Aug 2018 18:52:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9FD4226CFC; Wed, 1 Aug 2018 18:52:46 +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=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 575332580E for ; Wed, 1 Aug 2018 18:52:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=wpLwQ8gmU3a6EB0X/J/wkVNIn5wXiEEfF/SPQCF2mb4=; b=mtrW6cYGd11vrYdOxDGQrIPGQH b0hwmDSHNh+k9jSML8i5yxdXf4vpj08ihjbvmFR2YKylDdSHZjKIKl1swVlKWGiNks4FcZGK7ZUlZ moeB2KJxmvm7p+teJjZFUOIisdoqEMHxFfaw6jvTvVdXpFOWExNjZF8CCRZxw5MlVZ0V23Jb/vnKP 473yaVXwKa2YVvrsN/aO9RD9SkhOe+VvkA6DfwUKw/DF2zwEwwXx5XcdhBXGjpFrlwmz48q3mAmgH DCd55zXmoeQ5iPMW0A6WMHrIgvY11ZibOzhDntd+OREymbCXp/ZQyoQZwMFDr/snkgmJwu9L098Jr quTddQIQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fkwEm-0003lp-JJ; Wed, 01 Aug 2018 18:52:44 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fkwEU-0003LN-LK for linux-amlogic@bombadil.infradead.org; Wed, 01 Aug 2018 18:52:26 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=gmN3sjwDV7gCjUFbZIIz4KRkFOW3IT0jZXbZUnZq1kw=; b=ricXGqb/Ed+QhgmwyqoM93aKQ cWlHo/4vmUtUGzwcI0pijHhl6Tt4640NH7/xt9/HC7DPAp1eRfu6MIDS4GtvOEq72Y+48JF63vra1 vbc554nYEpYylWfhCy38RfZOxMuPWmdd5hHWbvHjcaNkPsZT+GMsDors7/BfI0t0ihl5QopXfmm9k Qn+C4j3oDd7YY1oI1U6mwSn0dwrWqrcdvnqj8tIGbe+eS7esqxDHd5ilgsaIrkQnuPSaATtQ+VRCr RVJD2GGypnoTw6rp6UYXJhkYi0NL4SpMbrnJ6tMr+zehNE1wVcVG1PbDaL1CUFigiU0Zci6zjFJ+9 EUMxDxdbQ==; Received: from smtp10.smtpout.orange.fr ([80.12.242.132] helo=smtp.smtpout.orange.fr) by casper.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fkwER-0005hN-U9 for linux-amlogic@lists.infradead.org; Wed, 01 Aug 2018 18:52:25 +0000 Received: from localhost.localdomain ([81.67.76.113]) by mwinf5d86 with ME id Huro1y0012Sg6Vd03us41M; Wed, 01 Aug 2018 20:52:04 +0200 X-ME-Helo: localhost.localdomain X-ME-Auth: bWF4aS5qb3VyZGFuQHdhbmFkb28uZnI= X-ME-Date: Wed, 01 Aug 2018 20:52:04 +0200 X-ME-IP: 81.67.76.113 From: Maxime Jourdan To: Kevin Hilman Subject: [PATCH 3/4] ARM64: dts: meson-gx: add dmcbus and canvas nodes. Date: Wed, 1 Aug 2018 20:51:27 +0200 Message-Id: <20180801185128.23440-4-maxi.jourdan@wanadoo.fr> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180801185128.23440-1-maxi.jourdan@wanadoo.fr> References: <20180801185128.23440-1-maxi.jourdan@wanadoo.fr> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180801_195223_999917_3A815274 X-CRM114-Status: UNSURE ( 8.71 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-amlogic@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, Neil Armstrong , linux-kernel@vger.kernel.org, Maxime Jourdan , linux-amlogic@lists.infradead.org, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-amlogic" Errors-To: linux-amlogic-bounces+patchwork-linux-amlogic=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Wrap the canvas node in a syscon node. Signed-off-by: Maxime Jourdan --- arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi index b8dc4dbb391b..d104b9e111fb 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi @@ -423,6 +423,23 @@ }; }; + dmcbus: bus@c8838000 { + compatible = "simple-bus"; + reg = <0x0 0xc8838000 0x0 0x1000>; + #address-cells = <2>; + #size-cells = <2>; + ranges = <0x0 0x0 0x0 0xc8838000 0x0 0x1000>; + + sysctrl_DMC: system-controller@0 { + compatible = "amlogic,meson-gx-dmc-sysctrl", "syscon", "simple-mfd"; + reg = <0x0 0x0 0x0 0x1000>; + + canvas: canvas-provider@0 { + compatible = "amlogic,meson-canvas"; + }; + }; + }; + hiubus: bus@c883c000 { compatible = "simple-bus"; reg = <0x0 0xc883c000 0x0 0x2000>; From patchwork Wed Aug 1 18:51:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Jourdan X-Patchwork-Id: 10552815 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6C80C1708 for ; Wed, 1 Aug 2018 18:52:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 66B562580E for ; Wed, 1 Aug 2018 18:52:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5A3A726E7B; Wed, 1 Aug 2018 18:52:49 +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=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 74A5A2580E for ; Wed, 1 Aug 2018 18:52:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=91lpGpX6DrR91tWCVhwWKFWWgqMoFxEUBsvRPchfrjs=; b=bJVojDRcdWRNBFJRL0wL8DNu6v 9wuaBnTJHEDgrDEgKBxh31wSKzvfuNj4fKRZczuK5EzJDQ5JuhBvkcxzKfnM6KPh00G5sBdB1Yl5l 6EaZpQ8w+tt0LjNZXt3zY3dlEQbBqgmIKHUVYs9n9GxfLzdkDgPLCYgWeKvf+K696+aHlXRT8JquO IBJRCoU/W3QHrR+YpZHrORoFfy8Cm2P5cxLUPvUyfC8XGbNpuOAml6tLepbQElL9ocwu6q+YwmJO5 UK8WX4fUbzyOd00eQA2AevIir65jmSva8W7Qm3oQ7O0wKARRc6qAU6p+LIZY0v+yVo+XK2n0IeX34 RL/jDIBw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fkwEo-0003oH-8o; Wed, 01 Aug 2018 18:52:46 +0000 Received: from smtp10.smtpout.orange.fr ([80.12.242.132] helo=smtp.smtpout.orange.fr) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fkwEM-0002yw-OI for linux-amlogic@lists.infradead.org; Wed, 01 Aug 2018 18:52:28 +0000 Received: from localhost.localdomain ([81.67.76.113]) by mwinf5d86 with ME id Huro1y0012Sg6Vd03us61a; Wed, 01 Aug 2018 20:52:07 +0200 X-ME-Helo: localhost.localdomain X-ME-Auth: bWF4aS5qb3VyZGFuQHdhbmFkb28uZnI= X-ME-Date: Wed, 01 Aug 2018 20:52:07 +0200 X-ME-IP: 81.67.76.113 From: Maxime Jourdan To: Neil Armstrong Subject: [PATCH 4/4] drm/meson: convert to the new canvas module Date: Wed, 1 Aug 2018 20:51:28 +0200 Message-Id: <20180801185128.23440-5-maxi.jourdan@wanadoo.fr> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180801185128.23440-1-maxi.jourdan@wanadoo.fr> References: <20180801185128.23440-1-maxi.jourdan@wanadoo.fr> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180801_115220_408140_FB63A3AC X-CRM114-Status: GOOD ( 25.04 ) X-BeenThere: linux-amlogic@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, Kevin Hilman , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Maxime Jourdan , linux-amlogic@lists.infradead.org, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-amlogic" Errors-To: linux-amlogic-bounces+patchwork-linux-amlogic=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP This removes the meson_canvas files within the meson/drm layer and makes use of the new canvas module that is referenced in the dts. Canvases can be used by different IPs and modules, and it is as such preferable to rely on a module that can safely dispatch canvases on demand. Signed-off-by: Maxime Jourdan --- .../bindings/display/amlogic,meson-vpu.txt | 9 +-- arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 7 +- drivers/gpu/drm/meson/Kconfig | 1 + drivers/gpu/drm/meson/Makefile | 2 +- drivers/gpu/drm/meson/meson_canvas.c | 70 ------------------- drivers/gpu/drm/meson/meson_canvas.h | 42 ----------- drivers/gpu/drm/meson/meson_crtc.c | 5 +- drivers/gpu/drm/meson/meson_drv.c | 35 ++++++---- drivers/gpu/drm/meson/meson_drv.h | 5 +- drivers/gpu/drm/meson/meson_plane.c | 3 +- drivers/gpu/drm/meson/meson_viu.c | 1 - 11 files changed, 39 insertions(+), 141 deletions(-) delete mode 100644 drivers/gpu/drm/meson/meson_canvas.c delete mode 100644 drivers/gpu/drm/meson/meson_canvas.h diff --git a/Documentation/devicetree/bindings/display/amlogic,meson-vpu.txt b/Documentation/devicetree/bindings/display/amlogic,meson-vpu.txt index 057b81335775..60b6e1398636 100644 --- a/Documentation/devicetree/bindings/display/amlogic,meson-vpu.txt +++ b/Documentation/devicetree/bindings/display/amlogic,meson-vpu.txt @@ -60,9 +60,9 @@ Required properties: - reg: base address and size of he following memory-mapped regions : - vpu - hhi - - dmc - reg-names: should contain the names of the previous memory regions - interrupts: should contain the VENC Vsync interrupt number +- amlogic,canvas: should point to a meson canvas provider node Optional properties: - power-domains: Optional phandle to associated power domain as described in @@ -98,13 +98,14 @@ tv-connector { vpu: vpu@d0100000 { compatible = "amlogic,meson-gxbb-vpu"; reg = <0x0 0xd0100000 0x0 0x100000>, - <0x0 0xc883c000 0x0 0x1000>, - <0x0 0xc8838000 0x0 0x1000>; - reg-names = "vpu", "hhi", "dmc"; + <0x0 0xc883c000 0x0 0x1000>; + reg-names = "vpu", "hhi"; interrupts = ; #address-cells = <1>; #size-cells = <0>; + amlogic,canvas = <&canvas>; + /* CVBS VDAC output port */ port@0 { reg = <0>; diff --git a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi index d104b9e111fb..7c4d971ecd80 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi @@ -503,13 +503,14 @@ vpu: vpu@d0100000 { compatible = "amlogic,meson-gx-vpu"; reg = <0x0 0xd0100000 0x0 0x100000>, - <0x0 0xc883c000 0x0 0x1000>, - <0x0 0xc8838000 0x0 0x1000>; - reg-names = "vpu", "hhi", "dmc"; + <0x0 0xc883c000 0x0 0x1000>; + reg-names = "vpu", "hhi"; interrupts = ; #address-cells = <1>; #size-cells = <0>; + amlogic,canvas = <&canvas>; + /* CVBS VDAC output port */ cvbs_vdac_port: port@0 { reg = <0>; diff --git a/drivers/gpu/drm/meson/Kconfig b/drivers/gpu/drm/meson/Kconfig index 3ce51d8dfe1c..c28b69f48555 100644 --- a/drivers/gpu/drm/meson/Kconfig +++ b/drivers/gpu/drm/meson/Kconfig @@ -7,6 +7,7 @@ config DRM_MESON select DRM_GEM_CMA_HELPER select VIDEOMODE_HELPERS select REGMAP_MMIO + select MESON_CANVAS config DRM_MESON_DW_HDMI tristate "HDMI Synopsys Controller support for Amlogic Meson Display" diff --git a/drivers/gpu/drm/meson/Makefile b/drivers/gpu/drm/meson/Makefile index c5c4cc362f02..bd67429185ff 100644 --- a/drivers/gpu/drm/meson/Makefile +++ b/drivers/gpu/drm/meson/Makefile @@ -1,5 +1,5 @@ meson-drm-y := meson_drv.o meson_plane.o meson_crtc.o meson_venc_cvbs.o -meson-drm-y += meson_viu.o meson_vpp.o meson_venc.o meson_vclk.o meson_canvas.o +meson-drm-y += meson_viu.o meson_vpp.o meson_venc.o meson_vclk.o obj-$(CONFIG_DRM_MESON) += meson-drm.o obj-$(CONFIG_DRM_MESON_DW_HDMI) += meson_dw_hdmi.o diff --git a/drivers/gpu/drm/meson/meson_canvas.c b/drivers/gpu/drm/meson/meson_canvas.c deleted file mode 100644 index 08f6073d967e..000000000000 --- a/drivers/gpu/drm/meson/meson_canvas.c +++ /dev/null @@ -1,70 +0,0 @@ -/* - * Copyright (C) 2016 BayLibre, SAS - * Author: Neil Armstrong - * Copyright (C) 2015 Amlogic, Inc. All rights reserved. - * Copyright (C) 2014 Endless Mobile - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, see . - */ - -#include -#include -#include "meson_drv.h" -#include "meson_canvas.h" -#include "meson_registers.h" - -/** - * DOC: Canvas - * - * CANVAS is a memory zone where physical memory frames information - * are stored for the VIU to scanout. - */ - -/* DMC Registers */ -#define DMC_CAV_LUT_DATAL 0x48 /* 0x12 offset in data sheet */ -#define CANVAS_WIDTH_LBIT 29 -#define CANVAS_WIDTH_LWID 3 -#define DMC_CAV_LUT_DATAH 0x4c /* 0x13 offset in data sheet */ -#define CANVAS_WIDTH_HBIT 0 -#define CANVAS_HEIGHT_BIT 9 -#define CANVAS_BLKMODE_BIT 24 -#define DMC_CAV_LUT_ADDR 0x50 /* 0x14 offset in data sheet */ -#define CANVAS_LUT_WR_EN (0x2 << 8) -#define CANVAS_LUT_RD_EN (0x1 << 8) - -void meson_canvas_setup(struct meson_drm *priv, - uint32_t canvas_index, uint32_t addr, - uint32_t stride, uint32_t height, - unsigned int wrap, - unsigned int blkmode) -{ - unsigned int val; - - regmap_write(priv->dmc, DMC_CAV_LUT_DATAL, - (((addr + 7) >> 3)) | - (((stride + 7) >> 3) << CANVAS_WIDTH_LBIT)); - - regmap_write(priv->dmc, DMC_CAV_LUT_DATAH, - ((((stride + 7) >> 3) >> CANVAS_WIDTH_LWID) << - CANVAS_WIDTH_HBIT) | - (height << CANVAS_HEIGHT_BIT) | - (wrap << 22) | - (blkmode << CANVAS_BLKMODE_BIT)); - - regmap_write(priv->dmc, DMC_CAV_LUT_ADDR, - CANVAS_LUT_WR_EN | canvas_index); - - /* Force a read-back to make sure everything is flushed. */ - regmap_read(priv->dmc, DMC_CAV_LUT_DATAH, &val); -} diff --git a/drivers/gpu/drm/meson/meson_canvas.h b/drivers/gpu/drm/meson/meson_canvas.h deleted file mode 100644 index af1759da4b27..000000000000 --- a/drivers/gpu/drm/meson/meson_canvas.h +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (C) 2016 BayLibre, SAS - * Author: Neil Armstrong - * Copyright (C) 2014 Endless Mobile - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, see . - */ - -/* Canvas LUT Memory */ - -#ifndef __MESON_CANVAS_H -#define __MESON_CANVAS_H - -#define MESON_CANVAS_ID_OSD1 0x4e - -/* Canvas configuration. */ -#define MESON_CANVAS_WRAP_NONE 0x00 -#define MESON_CANVAS_WRAP_X 0x01 -#define MESON_CANVAS_WRAP_Y 0x02 - -#define MESON_CANVAS_BLKMODE_LINEAR 0x00 -#define MESON_CANVAS_BLKMODE_32x32 0x01 -#define MESON_CANVAS_BLKMODE_64x64 0x02 - -void meson_canvas_setup(struct meson_drm *priv, - uint32_t canvas_index, uint32_t addr, - uint32_t stride, uint32_t height, - unsigned int wrap, - unsigned int blkmode); - -#endif /* __MESON_CANVAS_H */ diff --git a/drivers/gpu/drm/meson/meson_crtc.c b/drivers/gpu/drm/meson/meson_crtc.c index 05520202c967..506b3619c983 100644 --- a/drivers/gpu/drm/meson/meson_crtc.c +++ b/drivers/gpu/drm/meson/meson_crtc.c @@ -36,7 +36,6 @@ #include "meson_venc.h" #include "meson_vpp.h" #include "meson_viu.h" -#include "meson_canvas.h" #include "meson_registers.h" /* CRTC definition */ @@ -193,10 +192,10 @@ void meson_crtc_irq(struct meson_drm *priv) } else meson_vpp_disable_interlace_vscaler_osd1(priv); - meson_canvas_setup(priv, MESON_CANVAS_ID_OSD1, + priv->canvas_ops->setup(priv->canvas_id_osd1, priv->viu.osd1_addr, priv->viu.osd1_stride, priv->viu.osd1_height, MESON_CANVAS_WRAP_NONE, - MESON_CANVAS_BLKMODE_LINEAR); + MESON_CANVAS_BLKMODE_LINEAR, 0); /* Enable OSD1 */ writel_bits_relaxed(VPP_OSD1_POSTBLEND, VPP_OSD1_POSTBLEND, diff --git a/drivers/gpu/drm/meson/meson_drv.c b/drivers/gpu/drm/meson/meson_drv.c index d3443125e661..de468339d75a 100644 --- a/drivers/gpu/drm/meson/meson_drv.c +++ b/drivers/gpu/drm/meson/meson_drv.c @@ -26,6 +26,7 @@ #include #include #include +#include #include #include @@ -47,7 +48,6 @@ #include "meson_vpp.h" #include "meson_viu.h" #include "meson_venc.h" -#include "meson_canvas.h" #include "meson_registers.h" #define DRIVER_NAME "meson" @@ -165,6 +165,8 @@ static int meson_drv_bind_master(struct device *dev, bool has_components) struct meson_drm *priv; struct drm_device *drm; struct resource *res; + struct device_node *canvas; + struct platform_device *canvas_pdev; void __iomem *regs; int ret; @@ -211,31 +213,35 @@ static int meson_drv_bind_master(struct device *dev, bool has_components) priv->hhi = devm_regmap_init_mmio(dev, regs, &meson_regmap_config); if (IS_ERR(priv->hhi)) { - dev_err(&pdev->dev, "Couldn't create the HHI regmap\n"); + dev_err(dev, "Couldn't create the HHI regmap\n"); ret = PTR_ERR(priv->hhi); goto free_drm; } - res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "dmc"); - if (!res) { - ret = -EINVAL; + canvas = of_parse_phandle(dev->of_node, "amlogic,canvas", 0); + if (!canvas) { + ret = -ENODEV; goto free_drm; } - /* Simply ioremap since it may be a shared register zone */ - regs = devm_ioremap(dev, res->start, resource_size(res)); - if (!regs) { - ret = -EADDRNOTAVAIL; + + canvas_pdev = of_find_device_by_node(canvas); + if (!canvas_pdev) { + dev_err(dev, "Unable to find canvas pdev\n"); + ret = -ENODEV; goto free_drm; } - priv->dmc = devm_regmap_init_mmio(dev, regs, - &meson_regmap_config); - if (IS_ERR(priv->dmc)) { - dev_err(&pdev->dev, "Couldn't create the DMC regmap\n"); - ret = PTR_ERR(priv->dmc); + priv->canvas_ops = dev_get_platdata(&canvas_pdev->dev); + if (!priv->canvas_ops) { + dev_err(dev, "canvas pdata structure NULL\n"); + ret = -EINVAL; goto free_drm; } + ret = priv->canvas_ops->alloc(&priv->canvas_id_osd1); + if (ret) + goto free_drm; + priv->vsync_irq = platform_get_irq(pdev, 0); ret = drm_vblank_init(drm, 1); @@ -315,6 +321,7 @@ static void meson_drv_unbind(struct device *dev) struct drm_device *drm = dev_get_drvdata(dev); struct meson_drm *priv = drm->dev_private; + priv->canvas_ops->free(priv->canvas_id_osd1); drm_dev_unregister(drm); drm_kms_helper_poll_fini(drm); drm_fbdev_cma_fini(priv->fbdev); diff --git a/drivers/gpu/drm/meson/meson_drv.h b/drivers/gpu/drm/meson/meson_drv.h index 8450d6ac8c9b..dfea959baaa3 100644 --- a/drivers/gpu/drm/meson/meson_drv.h +++ b/drivers/gpu/drm/meson/meson_drv.h @@ -22,15 +22,18 @@ #include #include #include +#include #include struct meson_drm { struct device *dev; void __iomem *io_base; struct regmap *hhi; - struct regmap *dmc; int vsync_irq; + struct meson_canvas_platform_data *canvas_ops; + uint8_t canvas_id_osd1; + struct drm_device *drm; struct drm_crtc *crtc; struct drm_fbdev_cma *fbdev; diff --git a/drivers/gpu/drm/meson/meson_plane.c b/drivers/gpu/drm/meson/meson_plane.c index 12c80dfcff59..8745f9209625 100644 --- a/drivers/gpu/drm/meson/meson_plane.c +++ b/drivers/gpu/drm/meson/meson_plane.c @@ -36,7 +36,6 @@ #include "meson_plane.h" #include "meson_vpp.h" #include "meson_viu.h" -#include "meson_canvas.h" #include "meson_registers.h" struct meson_plane { @@ -105,7 +104,7 @@ static void meson_plane_atomic_update(struct drm_plane *plane, OSD_BLK0_ENABLE; /* Set up BLK0 to point to the right canvas */ - priv->viu.osd1_blk0_cfg[0] = ((MESON_CANVAS_ID_OSD1 << OSD_CANVAS_SEL) | + priv->viu.osd1_blk0_cfg[0] = ((priv->canvas_id_osd1 << OSD_CANVAS_SEL) | OSD_ENDIANNESS_LE); /* On GXBB, Use the old non-HDR RGB2YUV converter */ diff --git a/drivers/gpu/drm/meson/meson_viu.c b/drivers/gpu/drm/meson/meson_viu.c index 6bcfa527c180..5b48c4c0985b 100644 --- a/drivers/gpu/drm/meson/meson_viu.c +++ b/drivers/gpu/drm/meson/meson_viu.c @@ -25,7 +25,6 @@ #include "meson_viu.h" #include "meson_vpp.h" #include "meson_venc.h" -#include "meson_canvas.h" #include "meson_registers.h" /**