* [PATCH 0/2] ARM: dts: meson: two GPU fixes @ 2019-04-20 9:32 Martin Blumenstingl 2019-04-20 9:32 ` [PATCH 1/2] ARM: dts: meson8: fix GPU interrupts and drop an undocumented property Martin Blumenstingl ` (2 more replies) 0 siblings, 3 replies; 4+ messages in thread From: Martin Blumenstingl @ 2019-04-20 9:32 UTC (permalink / raw) To: linux-amlogic, khilman Cc: linux-arm-kernel, linux-kernel, Martin Blumenstingl While switching over to the main mesa git repository I was testing kmscube again. On my Meson8m2 board I noticed that two interrupts were correctly set up. This didn't cause any errors so far because on my setup the lima driver is using the "pp_bcast" interrupt instead of ppX and ppmmuX. While fixing the interrupt lines I also noticed that I accidentally left the switch-delay property in there. That was needed at some point to run the out-of-tree lima kernel driver. It's not required anymore and it's not documented so drop it. Target release: v5.2 (if possible because this is where the lima kernel driver will land). No need to send it for v5.1-rcX because there lima driver won't be part of v5.1. Martin Blumenstingl (2): ARM: dts: meson8: fix GPU interrupts and drop an undocumented property ARM: dts: meson8b: drop undocumented property from the Mali GPU node arch/arm/boot/dts/meson8.dtsi | 5 ++--- arch/arm/boot/dts/meson8b.dtsi | 1 - 2 files changed, 2 insertions(+), 4 deletions(-) -- 2.21.0 ^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 1/2] ARM: dts: meson8: fix GPU interrupts and drop an undocumented property 2019-04-20 9:32 [PATCH 0/2] ARM: dts: meson: two GPU fixes Martin Blumenstingl @ 2019-04-20 9:32 ` Martin Blumenstingl 2019-04-20 9:32 ` [PATCH 2/2] ARM: dts: meson8b: drop undocumented property from the Mali GPU node Martin Blumenstingl 2019-05-06 23:43 ` [PATCH 0/2] ARM: dts: meson: two GPU fixes Kevin Hilman 2 siblings, 0 replies; 4+ messages in thread From: Martin Blumenstingl @ 2019-04-20 9:32 UTC (permalink / raw) To: linux-amlogic, khilman Cc: linux-arm-kernel, linux-kernel, Martin Blumenstingl The interrupts in Amlogic's vendor kernel sources are all contiguous. There are two typos leading to pp2 and pp4 as well as ppmmu2 and ppmmu4 incorrectly sharing the same interrupt line. Fix this by using interrupt 170 for pp2 and 171 for ppmmu2. Also drop the undocumented "switch-delay" which is a left-over from my experiments with an early lima kernel driver when it was still out-of-tree and required this property on Amlogic SoCs. Fixes: 7d3f6b536e72c9 ("ARM: dts: meson8: add the Mali-450 MP6 GPU") Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> --- arch/arm/boot/dts/meson8.dtsi | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/arch/arm/boot/dts/meson8.dtsi b/arch/arm/boot/dts/meson8.dtsi index 7ef442462ea4..40c11b6b217a 100644 --- a/arch/arm/boot/dts/meson8.dtsi +++ b/arch/arm/boot/dts/meson8.dtsi @@ -248,8 +248,8 @@ <GIC_SPI 167 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 168 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 169 IRQ_TYPE_LEVEL_HIGH>, - <GIC_SPI 172 IRQ_TYPE_LEVEL_HIGH>, - <GIC_SPI 173 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 170 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 171 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 172 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 173 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH>, @@ -264,7 +264,6 @@ clocks = <&clkc CLKID_CLK81>, <&clkc CLKID_MALI>; clock-names = "bus", "core"; operating-points-v2 = <&gpu_opp_table>; - switch-delay = <0xffff>; }; }; }; /* end of / */ -- 2.21.0 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2] ARM: dts: meson8b: drop undocumented property from the Mali GPU node 2019-04-20 9:32 [PATCH 0/2] ARM: dts: meson: two GPU fixes Martin Blumenstingl 2019-04-20 9:32 ` [PATCH 1/2] ARM: dts: meson8: fix GPU interrupts and drop an undocumented property Martin Blumenstingl @ 2019-04-20 9:32 ` Martin Blumenstingl 2019-05-06 23:43 ` [PATCH 0/2] ARM: dts: meson: two GPU fixes Kevin Hilman 2 siblings, 0 replies; 4+ messages in thread From: Martin Blumenstingl @ 2019-04-20 9:32 UTC (permalink / raw) To: linux-amlogic, khilman Cc: linux-arm-kernel, linux-kernel, Martin Blumenstingl Drop the undocumented "switch-delay" which is a left-over from my experiments with an early lima kernel driver when it was still out-of-tree and required this property on Amlogic SoCs. Fixes: c3ea80b6138cae ("ARM: dts: meson8b: add the Mali-450 MP2 GPU") Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> --- arch/arm/boot/dts/meson8b.dtsi | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/arm/boot/dts/meson8b.dtsi b/arch/arm/boot/dts/meson8b.dtsi index 800cd65fc50a..4b919590dae5 100644 --- a/arch/arm/boot/dts/meson8b.dtsi +++ b/arch/arm/boot/dts/meson8b.dtsi @@ -229,7 +229,6 @@ clocks = <&clkc CLKID_CLK81>, <&clkc CLKID_MALI>; clock-names = "bus", "core"; operating-points-v2 = <&gpu_opp_table>; - switch-delay = <0xffff>; }; }; }; /* end of / */ -- 2.21.0 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 0/2] ARM: dts: meson: two GPU fixes 2019-04-20 9:32 [PATCH 0/2] ARM: dts: meson: two GPU fixes Martin Blumenstingl 2019-04-20 9:32 ` [PATCH 1/2] ARM: dts: meson8: fix GPU interrupts and drop an undocumented property Martin Blumenstingl 2019-04-20 9:32 ` [PATCH 2/2] ARM: dts: meson8b: drop undocumented property from the Mali GPU node Martin Blumenstingl @ 2019-05-06 23:43 ` Kevin Hilman 2 siblings, 0 replies; 4+ messages in thread From: Kevin Hilman @ 2019-05-06 23:43 UTC (permalink / raw) To: Martin Blumenstingl, linux-amlogic Cc: linux-arm-kernel, linux-kernel, Martin Blumenstingl Martin Blumenstingl <martin.blumenstingl@googlemail.com> writes: > While switching over to the main mesa git repository I was testing > kmscube again. On my Meson8m2 board I noticed that two interrupts were > correctly set up. This didn't cause any errors so far because on my > setup the lima driver is using the "pp_bcast" interrupt instead of > ppX and ppmmuX. > > While fixing the interrupt lines I also noticed that I accidentally > left the switch-delay property in there. That was needed at some > point to run the out-of-tree lima kernel driver. It's not required > anymore and it's not documented so drop it. > > Target release: v5.2 (if possible because this is where the lima kernel > driver will land). No need to send it for v5.1-rcX because there lima > driver won't be part of v5.1. Queued as fixes for v5.2. I'll submit when v5.2-rc1 comes out. For now, they're in my tree (branch: v5.2/fixes) and included in my for-next branch for some broader testing. Thanks, Kevin ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-05-06 23:44 UTC | newest] Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2019-04-20 9:32 [PATCH 0/2] ARM: dts: meson: two GPU fixes Martin Blumenstingl 2019-04-20 9:32 ` [PATCH 1/2] ARM: dts: meson8: fix GPU interrupts and drop an undocumented property Martin Blumenstingl 2019-04-20 9:32 ` [PATCH 2/2] ARM: dts: meson8b: drop undocumented property from the Mali GPU node Martin Blumenstingl 2019-05-06 23:43 ` [PATCH 0/2] ARM: dts: meson: two GPU fixes Kevin Hilman
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).