From patchwork Thu Jun 28 13:36:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 140448 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp2199339ljj; Thu, 28 Jun 2018 06:36:57 -0700 (PDT) X-Google-Smtp-Source: ADUXVKJiSvadwcTPdL3yWPu8z6DTnVuMfnTuHaxyQAeOmo52Yb+ZFJBAxp9WFz6u1AAa3QLoGjhT X-Received: by 2002:a17:902:3343:: with SMTP id a61-v6mr10432218plc.241.1530193017240; Thu, 28 Jun 2018 06:36:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530193017; cv=none; d=google.com; s=arc-20160816; b=fQYb9GCOwjSRqCaljng4OuSGHXbyLu0N7xFH/XoSS+QvXe5gvc1PGsL/CLkzQjQ2F/ 50RhrW5YCG9st6LfyoD96PS6FDIqmcoz8q6ggP8eZA2D/l7AGdoOJQm7pmm1pxZtm4s1 3GWHbZU0ZQ0EYef835XNl+OJWB6vXYeVCDlexcpboohLip77oElFHFczJsZP+R3Uzwb4 9TdwJAW46kplR+Zu5Tmh0/hmzPq68l/yoxC/yb856/E3YBUgZef4s4nswp9RGjD4tjq+ tr+3R4708SzHXnJJhKGSuMKUbQ80Rfkjr0EkOpzj8dqUYU+xbbfRsKpyajtm2qHP7m+G VHdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:message-id:date:subject:to:from:delivered-to :arc-authentication-results; bh=MTTn2cC1YgVmf1QUBWdW9T8JFcxiJ9iOz9hYpZJm80M=; b=IbaVIvDsORliHQUXoLpGlGZH+WNu7JwiIN8lMo2CUO7I4rtaxixBktTuyGyzX7eMRh tESzTPHvGNnIJ0ZvNpCBEKx5/VcBXKBKDY1uJblUSysEx1SW57C+fROGqH4kppcS77xa FQPJW/Alaal+AYAfLApI3HF4u5wG30Wqz9iBKtdjXDPvQ2rv1NFAoV0kur/Nnc4RKWQW lNqYMjC8zBlo/E1mkVUTiV3Z4U+9xcDfwV8Ju1giRnWxM+Vt35WPOmwbWVq+L8VaWcOf OcoRpO/28UlRRV1hLFlph9K5N2NR8KxWKZgVYVP+R8jobscebKxQkRbj8cHR3a/15cgR //Og== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from gabe.freedesktop.org (gabe.freedesktop.org. [131.252.210.177]) by mx.google.com with ESMTPS id 84-v6si6850681pfz.8.2018.06.28.06.36.57 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 28 Jun 2018 06:36:57 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) client-ip=131.252.210.177; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id ED1096EDAC; Thu, 28 Jun 2018 13:36:55 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-lj1-x244.google.com (mail-lj1-x244.google.com [IPv6:2a00:1450:4864:20::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id 60C626EDAC for ; Thu, 28 Jun 2018 13:36:54 +0000 (UTC) Received: by mail-lj1-x244.google.com with SMTP id u6-v6so4524572lju.13 for ; Thu, 28 Jun 2018 06:36:54 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=BXgKS/M9aRnwouGzSpdTqXZp/P5XIwIN0uouggTFX90=; b=rsntwcH22f+9gMu0a5fkkMr6n1aEgeXWf08b5eun09lTr6C65XopchWDtNIkoxLaLq BtZSNL6Tmbb3UOoDglU8AlNUoHmf3FoKji1IVcZYTa4R7lk0l/VdojgRNAHdQmHSNCiM iZ9i6bqF17HhTX42BId25CqDJdTQ1PYkQxG5eqAba1VmuViJ6JYeZQaXMzMXQO1XlBZm TD5qW4+wAS5K0LisFQivLn3uanQ582hiCruy/QJ+80gT+DpOtlpfp5bTvpGXUCAjtF/v 9a6KzzKN3QhhHQX2elkBof9wbtJY3j8DRjVlPenJaeZFdsous1GgNs/Ihsa5H1kpRgkr rc1Q== X-Gm-Message-State: APt69E0xDUrnbVRj5Kb85J+/qbxOGFF/yiq1xiYKCKMuPL01p1etGPfa F4FLBEhnI+F3hHsXjb2OC/S2Xw== X-Received: by 2002:a2e:5bc8:: with SMTP id m69-v6mr7654247lje.115.1530193012723; Thu, 28 Jun 2018 06:36:52 -0700 (PDT) Received: from genomnajs.ideon.se ([85.235.10.227]) by smtp.gmail.com with ESMTPSA id h20-v6sm789626lfl.77.2018.06.28.06.36.50 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 28 Jun 2018 06:36:51 -0700 (PDT) From: Linus Walleij To: Sudeep Holla , Lorenzo Pieralisi , linux-arm-kernel@lists.infradead.org Subject: [PATCH 1/3 v3] ARM: dts: Modernize the Vexpress PL111 integration Date: Thu, 28 Jun 2018 15:36:46 +0200 Message-Id: <20180628133648.6765-1-linus.walleij@linaro.org> X-Mailer: git-send-email 2.17.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Liviu Dudau , dri-devel@lists.freedesktop.org, Mali DP Maintainers , Robin Murphy MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" The Versatile Express was submitted with the actual display bridges unconnected (but defined in the device tree) and mock "panels" encoded in the device tree node of the PL111 controller. This doesn't even remotely describe the actual Versatile Express hardware. Exploit the SiI9022 bridge by connecting the PL111 pads to it, making it use EDID or fallback values to drive the monitor. The also has to use the reserved memory through the CMA pool rather than by open coding a memory region and remapping it explicitly in the driver. To achieve this, a reserved-memory node must exist in the root of the device tree, so we need to pull that out of the motherboard .dtsi include files, and push it into each top-level device tree instead. We do the same manouver for all the Versatile Express boards, taking into account the different location of the video RAM depending on which chip select is used on each platform. This plays nicely with the new PL111 DRM driver and follows the standard ways of assigning bridges and memory pools for graphics. Cc: Sudeep Holla Cc: Lorenzo Pieralisi Cc: Liviu Dudau Cc: Mali DP Maintainers Cc: Robin Murphy Signed-off-by: Linus Walleij --- ChangeLog v2->v3: - Add some reg = <0>; to the ports to make the DTC happy. - Add reserved memory node to arch/arm64/boot/dts/arm/vexpress-v2f-1xv7-ca53x2.dts as well. ChangeLog v1->v2: - Fix up the memory address for the -rs1 tiles to 0x18000000 - Drop a bunch of extraneous reg props from the DVI adapter --- arch/arm/boot/dts/vexpress-v2m-rs1.dtsi | 45 ++++++------------ arch/arm/boot/dts/vexpress-v2m.dtsi | 46 ++++++------------- arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts | 14 ++++++ arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts | 14 ++++++ arch/arm/boot/dts/vexpress-v2p-ca5s.dts | 14 ++++++ arch/arm/boot/dts/vexpress-v2p-ca9.dts | 41 +++++++---------- arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts | 14 ++++++ .../boot/dts/arm/rtsm_ve-motherboard.dtsi | 37 ++------------- .../boot/dts/arm/vexpress-v2f-1xv7-ca53x2.dts | 14 ++++++ 9 files changed, 121 insertions(+), 118 deletions(-) diff --git a/arch/arm/boot/dts/vexpress-v2m-rs1.dtsi b/arch/arm/boot/dts/vexpress-v2m-rs1.dtsi index 4488c8fe213a..80a1333d69fd 100644 --- a/arch/arm/boot/dts/vexpress-v2m-rs1.dtsi +++ b/arch/arm/boot/dts/vexpress-v2m-rs1.dtsi @@ -43,11 +43,6 @@ bank-width = <4>; }; - v2m_video_ram: vram@2,00000000 { - compatible = "arm,vexpress-vram"; - reg = <2 0x00000000 0x00800000>; - }; - ethernet@2,02000000 { compatible = "smsc,lan9118", "smsc,lan9115"; reg = <2 0x02000000 0x10000>; @@ -230,6 +225,15 @@ dvi-transmitter@39 { compatible = "sil,sii9022-tpi", "sil,sii9022"; reg = <0x39>; + + ports { + port@0 { + reg = <0>; + dvi_bridge_in: endpoint { + remote-endpoint = <&clcd_pads>; + }; + }; + }; }; dvi-transmitter@60 { @@ -260,37 +264,16 @@ interrupts = <14>; clocks = <&v2m_oscclk1>, <&smbclk>; clock-names = "clcdclk", "apb_pclk"; - memory-region = <&v2m_video_ram>; - max-memory-bandwidth = <50350000>; /* 16bpp @ 25.175MHz */ + /* 800x600 16bpp @36MHz works fine */ + max-memory-bandwidth = <54000000>; + memory-region = <&vram>; port { - v2m_clcd_pads: endpoint { - remote-endpoint = <&v2m_clcd_panel>; + clcd_pads: endpoint { + remote-endpoint = <&dvi_bridge_in>; arm,pl11x,tft-r0g0b0-pads = <0 8 16>; }; }; - - panel { - compatible = "panel-dpi"; - - port { - v2m_clcd_panel: endpoint { - remote-endpoint = <&v2m_clcd_pads>; - }; - }; - - panel-timing { - clock-frequency = <25175000>; - hactive = <640>; - hback-porch = <40>; - hfront-porch = <24>; - hsync-len = <96>; - vactive = <480>; - vback-porch = <32>; - vfront-porch = <11>; - vsync-len = <2>; - }; - }; }; }; diff --git a/arch/arm/boot/dts/vexpress-v2m.dtsi b/arch/arm/boot/dts/vexpress-v2m.dtsi index 4db42f6326a3..863aa2bfb38f 100644 --- a/arch/arm/boot/dts/vexpress-v2m.dtsi +++ b/arch/arm/boot/dts/vexpress-v2m.dtsi @@ -43,11 +43,6 @@ bank-width = <4>; }; - v2m_video_ram: vram@3,00000000 { - compatible = "arm,vexpress-vram"; - reg = <3 0x00000000 0x00800000>; - }; - ethernet@3,02000000 { compatible = "smsc,lan9118", "smsc,lan9115"; reg = <3 0x02000000 0x10000>; @@ -230,6 +225,15 @@ dvi-transmitter@39 { compatible = "sil,sii9022-tpi", "sil,sii9022"; reg = <0x39>; + + ports { + port@0 { + reg = <0>; + dvi_bridge_in: endpoint { + remote-endpoint = <&clcd_pads>; + }; + }; + }; }; dvi-transmitter@60 { @@ -253,6 +257,7 @@ reg-shift = <2>; }; + clcd@1f000 { compatible = "arm,pl111", "arm,primecell"; reg = <0x1f000 0x1000>; @@ -260,37 +265,16 @@ interrupts = <14>; clocks = <&v2m_oscclk1>, <&smbclk>; clock-names = "clcdclk", "apb_pclk"; - memory-region = <&v2m_video_ram>; - max-memory-bandwidth = <50350000>; /* 16bpp @ 25.175MHz */ + /* 800x600 16bpp @36MHz works fine */ + max-memory-bandwidth = <54000000>; + memory-region = <&vram>; port { - v2m_clcd_pads: endpoint { - remote-endpoint = <&v2m_clcd_panel>; + clcd_pads_mb: endpoint { + remote-endpoint = <&dvi_bridge_in>; arm,pl11x,tft-r0g0b0-pads = <0 8 16>; }; }; - - panel { - compatible = "panel-dpi"; - - port { - v2m_clcd_panel: endpoint { - remote-endpoint = <&v2m_clcd_pads>; - }; - }; - - panel-timing { - clock-frequency = <25175000>; - hactive = <640>; - hback-porch = <40>; - hfront-porch = <24>; - hsync-len = <96>; - vactive = <480>; - vback-porch = <32>; - vfront-porch = <11>; - vsync-len = <2>; - }; - }; }; }; diff --git a/arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts b/arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts index 3971427a105b..0dc4277d5f8b 100644 --- a/arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts +++ b/arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts @@ -53,6 +53,20 @@ reg = <0 0x80000000 0 0x40000000>; }; + reserved-memory { + #address-cells = <2>; + #size-cells = <2>; + ranges; + + /* Chipselect 2 is physically at 0x18000000 */ + vram: vram@18000000 { + /* 8 MB of designated video RAM */ + compatible = "shared-dma-pool"; + reg = <0 0x18000000 0 0x00800000>; + no-map; + }; + }; + hdlcd@2b000000 { compatible = "arm,hdlcd"; reg = <0 0x2b000000 0 0x1000>; diff --git a/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts b/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts index ac6b90e9d806..a5136b1adaa2 100644 --- a/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts +++ b/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts @@ -104,6 +104,20 @@ reg = <0 0x80000000 0 0x40000000>; }; + reserved-memory { + #address-cells = <2>; + #size-cells = <2>; + ranges; + + /* Chipselect 2 is physically at 0x18000000 */ + vram: vram@18000000 { + /* 8 MB of designated video RAM */ + compatible = "shared-dma-pool"; + reg = <0 0x18000000 0 0x00800000>; + no-map; + }; + }; + wdt@2a490000 { compatible = "arm,sp805", "arm,primecell"; reg = <0 0x2a490000 0 0x1000>; diff --git a/arch/arm/boot/dts/vexpress-v2p-ca5s.dts b/arch/arm/boot/dts/vexpress-v2p-ca5s.dts index e5b4a7570a01..d5b47d526f9e 100644 --- a/arch/arm/boot/dts/vexpress-v2p-ca5s.dts +++ b/arch/arm/boot/dts/vexpress-v2p-ca5s.dts @@ -55,6 +55,20 @@ reg = <0x80000000 0x40000000>; }; + reserved-memory { + #address-cells = <1>; + #size-cells = <1>; + ranges; + + /* Chipselect 2 is physically at 0x18000000 */ + vram: vram@18000000 { + /* 8 MB of designated video RAM */ + compatible = "shared-dma-pool"; + reg = <0x18000000 0x00800000>; + no-map; + }; + }; + hdlcd@2a110000 { compatible = "arm,hdlcd"; reg = <0x2a110000 0x1000>; diff --git a/arch/arm/boot/dts/vexpress-v2p-ca9.dts b/arch/arm/boot/dts/vexpress-v2p-ca9.dts index 7ec3dac1f61d..7252bcce2086 100644 --- a/arch/arm/boot/dts/vexpress-v2p-ca9.dts +++ b/arch/arm/boot/dts/vexpress-v2p-ca9.dts @@ -69,6 +69,20 @@ reg = <0x60000000 0x40000000>; }; + reserved-memory { + #address-cells = <1>; + #size-cells = <1>; + ranges; + + /* Chipselect 3 is physically at 0x4c000000 */ + vram: vram@4c000000 { + /* 8 MB of designated video RAM */ + compatible = "shared-dma-pool"; + reg = <0x4c000000 0x00800000>; + no-map; + }; + }; + clcd@10020000 { compatible = "arm,pl111", "arm,primecell"; reg = <0x10020000 0x1000>; @@ -76,36 +90,15 @@ interrupts = <0 44 4>; clocks = <&oscclk1>, <&oscclk2>; clock-names = "clcdclk", "apb_pclk"; - max-memory-bandwidth = <130000000>; /* 16bpp @ 63.5MHz */ + /* 1024x768 16bpp @65MHz */ + max-memory-bandwidth = <95000000>; port { clcd_pads: endpoint { - remote-endpoint = <&clcd_panel>; + remote-endpoint = <&dvi_bridge_in>; arm,pl11x,tft-r0g0b0-pads = <0 8 16>; }; }; - - panel { - compatible = "panel-dpi"; - - port { - clcd_panel: endpoint { - remote-endpoint = <&clcd_pads>; - }; - }; - - panel-timing { - clock-frequency = <63500127>; - hactive = <1024>; - hback-porch = <152>; - hfront-porch = <48>; - hsync-len = <104>; - vactive = <768>; - vback-porch = <23>; - vfront-porch = <3>; - vsync-len = <4>; - }; - }; }; memory-controller@100e0000 { diff --git a/arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts b/arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts index 602f63f72c37..119e4d50e7ff 100644 --- a/arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts +++ b/arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts @@ -78,6 +78,20 @@ <0x00000008 0x80000000 0 0x80000000>; }; + reserved-memory { + #address-cells = <1>; + #size-cells = <1>; + ranges; + + /* Chipselect 2 is physically at 0x48000000 */ + vram: vram@48000000 { + /* 8 MB of designated video RAM */ + compatible = "shared-dma-pool"; + reg = <0x48000000 0x00800000>; + no-map; + }; + }; + gic: interrupt-controller@2c001000 { compatible = "arm,cortex-a15-gic", "arm,cortex-a9-gic"; #interrupt-cells = <3>; diff --git a/arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi b/arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi index d2dbc3f39263..79ea861b48df 100644 --- a/arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi +++ b/arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi @@ -24,11 +24,6 @@ bank-width = <4>; }; - v2m_video_ram: vram@2,00000000 { - compatible = "arm,vexpress-vram"; - reg = <2 0x00000000 0x00800000>; - }; - ethernet@2,02000000 { compatible = "smsc,lan91c111"; reg = <2 0x02000000 0x10000>; @@ -187,38 +182,16 @@ interrupts = <14>; clocks = <&v2m_oscclk1>, <&v2m_clk24mhz>; clock-names = "clcdclk", "apb_pclk"; - arm,pl11x,framebuffer = <0x18000000 0x00180000>; - memory-region = <&v2m_video_ram>; - max-memory-bandwidth = <130000000>; /* 16bpp @ 63.5MHz */ + /* 800x600 16bpp @36MHz works fine */ + max-memory-bandwidth = <54000000>; + memory-region = <&vram>; port { - v2m_clcd_pads: endpoint { - remote-endpoint = <&v2m_clcd_panel>; + clcd_pads: endpoint { + remote-endpoint = <&dvi_bridge_in>; arm,pl11x,tft-r0g0b0-pads = <0 8 16>; }; }; - - panel { - compatible = "panel-dpi"; - - port { - v2m_clcd_panel: endpoint { - remote-endpoint = <&v2m_clcd_pads>; - }; - }; - - panel-timing { - clock-frequency = <63500127>; - hactive = <1024>; - hback-porch = <152>; - hfront-porch = <48>; - hsync-len = <104>; - vactive = <768>; - vback-porch = <23>; - vfront-porch = <3>; - vsync-len = <4>; - }; - }; }; virtio-block@130000 { diff --git a/arch/arm64/boot/dts/arm/vexpress-v2f-1xv7-ca53x2.dts b/arch/arm64/boot/dts/arm/vexpress-v2f-1xv7-ca53x2.dts index 38880380e0fa..c8ec244db7c9 100644 --- a/arch/arm64/boot/dts/arm/vexpress-v2f-1xv7-ca53x2.dts +++ b/arch/arm64/boot/dts/arm/vexpress-v2f-1xv7-ca53x2.dts @@ -65,6 +65,20 @@ reg = <0 0x80000000 0 0x80000000>; /* 2GB @ 2GB */ }; + reserved-memory { + #address-cells = <1>; + #size-cells = <1>; + ranges; + + /* Chipselect 2 is physically at 0x48000000 */ + vram: vram@48000000 { + /* 8 MB of designated video RAM */ + compatible = "shared-dma-pool"; + reg = <0x48000000 0x00800000>; + no-map; + }; + }; + gic: interrupt-controller@2c001000 { compatible = "arm,gic-400"; #interrupt-cells = <3>; From patchwork Thu Jun 28 13:36:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 140449 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp2199437ljj; Thu, 28 Jun 2018 06:37:02 -0700 (PDT) X-Google-Smtp-Source: ADUXVKKnHJiA/14ALJuH0j7dGILxpQEzwPEMuETzIpFkNv3oUClCyowB7VBmv4RT7ir2zSwOmu5k X-Received: by 2002:a17:902:7295:: with SMTP id d21-v6mr10438829pll.221.1530193022509; Thu, 28 Jun 2018 06:37:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530193022; cv=none; d=google.com; s=arc-20160816; b=EvXMsj2nbLQNtt3xzGGsYadkKigB31KCnXqJuwpz/RieUHK0yVK6rP2+YdiAfaRSxZ bo81I6yVcC5KBtyhDWBbCsOWa4DSATg6X85VSjEJPmWqUQKj1g4ynFAtEM247msXdbhx /Tpgu2ZX29/qU7Au6n7mcycimg7NZeOretsvoOWSvFPvyI04hlF1+Wxpe3kKjD7y3QeF 7zL5If5SnqF4vcTrTpNYKY6eGDtk5R4VsP3vSIVNyimexmKOrvdV5vjaDicSUIv95zPG wHr0kmGl7eaT4XJjSzN5yVTdUC9nSJQMEwxv4+/nS1hQEzeI8W5H9eY3xmlnQ/QV1s1E MMSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:references:in-reply-to:message-id:date:subject :to:from:delivered-to:arc-authentication-results; bh=eIkqY99H9yMcF0d4+SrNG0Ud1oBneTiNT7KGnoxUIJQ=; b=SvBdR1yJxAN2HCJBnDj1/7Yly1zxA3oVqevB0Cqstr6VFoMge5n673P7DVArnDnhel qXUHJKJaJ7mFx8lDDvV9IN3PyRo6lGxXFgNbnK7xMWYrmuYs153FuiVLGuv2OwKL8Mxw lzTebm4gWsu8dnCTC9dQuYKXuJguMxUs13ehgNIXdJC194yDT/XAyo4NdqkrdtgC0oOV e5SW8c600eNTHAVRoJ/ZJUhVrtuZ2At8Lc01wY/BWTjjZazgokN4TrgAo0UFpaIEgYpO FzA28D/v+oSaml4oKVhFSs3t4I+inWqRTCntlo48BRVrx9SH3rJpx5t1VrT1OVy2asPN AVSw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from gabe.freedesktop.org (gabe.freedesktop.org. [131.252.210.177]) by mx.google.com with ESMTPS id 194-v6si6116063pgf.651.2018.06.28.06.37.02 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 28 Jun 2018 06:37:02 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) client-ip=131.252.210.177; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 591016EDB2; Thu, 28 Jun 2018 13:37:01 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-lf0-x243.google.com (mail-lf0-x243.google.com [IPv6:2a00:1450:4010:c07::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id C833C6EDAE for ; Thu, 28 Jun 2018 13:36:56 +0000 (UTC) Received: by mail-lf0-x243.google.com with SMTP id i15-v6so4244859lfc.2 for ; Thu, 28 Jun 2018 06:36:56 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=4cO1Gi1iLnU/SQGeKMq2EhsCkRDxGG6xTXPWgUqVvmg=; b=pLadXL/cj0gypGFn22Y/pQQFI1PMJFxY/fAS/LH/XvZh6wfHaJU/hi/2v5LJVmh9YU lgd2cZ+Ej7DgwvghgXP1IXy0HGJU5+TVGh+cpDWIEycHK82+1Hhog0cXyhr0CmS6t+qh n3GnJqZ7QpZiCwF34jHMZxxATFcismA4HmtfXyU1rhSRdI5Qa+YOG1hnXEwseepN+9Lx 1kak9s3k5aniEo5smg9dRxW4L+fwIYYi389dWuETza4sf+yORQkccdDXnHkCoAwSjEuK BeTrS30Gb4mhSJ3wAIt+U1puXZ4s3hFnCTaWja23NSGWOuS/0WXl0VJRZuY81mLQYU6I P/lw== X-Gm-Message-State: APt69E0s3fdu7ic8xkbe0xYKS1VddZ78g3RtyF39lt8OvNM84igFnv97 qtjj568KymPORBwChUAqqQ5KNg== X-Received: by 2002:a19:1190:: with SMTP id 16-v6mr6834911lfr.122.1530193015208; Thu, 28 Jun 2018 06:36:55 -0700 (PDT) Received: from genomnajs.ideon.se ([85.235.10.227]) by smtp.gmail.com with ESMTPSA id h20-v6sm789626lfl.77.2018.06.28.06.36.53 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 28 Jun 2018 06:36:53 -0700 (PDT) From: Linus Walleij To: Sudeep Holla , Lorenzo Pieralisi , linux-arm-kernel@lists.infradead.org Subject: [PATCH 2/3 v3] ARM: defconfig: Update the vexpress defconfig Date: Thu, 28 Jun 2018 15:36:47 +0200 Message-Id: <20180628133648.6765-2-linus.walleij@linaro.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180628133648.6765-1-linus.walleij@linaro.org> References: <20180628133648.6765-1-linus.walleij@linaro.org> X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Liviu Dudau , dri-devel@lists.freedesktop.org MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Update the Versatile Express defconfig to match the Kconfig changes in the kernel. Cc: Sudeep Holla Cc: Lorenzo Pieralisi Signed-off-by: Linus Walleij --- ChangeLog v1->v3: - Rebased --- arch/arm/configs/vexpress_defconfig | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/arch/arm/configs/vexpress_defconfig b/arch/arm/configs/vexpress_defconfig index edae1c58fe80..226fe4bfb487 100644 --- a/arch/arm/configs/vexpress_defconfig +++ b/arch/arm/configs/vexpress_defconfig @@ -21,20 +21,17 @@ CONFIG_MODULE_UNLOAD=y CONFIG_ARCH_VEXPRESS=y CONFIG_ARCH_VEXPRESS_DCSCB=y CONFIG_ARCH_VEXPRESS_TC2_PM=y -# CONFIG_SWP_EMULATE is not set CONFIG_SMP=y CONFIG_HAVE_ARM_ARCH_TIMER=y CONFIG_MCPM=y CONFIG_VMSPLIT_2G=y CONFIG_NR_CPUS=8 CONFIG_ARM_PSCI=y -CONFIG_AEABI=y CONFIG_CMA=y CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_CMDLINE="console=ttyAMA0" CONFIG_CPU_IDLE=y -CONFIG_CPU_IDLE_MULTIPLE_DRIVERS=y CONFIG_VFP=y CONFIG_NEON=y # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set @@ -61,7 +58,6 @@ CONFIG_MTD_PHYSMAP=y CONFIG_MTD_PHYSMAP_OF=y CONFIG_MTD_PLATRAM=y CONFIG_MTD_UBI=y -CONFIG_PROC_DEVICETREE=y CONFIG_VIRTIO_BLK=y # CONFIG_SCSI_PROC_FS is not set CONFIG_BLK_DEV_SD=y @@ -85,7 +81,6 @@ CONFIG_HW_RANDOM_VIRTIO=y CONFIG_I2C=y CONFIG_I2C_VERSATILE=y CONFIG_SENSORS_VEXPRESS=y -CONFIG_REGULATOR=y CONFIG_REGULATOR_VEXPRESS=y CONFIG_FB=y CONFIG_FB_ARMCLCD=y @@ -95,8 +90,6 @@ CONFIG_LOGO=y # CONFIG_LOGO_LINUX_VGA16 is not set CONFIG_SOUND=y CONFIG_SND=y -CONFIG_SND_MIXER_OSS=y -CONFIG_SND_PCM_OSS=y # CONFIG_SND_DRIVERS is not set CONFIG_SND_ARMAACI=y CONFIG_HID_DRAGONRISE=y @@ -133,9 +126,6 @@ CONFIG_VIRTIO_MMIO=y CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y CONFIG_EXT2_FS=y CONFIG_EXT3_FS=y -# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set -# CONFIG_EXT3_FS_XATTR is not set -CONFIG_EXT4_FS=y CONFIG_VFAT_FS=y CONFIG_TMPFS=y CONFIG_JFFS2_FS=y @@ -149,11 +139,9 @@ CONFIG_9P_FS=y CONFIG_NLS_CODEPAGE_437=y CONFIG_NLS_ISO8859_1=y CONFIG_DEBUG_INFO=y -CONFIG_DEBUG_FS=y CONFIG_MAGIC_SYSRQ=y CONFIG_DEBUG_KERNEL=y CONFIG_DETECT_HUNG_TASK=y # CONFIG_SCHED_DEBUG is not set CONFIG_DEBUG_USER=y -# CONFIG_CRYPTO_ANSI_CPRNG is not set # CONFIG_CRYPTO_HW is not set From patchwork Thu Jun 28 13:36:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 140450 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp2199489ljj; Thu, 28 Jun 2018 06:37:04 -0700 (PDT) X-Google-Smtp-Source: ADUXVKJsVKuTBUUvKG169ZcRFwzTt8oSklDHVvwHbNj84SjHDQrT/W7w6xu5qunyZLMxEccMd/d5 X-Received: by 2002:a63:7c03:: with SMTP id x3-v6mr9089228pgc.412.1530193024588; Thu, 28 Jun 2018 06:37:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530193024; cv=none; d=google.com; s=arc-20160816; b=yP5LZaOz7kL4BdG8R6+9TzZtlA0crRS3v+dpfWQL9xbX4Shpih2qpGM/5tMQ+OyOC7 8bgrNayHcj8me8h4TIGt0lx6UzHZZaDmNBqBIHHCu3TngnJQsB3w3QI6dkPJ3wGD3KIl L366WYZLVPZtS5uriOfeEIvb9rsxrIoDUb9BIo08xXFrS+vDCX+ZU2sqkXQVL///SIaw rnVf4MHXALvcyuD/7tBvTacPr6F3dGjtEt8olSWxdnVWhI2jFddVq6E/FoSQ5unpQiPj jno9Ic8h3rpI36Rp6X5ks0mB77RiDcX/CUCBvur8cx6TKFjksKhd6r6hjxBsQFt2JhDg tp9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:references:in-reply-to:message-id:date:subject :to:from:delivered-to:arc-authentication-results; bh=tnIrplMS94V+Zvu/uOsCloAlnrKxPc6Ge0ewxp4/vEM=; b=jtE22I4ricIFyp0zWfrIyuSGRujgldjklPgqbBcrguw8WYuWKdrh6Ois8GQQfNO3Zj KfqLwkzUzGM1aN9zfdPu9Ms/ifYaGY3o+Pkqrr1vh4RyM3u6oeo/YnMzunDxke1yFBk/ T0rJaBVhE+VQa9PZv8SKhh+OA7+1JwMFiKSHPzXSwkVKW3hnZT4Bu56TqoHZjMdPdbHl tMTRZ4J+R/T+ri1gxZ79HXa1985Ogve4LbjwzTrVfQYC4/qX9TpjEr5dryLOYZkXMmnA ubVi4IN2/4E0/03vBFKZ6c/p3j9qRlYBaB1BEou3fxq+jySFOTz9Om24GoYxaknWbui8 G8SQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from gabe.freedesktop.org (gabe.freedesktop.org. [131.252.210.177]) by mx.google.com with ESMTPS id m3-v6si6987392plt.71.2018.06.28.06.37.04 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 28 Jun 2018 06:37:04 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) client-ip=131.252.210.177; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 703B56EDB3; Thu, 28 Jun 2018 13:37:01 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-lf0-x244.google.com (mail-lf0-x244.google.com [IPv6:2a00:1450:4010:c07::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1651C6EDAE for ; Thu, 28 Jun 2018 13:36:59 +0000 (UTC) Received: by mail-lf0-x244.google.com with SMTP id y127-v6so4230456lfc.8 for ; Thu, 28 Jun 2018 06:36:58 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=iTZvkX9dV/3Hu9xNqkHZ++K/A/RadyeCyFp9fGJMCnc=; b=BubWBILyBBEfjVzmFgovR6nUyfG9a7Zt/7jCWb0XE07Epw/KL8c+x3B4zZ7/Bw9bFc sKoed+IgLvMeC+bblXh7sEbeaz3I2WH/29cFjGPTOPAX4JJa6c9fjzG4lpsaWWWht935 ftjQLdAPUGPfnXM82x8zeP2WmE5NIbgCQfkua0P0p6C4607gOObPRzJDWFA3IKL/g9pB SvIV3PtQRQD6vr6j9BcSNDW+QJeec4MZykoOn4rGA3BtFkaMy5B8uGgpc/7gQyxxpdtK iw+lEBOpqrB5wX7lboQII/7qyoewQXJAwnUg7L1g0J7c6n1IHRi4R7mVPesUb5bmtC6o e0zA== X-Gm-Message-State: APt69E0aGQ20tJqQinnVAiOy5zm7vY29rkEwLkqd8oLWGdC4dMyjpvNl Fivj+jAKoj1FbdtTHqx7bc/qxQ== X-Received: by 2002:a19:1749:: with SMTP id n70-v6mr6972414lfi.54.1530193017559; Thu, 28 Jun 2018 06:36:57 -0700 (PDT) Received: from genomnajs.ideon.se ([85.235.10.227]) by smtp.gmail.com with ESMTPSA id h20-v6sm789626lfl.77.2018.06.28.06.36.55 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 28 Jun 2018 06:36:56 -0700 (PDT) From: Linus Walleij To: Sudeep Holla , Lorenzo Pieralisi , linux-arm-kernel@lists.infradead.org Subject: [PATCH 3/3 v3] ARM: defconfig: Enable the PL111 DRM driver on vexpress Date: Thu, 28 Jun 2018 15:36:48 +0200 Message-Id: <20180628133648.6765-3-linus.walleij@linaro.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180628133648.6765-1-linus.walleij@linaro.org> References: <20180628133648.6765-1-linus.walleij@linaro.org> X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Liviu Dudau , dri-devel@lists.freedesktop.org MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" This updates the Versatile defconfig to use the new P111 DRM driver that is merged in the DRM subsystem. We deactivate the old CLCD driver and activate the Pl111 DRM driver and the SiI9022 HDMI bridge. We activate DMA memory allocation using CMA so that the special graphics memory for the on-board CLCD can be used. Cc: Sudeep Holla Cc: Lorenzo Pieralisi Signed-off-by: Linus Walleij --- ChangeLog v1->v3: - Rebased --- arch/arm/configs/vexpress_defconfig | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/arch/arm/configs/vexpress_defconfig b/arch/arm/configs/vexpress_defconfig index 226fe4bfb487..392ed3b3613c 100644 --- a/arch/arm/configs/vexpress_defconfig +++ b/arch/arm/configs/vexpress_defconfig @@ -48,6 +48,7 @@ CONFIG_NET_9P=y CONFIG_NET_9P_VIRTIO=y CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" CONFIG_DEVTMPFS=y +CONFIG_DMA_CMA=y CONFIG_MTD=y CONFIG_MTD_CMDLINE_PARTS=y CONFIG_MTD_BLOCK=y @@ -78,13 +79,16 @@ CONFIG_SERIAL_AMBA_PL011_CONSOLE=y CONFIG_VIRTIO_CONSOLE=y CONFIG_HW_RANDOM=y CONFIG_HW_RANDOM_VIRTIO=y -CONFIG_I2C=y CONFIG_I2C_VERSATILE=y CONFIG_SENSORS_VEXPRESS=y CONFIG_REGULATOR_VEXPRESS=y -CONFIG_FB=y -CONFIG_FB_ARMCLCD=y -CONFIG_FRAMEBUFFER_CONSOLE=y +CONFIG_DRM=y +CONFIG_DRM_PANEL_SIMPLE=y +CONFIG_DRM_SII902X=y +CONFIG_DRM_PL111=y +CONFIG_FB_MODE_HELPERS=y +CONFIG_BACKLIGHT_LCD_SUPPORT=y +CONFIG_BACKLIGHT_CLASS_DEVICE=y CONFIG_LOGO=y # CONFIG_LOGO_LINUX_MONO is not set # CONFIG_LOGO_LINUX_VGA16 is not set