aboutsummaryrefslogtreecommitdiffstats
path: root/testing/linux-amlogic/0024-drm-meson-convert-to-the-new-canvas-module.patch
diff options
context:
space:
mode:
Diffstat (limited to 'testing/linux-amlogic/0024-drm-meson-convert-to-the-new-canvas-module.patch')
-rw-r--r--testing/linux-amlogic/0024-drm-meson-convert-to-the-new-canvas-module.patch399
1 files changed, 0 insertions, 399 deletions
diff --git a/testing/linux-amlogic/0024-drm-meson-convert-to-the-new-canvas-module.patch b/testing/linux-amlogic/0024-drm-meson-convert-to-the-new-canvas-module.patch
deleted file mode 100644
index dc8fdcb181..0000000000
--- a/testing/linux-amlogic/0024-drm-meson-convert-to-the-new-canvas-module.patch
+++ /dev/null
@@ -1,399 +0,0 @@
-From c71ba17b0625595a2c0268cb76b7032694550fb3 Mon Sep 17 00:00:00 2001
-From: Maxime Jourdan <maxi.jourdan@wanadoo.fr>
-Date: Wed, 1 Aug 2018 20:51:28 +0200
-Subject: [PATCH] drm/meson: convert to the new canvas module
-
-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 <maxi.jourdan@wanadoo.fr>
----
- .../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 057b813..60b6e13 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 = <GIC_SPI 3 IRQ_TYPE_EDGE_RISING>;
- #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 25e195f..7296b4f 100644
---- a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
-+++ b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
-@@ -538,13 +538,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 = <GIC_SPI 3 IRQ_TYPE_EDGE_RISING>;
- #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 02d400b..8929058 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 c5c4cc3..bd67429 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 08f6073..0000000
---- a/drivers/gpu/drm/meson/meson_canvas.c
-+++ /dev/null
-@@ -1,70 +0,0 @@
--/*
-- * Copyright (C) 2016 BayLibre, SAS
-- * Author: Neil Armstrong <narmstrong@baylibre.com>
-- * 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 <http://www.gnu.org/licenses/>.
-- */
--
--#include <linux/kernel.h>
--#include <linux/module.h>
--#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 af1759d..0000000
---- a/drivers/gpu/drm/meson/meson_canvas.h
-+++ /dev/null
-@@ -1,42 +0,0 @@
--/*
-- * Copyright (C) 2016 BayLibre, SAS
-- * Author: Neil Armstrong <narmstrong@baylibre.com>
-- * 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 <http://www.gnu.org/licenses/>.
-- */
--
--/* 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 4dd0df0..7c8ad06 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 */
-@@ -199,10 +198,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 d344312..de46833 100644
---- a/drivers/gpu/drm/meson/meson_drv.c
-+++ b/drivers/gpu/drm/meson/meson_drv.c
-@@ -26,6 +26,7 @@
- #include <linux/platform_device.h>
- #include <linux/component.h>
- #include <linux/of_graph.h>
-+#include <linux/of_platform.h>
-
- #include <drm/drmP.h>
- #include <drm/drm_atomic.h>
-@@ -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 8450d6ac..dfea959 100644
---- a/drivers/gpu/drm/meson/meson_drv.h
-+++ b/drivers/gpu/drm/meson/meson_drv.h
-@@ -22,15 +22,18 @@
- #include <linux/platform_device.h>
- #include <linux/regmap.h>
- #include <linux/of.h>
-+#include <linux/soc/amlogic/meson-canvas.h>
- #include <drm/drmP.h>
-
- 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 12c80df..8745f92 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 6bcfa52..5b48c4c 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"
-
- /**
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-12 14:01:55 +0000