From 672369c18e27999b6297ace2d99c74e217234f3b Mon Sep 17 00:00:00 2001 From: Christopher Braga Date: Mon, 10 Feb 2020 14:58:05 -0500 Subject: [PATCH] ARM: dts: msm: Add SB LUTDMA support for lahaina target A new LUTDMA instance is added to the DMA hardware in Lahaina. This change updates the corresponding entries, including block size, offsets, and version. This change also updates the DSPP IGC and Gamut version to indicate new HW programming changes using SB LUTDMA. Change-Id: I7a7314b2c80991e3e15990a080774bacf6de0e19 --- bindings/sde.txt | 13 ++++++++----- display/lahaina-sde.dtsi | 13 +++++++------ 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/bindings/sde.txt b/bindings/sde.txt index 19432d600a2e..b0665fb4c1d1 100644 --- a/bindings/sde.txt +++ b/bindings/sde.txt @@ -338,9 +338,11 @@ Optional properties: control register. Number of offsets defined should match the number of offsets defined in property: qcom,sde-wb-off -- qcom,sde-reg-dma-off: Offset of the register dma hardware block from - "regdma_phys" defined in reg property. -- qcom,sde-reg-dma-version: Version of the reg dma hardware block. +- qcom,sde-reg-dma-off: Array of u32 offset addresses of the dma hardware blocks, + relative to "regdma_phys" defined in reg property. +- qcom,sde-reg-dma-id: Array of u32 DMA block type ids corresponding to the + offsets declared in property: qcom,sde-reg-dma-off +- qcom,sde-reg-dma-version: Version of the reg dma hardware blocks. - qcom,sde-reg-dma-trigger-off: Offset of the lut dma trigger reg from "mdp_phys" defined in reg property. - qcom,sde-reg-dma-broadcast-disabled: Boolean property to indicate if broadcast @@ -802,8 +804,9 @@ Example: qcom,sde-vbif-qos-cwb-remap = <3 3 4 4 5 5 6 3>; qcom,sde-vbif-qos-lutdma-remap = <3 3 3 3 4 4 4 4>; - qcom,sde-reg-dma-off = <0>; - qcom,sde-reg-dma-version = <0x00010002>; + qcom,sde-reg-dma-off = <0 0x400>; + qcom,sde-reg-dma-id = <0 1>; + qcom,sde-reg-dma-version = <0x00020000>; qcom,sde-reg-dma-trigger-off = <0x119c>; qcom,sde-reg-dma-broadcast-disabled = <0>; qcom,sde-reg-dma-xin-id = <7>; diff --git a/display/lahaina-sde.dtsi b/display/lahaina-sde.dtsi index 6d0e7591826e..9b37dcb296de 100644 --- a/display/lahaina-sde.dtsi +++ b/display/lahaina-sde.dtsi @@ -5,7 +5,7 @@ compatible = "qcom,sde-kms"; reg = <0x0ae00000 0x84000>, <0x0aeb0000 0x2008>, - <0x0aeac000 0x214>, + <0x0aeac000 0x648>, <0x0ae8f000 0x02c>, <0x0af50000 0x038>; reg-names = "mdp_phys", @@ -221,8 +221,9 @@ /* offsets are relative to "mdp_phys + qcom,sde-off */ - qcom,sde-reg-dma-off = <0>; - qcom,sde-reg-dma-version = <0x00010002>; + qcom,sde-reg-dma-off = <0 0x400>; + qcom,sde-reg-dma-id = <0 1>; + qcom,sde-reg-dma-version = <0x00020000>; qcom,sde-reg-dma-trigger-off = <0x119c>; qcom,sde-reg-dma-xin-id = <7>; qcom,sde-reg-dma-clk-ctrl = <0x2bc 20>; @@ -242,7 +243,7 @@ qcom,sde-vig-csc-off = <0x1a00>; qcom,sde-vig-qseed-off = <0xa00>; qcom,sde-vig-qseed-size = <0xa0>; - qcom,sde-vig-gamut = <0x1d00 0x00060000>; + qcom,sde-vig-gamut = <0x1d00 0x00060001>; qcom,sde-vig-igc = <0x1d00 0x00060000>; qcom,sde-vig-inverse-pma; }; @@ -264,13 +265,13 @@ }; qcom,sde-dspp-blocks { - qcom,sde-dspp-igc = <0x0 0x00030001>; + qcom,sde-dspp-igc = <0x1260 0x00030002>; qcom,sde-dspp-hsic = <0x800 0x00010007>; qcom,sde-dspp-memcolor = <0x880 0x00010007>; qcom,sde-dspp-hist = <0x800 0x00010007>; qcom,sde-dspp-sixzone= <0x900 0x00010007>; qcom,sde-dspp-vlut = <0xa00 0x00010008>; - qcom,sde-dspp-gamut = <0x1000 0x00040002>; + qcom,sde-dspp-gamut = <0x1000 0x00040003>; qcom,sde-dspp-pcc = <0x1700 0x00040000>; qcom,sde-dspp-gc = <0x17c0 0x00010008>; qcom,sde-dspp-dither = <0x82c 0x00010007>;