DRM driver for verisilicon
Subsystems (7)
v2 cover DRM driver for verisilicon
This patch is a drm driver for Starfive Soc JH7110, I am sending Drm driver part and HDMI driver part.
We used GEM framework for buffer management , and for buffer allocation,we use DMA APIs.
the Starfive HDMI servers as interface between a LCD Controller and a HDMI bus. A HDMI TX consists of one HDMI transmitter controller and one HDMI transmitter PHY. (Sound support is not include in this patch)
This patchset should be applied after the patchset:
https://patchwork.kernel.org/project/linux-clk/cover/[email protected]/
V1:
Changes since v1:
- Further standardize the yaml file.
- Dts naming convention improved.
- Fix the problem of compiling and loading ko files.
- Use drm new api to automatically manage resources.
- Drop struct vs_crtc_funcs&vs_plane_funcs��subdivide the plane's help interface
- Reduce the modifiers unused.
- Optimize the hdmi driver code
V2:
Changes since v2:
- fix the error about checking the yaml file.
- match drm driver GEM DMA API.
- Delete the custom crtc property .
- hdmi use drmm_ new api to automatically manage resources.
- update the modifiers comments.
- enabling KASAN, fix the error during removing module
Keith Zhao (6):
dt-bindings: display: Add yamls for JH7110 display system
riscv: dts: starfive: jh7110: add dc controller and hdmi node drm/fourcc: Add drm/vs tiled modifiers
drm/vs: Register DRM device
drm/vs: Add KMS crtc&plane
drm/vs: Add hdmi driver
.../starfive/starfive,display-subsystem.yaml | 41 + .../starfive/starfive,jh7110-dc8200.yaml | 109 + .../starfive/starfive,jh7110-inno-hdmi.yaml | 85 + MAINTAINERS | 7 + .../jh7110-starfive-visionfive-2.dtsi | 91 + arch/riscv/boot/dts/starfive/jh7110.dtsi | 41 + drivers/gpu/drm/Kconfig | 2 + drivers/gpu/drm/Makefile | 1 + drivers/gpu/drm/verisilicon/Kconfig | 21 + drivers/gpu/drm/verisilicon/Makefile | 12 + drivers/gpu/drm/verisilicon/starfive_hdmi.c | 949 ++++++++ drivers/gpu/drm/verisilicon/starfive_hdmi.h | 295 +++ drivers/gpu/drm/verisilicon/vs_crtc.c | 257 +++ drivers/gpu/drm/verisilicon/vs_crtc.h | 43 + drivers/gpu/drm/verisilicon/vs_dc.c | 1002 +++++++++ drivers/gpu/drm/verisilicon/vs_dc.h | 80 + drivers/gpu/drm/verisilicon/vs_dc_hw.c | 1959 +++++++++++++++++ drivers/gpu/drm/verisilicon/vs_dc_hw.h | 492 +++++ drivers/gpu/drm/verisilicon/vs_drv.c | 234 ++ drivers/gpu/drm/verisilicon/vs_drv.h | 31 + drivers/gpu/drm/verisilicon/vs_modeset.c | 36 + drivers/gpu/drm/verisilicon/vs_modeset.h | 10 + drivers/gpu/drm/verisilicon/vs_plane.c | 526 +++++ drivers/gpu/drm/verisilicon/vs_plane.h | 58 + drivers/gpu/drm/verisilicon/vs_type.h | 69 + include/uapi/drm/drm_fourcc.h | 57 + include/uapi/drm/vs_drm.h | 50 + 27 files changed, 6558 insertions(+) create mode 100644 Documentation/devicetree/bindings/display/starfive/starfive,display-subsystem.yaml create mode 100644 Documentation/devicetree/bindings/display/starfive/starfive,jh7110-dc8200.yaml create mode 100644 Documentation/devicetree/bindings/display/starfive/starfive,jh7110-inno-hdmi.yaml create mode 100644 drivers/gpu/drm/verisilicon/Kconfig create mode 100644 drivers/gpu/drm/verisilicon/Makefile create mode 100644 drivers/gpu/drm/verisilicon/starfive_hdmi.c create mode 100644 drivers/gpu/drm/verisilicon/starfive_hdmi.h create mode 100644 drivers/gpu/drm/verisilicon/vs_crtc.c create mode 100644 drivers/gpu/drm/verisilicon/vs_crtc.h create mode 100644 drivers/gpu/drm/verisilicon/vs_dc.c create mode 100644 drivers/gpu/drm/verisilicon/vs_dc.h create mode 100644 drivers/gpu/drm/verisilicon/vs_dc_hw.c create mode 100644 drivers/gpu/drm/verisilicon/vs_dc_hw.h create mode 100644 drivers/gpu/drm/verisilicon/vs_drv.c create mode 100644 drivers/gpu/drm/verisilicon/vs_drv.h create mode 100644 drivers/gpu/drm/verisilicon/vs_modeset.c create mode 100644 drivers/gpu/drm/verisilicon/vs_modeset.h create mode 100644 drivers/gpu/drm/verisilicon/vs_plane.c create mode 100644 drivers/gpu/drm/verisilicon/vs_plane.h create mode 100644 drivers/gpu/drm/verisilicon/vs_type.h create mode 100644 include/uapi/drm/vs_drm.h
Signature · 1 line
2.34.1
PATCH v2 1/6 dt-bindings: display: Add yamls for JH7110 display system
StarFive SoCs JH7110 display system:
lcd-controller bases verisilicon dc8200 IP, and hdmi bases Innosilicon IP. Add bindings for them.
also update MAINTAINERS for dt-bindings
about this patch, I tested the dtbs_check and dt_binding_check
with the result pass.
Based on the feedback of the previous version, the corresponding arrangement is made
--- .../starfive/starfive,display-subsystem.yaml | 41 +++++++ .../starfive/starfive,jh7110-dc8200.yaml | 109 ++++++++++++++++++ .../starfive/starfive,jh7110-inno-hdmi.yaml | 85 ++++++++++++++ MAINTAINERS | 7 ++ 4 files changed, 242 insertions(+) create mode 100644 Documentation/devicetree/bindings/display/starfive/starfive,display-subsystem.yaml create mode 100644 Documentation/devicetree/bindings/display/starfive/starfive,jh7110-dc8200.yaml create mode 100644 Documentation/devicetree/bindings/display/starfive/starfive,jh7110-inno-hdmi.yaml
Documentation/devicetree/bindings/display/starfive/starfive,display-subsystem.yaml new file +41 -0
@@ -0,0 +1,41 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/display/starfive/starfive,display-subsystem.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Starfive DRM master device + +maintainers: + - Keith Zhao <[email protected]> + - ShengYang Chen <[email protected]> + +description: + The Starfive DRM master device is a virtual device needed to list all + display controller or other display interface nodes that comprise the + graphics subsystem. + +properties: + compatible: + const: starfive,display-subsystem + + ports: + $ref: /schemas/types.yaml#/definitions/phandle-array + description: + Should contain a list of phandles pointing to display interface ports + of display controller devices. Display controller definitions as defined + in Documentation/devicetree/bindings/display/starfive/ + starfive,jh7110-dc8200.yaml + +required: + - compatible + - ports + +additionalProperties: false + +examples: + - | + display-subsystem { + compatible = "starfive,display-subsystem"; + ports = <&dc_out>; + };
Documentation/devicetree/bindings/display/starfive/starfive,jh7110-dc8200.yaml new file +109 -0
109 lines not on this page · raw message
Documentation/devicetree/bindings/display/starfive/starfive,jh7110-inno-hdmi.yaml new file +85 -0
85 lines not on this page · raw message
MAINTAINERS +7 -0
@@ -6751,6 +6751,13 @@ T: git git://anongit.freedesktop.org/drm/drm-misc F: Documentation/devicetree/bindings/display/panel/tpo,tpg110.yaml F: drivers/gpu/drm/panel/panel-tpo-tpg110.c +DRM DRIVERS FOR STARFIVE +M: Keith Zhao <[email protected]> +L: [email protected] +S: Maintained +T: git git://anongit.freedesktop.org/drm/drm-misc +F: Documentation/devicetree/bindings/display/starfive/ + DRM DRIVER FOR USB DISPLAYLINK VIDEO ADAPTERS M: Dave Airlie <[email protected]> R: Sean Paul <[email protected]>
Signature · 1 line
2.34.1
Re: [PATCH v2 1/6] dt-bindings: display: Add yamls for JH7110 display system
Quoted 1 line · Keith Zhao
StarFive SoCs JH7110 display system:
A nit, subject: drop second/last, redundant "yamls for". The "dt-bindings" prefix is already stating that these are bindings, so format is fixed.
Quoted 2 lines
lcd-controller bases verisilicon dc8200 IP, and hdmi bases Innosilicon IP. Add bindings for them.
Please make it a proper sentences, with proper wrapping.
Quoted 2 lines
also update
MAINTAINERSfor dt-bindings
Not a sentence, but also not really needed.
Quoted 4 lines
about this patch, I tested the
dtbs_checkanddt_binding_check
with the result pass.
Based on the feedback of the previous version, the corresponding arrangement is made
Not relevant, so not really suitable for commit msg.
Quoted 18 lines
Signed-off-by Keith Zhao <[email protected]>--- .../starfive/starfive,display-subsystem.yaml | 41 +++++++ .../starfive/starfive,jh7110-dc8200.yaml | 109 ++++++++++++++++++ .../starfive/starfive,jh7110-inno-hdmi.yaml | 85 ++++++++++++++ MAINTAINERS | 7 ++ 4 files changed, 242 insertions(+) create mode 100644 Documentation/devicetree/bindings/display/starfive/starfive,display-subsystem.yaml create mode 100644 Documentation/devicetree/bindings/display/starfive/starfive,jh7110-dc8200.yaml create mode 100644 Documentation/devicetree/bindings/display/starfive/starfive,jh7110-inno-hdmi.yamlDocumentation/devicetree/bindings/display/starfive/starfive,display-subsystem.yaml new file +0
-0
Documentation/devicetree/bindings/display/starfive/starfive,display-subsystem.yaml line 7
Quoted 7 lines
Documentation/devicetree/bindings/display/starfive/starfive,display-subsystem.yaml new file +7
-0@@ -0,0 +1,41 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/display/starfive/starfive,display-subsystem.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Starfive DRM master device
What is DRM in hardware? I know Digital Rights Management, but then subsystem seems wrong. If you mean Linux DRM, then Linux is not a hardware, so drop all Linuxisms and describe hardware.
Documentation/devicetree/bindings/display/starfive/starfive,display-subsystem.yaml line 14
Quoted 7 lines
Documentation/devicetree/bindings/display/starfive/starfive,display-subsystem.yaml new file +7
-0+ +maintainers: + - Keith Zhao <[email protected]> + - ShengYang Chen <[email protected]> + +description: + The Starfive DRM master device is a virtual device needed to list all
Virtual device? Then not suitable for bindings, sorry.
Documentation/devicetree/bindings/display/starfive/starfive,display-subsystem.yaml line 23
Quoted 9 lines
Documentation/devicetree/bindings/display/starfive/starfive,display-subsystem.yaml new file +9
-0+ display controller or other display interface nodes that comprise the + graphics subsystem. + +properties: + compatible: + const: starfive,display-subsystem + + ports: + $ref: /schemas/types.yaml#/definitions/phandle-array
No, ports is not phandle-array. ports is object, always.
Documentation/devicetree/bindings/display/starfive/starfive,display-subsystem.yaml line 28
Quoted 5 lines
Documentation/devicetree/bindings/display/starfive/starfive,display-subsystem.yaml new file +5
-0+ description: + Should contain a list of phandles pointing to display interface ports + of display controller devices. Display controller definitions as defined + in Documentation/devicetree/bindings/display/starfive/ + starfive,jh7110-dc8200.yaml
Use standard graph ports, not some own, custom property.
Anyway, entire binding should be dropped. You do not need it even.
Quoted 34 lines
Documentation/devicetree/bindings/display/starfive/starfive,display-subsystem.yaml new file +13
-0+ +required: + - compatible + - ports + +additionalProperties: false + +examples: + - | + display-subsystem { + compatible = "starfive,display-subsystem"; + ports = <&dc_out>; + };Documentation/devicetree/bindings/display/starfive/starfive,jh7110-dc8200.yaml new file +15
-0@@ -0,0 +1,109 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/display/starfive/starfive,jh7110-dc8200.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: StarFive display controller + +description: + The StarFive SoC uses the display controller based on Verisilicon IP + to transfer the image data from a video memory buffer to an external + LCD interface. + +maintainers: + - Keith Zhao <[email protected]>
Documentation/devicetree/bindings/display/starfive/starfive,jh7110-dc8200.yaml line 25
Quoted 10 lines
Documentation/devicetree/bindings/display/starfive/starfive,jh7110-dc8200.yaml new file +10
-0+ +properties: + compatible: + const: starfive,jh7110-dc8200 + + reg: + minItems: 1 + items: + - description: + host interface
In one line.
- description: host interface
Documentation/devicetree/bindings/display/starfive/starfive,jh7110-dc8200.yaml line 27
Quoted 2 lines
Documentation/devicetree/bindings/display/starfive/starfive,jh7110-dc8200.yaml new file +2
-0+ - description: + display physical base address and length.
Drop redundant parts: base address and length. Everything in reg for MMIO would have it...
Quoted 96 lines
Documentation/devicetree/bindings/display/starfive/starfive,jh7110-dc8200.yaml new file +82
-0+ + interrupts: + items: + - description: The interrupt will be generated when DC finish one frame + + clocks: + items: + - description: Clock for display system noc bus. + - description: Pixel clock for display channel 0. + - description: Pixel clock for display channel 1. + - description: Core clock for display controller. + - description: Clock for axi bus to access ddr. + - description: Clock for ahb bus to R/W the phy regs. + - description: External HDMI pixel clock. + - description: Parent clock for pixel clock + + clock-names: + items: + - const: noc_bus + - const: channel0 + - const: channel1 + - const: dc_core + - const: axi_core + - const: ahb + - const: hdmi_tx + - const: dc_parent + + resets: + items: + - description: Reset for axi bus. + - description: Reset for ahb bus. + - description: Core reset of display controller. + + reset-names: + items: + - const: axi + - const: ahb + - const: core + + port: + $ref: /schemas/graph.yaml#/properties/port + +required: + - compatible + - reg + - interrupts + - clocks + - clock-names + - resets + - reset-names + - port + +additionalProperties: false + +examples: + - | + dc8200: lcd-controller@29400000 { + compatible = "starfive,jh7110-dc8200"; + reg = <0x29400000 0x100>, <0x29400800 0x2000>; + interrupts = <95>; + clocks = <&syscrg 60>, + <&voutcrg 7>, + <&voutcrg 8>, + <&voutcrg 4>, + <&voutcrg 5>, + <&voutcrg 6>, + <&hdmitx0_pixelclk>, + <&voutcrg 1>; + clock-names = "noc_bus", "channel0", "channel1", + "dc_core", "axi_core", "ahb", + "hdmi_tx","dc_parent"; + resets = <&voutcrg 0>, <&voutcrg 1>, <&voutcrg 2>; + reset-names = "axi", "ahb", "core"; + dc_out: port { + #address-cells = <1>; + #size-cells = <0>; + dc_out_hdmi: endpoint@0 { + reg = <0>; + remote-endpoint = <&hdmi_in_dc>; + }; + }; + };Documentation/devicetree/bindings/display/starfive/starfive,jh7110-inno-hdmi.yaml new file +8
-0@@ -0,0 +1,85 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/display/starfive/starfive,jh7110-inno-hdmi.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Starfive JH7110 HDMI controller +
Documentation/devicetree/bindings/display/starfive/starfive,jh7110-inno-hdmi.yaml line 18
Quoted 10 lines
Documentation/devicetree/bindings/display/starfive/starfive,jh7110-inno-hdmi.yaml new file +10
-0+description: + The StarFive JH7110 SoC uses the HDMI signal transmiter based on innosilicon IP + to generate HDMI signal from its input and transmit the signal to the screen. + +maintainers: + - Keith Zhao <[email protected]> + +properties: + compatible: + const: "starfive,jh7110-inno-hdmi"
It does not look like you tested the bindings, at least after quick look. Please run make dt_binding_check (see Documentation/devicetree/bindings/writing-schema.rst for instructions). Maybe you need to update your dtschema and yamllint.
Best regards,
Krzysztof
Re: [PATCH v2 1/6] dt-bindings: display: Add yamls for JH7110 display system
Quoted 45 lines · Krzysztof Kozlowski
Quoted 1 line · Keith Zhao
StarFive SoCs JH7110 display system:
A nit, subject: drop second/last, redundant "yamls for". The "dt-bindings" prefix is already stating that these are bindings, so format is fixed.
Quoted 2 lines
lcd-controller bases verisilicon dc8200 IP, and hdmi bases Innosilicon IP. Add bindings for them.
Please make it a proper sentences, with proper wrapping.
Quoted 2 lines
also update
MAINTAINERSfor dt-bindingsNot a sentence, but also not really needed.ok I see.
Quoted 4 lines
about this patch, I tested the
dtbs_checkanddt_binding_check
with the result pass.
Based on the feedback of the previous version, the corresponding arrangement is madeNot relevant, so not really suitable for commit msg.
Quoted 21 lines
Signed-off-by Keith Zhao <[email protected]>--- .../starfive/starfive,display-subsystem.yaml | 41 +++++++ .../starfive/starfive,jh7110-dc8200.yaml | 109 ++++++++++++++++++ .../starfive/starfive,jh7110-inno-hdmi.yaml | 85 ++++++++++++++ MAINTAINERS | 7 ++ 4 files changed, 242 insertions(+) create mode 100644 Documentation/devicetree/bindings/display/starfive/starfive,display-subsystem.yaml create mode 100644 Documentation/devicetree/bindings/display/starfive/starfive,jh7110-dc8200.yaml create mode 100644 Documentation/devicetree/bindings/display/starfive/starfive,jh7110-inno-hdmi.yamlDocumentation/devicetree/bindings/display/starfive/starfive,display-subsystem.yaml new file +3
-0@@ -0,0 +1,41 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +---
Quoted 8 lines
Documentation/devicetree/bindings/display/starfive/starfive,display-subsystem.yaml line 7
Quoted 4 lines
Documentation/devicetree/bindings/display/starfive/starfive,display-subsystem.yaml new file +4
-0+$id: http://devicetree.org/schemas/display/starfive/starfive,display-subsystem.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Starfive DRM master deviceWhat is DRM in hardware? I know Digital Rights Management, but then subsystem seems wrong. If you mean Linux DRM, then Linux is not a hardware, so drop all Linuxisms and describe hardware.
ok , will only keep hardware describe in my next version
Quoted 30 lines
Documentation/devicetree/bindings/display/starfive/starfive,display-subsystem.yaml line 14
Quoted 9 lines
Documentation/devicetree/bindings/display/starfive/starfive,display-subsystem.yaml new file +7
-0+ +maintainers: + - Keith Zhao <[email protected]> + - ShengYang Chen <[email protected]> + +description: + The Starfive DRM master device is a virtual device needed to list allVirtual device? Then not suitable for bindings, sorry.
Documentation/devicetree/bindings/display/starfive/starfive,display-subsystem.yaml line 23
Quoted 9 lines
Documentation/devicetree/bindings/display/starfive/starfive,display-subsystem.yaml new file +9
-0+ display controller or other display interface nodes that comprise the + graphics subsystem. + +properties: + compatible: + const: starfive,display-subsystem + + ports: + $ref: /schemas/types.yaml#/definitions/phandle-arrayNo, ports is not phandle-array. ports is object, always.
Documentation/devicetree/bindings/display/starfive/starfive,display-subsystem.yaml line 28
Quoted 5 lines
Documentation/devicetree/bindings/display/starfive/starfive,display-subsystem.yaml new file +5
-0+ description: + Should contain a list of phandles pointing to display interface ports + of display controller devices. Display controller definitions as defined + in Documentation/devicetree/bindings/display/starfive/ + starfive,jh7110-dc8200.yaml
Quoted 3 lines
Use standard graph ports, not some own, custom property.
Anyway, entire binding should be dropped. You do not need it even.
Hi Krzysztof:
Virtual device is not suitable for bindings, matbe I need associate it with the real hardware. such as the top clocks & reset , irq , etc.
Currently I configure them in another yaml file. Logically speaking, this is more suitable.
Can adding the corresponding hardware description change its fate of being deleted?
Quoted 170 lines
Quoted 35 lines
Documentation/devicetree/bindings/display/starfive/starfive,display-subsystem.yaml new file +13
-0+ +required: + - compatible + - ports + +additionalProperties: false + +examples: + - | + display-subsystem { + compatible = "starfive,display-subsystem"; + ports = <&dc_out>; + };Documentation/devicetree/bindings/display/starfive/starfive,jh7110-dc8200.yaml new file +15
-0@@ -0,0 +1,109 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/display/starfive/starfive,jh7110-dc8200.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: StarFive display controller + +description: + The StarFive SoC uses the display controller based on Verisilicon IP + to transfer the image data from a video memory buffer to an external + LCD interface. + +maintainers: + - Keith Zhao <[email protected]>Documentation/devicetree/bindings/display/starfive/starfive,jh7110-dc8200.yaml line 25
Quoted 10 lines
Documentation/devicetree/bindings/display/starfive/starfive,jh7110-dc8200.yaml new file +10
-0+ +properties: + compatible: + const: starfive,jh7110-dc8200 + + reg: + minItems: 1 + items: + - description: + host interfaceIn one line.
- description: host interfaceDocumentation/devicetree/bindings/display/starfive/starfive,jh7110-dc8200.yaml line 27
Quoted 2 lines
Documentation/devicetree/bindings/display/starfive/starfive,jh7110-dc8200.yaml new file +2
-0+ - description: + display physical base address and length.Drop redundant parts: base address and length. Everything in reg for MMIO would have it...
Quoted 96 lines
Documentation/devicetree/bindings/display/starfive/starfive,jh7110-dc8200.yaml new file +82
-0+ + interrupts: + items: + - description: The interrupt will be generated when DC finish one frame + + clocks: + items: + - description: Clock for display system noc bus. + - description: Pixel clock for display channel 0. + - description: Pixel clock for display channel 1. + - description: Core clock for display controller. + - description: Clock for axi bus to access ddr. + - description: Clock for ahb bus to R/W the phy regs. + - description: External HDMI pixel clock. + - description: Parent clock for pixel clock + + clock-names: + items: + - const: noc_bus + - const: channel0 + - const: channel1 + - const: dc_core + - const: axi_core + - const: ahb + - const: hdmi_tx + - const: dc_parent + + resets: + items: + - description: Reset for axi bus. + - description: Reset for ahb bus. + - description: Core reset of display controller. + + reset-names: + items: + - const: axi + - const: ahb + - const: core + + port: + $ref: /schemas/graph.yaml#/properties/port + +required: + - compatible + - reg + - interrupts + - clocks + - clock-names + - resets + - reset-names + - port + +additionalProperties: false + +examples: + - | + dc8200: lcd-controller@29400000 { + compatible = "starfive,jh7110-dc8200"; + reg = <0x29400000 0x100>, <0x29400800 0x2000>; + interrupts = <95>; + clocks = <&syscrg 60>, + <&voutcrg 7>, + <&voutcrg 8>, + <&voutcrg 4>, + <&voutcrg 5>, + <&voutcrg 6>, + <&hdmitx0_pixelclk>, + <&voutcrg 1>; + clock-names = "noc_bus", "channel0", "channel1", + "dc_core", "axi_core", "ahb", + "hdmi_tx","dc_parent"; + resets = <&voutcrg 0>, <&voutcrg 1>, <&voutcrg 2>; + reset-names = "axi", "ahb", "core"; + dc_out: port { + #address-cells = <1>; + #size-cells = <0>; + dc_out_hdmi: endpoint@0 { + reg = <0>; + remote-endpoint = <&hdmi_in_dc>; + }; + }; + };Documentation/devicetree/bindings/display/starfive/starfive,jh7110-inno-hdmi.yaml new file +8
-0@@ -0,0 +1,85 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/display/starfive/starfive,jh7110-inno-hdmi.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Starfive JH7110 HDMI controller +Documentation/devicetree/bindings/display/starfive/starfive,jh7110-inno-hdmi.yaml line 18
Quoted 10 lines
Documentation/devicetree/bindings/display/starfive/starfive,jh7110-inno-hdmi.yaml new file +10
-0+description: + The StarFive JH7110 SoC uses the HDMI signal transmiter based on innosilicon IP + to generate HDMI signal from its input and transmit the signal to the screen. + +maintainers: + - Keith Zhao <[email protected]> + +properties: + compatible: + const: "starfive,jh7110-inno-hdmi"It does not look like you tested the bindings, at least after quick look. Please run
make dt_binding_check(seeDocumentation/devicetree/bindings/writing-schema.rstfor instructions). Maybe you need to update your dtschema and yamllint.Best regards,
Krzysztof
Re: [PATCH v2 1/6] dt-bindings: display: Add yamls for JH7110 display system
Quoted 89 lines · Keith Zhao
Quoted 45 lines · Krzysztof Kozlowski
Quoted 1 line · Keith Zhao
StarFive SoCs JH7110 display system:
A nit, subject: drop second/last, redundant "yamls for". The "dt-bindings" prefix is already stating that these are bindings, so format is fixed.
Quoted 2 lines
lcd-controller bases verisilicon dc8200 IP, and hdmi bases Innosilicon IP. Add bindings for them.
Please make it a proper sentences, with proper wrapping.
Quoted 2 lines
also update
MAINTAINERSfor dt-bindingsNot a sentence, but also not really needed.ok I see.
Quoted 4 lines
about this patch, I tested the
dtbs_checkanddt_binding_check
with the result pass.
Based on the feedback of the previous version, the corresponding arrangement is madeNot relevant, so not really suitable for commit msg.
Quoted 21 lines
Signed-off-by Keith Zhao <[email protected]>--- .../starfive/starfive,display-subsystem.yaml | 41 +++++++ .../starfive/starfive,jh7110-dc8200.yaml | 109 ++++++++++++++++++ .../starfive/starfive,jh7110-inno-hdmi.yaml | 85 ++++++++++++++ MAINTAINERS | 7 ++ 4 files changed, 242 insertions(+) create mode 100644 Documentation/devicetree/bindings/display/starfive/starfive,display-subsystem.yaml create mode 100644 Documentation/devicetree/bindings/display/starfive/starfive,jh7110-dc8200.yaml create mode 100644 Documentation/devicetree/bindings/display/starfive/starfive,jh7110-inno-hdmi.yamlDocumentation/devicetree/bindings/display/starfive/starfive,display-subsystem.yaml new file +3
-0@@ -0,0 +1,41 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +---Quoted 8 lines
Documentation/devicetree/bindings/display/starfive/starfive,display-subsystem.yaml line 7
Quoted 4 lines
Documentation/devicetree/bindings/display/starfive/starfive,display-subsystem.yaml new file +4
-0+$id: http://devicetree.org/schemas/display/starfive/starfive,display-subsystem.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Starfive DRM master deviceWhat is DRM in hardware? I know Digital Rights Management, but then subsystem seems wrong. If you mean Linux DRM, then Linux is not a hardware, so drop all Linuxisms and describe hardware.
ok , will only keep hardware describe in my next version
Quoted 32 lines
Documentation/devicetree/bindings/display/starfive/starfive,display-subsystem.yaml line 14
Quoted 9 lines
Documentation/devicetree/bindings/display/starfive/starfive,display-subsystem.yaml new file +7
-0+ +maintainers: + - Keith Zhao <[email protected]> + - ShengYang Chen <[email protected]> + +description: + The Starfive DRM master device is a virtual device needed to list allVirtual device? Then not suitable for bindings, sorry.
Documentation/devicetree/bindings/display/starfive/starfive,display-subsystem.yaml line 23
Quoted 9 lines
Documentation/devicetree/bindings/display/starfive/starfive,display-subsystem.yaml new file +9
-0+ display controller or other display interface nodes that comprise the + graphics subsystem. + +properties: + compatible: + const: starfive,display-subsystem + + ports: + $ref: /schemas/types.yaml#/definitions/phandle-arrayNo, ports is not phandle-array. ports is object, always.
Documentation/devicetree/bindings/display/starfive/starfive,display-subsystem.yaml line 28
Quoted 5 lines
Documentation/devicetree/bindings/display/starfive/starfive,display-subsystem.yaml new file +5
-0+ description: + Should contain a list of phandles pointing to display interface ports + of display controller devices. Display controller definitions as defined + in Documentation/devicetree/bindings/display/starfive/ + starfive,jh7110-dc8200.yamlUse standard graph ports, not some own, custom property.
Quoted 7 lines
Quoted 1 line
Anyway, entire binding should be dropped. You do not need it even.
Hi Krzysztof:
Virtual device is not suitable for bindings, matbe I need associate it with the real hardware. such as the top clocks & reset , irq , etc.
Currently I configure them in another yaml file. Logically speaking, this is more suitable.Can adding the corresponding hardware description change its fate of being deleted?
I am not sure if I follow. Bindings and DTS describe the hardware, so if you configure device A clocks in a device B node, then it is not correct. If you add binding for something not being a real device, it is not correct.
Feel free to bring proper hardware description, not Linux. This entire binding was written to describe Linux driver, which is not correct.
Best regards,
Krzysztof
PATCH v2 2/6 riscv: dts: starfive: jh7110: add dc controller and hdmi node
In reply to Keith ZhaoAdd the dc controller and hdmi node for the Starfive JH7110 SoC.
--- .../jh7110-starfive-visionfive-2.dtsi | 91 +++++++++++++++++++ arch/riscv/boot/dts/starfive/jh7110.dtsi | 41 +++++++++ 2 files changed, 132 insertions(+)
arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi +91 -0
@@ -31,6 +31,25 @@ memory@40000000 { reg = <0x0 0x40000000 0x1 0x0>; }; + reserved-memory { + #address-cells = <2>; + #size-cells = <2>; + ranges; + + /* vout applies for space from this CMA + * Without this CMA reservation, + * vout may not work properly. + */ + linux,cma { + compatible = "shared-dma-pool"; + reusable; + size = <0x0 0x20000000>; + alignment = <0x0 0x1000>; + alloc-ranges = <0x0 0x70000000 0x0 0x20000000>; + linux,cma-default; + }; + }; + gpio-restart { compatible = "gpio-restart"; gpios = <&sysgpio 35 GPIO_ACTIVE_HIGH>;
@@ -231,6 +250,41 @@ GPOEN_DISABLE, slew-rate = <0>; }; }; + + hdmi_pins: hdmi-0 { + hdmi-scl-pins { + pinmux = <GPIOMUX(0, GPOUT_SYS_HDMI_DDC_SCL, + GPOEN_SYS_HDMI_DDC_SCL, + GPI_SYS_HDMI_DDC_SCL)>; + input-enable; + bias-pull-up; + }; + + hdmi-sda-pins { + pinmux = <GPIOMUX(1, GPOUT_SYS_HDMI_DDC_SDA, + GPOEN_SYS_HDMI_DDC_SDA, + GPI_SYS_HDMI_DDC_SDA)>; + input-enable; + bias-pull-up; + }; + + hdmi-cec-pins { + pinmux = <GPIOMUX(14, GPOUT_SYS_HDMI_CEC_SDA, + GPOEN_SYS_HDMI_CEC_SDA, + GPI_SYS_HDMI_CEC_SDA)>; + input-enable; + bias-pull-up; + }; + + hdmi-hpd-pins { + pinmux = <GPIOMUX(15, GPOUT_HIGH, + GPOEN_ENABLE, + GPI_SYS_HDMI_HPD)>; + input-enable; + bias-disable; /* external pull-up */ + }; + }; + }; &uart0 {
@@ -254,3 +308,40 @@ &U74_3 { &U74_4 { cpu-supply = <&vdd_cpu>; }; + +&voutcrg { + status = "okay"; +}; + +&display { + status = "okay"; +}; + +&hdmi { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&hdmi_pins>; + + hdmi_in: port { + #address-cells = <1>; + #size-cells = <0>; + hdmi_in_dc: endpoint@0 { + reg = <0>; + remote-endpoint = <&dc_out_hdmi>; + }; + }; +}; + +&dc8200 { + status = "okay"; + + dc_out: port { + #address-cells = <1>; + #size-cells = <0>; + dc_out_hdmi: endpoint@0 { + reg = <0>; + remote-endpoint = <&hdmi_in_dc>; + }; + + }; +};
arch/riscv/boot/dts/starfive/jh7110.dtsi +41 -0
52 lines not on this page · raw message
Signature · 1 line
2.34.1
Re: [PATCH v2 2/6] riscv: dts: starfive: jh7110: add dc controller and hdmi node
Quoted 67 lines · Keith Zhao
Add the dc controller and hdmi node for the Starfive JH7110 SoC.
Signed-off-by Keith Zhao <[email protected]>--- .../jh7110-starfive-visionfive-2.dtsi | 91 +++++++++++++++++++ arch/riscv/boot/dts/starfive/jh7110.dtsi | 41 +++++++++ 2 files changed, 132 insertions(+)arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi +44
-0@@ -31,6 +31,25 @@ memory@40000000 { reg = <0x0 0x40000000 0x1 0x0>; }; + reserved-memory { + #address-cells = <2>; + #size-cells = <2>; + ranges; + + /* vout applies for space from this CMA + * Without this CMA reservation, + * vout may not work properly. + */ + linux,cma { + compatible = "shared-dma-pool"; + reusable; + size = <0x0 0x20000000>; + alignment = <0x0 0x1000>; + alloc-ranges = <0x0 0x70000000 0x0 0x20000000>; + linux,cma-default; + }; + }; + gpio-restart { compatible = "gpio-restart"; gpios = <&sysgpio 35 GPIO_ACTIVE_HIGH>;@@ -231,6 +250,41 @@ GPOEN_DISABLE, slew-rate = <0>; }; }; + + hdmi_pins: hdmi-0 { + hdmi-scl-pins { + pinmux = <GPIOMUX(0, GPOUT_SYS_HDMI_DDC_SCL, + GPOEN_SYS_HDMI_DDC_SCL, + GPI_SYS_HDMI_DDC_SCL)>; + input-enable; + bias-pull-up; + }; + + hdmi-sda-pins { + pinmux = <GPIOMUX(1, GPOUT_SYS_HDMI_DDC_SDA, + GPOEN_SYS_HDMI_DDC_SDA, + GPI_SYS_HDMI_DDC_SDA)>; + input-enable; + bias-pull-up; + }; + + hdmi-cec-pins { + pinmux = <GPIOMUX(14, GPOUT_SYS_HDMI_CEC_SDA, + GPOEN_SYS_HDMI_CEC_SDA, + GPI_SYS_HDMI_CEC_SDA)>; + input-enable; + bias-pull-up; + };
arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi GPOEN_DISABLE, · line 287
Quoted 10 lines
arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi +10
-0+ + hdmi-hpd-pins { + pinmux = <GPIOMUX(15, GPOUT_HIGH, + GPOEN_ENABLE, + GPI_SYS_HDMI_HPD)>; + input-enable; + bias-disable; /* external pull-up */ + }; + }; +
Please don't break the alphabetical ordering of these nodes.
Quoted 34 lines
arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi +27
-0}; &uart0 {@@ -254,3 +308,40 @@ &U74_3 { &U74_4 { cpu-supply = <&vdd_cpu>; }; + +&voutcrg { + status = "okay"; +}; + +&display { + status = "okay"; +}; + +&hdmi { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&hdmi_pins>; + + hdmi_in: port { + #address-cells = <1>; + #size-cells = <0>; + hdmi_in_dc: endpoint@0 { + reg = <0>; + remote-endpoint = <&dc_out_hdmi>; + }; + }; +}; + +&dc8200 { + status = "okay"; +
arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi &U74_3 { · line 347
Quoted 10 lines
arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi +10
-0+ dc_out: port { + #address-cells = <1>; + #size-cells = <0>; + dc_out_hdmi: endpoint@0 { + reg = <0>; + remote-endpoint = <&hdmi_in_dc>; + }; + + }; +};
Some goes for these node references. The order is /-node, clocks, node refences sorted alphabetically.
Quoted 46 lines
arch/riscv/boot/dts/starfive/jh7110.dtsi +31
-0@@ -282,6 +282,11 @@ tdm_ext: tdm-ext-clock { #clock-cells = <0>; }; + display: display-subsystem { + compatible = "starfive,display-subsystem"; + ports = <&dc_out>; + }; + soc { compatible = "simple-bus"; interrupt-parent = <&plic>;@@ -613,5 +618,41 @@ voutcrg: clock-controller@295c0000 { #reset-cells = <1>; power-domains = <&pwrc JH7110_PD_VOUT>; }; + + dc8200: lcd-controller@29400000 { + compatible = "starfive,jh7110-dc8200"; + reg = <0x0 0x29400000 0x0 0x100>, + <0x0 0x29400800 0x0 0x2000>; + interrupts = <95>; + clocks = <&syscrg JH7110_SYSCLK_NOC_BUS_DISP_AXI>, + <&voutcrg JH7110_VOUTCLK_DC8200_PIX0>, + <&voutcrg JH7110_VOUTCLK_DC8200_PIX1>, + <&voutcrg JH7110_VOUTCLK_DC8200_CORE>, + <&voutcrg JH7110_VOUTCLK_DC8200_AXI>, + <&voutcrg JH7110_VOUTCLK_DC8200_AHB>, + <&hdmitx0_pixelclk>, + <&voutcrg JH7110_VOUTCLK_DC8200_PIX>; + clock-names = "noc_bus", "channel0", "channel1", + "dc_core", "axi_core", "ahb", + "hdmi_tx", "dc_parent"; + resets = <&voutcrg JH7110_VOUTRST_DC8200_AXI>, + <&voutcrg JH7110_VOUTRST_DC8200_AHB>, + <&voutcrg JH7110_VOUTRST_DC8200_CORE>; + reset-names = "axi","ahb", "core"; + }; + + hdmi: hdmi@29590000 { + compatible = "starfive,jh7110-inno-hdmi"; + reg = <0x0 0x29590000 0x0 0x4000>;
arch/riscv/boot/dts/starfive/jh7110.dtsi voutcrg: clock-controller@295c0000 { · line 656
Quoted 10 lines
arch/riscv/boot/dts/starfive/jh7110.dtsi +10
-0+ interrupts = <99>; + + clocks = <&voutcrg JH7110_VOUTCLK_HDMI_TX_SYS>, + <&voutcrg JH7110_VOUTCLK_HDMI_TX_MCLK>, + <&voutcrg JH7110_VOUTCLK_HDMI_TX_BCLK>, + <&hdmitx0_pixelclk>; + clock-names = "sysclk", "mclk", "bclk", "pclk"; + resets = <&voutcrg JH7110_VOUTRST_HDMI_TX_HDMI>; + #sound-dai-cells = <0>; + };
These nodes, however, are sorted by their address which you alse break in this patch :(
Quoted 5 lines
arch/riscv/boot/dts/starfive/jh7110.dtsi +0
-1}; }; --2.34.1
PATCH v2 3/6 drm/fourcc: Add drm/vs tiled modifiers
In reply to Keith ZhaoFor each modifier, add the corresponding description
--- include/uapi/drm/drm_fourcc.h | 57 +++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+)
include/uapi/drm/drm_fourcc.h +57 -0
@@ -419,6 +419,7 @@ extern "C" {#define DRM_FORMAT_MOD_VENDOR_ARM 0x08#define DRM_FORMAT_MOD_VENDOR_ALLWINNER 0x09#define DRM_FORMAT_MOD_VENDOR_AMLOGIC 0x0a +#define DRM_FORMAT_MOD_VENDOR_VERISILICON 0x0b/* add more to the end as needed */
@@ -1562,6 +1563,62 @@ drm_fourcc_canonicalize_nvidia_format_mod(__u64 modifier)#define AMD_FMT_MOD_CLEAR (field) \ (~((__u64)AMD_FMT_MOD_##field##_MASK << AMD_FMT_MOD_##field##_SHIFT)) +#define DRM_FORMAT_MOD_VERISILICON_TYPE_NORMAL 0x00 +#define DRM_FORMAT_MOD_VERISILICON_TYPE_MASK ((__u64)0x3 << 54) + +#define fourcc_mod_vs_code (type, val) \ + fourcc_mod_code(VERISILICON, ((((__u64)type) << 54) | (val))) + +#define DRM_FORMAT_MOD_VERISILICON_NORM_MODE_MASK 0x1F + +/* +* An x-major 8x8 super tile consists of 64 8x8 sub-tiles in total. +* Each 8x8 sub-tile consists of four standard tiles . +* standard tiles (see Vivante 4x4 tiling layout) +*/ +#define DRM_FORMAT_MOD_VERISILICON_SUPER_TILED_XMAJOR_8X8 0x02 + +/* +* A y-major 8x8 super tile consists of 64 8x8 sub-tiles in total. +* Each 8x8 sub-tile consists of four standard tiles . +* standard tiles (see Vivante 4x4 tiling layout) +*/ +#define DRM_FORMAT_MOD_VERISILICON_SUPER_TILED_YMAJOR_8X8 0x03 + +/* +* An 8x8 tile consists of four standard tiles +* that are organized in Z-order. +* standard tiles (see Vivante 4x4 tiling layout) +*/ +#define DRM_FORMAT_MOD_VERISILICON_TILE_8X8 0x04 + +/* +* An 8x4 tile consists of two standard tiles +* that are organized in Z-order. +* standard tiles (see Vivante 4x4 tiling layout) +*/ +#define DRM_FORMAT_MOD_VERISILICON_TILE_8X4 0x07 + +/* +* An x-major 8x4 super tile consists of 128 8x4 sub-tiles in total. +* Each 8x4 sub-tile consists of two standard tiles. +* two standard tiles also same with DRM_FORMAT_MOD_VS_TILE_8X4 +* standard tiles (see Vivante 4x4 tiling layout) +*/ +#define DRM_FORMAT_MOD_VERISILICON_SUPER_TILED_XMAJOR_8X4 0x0B + +/* +* A y-major 4x8 super tile consists of 128 4x8 sub-tiles in total. +* Each 4x8 sub-tile consists of two standard tiles. +* two standard tiles also same with DRM_FORMAT_MOD_VS_TILE_8X4 +* standard tiles (see Vivante 4x4 tiling layout) +*/ +#define DRM_FORMAT_MOD_VERISILICON_SUPER_TILED_YMAJOR_4X8 0x0C + +#define fourcc_mod_vs_norm_code (tile) \ + fourcc_mod_vs_code(DRM_FORMAT_MOD_VERISILICON_TYPE_NORMAL, \ + (tile)) +#if defined(__cplusplus) }#endif
Signature · 1 line
2.34.1
Re: [PATCH v2 3/6] drm/fourcc: Add drm/vs tiled modifiers
Quoted 56 lines · Keith Zhao
For each modifier, add the corresponding description
Signed-off-by Keith Zhao <[email protected]>--- include/uapi/drm/drm_fourcc.h | 57 +++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+)include/uapi/drm/drm_fourcc.h +34
-0@@ -419,6 +419,7 @@ extern "C" {#define DRM_FORMAT_MOD_VENDOR_ARM 0x08#define DRM_FORMAT_MOD_VENDOR_ALLWINNER 0x09#define DRM_FORMAT_MOD_VENDOR_AMLOGIC 0x0a +#define DRM_FORMAT_MOD_VENDOR_VERISILICON 0x0b/* add more to the end as needed */ @@ -1562,6 +1563,62 @@ drm_fourcc_canonicalize_nvidia_format_mod(__u64 modifier)#define AMD_FMT_MOD_CLEAR (field) \ (~((__u64)AMD_FMT_MOD_##field##_MASK << AMD_FMT_MOD_##field##_SHIFT)) +#define DRM_FORMAT_MOD_VERISILICON_TYPE_NORMAL 0x00 +#define DRM_FORMAT_MOD_VERISILICON_TYPE_MASK ((__u64)0x3 << 54) + +#define fourcc_mod_vs_code (type, val) \ + fourcc_mod_code(VERISILICON, ((((__u64)type) << 54) | (val))) + +#define DRM_FORMAT_MOD_VERISILICON_NORM_MODE_MASK 0x1F + +/* +* An x-major 8x8 super tile consists of 64 8x8 sub-tiles in total. +* Each 8x8 sub-tile consists of four standard tiles . +* standard tiles (see Vivante 4x4 tiling layout) +*/ +#define DRM_FORMAT_MOD_VERISILICON_SUPER_TILED_XMAJOR_8X8 0x02 + +/* +* A y-major 8x8 super tile consists of 64 8x8 sub-tiles in total. +* Each 8x8 sub-tile consists of four standard tiles . +* standard tiles (see Vivante 4x4 tiling layout) +*/ +#define DRM_FORMAT_MOD_VERISILICON_SUPER_TILED_YMAJOR_8X8 0x03 + +/* +* An 8x8 tile consists of four standard tiles +* that are organized in Z-order. +* standard tiles (see Vivante 4x4 tiling layout) +*/ +#define DRM_FORMAT_MOD_VERISILICON_TILE_8X8 0x04 + +/* +* An 8x4 tile consists of two standard tiles +* that are organized in Z-order. +* standard tiles (see Vivante 4x4 tiling layout)
include/uapi/drm/drm_fourcc.h drm_fourcc_canonicalize_nvidia_format_mod(__u64 modifier) · line 1608
Quoted 10 lines
include/uapi/drm/drm_fourcc.h +10
-0+*/ +#define DRM_FORMAT_MOD_VERISILICON_TILE_8X4 0x07 + +/* +* An x-major 8x4 super tile consists of 128 8x4 sub-tiles in total. +* Each 8x4 sub-tile consists of two standard tiles. +* two standard tiles also same with DRM_FORMAT_MOD_VS_TILE_8X4 +* standard tiles (see Vivante 4x4 tiling layout) +*/ +#define DRM_FORMAT_MOD_VERISILICON_SUPER_TILED_XMAJOR_8X4 0x0B
These indents are all over the place. Please either align them with tabs or use a single space like the AMD defines above.
Quoted 19 lines
include/uapi/drm/drm_fourcc.h +13
-1+ +/* +* A y-major 4x8 super tile consists of 128 4x8 sub-tiles in total. +* Each 4x8 sub-tile consists of two standard tiles. +* two standard tiles also same with DRM_FORMAT_MOD_VS_TILE_8X4 +* standard tiles (see Vivante 4x4 tiling layout) +*/ +#define DRM_FORMAT_MOD_VERISILICON_SUPER_TILED_YMAJOR_4X8 0x0C + +#define fourcc_mod_vs_norm_code (tile) \ + fourcc_mod_vs_code(DRM_FORMAT_MOD_VERISILICON_TYPE_NORMAL, \ + (tile)) +#if defined(__cplusplus) }#endif --2.34.1
Re: [PATCH v2 3/6] drm/fourcc: Add drm/vs tiled modifiers
In reply to Keith ZhaoQuoted 20 lines · Keith Zhao
For each modifier, add the corresponding description
Signed-off-by Keith Zhao <[email protected]>--- include/uapi/drm/drm_fourcc.h | 57 +++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+)include/uapi/drm/drm_fourcc.h +1
-0@@ -419,6 +419,7 @@ extern "C" {#define DRM_FORMAT_MOD_VENDOR_ARM 0x08#define DRM_FORMAT_MOD_VENDOR_ALLWINNER 0x09#define DRM_FORMAT_MOD_VENDOR_AMLOGIC 0x0a +#define DRM_FORMAT_MOD_VENDOR_VERISILICON 0x0b/* add more to the end as needed */
include/uapi/drm/drm_fourcc.h drm_fourcc_canonicalize_nvidia_format_mod(__u64 modifier) · line 1570
Quoted 8 lines
include/uapi/drm/drm_fourcc.h +5
-0@@ -1562,6 +1563,62 @@ drm_fourcc_canonicalize_nvidia_format_mod(__u64 modifier)#define AMD_FMT_MOD_CLEAR (field) \ (~((__u64)AMD_FMT_MOD_##field##_MASK << AMD_FMT_MOD_##field##_SHIFT)) +#define DRM_FORMAT_MOD_VERISILICON_TYPE_NORMAL 0x00 +#define DRM_FORMAT_MOD_VERISILICON_TYPE_MASK ((__u64)0x3 << 54) + +#define fourcc_mod_vs_code (type, val) \ + fourcc_mod_code(VERISILICON, ((((__u64)type) << 54) | (val)))
Please use fourcc_mode_code directly.
Quoted 40 lines
include/uapi/drm/drm_fourcc.h +40
-0+ +#define DRM_FORMAT_MOD_VERISILICON_NORM_MODE_MASK 0x1F + +/* +* An x-major 8x8 super tile consists of 64 8x8 sub-tiles in total. +* Each 8x8 sub-tile consists of four standard tiles . +* standard tiles (see Vivante 4x4 tiling layout) +*/ +#define DRM_FORMAT_MOD_VERISILICON_SUPER_TILED_XMAJOR_8X8 0x02 + +/* +* A y-major 8x8 super tile consists of 64 8x8 sub-tiles in total. +* Each 8x8 sub-tile consists of four standard tiles . +* standard tiles (see Vivante 4x4 tiling layout) +*/ +#define DRM_FORMAT_MOD_VERISILICON_SUPER_TILED_YMAJOR_8X8 0x03 + +/* +* An 8x8 tile consists of four standard tiles +* that are organized in Z-order. +* standard tiles (see Vivante 4x4 tiling layout) +*/ +#define DRM_FORMAT_MOD_VERISILICON_TILE_8X8 0x04 + +/* +* An 8x4 tile consists of two standard tiles +* that are organized in Z-order. +* standard tiles (see Vivante 4x4 tiling layout) +*/ +#define DRM_FORMAT_MOD_VERISILICON_TILE_8X4 0x07 + +/* +* An x-major 8x4 super tile consists of 128 8x4 sub-tiles in total. +* Each 8x4 sub-tile consists of two standard tiles. +* two standard tiles also same with DRM_FORMAT_MOD_VS_TILE_8X4 +* standard tiles (see Vivante 4x4 tiling layout) +*/ +#define DRM_FORMAT_MOD_VERISILICON_SUPER_TILED_XMAJOR_8X4 0x0B + +/*
include/uapi/drm/drm_fourcc.h drm_fourcc_canonicalize_nvidia_format_mod(__u64 modifier) · line 1620
Quoted 10 lines
include/uapi/drm/drm_fourcc.h +10
-0+* A y-major 4x8 super tile consists of 128 4x8 sub-tiles in total. +* Each 4x8 sub-tile consists of two standard tiles. +* two standard tiles also same with DRM_FORMAT_MOD_VS_TILE_8X4 +* standard tiles (see Vivante 4x4 tiling layout) +*/ +#define DRM_FORMAT_MOD_VERISILICON_SUPER_TILED_YMAJOR_4X8 0x0C + +#define fourcc_mod_vs_norm_code (tile) \ + fourcc_mod_vs_code(DRM_FORMAT_MOD_VERISILICON_TYPE_NORMAL, \ + (tile))
1) this is not a part of uAPI
2) please use fourcc_mod_code directly.
Quoted 4 lines
include/uapi/drm/drm_fourcc.h +1
-0+#if defined(__cplusplus) }#endif
Signature · 2 lines
With best wishes Dmitry
Re: [PATCH v2 3/6] drm/fourcc: Add drm/vs tiled modifiers
In reply to Keith ZhaoWould be good to have an overview comment to explain how bits in the modifier are used and how everything is tied up together, e.g. what the type and tile mode mean. Also some docs for DRM_FORMAT_MOD_VERISILICON_TYPE_NORMAL would be nice. (If there is no other type, this can be removed, the bits will be left as zero and can be extended later if needed.)
Re: [PATCH v2 3/6] drm/fourcc: Add drm/vs tiled modifiers
Thinking about this again, it seems like you could start with just simple enumerated modifiers like Intel does, and then only switch to more complicated logic with macros and fields if there is an actual need in the future.
Re: [PATCH v2 3/6] drm/fourcc: Add drm/vs tiled modifiers
ok, I will do this in my next patch
Thanks your advice!
Quoted 4 lines · Simon Ser
it seems like you could start with just simple
enumerated modifiers like Intel does, and then only switch to more complicated logic with macros and fields if there is an actual need in the future.
PATCH v2 4/6 drm/vs: Register DRM device
In reply to Keith ZhaoImplement drm device registration interface
Thomas Zimmermann wrote:
You are replacing almost all of the GEM DMA object's helper code. Either inherit directly from drm_gem_object drop the dependency entirely, or you could try to fit your code into GEM DMA as well
Eventually I found an answer and it was DRM_GEM_DMA_DRIVER_OPS_WITH_DUMB_CREATE After I adapt this interface, the custom gem logic interfaces can be deleted. It's a big shocking, clap!
--- drivers/gpu/drm/Kconfig | 2 + drivers/gpu/drm/Makefile | 1 + drivers/gpu/drm/verisilicon/Kconfig | 15 ++ drivers/gpu/drm/verisilicon/Makefile | 7 + drivers/gpu/drm/verisilicon/vs_drv.c | 227 +++++++++++++++++++++++ drivers/gpu/drm/verisilicon/vs_drv.h | 27 +++ drivers/gpu/drm/verisilicon/vs_modeset.c | 36 ++++ drivers/gpu/drm/verisilicon/vs_modeset.h | 10 + include/uapi/drm/vs_drm.h | 50 +++++ 9 files changed, 375 insertions(+) create mode 100644 drivers/gpu/drm/verisilicon/Kconfig create mode 100644 drivers/gpu/drm/verisilicon/Makefile create mode 100644 drivers/gpu/drm/verisilicon/vs_drv.c create mode 100644 drivers/gpu/drm/verisilicon/vs_drv.h create mode 100644 drivers/gpu/drm/verisilicon/vs_modeset.c create mode 100644 drivers/gpu/drm/verisilicon/vs_modeset.h create mode 100644 include/uapi/drm/vs_drm.h
drivers/gpu/drm/Kconfig +2 -0
@@ -363,6 +363,8 @@ source "drivers/gpu/drm/solomon/Kconfig" source "drivers/gpu/drm/sprd/Kconfig" +source "drivers/gpu/drm/verisilicon/Kconfig" + config DRM_HYPERV tristate "DRM Support for Hyper-V synthetic video device" depends on DRM && PCI && MMU && HYPERV
drivers/gpu/drm/Makefile +1 -0
@@ -194,3 +194,4 @@ obj-y += gud/ obj-$(CONFIG_DRM_HYPERV) += hyperv/ obj-y += solomon/ obj-$(CONFIG_DRM_SPRD) += sprd/ +obj-$(CONFIG_DRM_VERISILICON) += verisilicon/
drivers/gpu/drm/verisilicon/Kconfig new file +15 -0
@@ -0,0 +1,15 @@ +# SPDX-License-Identifier: GPL-2.0 +config DRM_VERISILICON + tristate "DRM Support for VeriSilicon" + depends on DRM + select DRM_KMS_HELPER + select DRM_GEM_DMA_HELPER + select CMA + select DMA_CMA + help + Choose this option if you have a VeriSilicon soc chipset. + This driver provides VeriSilicon kernel mode + setting and buffer management. It does not + provide 2D or 3D acceleration. + +
drivers/gpu/drm/verisilicon/Makefile new file +7 -0
@@ -0,0 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0 + +vs_drm-objs := vs_drv.o \ + vs_modeset.o + +obj-$(CONFIG_DRM_VERISILICON) += vs_drm.o +
drivers/gpu/drm/verisilicon/vs_drv.c new file +227 -0
227 lines not on this page · raw message
drivers/gpu/drm/verisilicon/vs_drv.h new file +27 -0
@@ -0,0 +1,27 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Copyright (C) 2023 VeriSilicon Holdings Co., Ltd. +*/ + +#ifndef __VS_DRV_H__ +#define __VS_DRV_H__ + +#include <linux/module.h> +#include <linux/platform_device.h> +#include <drm/drm_drv.h> +#include <drm/drm_gem.h> +#include <drm/drm_managed.h> + +/*@pitch_alignment: buffer pitch alignment required by sub-devices.*/ +struct vs_drm_device { +struct drm_device base; +unsigned int pitch_alignment; +}; + +static inline struct vs_drm_device * +to_vs_drm_private (const struct drm_device *dev) +{ + return container_of(dev, struct vs_drm_device, base); +} + +#endif /* __VS_DRV_H__ */
drivers/gpu/drm/verisilicon/vs_modeset.c new file +36 -0
@@ -0,0 +1,36 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Copyright (C) 2023 VeriSilicon Holdings Co., Ltd. +*/ + +#include <linux/module.h> + +#include <drm/drm_damage_helper.h> +#include <drm/drm_fb_helper.h> +#include <drm/drm_gem_framebuffer_helper.h> + +#include "vs_modeset.h" + +static const struct drm_mode_config_funcs vs_mode_config_funcs = { + .fb_create = drm_gem_fb_create, + .atomic_check = drm_atomic_helper_check, + .atomic_commit = drm_atomic_helper_commit, +}; + +static struct drm_mode_config_helper_funcs vs_mode_config_helpers = { + .atomic_commit_tail = drm_atomic_helper_commit_tail_rpm, +}; + +void vs_mode_config_init (struct drm_device *dev) +{ +drm_mode_config_init (dev); + dev->mode_config.fb_modifiers_not_supported = false; + + dev->mode_config.min_width =0 ; + dev->mode_config.min_height =0 ; + dev->mode_config.max_width =4096 ; + dev->mode_config.max_height =4096 ; + + dev->mode_config.funcs = &vs_mode_config_funcs; + dev->mode_config.helper_private = &vs_mode_config_helpers; +}
drivers/gpu/drm/verisilicon/vs_modeset.h new file +10 -0
@@ -0,0 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Copyright (C) 2020 VeriSilicon Holdings Co., Ltd. +*/ + +#ifndef __VS_FB_H__ +#define __VS_FB_H__ + +void vs_mode_config_init (struct drm_device *dev); +#endif /* __VS_FB_H__ */
include/uapi/drm/vs_drm.h new file +50 -0
50 lines not on this page · raw message
Signature · 1 line
2.34.1
Re: [PATCH v2 4/6] drm/vs: Register DRM device
Quoted 80 lines · Keith Zhao
Implement drm device registration interface
Thomas Zimmermann wrote:
You are replacing almost all of the GEM DMA object's helper code. Either inherit directly fromdrm_gem_objectdrop the dependency entirely, or you could try to fit your code into GEM DMA as wellEventually I found an answer and it was
DRM_GEM_DMA_DRIVER_OPS_WITH_DUMB_CREATEAfter I adapt this interface, the custom gem logic interfaces can be deleted. It's a big shocking, clap!Signed-off-by Keith Zhao <[email protected]>--- drivers/gpu/drm/Kconfig | 2 + drivers/gpu/drm/Makefile | 1 + drivers/gpu/drm/verisilicon/Kconfig | 15 ++ drivers/gpu/drm/verisilicon/Makefile | 7 + drivers/gpu/drm/verisilicon/vs_drv.c | 227 +++++++++++++++++++++++ drivers/gpu/drm/verisilicon/vs_drv.h | 27 +++ drivers/gpu/drm/verisilicon/vs_modeset.c | 36 ++++ drivers/gpu/drm/verisilicon/vs_modeset.h | 10 + include/uapi/drm/vs_drm.h | 50 +++++ 9 files changed, 375 insertions(+) create mode 100644 drivers/gpu/drm/verisilicon/Kconfig create mode 100644 drivers/gpu/drm/verisilicon/Makefile create mode 100644 drivers/gpu/drm/verisilicon/vs_drv.c create mode 100644 drivers/gpu/drm/verisilicon/vs_drv.h create mode 100644 drivers/gpu/drm/verisilicon/vs_modeset.c create mode 100644 drivers/gpu/drm/verisilicon/vs_modeset.h create mode 100644 include/uapi/drm/vs_drm.hdrivers/gpu/drm/Kconfig +2
-0@@ -363,6 +363,8 @@ source "drivers/gpu/drm/solomon/Kconfig" source "drivers/gpu/drm/sprd/Kconfig" +source "drivers/gpu/drm/verisilicon/Kconfig" + config DRM_HYPERV tristate "DRM Support for Hyper-V synthetic video device" depends on DRM && PCI && MMU && HYPERVdrivers/gpu/drm/Makefile +1
-0@@ -194,3 +194,4 @@ obj-y += gud/ obj-$(CONFIG_DRM_HYPERV) += hyperv/ obj-y += solomon/ obj-$(CONFIG_DRM_SPRD) += sprd/ +obj-$(CONFIG_DRM_VERISILICON) += verisilicon/drivers/gpu/drm/verisilicon/Kconfig new file +15
-0@@ -0,0 +1,15 @@ +# SPDX-License-Identifier: GPL-2.0 +config DRM_VERISILICON + tristate "DRM Support for VeriSilicon" + depends on DRM + select DRM_KMS_HELPER + select DRM_GEM_DMA_HELPER + select CMA + select DMA_CMA + help + Choose this option if you have a VeriSilicon soc chipset. + This driver provides VeriSilicon kernel mode + setting and buffer management. It does not + provide 2D or 3D acceleration. + +drivers/gpu/drm/verisilicon/Makefile new file +0
-0
drivers/gpu/drm/verisilicon/Makefile line 7
Quoted 7 lines
drivers/gpu/drm/verisilicon/Makefile new file +7
-0@@ -0,0 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0 + +vs_drm-objs := vs_drv.o \ + vs_modeset.o + +obj-$(CONFIG_DRM_VERISILICON) += vs_drm.o +
Git complains about trailing whitespace and trailing newlines in this patch. Here one of the instances.
Quoted 383 lines
drivers/gpu/drm/verisilicon/vs_drv.c new file +227
-0@@ -0,0 +1,227 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Copyright (C) 2023 VeriSilicon Holdings Co., Ltd. +*/ + +#include <linux/component.h> +#include <linux/pm_runtime.h> + +#include <drm/drm_aperture.h> +#include <drm/drm_atomic_helper.h> +#include <drm/drm_crtc.h> +#include <drm/drm_crtc_helper.h> +#include <drm/drm_fb_helper.h> +#include <drm/drm_fbdev_generic.h> +#include <drm/drm_file.h> +#include <drm/drm_gem_dma_helper.h> +#include <drm/drm_module.h> +#include <drm/drm_of.h> +#include <drm/drm_probe_helper.h> +#include <drm/drm_vblank.h> + +#include "vs_drv.h" +#include "vs_modeset.h" + +#define DRV_NAME "verisilicon" +#define DRV_DESC "Verisilicon DRM driver" +#define DRV_DATE "20230516" +#define DRV_MAJOR 1 +#define DRV_MINOR 0 + +static int vs_gem_dumb_create (struct drm_file *file,struct drm_device *dev, +struct drm_mode_create_dumb *args) +{ +struct vs_drm_device *priv =to_vs_drm_private (dev); + +unsigned int pitch =DIV_ROUND_UP (args->width * args->bpp,8 ); + +if (args->bpp %10 ) + args->pitch =ALIGN (pitch, priv->pitch_alignment); +else +/* for costum 10bit format with no bit gaps */ + args->pitch = pitch; + +return drm_gem_dma_dumb_create_internal (file, dev, args); +} + +DEFINE_DRM_GEM_FOPS (vs_drm_fops); + +static struct drm_driver vs_drm_driver = { + .driver_features =DRIVER_MODESET |DRIVER_ATOMIC |DRIVER_GEM , + +DRM_GEM_DMA_DRIVER_OPS_WITH_DUMB_CREATE (vs_gem_dumb_create), + + .fops = &vs_drm_fops, + .name =DRV_NAME , + .desc =DRV_DESC , + .date =DRV_DATE , + .major =DRV_MAJOR , + .minor =DRV_MINOR , +}; + +static int vs_drm_bind (struct device *dev) +{ +struct platform_device *pdev =to_platform_device (dev); +struct vs_drm_device *priv; +int ret; +struct drm_device *drm_dev; + +/* Remove existing drivers that may own the framebuffer memory. */ + ret =drm_aperture_remove_framebuffers (&vs_drm_driver); +if (ret) +return ret; + + priv = devm_drm_dev_alloc(dev, &vs_drm_driver, struct vs_drm_device, base); +if (IS_ERR (priv)) +return PTR_ERR (priv); + + priv->pitch_alignment =64 ; + + ret =dma_set_coherent_mask (priv->base.dev,DMA_BIT_MASK (40 )); +if (ret) +return ret; + + drm_dev = &priv->base; +platform_set_drvdata (pdev, drm_dev); + +vs_mode_config_init (drm_dev); + +/* Now try and bind all our sub-components */ + ret =component_bind_all (dev, drm_dev); +if (ret) +return ret; + + ret =drm_vblank_init (drm_dev, drm_dev->mode_config.num_crtc); +if (ret) +return ret; + +drm_mode_config_reset (drm_dev); + +drm_kms_helper_poll_init (drm_dev); + + ret =drm_dev_register (drm_dev,0 ); +if (ret) +return ret; + +drm_fbdev_generic_setup (drm_dev,32 ); + +return 0 ; +} + +static void vs_drm_unbind (struct device *dev) +{ +struct drm_device *drm_dev =dev_get_drvdata (dev); + +drm_dev_unregister (drm_dev); +drm_kms_helper_poll_fini (drm_dev); +component_unbind_all (drm_dev->dev, drm_dev); +} + +static const struct component_master_ops vs_drm_ops = { + .bind = vs_drm_bind, + .unbind = vs_drm_unbind, +}; + +static struct platform_driver *drm_sub_drivers[] = { + +}; + +static struct component_match *vs_drm_match_add (struct device *dev) +{ +struct component_match *match =NULL ; +int i; + +for (i =0 ; i <ARRAY_SIZE (drm_sub_drivers); ++i) { +struct platform_driver *drv = drm_sub_drivers[i]; +struct device *p =NULL , *d; + +while ((d =platform_find_device_by_driver (p, &drv->driver))) { +put_device (p); + +component_match_add (dev, &match, component_compare_dev, d); + p = d; + } +put_device (p); + } + +return match ? match :ERR_PTR (-ENODEV ); +} + +static int vs_drm_platform_probe (struct platform_device *pdev) +{ +struct device *dev = &pdev->dev; +struct component_match *match; + + match =vs_drm_match_add (dev); +if (IS_ERR (match)) +return PTR_ERR (match); + +return component_master_add_with_match (dev, &vs_drm_ops, match); +} + +static int vs_drm_platform_remove (struct platform_device *pdev) +{ +component_master_del (&pdev->dev, &vs_drm_ops); +return 0 ; +} + +#ifdef CONFIG_PM_SLEEP +static int vs_drm_suspend (struct device *dev) +{ +return drm_mode_config_helper_suspend (dev_get_drvdata (dev)); +} + +static int vs_drm_resume (struct device *dev) +{ +drm_mode_config_helper_resume (dev_get_drvdata (dev)); + +return 0 ; +} +#endif + +static SIMPLE_DEV_PM_OPS(vs_drm_pm_ops, vs_drm_suspend, vs_drm_resume); + +static const struct of_device_id vs_drm_dt_ids[] = { + { .compatible ="starfive,display-subsystem" , }, + { }, +}; + +MODULE_DEVICE_TABLE (of, vs_drm_dt_ids); + +static struct platform_driver vs_drm_platform_driver = { + .probe = vs_drm_platform_probe, + .remove = vs_drm_platform_remove, + + .driver = { + .name =DRV_NAME , + .of_match_table = vs_drm_dt_ids, + .pm = &vs_drm_pm_ops, + }, +}; + +static int __init vs_drm_init (void ) +{ +int ret; + + ret =platform_register_drivers (drm_sub_drivers,ARRAY_SIZE (drm_sub_drivers)); +if (ret) +return ret; + + ret =drm_platform_driver_register (&vs_drm_platform_driver); +if (ret) +platform_unregister_drivers (drm_sub_drivers,ARRAY_SIZE (drm_sub_drivers)); + +return ret; +} + +static void __exit vs_drm_fini(void) +{ +platform_driver_unregister (&vs_drm_platform_driver); +platform_unregister_drivers (drm_sub_drivers,ARRAY_SIZE (drm_sub_drivers)); +} + +module_init (vs_drm_init); +module_exit (vs_drm_fini); + +MODULE_DESCRIPTION ("VeriSilicon DRM Driver" ); +MODULE_LICENSE ("GPL" );drivers/gpu/drm/verisilicon/vs_drv.h new file +27
-0@@ -0,0 +1,27 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Copyright (C) 2023 VeriSilicon Holdings Co., Ltd. +*/ + +#ifndef __VS_DRV_H__ +#define __VS_DRV_H__ + +#include <linux/module.h> +#include <linux/platform_device.h> +#include <drm/drm_drv.h> +#include <drm/drm_gem.h> +#include <drm/drm_managed.h> + +/*@pitch_alignment: buffer pitch alignment required by sub-devices.*/ +struct vs_drm_device { +struct drm_device base; +unsigned int pitch_alignment; +}; + +static inline struct vs_drm_device * +to_vs_drm_private (const struct drm_device *dev) +{ + return container_of(dev, struct vs_drm_device, base); +} + +#endif /* __VS_DRV_H__ */ drivers/gpu/drm/verisilicon/vs_modeset.c new file +36
-0@@ -0,0 +1,36 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Copyright (C) 2023 VeriSilicon Holdings Co., Ltd. +*/ + +#include <linux/module.h> + +#include <drm/drm_damage_helper.h> +#include <drm/drm_fb_helper.h> +#include <drm/drm_gem_framebuffer_helper.h> + +#include "vs_modeset.h" + +static const struct drm_mode_config_funcs vs_mode_config_funcs = { + .fb_create = drm_gem_fb_create, + .atomic_check = drm_atomic_helper_check, + .atomic_commit = drm_atomic_helper_commit, +}; + +static struct drm_mode_config_helper_funcs vs_mode_config_helpers = { + .atomic_commit_tail = drm_atomic_helper_commit_tail_rpm, +}; + +void vs_mode_config_init (struct drm_device *dev) +{ +drm_mode_config_init (dev); + dev->mode_config.fb_modifiers_not_supported = false; + + dev->mode_config.min_width =0 ; + dev->mode_config.min_height =0 ; + dev->mode_config.max_width =4096 ; + dev->mode_config.max_height =4096 ; + + dev->mode_config.funcs = &vs_mode_config_funcs; + dev->mode_config.helper_private = &vs_mode_config_helpers; +}drivers/gpu/drm/verisilicon/vs_modeset.h new file +10
-0@@ -0,0 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Copyright (C) 2020 VeriSilicon Holdings Co., Ltd. +*/ + +#ifndef __VS_FB_H__ +#define __VS_FB_H__ + +void vs_mode_config_init (struct drm_device *dev); +#endif /* __VS_FB_H__ */ include/uapi/drm/vs_drm.h new file +50
-1@@ -0,0 +1,50 @@ +/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */ +/* +* Copyright (C) 2020 VeriSilicon Holdings Co., Ltd. +*/ + +#ifndef __VS_DRM_H__ +#define __VS_DRM_H__ + +#include "drm.h" + +enum drm_vs_degamma_mode { +VS_DEGAMMA_DISABLE =0 , +VS_DEGAMMA_BT709 =1 , +VS_DEGAMMA_BT2020 =2 , +}; + +enum drm_vs_sync_dc_mode { +VS_SINGLE_DC =0 , +VS_MULTI_DC_PRIMARY =1 , +VS_MULTI_DC_SECONDARY =2 , +}; + +enum drm_vs_mmu_prefetch_mode { +VS_MMU_PREFETCH_DISABLE =0 , +VS_MMU_PREFETCH_ENABLE =1 , +}; + +struct drm_vs_watermark { +__u32 watermark; +__u8 qos_low; +__u8 qos_high; +}; + +struct drm_vs_color_mgmt { +__u32 colorkey; +__u32 colorkey_high; +__u32 clear_value; +bool clear_enable; +bool transparency; +}; + +struct drm_vs_roi { +bool enable; +__u16 roi_x; +__u16 roi_y; +__u16 roi_w; +__u16 roi_h; +}; + +#endif /* __VS_DRM_H__ */ --2.34.1
Re: [PATCH v2 4/6] drm/vs: Register DRM device
In reply to Keith ZhaoQuoted 124 lines · Keith Zhao
Implement drm device registration interface
Thomas Zimmermann wrote:
You are replacing almost all of the GEM DMA object's helper code. Either inherit directly fromdrm_gem_objectdrop the dependency entirely, or you could try to fit your code into GEM DMA as wellEventually I found an answer and it was
DRM_GEM_DMA_DRIVER_OPS_WITH_DUMB_CREATEAfter I adapt this interface, the custom gem logic interfaces can be deleted. It's a big shocking, clap!Signed-off-by Keith Zhao <[email protected]>--- drivers/gpu/drm/Kconfig | 2 + drivers/gpu/drm/Makefile | 1 + drivers/gpu/drm/verisilicon/Kconfig | 15 ++ drivers/gpu/drm/verisilicon/Makefile | 7 + drivers/gpu/drm/verisilicon/vs_drv.c | 227 +++++++++++++++++++++++ drivers/gpu/drm/verisilicon/vs_drv.h | 27 +++ drivers/gpu/drm/verisilicon/vs_modeset.c | 36 ++++ drivers/gpu/drm/verisilicon/vs_modeset.h | 10 + include/uapi/drm/vs_drm.h | 50 +++++ 9 files changed, 375 insertions(+)create mode 100644
drivers/gpu/drm/verisilicon/Kconfigcreate mode 100644drivers/gpu/drm/verisilicon/Makefilecreate mode 100644drivers/gpu/drm/verisilicon/vs_drv.ccreate mode 100644drivers/gpu/drm/verisilicon/vs_drv.hcreate mode 100644drivers/gpu/drm/verisilicon/vs_modeset.ccreate mode 100644drivers/gpu/drm/verisilicon/vs_modeset.hcreate mode 100644include/uapi/drm/vs_drm.hdrivers/gpu/drm/Kconfig +2
-0@@ -363,6 +363,8 @@ source "drivers/gpu/drm/solomon/Kconfig" source "drivers/gpu/drm/sprd/Kconfig" +source "drivers/gpu/drm/verisilicon/Kconfig" + config DRM_HYPERV tristate "DRM Support for Hyper-V synthetic video device" depends on DRM && PCI && MMU && HYPERVdrivers/gpu/drm/Makefile +1
-0@@ -194,3 +194,4 @@ obj-y += gud/ obj-$(CONFIG_DRM_HYPERV) += hyperv/ obj-y += solomon/ obj-$(CONFIG_DRM_SPRD) += sprd/ +obj-$(CONFIG_DRM_VERISILICON) += verisilicon/drivers/gpu/drm/verisilicon/Kconfig new file +15
-0@@ -0,0 +1,15 @@ +# SPDX-License-Identifier: GPL-2.0 +config DRM_VERISILICON + tristate "DRM Support for VeriSilicon" + depends on DRM + select DRM_KMS_HELPER + select DRM_GEM_DMA_HELPER + select CMA + select DMA_CMA + help + Choose this option if you have a VeriSilicon soc chipset. + This driver provides VeriSilicon kernel mode + setting and buffer management. It does not + provide 2D or 3D acceleration. + +drivers/gpu/drm/verisilicon/Makefile new file +7
-0@@ -0,0 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0 + +vs_drm-objs := vs_drv.o \ + vs_modeset.o + +obj-$(CONFIG_DRM_VERISILICON) += vs_drm.o +drivers/gpu/drm/verisilicon/vs_drv.c new file +31
-0@@ -0,0 +1,227 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Copyright (C) 2023 VeriSilicon Holdings Co., Ltd. +*/ + +#include <linux/component.h> +#include <linux/pm_runtime.h> + +#include <drm/drm_aperture.h> +#include <drm/drm_atomic_helper.h> +#include <drm/drm_crtc.h> +#include <drm/drm_crtc_helper.h> +#include <drm/drm_fb_helper.h> +#include <drm/drm_fbdev_generic.h> +#include <drm/drm_file.h> +#include <drm/drm_gem_dma_helper.h> +#include <drm/drm_module.h> +#include <drm/drm_of.h> +#include <drm/drm_probe_helper.h> +#include <drm/drm_vblank.h> + +#include "vs_drv.h" +#include "vs_modeset.h" + +#define DRV_NAME "verisilicon" +#define DRV_DESC "Verisilicon DRM driver" +#define DRV_DATE "20230516" +#define DRV_MAJOR 1 +#define DRV_MINOR 0 + +static int vs_gem_dumb_create(struct drm_file *file, struct drm_device *dev,
drivers/gpu/drm/verisilicon/vs_drv.c line 41
Quoted 10 lines
drivers/gpu/drm/verisilicon/vs_drv.c new file +10
-0+ struct drm_mode_create_dumb *args) +{ +struct vs_drm_device *priv =to_vs_drm_private (dev); + +unsigned int pitch =DIV_ROUND_UP (args->width * args->bpp,8 ); + +if (args->bpp %10 ) + args->pitch =ALIGN (pitch, priv->pitch_alignment); +else +/* for costum 10bit format with no bit gaps */
? I think you meant 'custom' here. If so, please define that format and use it explicitly here. There can be other 10bpp formats.
Quoted 90 lines
drivers/gpu/drm/verisilicon/vs_drv.c new file +90
-0+ args->pitch = pitch; + +return drm_gem_dma_dumb_create_internal (file, dev, args); +} + +DEFINE_DRM_GEM_FOPS (vs_drm_fops); + +static struct drm_driver vs_drm_driver = { + .driver_features =DRIVER_MODESET |DRIVER_ATOMIC |DRIVER_GEM , + +DRM_GEM_DMA_DRIVER_OPS_WITH_DUMB_CREATE (vs_gem_dumb_create), + + .fops = &vs_drm_fops, + .name =DRV_NAME , + .desc =DRV_DESC , + .date =DRV_DATE , + .major =DRV_MAJOR , + .minor =DRV_MINOR , +}; + +static int vs_drm_bind (struct device *dev) +{ +struct platform_device *pdev =to_platform_device (dev); +struct vs_drm_device *priv; +int ret; +struct drm_device *drm_dev; + +/* Remove existing drivers that may own the framebuffer memory. */ + ret =drm_aperture_remove_framebuffers (&vs_drm_driver); +if (ret) +return ret; + + priv = devm_drm_dev_alloc(dev, &vs_drm_driver, struct vs_drm_device, base); +if (IS_ERR (priv)) +return PTR_ERR (priv); + + priv->pitch_alignment =64 ; + + ret =dma_set_coherent_mask (priv->base.dev,DMA_BIT_MASK (40 )); +if (ret) +return ret; + + drm_dev = &priv->base; +platform_set_drvdata (pdev, drm_dev); + +vs_mode_config_init (drm_dev); + +/* Now try and bind all our sub-components */ + ret =component_bind_all (dev, drm_dev); +if (ret) +return ret; + + ret =drm_vblank_init (drm_dev, drm_dev->mode_config.num_crtc); +if (ret) +return ret; + +drm_mode_config_reset (drm_dev); + +drm_kms_helper_poll_init (drm_dev); + + ret =drm_dev_register (drm_dev,0 ); +if (ret) +return ret; + +drm_fbdev_generic_setup (drm_dev,32 ); + +return 0 ; +} + +static void vs_drm_unbind (struct device *dev) +{ +struct drm_device *drm_dev =dev_get_drvdata (dev); + +drm_dev_unregister (drm_dev); +drm_kms_helper_poll_fini (drm_dev); +component_unbind_all (drm_dev->dev, drm_dev); +} + +static const struct component_master_ops vs_drm_ops = { + .bind = vs_drm_bind, + .unbind = vs_drm_unbind, +}; + +static struct platform_driver *drm_sub_drivers[] = { + +}; + +static struct component_match *vs_drm_match_add (struct device *dev) +{ +struct component_match *match =NULL ;
drivers/gpu/drm/verisilicon/vs_drv.c line 141
Quoted 10 lines
drivers/gpu/drm/verisilicon/vs_drv.c new file +10
-0+int i; + +for (i =0 ; i <ARRAY_SIZE (drm_sub_drivers); ++i) { +struct platform_driver *drv = drm_sub_drivers[i]; +struct device *p =NULL , *d; + +while ((d =platform_find_device_by_driver (p, &drv->driver))) { +put_device (p); + +component_match_add (dev, &match, component_compare_dev, d);
drm_of_component_match_add ?
Quoted 61 lines
drivers/gpu/drm/verisilicon/vs_drv.c new file +61
-0+ p = d; + } +put_device (p); + } + +return match ? match :ERR_PTR (-ENODEV ); +} + +static int vs_drm_platform_probe (struct platform_device *pdev) +{ +struct device *dev = &pdev->dev; +struct component_match *match; + + match =vs_drm_match_add (dev); +if (IS_ERR (match)) +return PTR_ERR (match); + +return component_master_add_with_match (dev, &vs_drm_ops, match); +} + +static int vs_drm_platform_remove (struct platform_device *pdev) +{ +component_master_del (&pdev->dev, &vs_drm_ops); +return 0 ; +} + +#ifdef CONFIG_PM_SLEEP +static int vs_drm_suspend (struct device *dev) +{ +return drm_mode_config_helper_suspend (dev_get_drvdata (dev)); +} + +static int vs_drm_resume (struct device *dev) +{ +drm_mode_config_helper_resume (dev_get_drvdata (dev)); + +return 0 ; +} +#endif + +static SIMPLE_DEV_PM_OPS(vs_drm_pm_ops, vs_drm_suspend, vs_drm_resume); + +static const struct of_device_id vs_drm_dt_ids[] = { + { .compatible ="starfive,display-subsystem" , }, + { }, +}; + +MODULE_DEVICE_TABLE (of, vs_drm_dt_ids); + +static struct platform_driver vs_drm_platform_driver = { + .probe = vs_drm_platform_probe, + .remove = vs_drm_platform_remove, + + .driver = { + .name =DRV_NAME , + .of_match_table = vs_drm_dt_ids, + .pm = &vs_drm_pm_ops, + }, +}; + +static int __init vs_drm_init (void )
drivers/gpu/drm/verisilicon/vs_drv.c line 212
Quoted 10 lines
drivers/gpu/drm/verisilicon/vs_drv.c new file +10
-0+{ +int ret; + + ret =platform_register_drivers (drm_sub_drivers,ARRAY_SIZE (drm_sub_drivers)); +if (ret) +return ret; + + ret =drm_platform_driver_register (&vs_drm_platform_driver); +if (ret) +platform_unregister_drivers (drm_sub_drivers,ARRAY_SIZE (drm_sub_drivers));
You can probably squash all the drivers into a single array.
Quoted 70 lines
drivers/gpu/drm/verisilicon/vs_drv.c new file +15
-0+ +return ret; +} + +static void __exit vs_drm_fini(void) +{ +platform_driver_unregister (&vs_drm_platform_driver); +platform_unregister_drivers (drm_sub_drivers,ARRAY_SIZE (drm_sub_drivers)); +} + +module_init (vs_drm_init); +module_exit (vs_drm_fini); + +MODULE_DESCRIPTION ("VeriSilicon DRM Driver" ); +MODULE_LICENSE ("GPL" );drivers/gpu/drm/verisilicon/vs_drv.h new file +27
-0@@ -0,0 +1,27 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Copyright (C) 2023 VeriSilicon Holdings Co., Ltd. +*/ + +#ifndef __VS_DRV_H__ +#define __VS_DRV_H__ + +#include <linux/module.h> +#include <linux/platform_device.h> +#include <drm/drm_drv.h> +#include <drm/drm_gem.h> +#include <drm/drm_managed.h> + +/*@pitch_alignment: buffer pitch alignment required by sub-devices.*/ +struct vs_drm_device { +struct drm_device base; +unsigned int pitch_alignment; +}; + +static inline struct vs_drm_device * +to_vs_drm_private (const struct drm_device *dev) +{ + return container_of(dev, struct vs_drm_device, base); +} + +#endif /* __VS_DRV_H__ */ drivers/gpu/drm/verisilicon/vs_modeset.c new file +16
-0@@ -0,0 +1,36 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Copyright (C) 2023 VeriSilicon Holdings Co., Ltd. +*/ + +#include <linux/module.h> + +#include <drm/drm_damage_helper.h> +#include <drm/drm_fb_helper.h> +#include <drm/drm_gem_framebuffer_helper.h> + +#include "vs_modeset.h" + +static const struct drm_mode_config_funcs vs_mode_config_funcs = { + .fb_create = drm_gem_fb_create, + .atomic_check = drm_atomic_helper_check,
drivers/gpu/drm/verisilicon/vs_modeset.c line 26
Quoted 10 lines
drivers/gpu/drm/verisilicon/vs_modeset.c new file +10
-0+ .atomic_commit = drm_atomic_helper_commit, +}; + +static struct drm_mode_config_helper_funcs vs_mode_config_helpers = { + .atomic_commit_tail = drm_atomic_helper_commit_tail_rpm, +}; + +void vs_mode_config_init (struct drm_device *dev) +{ +drm_mode_config_init (dev);
quoting docs:
* FIXME: This function is deprecated and drivers should be converted
over to
* drmm_mode_config_init().
drivers/gpu/drm/verisilicon/vs_modeset.c line 27
Quoted 1 line
drivers/gpu/drm/verisilicon/vs_modeset.c new file +1
-0+ dev->mode_config.fb_modifiers_not_supported = false;
This is the default, if I'm not mistaken
Quoted 15 lines
drivers/gpu/drm/verisilicon/vs_modeset.c new file +9
-0+ + dev->mode_config.min_width =0 ; + dev->mode_config.min_height =0 ; + dev->mode_config.max_width =4096 ; + dev->mode_config.max_height =4096 ; + + dev->mode_config.funcs = &vs_mode_config_funcs; + dev->mode_config.helper_private = &vs_mode_config_helpers; +}drivers/gpu/drm/verisilicon/vs_modeset.h new file +0
-0
drivers/gpu/drm/verisilicon/vs_modeset.h line 7
Quoted 7 lines
drivers/gpu/drm/verisilicon/vs_modeset.h new file +7
-0@@ -0,0 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Copyright (C) 2020 VeriSilicon Holdings Co., Ltd. +*/ + +#ifndef __VS_FB_H__ +#define __VS_FB_H__
Please match guarding define and the header name.
Quoted 9 lines
drivers/gpu/drm/verisilicon/vs_modeset.h new file +3
-0+ +void vs_mode_config_init (struct drm_device *dev); +#endif /* __VS_FB_H__ */ include/uapi/drm/vs_drm.h new file +0
-0
include/uapi/drm/vs_drm.h line 9
Quoted 9 lines
include/uapi/drm/vs_drm.h new file +9
-0@@ -0,0 +1,50 @@ +/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */ +/* +* Copyright (C) 2020 VeriSilicon Holdings Co., Ltd. +*/ + +#ifndef __VS_DRM_H__ +#define __VS_DRM_H__ + +#include "drm.h"
Which drm.h?
Quoted 29 lines
include/uapi/drm/vs_drm.h new file +29
-0+ +enum drm_vs_degamma_mode { +VS_DEGAMMA_DISABLE =0 , +VS_DEGAMMA_BT709 =1 , +VS_DEGAMMA_BT2020 =2 , +}; + +enum drm_vs_sync_dc_mode { +VS_SINGLE_DC =0 , +VS_MULTI_DC_PRIMARY =1 , +VS_MULTI_DC_SECONDARY =2 , +}; + +enum drm_vs_mmu_prefetch_mode { +VS_MMU_PREFETCH_DISABLE =0 , +VS_MMU_PREFETCH_ENABLE =1 , +}; + +struct drm_vs_watermark { +__u32 watermark; +__u8 qos_low; +__u8 qos_high; +}; + +struct drm_vs_color_mgmt { +__u32 colorkey; +__u32 colorkey_high; +__u32 clear_value; +bool clear_enable;
include/uapi/drm/vs_drm.h line 48
Quoted 10 lines
include/uapi/drm/vs_drm.h new file +10
-0+bool transparency; +}; + +struct drm_vs_roi { +bool enable; +__u16 roi_x; +__u16 roi_y; +__u16 roi_w; +__u16 roi_h; +};
Could you please add corresponding defines in the patch that actually makes use of them? Otherwise it might be hard to review usage.
Quoted 2 lines
include/uapi/drm/vs_drm.h new file +2
-0+ +#endif /* __VS_DRM_H__ */
Signature · 2 lines
With best wishes Dmitry
PATCH v2 5/6 drm/vs: Add KMS crtc&plane
In reply to Keith Zhaoadd 2 crtcs and 8 planes in vs-drm
--- drivers/gpu/drm/verisilicon/Makefile | 8 +- drivers/gpu/drm/verisilicon/vs_crtc.c | 257 ++++ drivers/gpu/drm/verisilicon/vs_crtc.h | 43 + drivers/gpu/drm/verisilicon/vs_dc.c | 1002 ++++++++++++ drivers/gpu/drm/verisilicon/vs_dc.h | 80 + drivers/gpu/drm/verisilicon/vs_dc_hw.c | 1959 ++++++++++++++++++++++++ drivers/gpu/drm/verisilicon/vs_dc_hw.h | 492 ++++++ drivers/gpu/drm/verisilicon/vs_drv.c | 2 + drivers/gpu/drm/verisilicon/vs_plane.c | 526 +++++++ drivers/gpu/drm/verisilicon/vs_plane.h | 58 + drivers/gpu/drm/verisilicon/vs_type.h | 69 + 11 files changed, 4494 insertions(+), 2 deletions(-) create mode 100644 drivers/gpu/drm/verisilicon/vs_crtc.c create mode 100644 drivers/gpu/drm/verisilicon/vs_crtc.h create mode 100644 drivers/gpu/drm/verisilicon/vs_dc.c create mode 100644 drivers/gpu/drm/verisilicon/vs_dc.h create mode 100644 drivers/gpu/drm/verisilicon/vs_dc_hw.c create mode 100644 drivers/gpu/drm/verisilicon/vs_dc_hw.h create mode 100644 drivers/gpu/drm/verisilicon/vs_plane.c create mode 100644 drivers/gpu/drm/verisilicon/vs_plane.h create mode 100644 drivers/gpu/drm/verisilicon/vs_type.h
drivers/gpu/drm/verisilicon/Makefile +6 -2
@@ -1,7 +1,11 @@ # SPDX-License-Identifier: GPL-2.0 -vs_drm-objs := vs_drv.o \ - vs_modeset.o +vs_drm-objs := vs_dc_hw.o \ + vs_dc.o \ + vs_crtc.o \ + vs_drv.o \ + vs_modeset.o \ + vs_plane.o obj-$(CONFIG_DRM_VERISILICON) += vs_drm.o
drivers/gpu/drm/verisilicon/vs_crtc.c new file +257 -0
257 lines not on this page · raw message
drivers/gpu/drm/verisilicon/vs_crtc.h new file +43 -0
43 lines not on this page · raw message
drivers/gpu/drm/verisilicon/vs_dc.c new file +1002 -0
1,002 lines not on this page · raw message
drivers/gpu/drm/verisilicon/vs_dc.h new file +80 -0
80 lines not on this page · raw message
drivers/gpu/drm/verisilicon/vs_dc_hw.c new file +1959 -0
1,605 lines not on this page · raw message
drivers/gpu/drm/verisilicon/vs_dc_hw.h new file +492 -0
492 lines not on this page · raw message
drivers/gpu/drm/verisilicon/vs_plane.c new file +526 -0
526 lines not on this page · raw message
drivers/gpu/drm/verisilicon/vs_plane.h new file +58 -0
58 lines not on this page · raw message
drivers/gpu/drm/verisilicon/vs_type.h new file +69 -0
69 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.34.1
Part of the diff is not shown here. View the raw message.
Maxime Ripard
maintainerRe: [PATCH v2 5/6] drm/vs: Add KMS crtc&plane
Quoted 7 lines · Keith Zhao
drivers/gpu/drm/verisilicon/vs_crtc.c new file +7
-0+static struct drm_crtc_state * +vs_crtc_atomic_duplicate_state (struct drm_crtc *crtc) +{ +struct vs_crtc_state *ori_state; +struct vs_crtc_state *state; + +if (!crtc->state)
drivers/gpu/drm/verisilicon/vs_crtc.c line 57
Quoted 10 lines
drivers/gpu/drm/verisilicon/vs_crtc.c new file +10
-0+return NULL ; + + ori_state =to_vs_crtc_state (crtc->state); + state =kzalloc (sizeof (*state),GFP_KERNEL ); +if (!state) +return NULL ; + +__drm_atomic_helper_crtc_duplicate_state (crtc, &state->base); + + state->output_fmt = ori_state->output_fmt;
That field is never set in your patch.
drivers/gpu/drm/verisilicon/vs_crtc.c line 58
Quoted 1 line
drivers/gpu/drm/verisilicon/vs_crtc.c new file +1
-0+ state->encoder_type = ori_state->encoder_type;
That isn't either, and it's not clear why you would need the encoder_type stored in the CRTC?
drivers/gpu/drm/verisilicon/vs_crtc.c line 59
Quoted 1 line
drivers/gpu/drm/verisilicon/vs_crtc.c new file +1
-0+ state->bpp = ori_state->bpp;
You seem to derive that from output_fmt, it doesn't need to be in the CRTC state.
drivers/gpu/drm/verisilicon/vs_crtc.c line 60
Quoted 1 line
drivers/gpu/drm/verisilicon/vs_crtc.c new file +1
-0+ state->underflow = ori_state->underflow;
Assuming you're setting this from the interrupt handler, it's unsafe, you shouldn't do that. What are you using it for?
drivers/gpu/drm/verisilicon/vs_crtc.c line 221
Quoted 5 lines
drivers/gpu/drm/verisilicon/vs_crtc.c new file +5
-0+static const struct drm_prop_enum_list vs_sync_mode_enum_list[] = { + {VS_SINGLE_DC ,"single dc mode" }, + {VS_MULTI_DC_PRIMARY ,"primary dc for multi dc mode" }, + {VS_MULTI_DC_SECONDARY ,"secondary dc for multi dc mode" }, +};
Custom driver properties are a no-go:
https://docs.kernel.org/gpu/drm-kms.html#requirements
And
https://docs.kernel.org/gpu/drm-uapi.html#open-source-userspace-requirements
drivers/gpu/drm/verisilicon/vs_dc.c line 335
Quoted 5 lines
drivers/gpu/drm/verisilicon/vs_dc.c new file +5
-0+void vs_dc_enable (struct vs_dc *dc,struct drm_crtc *crtc) +{ +struct vs_crtc_state *crtc_state =to_vs_crtc_state (crtc->state); +struct drm_display_mode *mode = &crtc->state->adjusted_mode; +struct dc_hw_display display;
Why are you rolling your own structure here, if it's exactly equivalent to what drm_display_mode and the crtc_state provide?
drivers/gpu/drm/verisilicon/vs_dc.c line 814
Quoted 11 lines
drivers/gpu/drm/verisilicon/vs_dc.c new file +11
-0+void vs_dc_commit (struct vs_dc *dc) +{ +dc_hw_enable_shadow_register (&dc->hw, false); + +dc_hw_commit (&dc->hw); + +if (dc->first_frame) + dc->first_frame = false; + +dc_hw_enable_shadow_register (&dc->hw, true); +}
It's not clear to me what you're trying to do here, does the hardware have latched registers that are only updated during vblank?
Quoted 44 lines
drivers/gpu/drm/verisilicon/vs_dc.c new file +44
-0+static int dc_bind (struct device *dev,struct device *master,void *data) +{ +struct drm_device *drm_dev = data; +struct vs_dc *dc =dev_get_drvdata (dev); +struct device_node *port; +struct vs_crtc *crtc; +struct vs_dc_info *dc_info; +struct vs_plane *plane; +struct vs_plane_info *plane_info; +int i, ret; +u32 ctrc_mask =0 ; + +if (!drm_dev || !dc) { +dev_err (dev,"devices are not created.\n" ); +return -ENODEV ; + } + + ret =dc_init (dev); +if (ret <0 ) { +drm_err (drm_dev,"Failed to initialize DC hardware.\n" ); +return ret; + } + + port =of_get_child_by_name (dev->of_node,"port" ); +if (!port) { +drm_err (drm_dev,"no port node found\n" ); +return -ENODEV ; + } +of_node_put (port); + + dc_info = dc->hw.info; + +for (i =0 ; i < dc_info->panel_num; i++) { + crtc =vs_crtc_create (drm_dev, dc_info); +if (!crtc) { +drm_err (drm_dev,"Failed to create CRTC.\n" ); + ret = -ENOMEM ; +return ret; + } + + crtc->base.port = port; + crtc->dev = dev; + dc->crtc[i] = crtc; + ctrc_mask |=drm_crtc_mask (&crtc->base);
drivers/gpu/drm/verisilicon/vs_dc.c line 869
Quoted 10 lines
drivers/gpu/drm/verisilicon/vs_dc.c new file +10
-0+ } + +for (i =0 ; i < dc_info->plane_num; i++) { + plane_info = (struct vs_plane_info *)&dc_info->planes[i]; + +if (!strcmp (plane_info->name,"Primary" ) || !strcmp (plane_info->name,"Cursor" )) { + plane =vs_plane_create (drm_dev, plane_info, dc_info->layer_num, +drm_crtc_mask (&dc->crtc[0 ]->base)); + }else if (!strcmp (plane_info->name,"Primary_1" ) || + !strcmp (plane_info->name,"Cursor_1" )) {
Please use an enum and an id there.
Quoted 31 lines
drivers/gpu/drm/verisilicon/vs_plane.c new file +31
-0+static int vs_plane_atomic_set_property (struct drm_plane *plane, +struct drm_plane_state *state, +struct drm_property *property, +uint64_t val) +{ +struct drm_device *dev = plane->dev; +struct vs_plane *vs_plane =to_vs_plane (plane); +struct vs_plane_state *vs_plane_state =to_vs_plane_state (state); +int ret =0 ; + +if (property == vs_plane->degamma_mode) { +if (vs_plane_state->degamma != val) { + vs_plane_state->degamma = val; + vs_plane_state->degamma_changed = true; + }else { + vs_plane_state->degamma_changed = false; + } + }else if (property == vs_plane->watermark_prop) { + ret =_vs_plane_set_property_blob_from_id (dev, + &vs_plane_state->watermark, + val, +sizeof (struct drm_vs_watermark )); +return ret; + }else if (property == vs_plane->color_mgmt_prop) { + ret =_vs_plane_set_property_blob_from_id (dev, + &vs_plane_state->color_mgmt, + val, +sizeof (struct drm_vs_color_mgmt )); +return ret; + }else if (property == vs_plane->roi_prop) { + ret = _vs_plane_set_property_blob_from_id(dev,
drivers/gpu/drm/verisilicon/vs_plane.c line 164
Quoted 10 lines
drivers/gpu/drm/verisilicon/vs_plane.c new file +10
-0+ &vs_plane_state->roi, + val, + sizeof(struct drm_vs_roi)); +return ret; + }else { +return -EINVAL ; + } + +return 0 ; +}
Same story than above for properties
Honestly, that driver is pretty massive, and you should be simplifying it a lot of you want the initial contribution to be as smooth as possible.
Things like all the tiling formats, the underflowing handling, all those properties, etc can (and should) be added in a second step once the foundations are in.
Maxime
Re: [PATCH v2 5/6] drm/vs: Add KMS crtc&plane
Quoted 31 lines · Maxime Ripard
Quoted 7 lines · Keith Zhao
drivers/gpu/drm/verisilicon/vs_crtc.c new file +7
-0+static struct drm_crtc_state * +vs_crtc_atomic_duplicate_state (struct drm_crtc *crtc) +{ +struct vs_crtc_state *ori_state; +struct vs_crtc_state *state; + +if (!crtc->state)drivers/gpu/drm/verisilicon/vs_crtc.c line 57
Quoted 10 lines
drivers/gpu/drm/verisilicon/vs_crtc.c new file +10
-0+return NULL ; + + ori_state =to_vs_crtc_state (crtc->state); + state =kzalloc (sizeof (*state),GFP_KERNEL ); +if (!state) +return NULL ; + +__drm_atomic_helper_crtc_duplicate_state (crtc, &state->base); + + state->output_fmt = ori_state->output_fmt;That field is never set in your patch.
drivers/gpu/drm/verisilicon/vs_crtc.c line 58
Quoted 1 line
drivers/gpu/drm/verisilicon/vs_crtc.c new file +1
-0+ state->encoder_type = ori_state->encoder_type;That isn't either, and it's not clear why you would need the
encoder_typestored in the CRTC?drivers/gpu/drm/verisilicon/vs_crtc.c line 59
Quoted 1 line
drivers/gpu/drm/verisilicon/vs_crtc.c new file +1
-0+ state->bpp = ori_state->bpp;You seem to derive that from
output_fmt, it doesn't need to be in the CRTC state.
Quoted 4 lines
drivers/gpu/drm/verisilicon/vs_crtc.c line 60
Quoted 1 line
drivers/gpu/drm/verisilicon/vs_crtc.c new file +1
-0+ state->underflow = ori_state->underflow;Assuming you're setting this from the interrupt handler, it's unsafe, you shouldn't do that. What are you using it for?
I am going to use the crtc_debugfs function for printing. crtc_debugfs will use it
But now I'd better delete it
Quoted 14 lines
drivers/gpu/drm/verisilicon/vs_crtc.c line 221
Quoted 6 lines
drivers/gpu/drm/verisilicon/vs_crtc.c new file +5
-0+static const struct drm_prop_enum_list vs_sync_mode_enum_list[] = { + {VS_SINGLE_DC ,"single dc mode" }, + {VS_MULTI_DC_PRIMARY ,"primary dc for multi dc mode" }, + {VS_MULTI_DC_SECONDARY ,"secondary dc for multi dc mode" }, +};Custom driver properties are a no-go:
https://docs.kernel.org/gpu/drm-kms.html#requirementsAnd
https://docs.kernel.org/gpu/drm-uapi.html#open-source-userspace-requirements
Quoted 8 lines
drivers/gpu/drm/verisilicon/vs_dc.c line 335
Quoted 5 lines
drivers/gpu/drm/verisilicon/vs_dc.c new file +5
-0+void vs_dc_enable (struct vs_dc *dc,struct drm_crtc *crtc) +{ +struct vs_crtc_state *crtc_state =to_vs_crtc_state (crtc->state); +struct drm_display_mode *mode = &crtc->state->adjusted_mode; +struct dc_hw_display display;Why are you rolling your own structure here, if it's exactly equivalent to what
drm_display_modeand thecrtc_stateprovide?
My original intention was to make the hardware part purer. and want to decouple hardware from drm struct.
so I define the own structure between drm and hardware. Maybe doing this will make both the hardware and drm happy
Quoted 122 lines
drivers/gpu/drm/verisilicon/vs_dc.c line 814
Quoted 12 lines
drivers/gpu/drm/verisilicon/vs_dc.c new file +11
-0+void vs_dc_commit (struct vs_dc *dc) +{ +dc_hw_enable_shadow_register (&dc->hw, false); + +dc_hw_commit (&dc->hw); + +if (dc->first_frame) + dc->first_frame = false; + +dc_hw_enable_shadow_register (&dc->hw, true); +}It's not clear to me what you're trying to do here, does the hardware have latched registers that are only updated during vblank?
Quoted 44 lines
drivers/gpu/drm/verisilicon/vs_dc.c new file +44
-0+static int dc_bind (struct device *dev,struct device *master,void *data) +{ +struct drm_device *drm_dev = data; +struct vs_dc *dc =dev_get_drvdata (dev); +struct device_node *port; +struct vs_crtc *crtc; +struct vs_dc_info *dc_info; +struct vs_plane *plane; +struct vs_plane_info *plane_info; +int i, ret; +u32 ctrc_mask =0 ; + +if (!drm_dev || !dc) { +dev_err (dev,"devices are not created.\n" ); +return -ENODEV ; + } + + ret =dc_init (dev); +if (ret <0 ) { +drm_err (drm_dev,"Failed to initialize DC hardware.\n" ); +return ret; + } + + port =of_get_child_by_name (dev->of_node,"port" ); +if (!port) { +drm_err (drm_dev,"no port node found\n" ); +return -ENODEV ; + } +of_node_put (port); + + dc_info = dc->hw.info; + +for (i =0 ; i < dc_info->panel_num; i++) { + crtc =vs_crtc_create (drm_dev, dc_info); +if (!crtc) { +drm_err (drm_dev,"Failed to create CRTC.\n" ); + ret = -ENOMEM ; +return ret; + } + + crtc->base.port = port; + crtc->dev = dev; + dc->crtc[i] = crtc; + ctrc_mask |=drm_crtc_mask (&crtc->base);drivers/gpu/drm/verisilicon/vs_dc.c line 869
Quoted 10 lines
drivers/gpu/drm/verisilicon/vs_dc.c new file +10
-0+ } + +for (i =0 ; i < dc_info->plane_num; i++) { + plane_info = (struct vs_plane_info *)&dc_info->planes[i]; + +if (!strcmp (plane_info->name,"Primary" ) || !strcmp (plane_info->name,"Cursor" )) { + plane =vs_plane_create (drm_dev, plane_info, dc_info->layer_num, +drm_crtc_mask (&dc->crtc[0 ]->base)); + }else if (!strcmp (plane_info->name,"Primary_1" ) || + !strcmp (plane_info->name,"Cursor_1" )) {Please use an enum and an id there.
Quoted 31 lines
drivers/gpu/drm/verisilicon/vs_plane.c new file +31
-0+static int vs_plane_atomic_set_property (struct drm_plane *plane, +struct drm_plane_state *state, +struct drm_property *property, +uint64_t val) +{ +struct drm_device *dev = plane->dev; +struct vs_plane *vs_plane =to_vs_plane (plane); +struct vs_plane_state *vs_plane_state =to_vs_plane_state (state); +int ret =0 ; + +if (property == vs_plane->degamma_mode) { +if (vs_plane_state->degamma != val) { + vs_plane_state->degamma = val; + vs_plane_state->degamma_changed = true; + }else { + vs_plane_state->degamma_changed = false; + } + }else if (property == vs_plane->watermark_prop) { + ret =_vs_plane_set_property_blob_from_id (dev, + &vs_plane_state->watermark, + val, +sizeof (struct drm_vs_watermark )); +return ret; + }else if (property == vs_plane->color_mgmt_prop) { + ret =_vs_plane_set_property_blob_from_id (dev, + &vs_plane_state->color_mgmt, + val, +sizeof (struct drm_vs_color_mgmt )); +return ret; + }else if (property == vs_plane->roi_prop) { + ret = _vs_plane_set_property_blob_from_id(dev,drivers/gpu/drm/verisilicon/vs_plane.c line 164
Quoted 10 lines
drivers/gpu/drm/verisilicon/vs_plane.c new file +10
-0+ &vs_plane_state->roi, + val, + sizeof(struct drm_vs_roi)); +return ret; + }else { +return -EINVAL ; + } + +return 0 ; +}Same story than above for properties
Honestly, that driver is pretty massive, and you should be simplifying it a lot of you want the initial contribution to be as smooth as possible.
Quoted 5 lines
Things like all the tiling formats, the underflowing handling, all those properties, etc can (and should) be added in a second step once the foundations are in.
Maxime
ok , Thanks for reminding me. I will clarify my next goal and be more likely to simplify features.
Re: [PATCH v2 5/6] drm/vs: Add KMS crtc&plane
In reply to Keith ZhaoQuoted 72 lines · Keith Zhao
add 2 crtcs and 8 planes in vs-drm
Signed-off-by Keith Zhao <[email protected]>--- drivers/gpu/drm/verisilicon/Makefile | 8 +- drivers/gpu/drm/verisilicon/vs_crtc.c | 257 ++++ drivers/gpu/drm/verisilicon/vs_crtc.h | 43 + drivers/gpu/drm/verisilicon/vs_dc.c | 1002 ++++++++++++ drivers/gpu/drm/verisilicon/vs_dc.h | 80 + drivers/gpu/drm/verisilicon/vs_dc_hw.c | 1959 ++++++++++++++++++++++++ drivers/gpu/drm/verisilicon/vs_dc_hw.h | 492 ++++++ drivers/gpu/drm/verisilicon/vs_drv.c | 2 + drivers/gpu/drm/verisilicon/vs_plane.c | 526 +++++++ drivers/gpu/drm/verisilicon/vs_plane.h | 58 + drivers/gpu/drm/verisilicon/vs_type.h | 69 + 11 files changed, 4494 insertions(+), 2 deletions(-)create mode 100644
drivers/gpu/drm/verisilicon/vs_crtc.ccreate mode 100644drivers/gpu/drm/verisilicon/vs_crtc.hcreate mode 100644drivers/gpu/drm/verisilicon/vs_dc.ccreate mode 100644drivers/gpu/drm/verisilicon/vs_dc.hcreate mode 100644drivers/gpu/drm/verisilicon/vs_dc_hw.ccreate mode 100644drivers/gpu/drm/verisilicon/vs_dc_hw.hcreate mode 100644drivers/gpu/drm/verisilicon/vs_plane.ccreate mode 100644drivers/gpu/drm/verisilicon/vs_plane.hcreate mode 100644drivers/gpu/drm/verisilicon/vs_type.hdrivers/gpu/drm/verisilicon/Makefile +6
-2@@ -1,7 +1,11 @@ # SPDX-License-Identifier: GPL-2.0 -vs_drm-objs := vs_drv.o \ - vs_modeset.o +vs_drm-objs := vs_dc_hw.o \ + vs_dc.o \ + vs_crtc.o \ + vs_drv.o \ + vs_modeset.o \ + vs_plane.o obj-$(CONFIG_DRM_VERISILICON) += vs_drm.odrivers/gpu/drm/verisilicon/vs_crtc.c new file +22
-0@@ -0,0 +1,257 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Copyright (C) 2023 VeriSilicon Holdings Co., Ltd. +* +*/ + +#include <linux/clk.h> +#include <linux/debugfs.h> +#include <linux/media-bus-format.h> + +#include <drm/drm_atomic_helper.h> +#include <drm/drm_atomic.h> +#include <drm/drm_crtc.h> +#include <drm/drm_gem_atomic_helper.h> +#include <drm/drm_vblank.h> +#include <drm/vs_drm.h> + +#include "vs_crtc.h" +#include "vs_dc.h" +#include "vs_drv.h" + +static void vs_crtc_reset (struct drm_crtc *crtc)
drivers/gpu/drm/verisilicon/vs_crtc.c line 32
Quoted 10 lines
drivers/gpu/drm/verisilicon/vs_crtc.c new file +10
-0+{ +struct vs_crtc_state *state; + +if (crtc->state) { +__drm_atomic_helper_crtc_destroy_state (crtc->state); + + state =to_vs_crtc_state (crtc->state); +kfree (state); + crtc->state =NULL ; + }
You can call your crtc_destroy_state function directly here.
drivers/gpu/drm/verisilicon/vs_crtc.c line 44
Quoted 12 lines
drivers/gpu/drm/verisilicon/vs_crtc.c new file +12
-0+ + state =kzalloc (sizeof (*state),GFP_KERNEL ); +if (!state) +return ; + +__drm_atomic_helper_crtc_reset (crtc, &state->base); +} + +static struct drm_crtc_state * +vs_crtc_atomic_duplicate_state (struct drm_crtc *crtc) +{ +struct vs_crtc_state *ori_state;
It might be a matter of taste, but it is usually old_state.
Quoted 6 lines
drivers/gpu/drm/verisilicon/vs_crtc.c new file +6
-0+struct vs_crtc_state *state; + +if (!crtc->state) +return NULL ; + + ori_state =to_vs_crtc_state (crtc->state);
drivers/gpu/drm/verisilicon/vs_crtc.c line 60
Quoted 10 lines
drivers/gpu/drm/verisilicon/vs_crtc.c new file +10
-0+ state =kzalloc (sizeof (*state),GFP_KERNEL ); +if (!state) +return NULL ; + +__drm_atomic_helper_crtc_duplicate_state (crtc, &state->base); + + state->output_fmt = ori_state->output_fmt; + state->encoder_type = ori_state->encoder_type; + state->bpp = ori_state->bpp; + state->underflow = ori_state->underflow;
Can you use kmemdup instead?
Quoted 22 lines
drivers/gpu/drm/verisilicon/vs_crtc.c new file +22
-0+ +return &state->base; +} + +static void vs_crtc_atomic_destroy_state (struct drm_crtc *crtc, +struct drm_crtc_state *state) +{ +__drm_atomic_helper_crtc_destroy_state (state); +kfree (to_vs_crtc_state (state)); +} + +static int vs_crtc_enable_vblank (struct drm_crtc *crtc) +{ +struct vs_crtc *vs_crtc =to_vs_crtc (crtc); +struct vs_dc *dc =dev_get_drvdata (vs_crtc->dev); + +vs_dc_enable_vblank (dc, true); + +return 0 ; +} + +static void vs_crtc_disable_vblank (struct drm_crtc *crtc)
drivers/gpu/drm/verisilicon/vs_crtc.c line 92
Quoted 10 lines
drivers/gpu/drm/verisilicon/vs_crtc.c new file +10
-0+{ +struct vs_crtc *vs_crtc =to_vs_crtc (crtc); +struct vs_dc *dc =dev_get_drvdata (vs_crtc->dev); + +vs_dc_enable_vblank (dc, false); +} + +static const struct drm_crtc_funcs vs_crtc_funcs = { + .set_config = drm_atomic_helper_set_config, + .page_flip = drm_atomic_helper_page_flip,
destroy is required, see drm_mode_config_cleanup()
drivers/gpu/drm/verisilicon/vs_crtc.c line 95
Quoted 3 lines
drivers/gpu/drm/verisilicon/vs_crtc.c new file +3
-0+ .reset = vs_crtc_reset, + .atomic_duplicate_state = vs_crtc_atomic_duplicate_state, + .atomic_destroy_state = vs_crtc_atomic_destroy_state,
please consider adding atomic_print_state to output driver-specific bits.
drivers/gpu/drm/verisilicon/vs_crtc.c line 100
Quoted 5 lines
drivers/gpu/drm/verisilicon/vs_crtc.c new file +5
-0+ .enable_vblank = vs_crtc_enable_vblank, + .disable_vblank = vs_crtc_disable_vblank, +}; + +static u8 cal_pixel_bits (u32 bus_format)
This looks like a generic helper code, which can go to a common place.
Quoted 52 lines
drivers/gpu/drm/verisilicon/vs_crtc.c new file +52
-0+{ +u8 bpp; + +switch (bus_format) { +case MEDIA_BUS_FMT_RGB565_1X16 : +case MEDIA_BUS_FMT_UYVY8_1X16 : + bpp =16 ; +break ; +case MEDIA_BUS_FMT_RGB666_1X18 : +case MEDIA_BUS_FMT_RGB666_1X24_CPADHI : + bpp =18 ; +break ; +case MEDIA_BUS_FMT_UYVY10_1X20 : + bpp =20 ; +break ; +case MEDIA_BUS_FMT_BGR888_1X24 : +case MEDIA_BUS_FMT_UYYVYY8_0_5X24 : +case MEDIA_BUS_FMT_YUV8_1X24 : + bpp =24 ; +break ; +case MEDIA_BUS_FMT_RGB101010_1X30 : +case MEDIA_BUS_FMT_UYYVYY10_0_5X30 : +case MEDIA_BUS_FMT_YUV10_1X30 : + bpp =30 ; +break ; +default : + bpp =24 ; +break ; + } + +return bpp; +} + +static void vs_crtc_atomic_enable (struct drm_crtc *crtc, +struct drm_atomic_state *state) +{ +struct vs_crtc *vs_crtc =to_vs_crtc (crtc); +struct vs_dc *dc =dev_get_drvdata (vs_crtc->dev); +struct vs_crtc_state *vs_crtc_state =to_vs_crtc_state (crtc->state); + + vs_crtc_state->bpp =cal_pixel_bits (vs_crtc_state->output_fmt); + +vs_dc_enable (dc, crtc); +drm_crtc_vblank_on (crtc); +} + +static void vs_crtc_atomic_disable (struct drm_crtc *crtc, +struct drm_atomic_state *state) +{ +struct vs_crtc *vs_crtc =to_vs_crtc (crtc); +struct vs_dc *dc =dev_get_drvdata (vs_crtc->dev); +
drivers/gpu/drm/verisilicon/vs_crtc.c line 162
Quoted 10 lines
drivers/gpu/drm/verisilicon/vs_crtc.c new file +10
-0+drm_crtc_vblank_off (crtc); + +vs_dc_disable (dc, crtc); + +if (crtc->state->event && !crtc->state->active) { +spin_lock_irq (&crtc->dev->event_lock); +drm_crtc_send_vblank_event (crtc, crtc->state->event); +spin_unlock_irq (&crtc->dev->event_lock); + + crtc->state->event =NULL ;
I think even should be cleared within the lock.
Quoted 33 lines
drivers/gpu/drm/verisilicon/vs_crtc.c new file +33
-0+ } +} + +static void vs_crtc_atomic_begin (struct drm_crtc *crtc, +struct drm_atomic_state *state) +{ +struct drm_crtc_state *crtc_state =drm_atomic_get_new_crtc_state (state, + crtc); + +struct vs_crtc *vs_crtc =to_vs_crtc (crtc); +struct device *dev = vs_crtc->dev; +struct drm_property_blob *blob = crtc->state->gamma_lut; +struct drm_color_lut *lut; +struct vs_dc *dc =dev_get_drvdata (dev); + +if (crtc_state->color_mgmt_changed) { +if (blob && blob->length) { + lut = blob->data; +vs_dc_set_gamma (dc, crtc, lut, + blob->length /sizeof (*lut)); +vs_dc_enable_gamma (dc, crtc, true); + }else { +vs_dc_enable_gamma (dc, crtc, false); + } + } +} + +static void vs_crtc_atomic_flush (struct drm_crtc *crtc, +struct drm_atomic_state *state) +{ +struct vs_crtc *vs_crtc =to_vs_crtc (crtc); +struct drm_pending_vblank_event *event = crtc->state->event; +struct vs_dc *dc =dev_get_drvdata (vs_crtc->dev);
drivers/gpu/drm/verisilicon/vs_crtc.c line 205
Quoted 10 lines
drivers/gpu/drm/verisilicon/vs_crtc.c new file +10
-0+ +vs_dc_commit (dc); + +if (event) { +WARN_ON (drm_crtc_vblank_get (crtc) !=0 ); + +spin_lock_irq (&crtc->dev->event_lock); +drm_crtc_arm_vblank_event (crtc, event); +spin_unlock_irq (&crtc->dev->event_lock); + crtc->state->event =NULL ;
I think even should be cleared within the lock.
Quoted 23 lines
drivers/gpu/drm/verisilicon/vs_crtc.c new file +23
-0+ } +} + +static const struct drm_crtc_helper_funcs vs_crtc_helper_funcs = { + .atomic_check = drm_crtc_helper_atomic_check, + .atomic_enable = vs_crtc_atomic_enable, + .atomic_disable = vs_crtc_atomic_disable, + .atomic_begin = vs_crtc_atomic_begin, + .atomic_flush = vs_crtc_atomic_flush, +}; + +static const struct drm_prop_enum_list vs_sync_mode_enum_list[] = { + {VS_SINGLE_DC ,"single dc mode" }, + {VS_MULTI_DC_PRIMARY ,"primary dc for multi dc mode" }, + {VS_MULTI_DC_SECONDARY ,"secondary dc for multi dc mode" }, +}; + +struct vs_crtc *vs_crtc_create (struct drm_device *drm_dev, +struct vs_dc_info *info) +{ +struct vs_crtc *crtc; +int ret; +
drivers/gpu/drm/verisilicon/vs_crtc.c line 238
Quoted 10 lines
drivers/gpu/drm/verisilicon/vs_crtc.c new file +10
-0+if (!info) +return NULL ; + + crtc =drmm_kzalloc (drm_dev,sizeof (*crtc),GFP_KERNEL ); +if (!crtc) +return NULL ; + + ret =drmm_crtc_init_with_planes (drm_dev, &crtc->base, +NULL ,NULL , &vs_crtc_funcs, + info->name ? info->name :NULL );
It might be better to add drmm_crtc_init() helper.
Quoted 935 lines
drivers/gpu/drm/verisilicon/vs_crtc.c new file +19
-0+if (ret) +return NULL ; + +drm_crtc_helper_add (&crtc->base, &vs_crtc_helper_funcs); + +if (info->gamma_size) { + ret =drm_mode_crtc_set_gamma_size (&crtc->base, + info->gamma_size); +if (ret) +return NULL ; + +drm_crtc_enable_color_mgmt (&crtc->base,0 , false, + info->gamma_size); + } + + crtc->max_bpc = info->max_bpc; + crtc->color_formats = info->color_formats; +return crtc; +}drivers/gpu/drm/verisilicon/vs_crtc.h new file +43
-0@@ -0,0 +1,43 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Copyright (C) 2023 VeriSilicon Holdings Co., Ltd. +*/ + +#ifndef __VS_CRTC_H__ +#define __VS_CRTC_H__ + +#include <drm/drm_crtc.h> +#include <drm/drm_crtc_helper.h> + +#include "vs_type.h" + +struct vs_crtc_state { +struct drm_crtc_state base; + +u32 output_fmt; +u8 encoder_type; +u8 bpp; +bool underflow; +}; + +struct vs_crtc { +struct drm_crtc base; +struct device *dev; +unsigned int max_bpc; +unsigned int color_formats; +}; + +struct vs_crtc *vs_crtc_create (struct drm_device *drm_dev, +struct vs_dc_info *info); + +static inline struct vs_crtc *to_vs_crtc (struct drm_crtc *crtc) +{ + return container_of(crtc, struct vs_crtc, base); +} + +static inline struct vs_crtc_state * +to_vs_crtc_state (struct drm_crtc_state *state) +{ + return container_of(state, struct vs_crtc_state, base); +} +#endif /* __VS_CRTC_H__ */ drivers/gpu/drm/verisilicon/vs_dc.c new file +861
-0@@ -0,0 +1,1002 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Copyright (C) 2023 VeriSilicon Holdings Co., Ltd. +*/ + +#include <linux/component.h> +#include <linux/clk.h> +#include <linux/of.h> +#include <linux/of_device.h> +#include <linux/pm_runtime.h> +#include <linux/reset.h> + +#include <drm/drm_atomic.h> +#include <drm/drm_atomic_helper.h> +#include <drm/drm_blend.h> +#include <drm/drm_framebuffer.h> +#include <drm/drm_vblank.h> +#include <drm/vs_drm.h> + +#include "vs_dc_hw.h" +#include "vs_dc.h" +#include "vs_drv.h" + +static const char *const vout_clocks[] = { +"noc_bus" , +"channel0" , +"channel1" , +"dc_core" , +"axi_core" , +"ahb" , +"hdmi_tx" , +"dc_parent" , + +}; + +static const char *const vout_resets[] = { +"axi" , +"ahb" , +"core" , +}; + +static inline void update_format (u32 format,u64 mod,struct dc_hw_fb *fb) +{ +u8 f =FORMAT_A8R8G8B8 ; + +switch (format) { +case DRM_FORMAT_XRGB4444 : +case DRM_FORMAT_RGBX4444 : +case DRM_FORMAT_XBGR4444 : +case DRM_FORMAT_BGRX4444 : + f =FORMAT_X4R4G4B4 ; +break ; +case DRM_FORMAT_ARGB4444 : +case DRM_FORMAT_RGBA4444 : +case DRM_FORMAT_ABGR4444 : +case DRM_FORMAT_BGRA4444 : + f =FORMAT_A4R4G4B4 ; +break ; +case DRM_FORMAT_XRGB1555 : +case DRM_FORMAT_RGBX5551 : +case DRM_FORMAT_XBGR1555 : +case DRM_FORMAT_BGRX5551 : + f =FORMAT_X1R5G5B5 ; +break ; +case DRM_FORMAT_ARGB1555 : +case DRM_FORMAT_RGBA5551 : +case DRM_FORMAT_ABGR1555 : +case DRM_FORMAT_BGRA5551 : + f =FORMAT_A1R5G5B5 ; +break ; +case DRM_FORMAT_RGB565 : +case DRM_FORMAT_BGR565 : + f =FORMAT_R5G6B5 ; +break ; +case DRM_FORMAT_XRGB8888 : +case DRM_FORMAT_RGBX8888 : +case DRM_FORMAT_XBGR8888 : +case DRM_FORMAT_BGRX8888 : + f =FORMAT_X8R8G8B8 ; +break ; +case DRM_FORMAT_ARGB8888 : +case DRM_FORMAT_RGBA8888 : +case DRM_FORMAT_ABGR8888 : +case DRM_FORMAT_BGRA8888 : + f =FORMAT_A8R8G8B8 ; +break ; +case DRM_FORMAT_YUYV : +case DRM_FORMAT_YVYU : + f =FORMAT_YUY2 ; +break ; +case DRM_FORMAT_UYVY : +case DRM_FORMAT_VYUY : + f =FORMAT_UYVY ; +break ; +case DRM_FORMAT_YUV420 : +case DRM_FORMAT_YVU420 : + f =FORMAT_YV12 ; +break ; +case DRM_FORMAT_NV21 : + f =FORMAT_NV12 ; +break ; +case DRM_FORMAT_NV16 : +case DRM_FORMAT_NV61 : + f =FORMAT_NV16 ; +break ; +case DRM_FORMAT_P010 : + f =FORMAT_P010 ; +break ; +case DRM_FORMAT_ARGB2101010 : +case DRM_FORMAT_RGBA1010102 : +case DRM_FORMAT_ABGR2101010 : +case DRM_FORMAT_BGRA1010102 : + f =FORMAT_A2R10G10B10 ; +break ; +case DRM_FORMAT_NV12 : + f =FORMAT_NV12 ; +break ; +case DRM_FORMAT_YUV444 : + f =FORMAT_YUV444 ; +break ; +default : +break ; + } + + fb->format = f; +} + +static inline void update_swizzle (u32 format,struct dc_hw_fb *fb) +{ + fb->swizzle =SWIZZLE_ARGB ; + fb->uv_swizzle =0 ; + +switch (format) { +case DRM_FORMAT_RGBX4444 : +case DRM_FORMAT_RGBA4444 : +case DRM_FORMAT_RGBX5551 : +case DRM_FORMAT_RGBA5551 : +case DRM_FORMAT_RGBX8888 : +case DRM_FORMAT_RGBA8888 : +case DRM_FORMAT_RGBA1010102 : + fb->swizzle =SWIZZLE_RGBA ; +break ; +case DRM_FORMAT_XBGR4444 : +case DRM_FORMAT_ABGR4444 : +case DRM_FORMAT_XBGR1555 : +case DRM_FORMAT_ABGR1555 : +case DRM_FORMAT_BGR565 : +case DRM_FORMAT_XBGR8888 : +case DRM_FORMAT_ABGR8888 : +case DRM_FORMAT_ABGR2101010 : + fb->swizzle =SWIZZLE_ABGR ; +break ; +case DRM_FORMAT_BGRX4444 : +case DRM_FORMAT_BGRA4444 : +case DRM_FORMAT_BGRX5551 : +case DRM_FORMAT_BGRA5551 : +case DRM_FORMAT_BGRX8888 : +case DRM_FORMAT_BGRA8888 : +case DRM_FORMAT_BGRA1010102 : + fb->swizzle =SWIZZLE_BGRA ; +break ; +case DRM_FORMAT_YVYU : +case DRM_FORMAT_VYUY : +case DRM_FORMAT_NV21 : +case DRM_FORMAT_NV61 : + fb->uv_swizzle =1 ; +break ; +default : +break ; + } +} + +static inline void update_watermark (struct drm_property_blob *watermark, +struct dc_hw_fb *fb) +{ +struct drm_vs_watermark *data; + + fb->water_mark =0 ; + +if (watermark) { + data = watermark->data; + fb->water_mark = data->watermark &0xFFFFF ; + } +} + +static inline u8 to_vs_rotation (unsigned int rotation) +{ +u8 rot; + +switch (rotation &DRM_MODE_REFLECT_MASK ) { +case DRM_MODE_REFLECT_X : + rot =FLIP_X ; +return rot; +case DRM_MODE_REFLECT_Y : + rot =FLIP_Y ; +return rot; +case DRM_MODE_REFLECT_X |DRM_MODE_REFLECT_Y : + rot =FLIP_XY ; +return rot; +default : +break ; + } + +switch (rotation &DRM_MODE_ROTATE_MASK ) { +case DRM_MODE_ROTATE_0 : + rot =ROT_0 ; +break ; +case DRM_MODE_ROTATE_90 : + rot =ROT_90 ; +break ; +case DRM_MODE_ROTATE_180 : + rot =ROT_180 ; +break ; +case DRM_MODE_ROTATE_270 : + rot =ROT_270 ; +break ; +default : + rot =ROT_0 ; +break ; + } + +return rot; +} + +static inline u8 to_vs_yuv_color_space (u32 color_space) +{ +u8 cs; + +switch (color_space) { +case DRM_COLOR_YCBCR_BT601 : + cs =COLOR_SPACE_601 ; +break ; +case DRM_COLOR_YCBCR_BT709 : + cs =COLOR_SPACE_709 ; +break ; +case DRM_COLOR_YCBCR_BT2020 : + cs =COLOR_SPACE_2020 ; +break ; +default : + cs =COLOR_SPACE_601 ; +break ; + } + +return cs; +} + +static inline u8 to_vs_tile_mode (u64 modifier) +{ +if (modifier ==DRM_FORMAT_MOD_VIVANTE_TILED ) +return DC_TILE_MODE4X4 ; + +return (u8)(modifier &DRM_FORMAT_MOD_VERISILICON_NORM_MODE_MASK ); +} + +static inline u8 to_vs_display_id (struct vs_dc *dc,struct drm_crtc *crtc) +{ +u8 panel_num = dc->hw.info->panel_num; +u32 index =drm_crtc_index (crtc); +int i; + +for (i =0 ; i < panel_num; i++) { +if (index == dc->crtc[i]->base.index) +return i; + } + +return 0 ; +} + +static void vs_drm_update_pitch_alignment (struct drm_device *drm_dev, +unsigned int alignment) +{ +struct vs_drm_device *priv =to_vs_drm_private (drm_dev); + +if (alignment > priv->pitch_alignment) + priv->pitch_alignment = alignment; +} + +static int plda_clk_rst_init (struct device *dev) +{ +int ret =0 ; +struct vs_dc *dc =dev_get_drvdata (dev); + + ret =clk_bulk_prepare_enable (dc->nclks, dc->clk_vout); +if (ret) { +dev_err (dev,"failed to enable clocks\n" ); +return ret; + } + + ret =reset_control_bulk_deassert (dc->nrsts, dc->rst_vout); +return ret; +} + +static void plda_clk_rst_deinit (struct device *dev) +{ +struct vs_dc *dc =dev_get_drvdata (dev); + +reset_control_bulk_assert (dc->nrsts, dc->rst_vout); +clk_bulk_disable_unprepare (dc->nclks, dc->clk_vout); +} + +static void dc_deinit (struct device *dev) +{ +struct vs_dc *dc =dev_get_drvdata (dev); + +dc_hw_enable_interrupt (&dc->hw,0 ); +dc_hw_deinit (&dc->hw); +plda_clk_rst_deinit (dev); +} + +static int dc_init (struct device *dev) +{ +struct vs_dc *dc =dev_get_drvdata (dev); +int ret; + + dc->first_frame = true; + + ret =plda_clk_rst_init (dev); +if (ret <0 ) { +dev_err (dev,"failed to init dc clk reset: %d\n" , ret); +return ret; + } + + ret =dc_hw_init (&dc->hw); +if (ret) { +dev_err (dev,"failed to init DC HW\n" ); +return ret; + } +return 0 ; +} + +void vs_dc_enable (struct vs_dc *dc,struct drm_crtc *crtc) +{ +struct vs_crtc_state *crtc_state =to_vs_crtc_state (crtc->state); +struct drm_display_mode *mode = &crtc->state->adjusted_mode; +struct dc_hw_display display; + + display.bus_format = crtc_state->output_fmt; + display.h_active = mode->hdisplay; + display.h_total = mode->htotal; + display.h_sync_start = mode->hsync_start; + display.h_sync_end = mode->hsync_end; +if (mode->flags &DRM_MODE_FLAG_PHSYNC ) + display.h_sync_polarity = true; +else + display.h_sync_polarity = false; + + display.v_active = mode->vdisplay; + display.v_total = mode->vtotal; + display.v_sync_start = mode->vsync_start; + display.v_sync_end = mode->vsync_end; + +if (mode->flags &DRM_MODE_FLAG_PVSYNC ) + display.v_sync_polarity = true; +else + display.v_sync_polarity = false; + + display.id =to_vs_display_id (dc, crtc); + + display.enable = true; + +if (crtc_state->encoder_type ==DRM_MODE_ENCODER_DSI ) { +dc_hw_set_out (&dc->hw,OUT_DPI , display.id); +clk_set_rate (dc->clk_vout[CLK_VOUT_SOC_PIX ].clk, mode->clock *1000 ); +clk_set_parent (dc->clk_vout[CLK_VOUT_PIX1 ].clk, + dc->clk_vout[CLK_VOUT_SOC_PIX ].clk); + }else { +dc_hw_set_out (&dc->hw,OUT_DP , display.id); +clk_set_parent (dc->clk_vout[CLK_VOUT_PIX0 ].clk, + dc->clk_vout[CLK_VOUT_HDMI_PIX ].clk); + } + +dc_hw_setup_display (&dc->hw, &display); +} + +void vs_dc_disable (struct vs_dc *dc,struct drm_crtc *crtc) +{ +struct dc_hw_display display; + + display.id =to_vs_display_id (dc, crtc); + display.enable = false; + +dc_hw_setup_display (&dc->hw, &display); +} + +void vs_dc_set_gamma (struct vs_dc *dc,struct drm_crtc *crtc, +struct drm_color_lut *lut,unsigned int size) +{ +u16 i, r, g, b; +u8 bits, id; + +if (size != dc->hw.info->gamma_size) { +drm_err (crtc->dev,"gamma size does not match!\n" ); +return ; + } + + id =to_vs_display_id (dc, crtc); + + bits = dc->hw.info->gamma_bits; +for (i =0 ; i < size; i++) { + r =drm_color_lut_extract (lut[i].red, bits); + g =drm_color_lut_extract (lut[i].green, bits); + b =drm_color_lut_extract (lut[i].blue, bits); +dc_hw_update_gamma (&dc->hw, id, i, r, g, b); + } +} + +void vs_dc_enable_gamma (struct vs_dc *dc,struct drm_crtc *crtc, +bool enable) +{ +u8 id; + + id =to_vs_display_id (dc, crtc); +dc_hw_enable_gamma (&dc->hw, id, enable); +} + +void vs_dc_enable_vblank (struct vs_dc *dc,bool enable) +{ +dc_hw_enable_interrupt (&dc->hw, enable); +} + +static u32 calc_factor (u32 src,u32 dest) +{ +u32 factor =1 <<16 ; + +if (src >1 && dest >1 ) + factor = ((src -1 ) <<16 ) / (dest -1 ); + +return factor; +} + +static void update_scale (struct drm_plane_state *state,struct dc_hw_roi *roi, +struct dc_hw_scale *scale) +{ +int dst_w =drm_rect_width (&state->dst); +int dst_h =drm_rect_height (&state->dst); +int src_w, src_h, temp; + + scale->enable = false; + +if (roi->enable) { + src_w = roi->width; + src_h = roi->height; + }else { + src_w =drm_rect_width (&state->src) >>16 ; + src_h =drm_rect_height (&state->src) >>16 ; + } + +if (drm_rotation_90_or_270 (state->rotation)) { + temp = src_w; + src_w = src_h; + src_h = temp; + } + +if (src_w != dst_w) { + scale->scale_factor_x =calc_factor (src_w, dst_w); + scale->enable = true; + }else { + scale->scale_factor_x =1 <<16 ; + } +if (src_h != dst_h) { + scale->scale_factor_y =calc_factor (src_h, dst_h); + scale->enable = true; + }else { + scale->scale_factor_y =1 <<16 ; + } +} + +static void update_fb (struct vs_plane *plane,u8 display_id, +struct dc_hw_fb *fb,struct drm_plane_state *state) +{ +struct vs_plane_state *plane_state =to_vs_plane_state (state); +struct drm_framebuffer *drm_fb = state->fb; +struct drm_rect *src = &state->src; + + fb->display_id = display_id; + fb->y_address = plane_state->dma_addr[0 ]; + fb->y_stride = drm_fb->pitches[0 ]; +if (drm_fb->format->format ==DRM_FORMAT_YVU420 ) { + fb->u_address = plane_state->dma_addr[2 ]; + fb->v_address = plane_state->dma_addr[1 ]; + fb->u_stride = drm_fb->pitches[2 ]; + fb->v_stride = drm_fb->pitches[1 ]; + }else { + fb->u_address = plane_state->dma_addr[1 ]; + fb->v_address = plane_state->dma_addr[2 ]; + fb->u_stride = drm_fb->pitches[1 ]; + fb->v_stride = drm_fb->pitches[2 ]; + } + fb->width =drm_rect_width (src) >>16 ; + fb->height =drm_rect_height (src) >>16 ; + fb->tile_mode =to_vs_tile_mode (drm_fb->modifier); + fb->rotation =to_vs_rotation (state->rotation); + fb->yuv_color_space =to_vs_yuv_color_space (state->color_encoding); + fb->zpos = state->zpos; + fb->enable = state->visible; +update_format (drm_fb->format->format, drm_fb->modifier, fb); +update_swizzle (drm_fb->format->format, fb); +update_watermark (plane_state->watermark, fb); + plane_state->status.tile_mode = fb->tile_mode; +} + +static void update_degamma (struct vs_dc *dc,struct vs_plane *plane, +struct vs_plane_state *plane_state) +{ +dc_hw_update_degamma (&dc->hw, plane->id, plane_state->degamma); + plane_state->degamma_changed = false; +} + +static void update_roi (struct vs_dc *dc,u8 id, +struct vs_plane_state *plane_state, +struct dc_hw_roi *roi, +struct drm_plane_state *state) +{ +struct drm_vs_roi *data; +struct drm_rect *src = &state->src; +u16 src_w =drm_rect_width (src) >>16 ; +u16 src_h =drm_rect_height (src) >>16 ; + +if (plane_state->roi) { + data = plane_state->roi->data; + +if (data->enable) { + roi->x = data->roi_x; + roi->y = data->roi_y; + roi->width = (data->roi_x + data->roi_w > src_w) ? + (src_w - data->roi_x) : data->roi_w; + roi->height = (data->roi_y + data->roi_h > src_h) ? + (src_h - data->roi_y) : data->roi_h; + roi->enable = true; + }else { + roi->enable = false; + } + +dc_hw_update_roi (&dc->hw, id, roi); + }else { + roi->enable = false; + } +} + +static void update_color_mgmt (struct vs_dc *dc,u8 id, +struct dc_hw_fb *fb, +struct vs_plane_state *plane_state) +{ +struct drm_vs_color_mgmt *data; +struct dc_hw_colorkey colorkey; + +if (plane_state->color_mgmt) { + data = plane_state->color_mgmt->data; + + fb->clear_enable = data->clear_enable; + fb->clear_value = data->clear_value; + +if (data->colorkey > data->colorkey_high) + data->colorkey = data->colorkey_high; + + colorkey.colorkey = data->colorkey; + colorkey.colorkey_high = data->colorkey_high; + colorkey.transparency = (data->transparency) ? +DC_TRANSPARENCY_KEY :DC_TRANSPARENCY_OPAQUE ; +dc_hw_update_colorkey (&dc->hw, id, &colorkey); + } +} + +static void update_plane (struct vs_dc *dc,struct vs_plane *plane, +struct drm_plane *drm_plane, +struct drm_atomic_state *drm_state) +{ +struct dc_hw_fb fb = {0 }; +struct dc_hw_scale scale; +struct dc_hw_position pos; +struct dc_hw_blend blend; +struct dc_hw_roi roi; +struct drm_plane_state *state =drm_atomic_get_new_plane_state (drm_state, + drm_plane); +struct vs_plane_state *plane_state =to_vs_plane_state (state); +struct drm_rect *dest = &state->dst; +bool dec_enable = false; +u8 display_id =0 ; + + display_id =to_vs_display_id (dc, state->crtc); +update_fb (plane, display_id, &fb, state); + fb.dec_enable = dec_enable; + +update_roi (dc, plane->id, plane_state, &roi, state); + +update_scale (state, &roi, &scale); + +if (plane_state->degamma_changed) +update_degamma (dc, plane, plane_state); + + pos.start_x = dest->x1; + pos.start_y = dest->y1; + pos.end_x = dest->x2; + pos.end_y = dest->y2; + + blend.alpha = (u8)(state->alpha >>8 ); + blend.blend_mode = (u8)(state->pixel_blend_mode); + +update_color_mgmt (dc, plane->id, &fb, plane_state); + +dc_hw_update_plane (&dc->hw, plane->id, &fb, &scale, &pos, &blend); +} + +static void update_qos (struct vs_dc *dc,struct vs_plane *plane, +struct drm_plane *drm_plane, +struct drm_atomic_state *drm_state) +{ +struct drm_plane_state *state =drm_atomic_get_new_plane_state (drm_state, + drm_plane); +struct vs_plane_state *plane_state =to_vs_plane_state (state); +struct drm_vs_watermark *data; +struct dc_hw_qos qos; + +if (plane_state->watermark) { + data = plane_state->watermark->data; + +if (data->qos_high) { +if (data->qos_low > data->qos_high) + data->qos_low = data->qos_high; + + qos.low_value = data->qos_low &0x0F ; + qos.high_value = data->qos_high &0x0F ; +dc_hw_update_qos (&dc->hw, &qos); + } + } +} + +static void update_cursor_size (struct drm_plane_state *state,struct dc_hw_cursor *cursor) +{ +u8 size_type; + +switch (state->crtc_w) { +case 32 : + size_type =CURSOR_SIZE_32X32 ; +break ; +case 64 : + size_type =CURSOR_SIZE_64X64 ; +break ; +default : + size_type =CURSOR_SIZE_32X32 ; +break ; + } + + cursor->size = size_type; +} + +static void update_cursor_plane (struct vs_dc *dc,struct vs_plane *plane, +struct drm_plane *drm_plane, +struct drm_atomic_state *drm_state) +{ +struct drm_plane_state *state =drm_atomic_get_new_plane_state (drm_state, + drm_plane); +struct vs_plane_state *plane_state =to_vs_plane_state (state); +struct drm_framebuffer *drm_fb = state->fb; +struct dc_hw_cursor cursor; + + cursor.address = plane_state->dma_addr[0 ]; + cursor.x = state->crtc_x; + cursor.y = state->crtc_y; + cursor.hot_x = drm_fb->hot_x; + cursor.hot_y = drm_fb->hot_y; + cursor.display_id =to_vs_display_id (dc, state->crtc); +update_cursor_size (state, &cursor); + cursor.enable = true; + +dc_hw_update_cursor (&dc->hw, cursor.display_id, &cursor); +} + +void vs_dc_update_plane (struct vs_dc *dc,struct vs_plane *plane, +struct drm_plane *drm_plane, +struct drm_atomic_state *drm_state) +{ +update_plane (dc, plane, drm_plane, drm_state); +update_qos (dc, plane, drm_plane, drm_state); +} + +void vs_dc_update_cursor_plane (struct vs_dc *dc,struct vs_plane *plane, +struct drm_plane *drm_plane, +struct drm_atomic_state *drm_state) +{ +update_cursor_plane (dc, plane, drm_plane, drm_state); +} + +void vs_dc_disable_plane (struct vs_dc *dc,struct vs_plane *plane, +struct drm_plane_state *old_state) +{ +struct dc_hw_fb fb = {0 }; + + fb.enable = false; +dc_hw_update_plane (&dc->hw, plane->id, &fb,NULL ,NULL ,NULL ); +} + +void vs_dc_disable_cursor_plane (struct vs_dc *dc,struct vs_plane *plane, +struct drm_plane_state *old_state) +{ +struct dc_hw_cursor cursor = {0 }; + + cursor.enable = false; + cursor.display_id =to_vs_display_id (dc, old_state->crtc); +dc_hw_update_cursor (&dc->hw, cursor.display_id, &cursor); +} + +static bool vs_dc_mod_supported (const struct vs_plane_info *plane_info, +u64 modifier) +{ +const u64 *mods; + +if (!plane_info->modifiers) +return false; + +for (mods = plane_info->modifiers; *mods !=DRM_FORMAT_MOD_INVALID ; mods++) { +if (*mods == modifier) +return true; + } + +return false; +} + +int vs_dc_check_plane (struct vs_dc *dc,struct drm_plane *plane, +struct drm_atomic_state *state) +{ +struct drm_plane_state *new_plane_state =drm_atomic_get_new_plane_state (state, + plane); + +struct drm_framebuffer *fb = new_plane_state->fb; +const struct vs_plane_info *plane_info; +struct drm_crtc *crtc = new_plane_state->crtc; +struct drm_crtc_state *crtc_state; +struct vs_plane *vs_plane =to_vs_plane (plane); + + plane_info = &dc->hw.info->planes[vs_plane->id]; + +if (fb->width < plane_info->min_width || + fb->width > plane_info->max_width || + fb->height < plane_info->min_height || + fb->height > plane_info->max_height) +drm_err_once (plane->dev,"buffer size may not support on plane%d.\n" , + vs_plane->id); + +if (!vs_dc_mod_supported (plane_info, fb->modifier)) { +drm_err (plane->dev,"unsupported modifier on plane%d.\n" , vs_plane->id); +return -EINVAL ; + } + + crtc_state =drm_atomic_get_existing_crtc_state (state, crtc); +return drm_atomic_helper_check_plane_state (new_plane_state, crtc_state, + plane_info->min_scale, + plane_info->max_scale, + true, true); +} + +int vs_dc_check_cursor_plane (struct vs_dc *dc,struct drm_plane *plane, +struct drm_atomic_state *state) +{ +struct drm_plane_state *new_plane_state =drm_atomic_get_new_plane_state (state, + plane); +struct drm_framebuffer *fb = new_plane_state->fb; +const struct vs_plane_info *plane_info; +struct drm_crtc *crtc = new_plane_state->crtc; +struct drm_crtc_state *crtc_state; +struct vs_plane *vs_plane =to_vs_plane (plane); + + plane_info = &dc->hw.info->planes[vs_plane->id]; + +if (fb->width < plane_info->min_width || + fb->width > plane_info->max_width || + fb->height < plane_info->min_height || + fb->height > plane_info->max_height) +drm_err_once (plane->dev,"buffer size may not support on plane%d.\n" , vs_plane->id); + + crtc_state =drm_atomic_get_existing_crtc_state (state, crtc); +if (IS_ERR (crtc_state)) +return -EINVAL ; + +return drm_atomic_helper_check_plane_state (new_plane_state, crtc_state, + plane_info->min_scale, + plane_info->max_scale, + true, true); +} + +static void vs_crtc_handle_vblank (struct drm_crtc *crtc,bool underflow) +{ +struct vs_crtc_state *vs_crtc_state =to_vs_crtc_state (crtc->state); + +drm_crtc_handle_vblank (crtc); + + vs_crtc_state->underflow = underflow; +} + +static irqreturn_t dc_isr (int irq,void *data) +{ +struct vs_dc *dc = data; +struct vs_dc_info *dc_info = dc->hw.info; +u32 i, ret; + + ret =dc_hw_get_interrupt (&dc->hw); + +for (i =0 ; i < dc_info->panel_num; i++) +vs_crtc_handle_vblank (&dc->crtc[i]->base,dc_hw_check_underflow (&dc->hw)); + +return IRQ_HANDLED ; +} + +void vs_dc_commit (struct vs_dc *dc) +{ +dc_hw_enable_shadow_register (&dc->hw, false); + +dc_hw_commit (&dc->hw); + +if (dc->first_frame) + dc->first_frame = false; + +dc_hw_enable_shadow_register (&dc->hw, true); +} + +static int dc_bind (struct device *dev,struct device *master,void *data) +{ +struct drm_device *drm_dev = data; +struct vs_dc *dc =dev_get_drvdata (dev); +struct device_node *port; +struct vs_crtc *crtc; +struct vs_dc_info *dc_info; +struct vs_plane *plane; +struct vs_plane_info *plane_info; +int i, ret; +u32 ctrc_mask =0 ; + +if (!drm_dev || !dc) { +dev_err (dev,"devices are not created.\n" ); +return -ENODEV ; + } + + ret =dc_init (dev); +if (ret <0 ) { +drm_err (drm_dev,"Failed to initialize DC hardware.\n" ); +return ret; + } + + port =of_get_child_by_name (dev->of_node,"port" ); +if (!port) { +drm_err (drm_dev,"no port node found\n" ); +return -ENODEV ; + } +of_node_put (port); + + dc_info = dc->hw.info; + +for (i =0 ; i < dc_info->panel_num; i++) { + crtc =vs_crtc_create (drm_dev, dc_info); +if (!crtc) { +drm_err (drm_dev,"Failed to create CRTC.\n" ); + ret = -ENOMEM ; +return ret; + } + + crtc->base.port = port; + crtc->dev = dev; + dc->crtc[i] = crtc; + ctrc_mask |=drm_crtc_mask (&crtc->base); + } +
drivers/gpu/drm/verisilicon/vs_dc.c line 871
Quoted 10 lines
drivers/gpu/drm/verisilicon/vs_dc.c new file +10
-0+for (i =0 ; i < dc_info->plane_num; i++) { + plane_info = (struct vs_plane_info *)&dc_info->planes[i]; + +if (!strcmp (plane_info->name,"Primary" ) || !strcmp (plane_info->name,"Cursor" )) { + plane =vs_plane_create (drm_dev, plane_info, dc_info->layer_num, +drm_crtc_mask (&dc->crtc[0 ]->base)); + }else if (!strcmp (plane_info->name,"Primary_1" ) || + !strcmp (plane_info->name,"Cursor_1" )) { + plane =vs_plane_create (drm_dev, plane_info, dc_info->layer_num, +drm_crtc_mask (&dc->crtc[1 ]->base));
I'd say, it's not typical to use name to distinguish objects. Maybe you can add indices to the info structure and drop the names instead?
Quoted 8 lines
drivers/gpu/drm/verisilicon/vs_dc.c new file +8
-0+ }else { + plane =vs_plane_create (drm_dev, plane_info, + dc_info->layer_num, ctrc_mask); + } + +if (IS_ERR (plane)) { +dev_err (dev,"failed to construct plane\n" ); +return PTR_ERR (plane);
drivers/gpu/drm/verisilicon/vs_dc.c line 889
Quoted 10 lines
drivers/gpu/drm/verisilicon/vs_dc.c new file +10
-0+ } + + plane->id = i; + dc->planes[i].id = plane_info->id; + +if (plane_info->type ==DRM_PLANE_TYPE_PRIMARY ) { +if (!strcmp (plane_info->name,"Primary" )) + dc->crtc[0 ]->base.primary = &plane->base; +else + dc->crtc[1 ]->base.primary = &plane->base;
This definitely urges for an index in the plane info / plane_state.
Quoted 70 lines
drivers/gpu/drm/verisilicon/vs_dc.c new file +70
-0+ drm_dev->mode_config.min_width = plane_info->min_width; + drm_dev->mode_config.min_height = + plane_info->min_height; + drm_dev->mode_config.max_width = plane_info->max_width; + drm_dev->mode_config.max_height = + plane_info->max_height; + } + +if (plane_info->type ==DRM_PLANE_TYPE_CURSOR ) { +if (!strcmp (plane_info->name,"Cursor" )) + dc->crtc[0 ]->base.cursor = &plane->base; +else + dc->crtc[1 ]->base.cursor = &plane->base; + drm_dev->mode_config.cursor_width = + plane_info->max_width; + drm_dev->mode_config.cursor_height = + plane_info->max_height; + } + } + +vs_drm_update_pitch_alignment (drm_dev, dc_info->pitch_alignment); +return 0 ; +} + +static void dc_unbind (struct device *dev,struct device *master,void *data) +{ +dc_deinit (dev); +} + +const struct component_ops dc_component_ops = { + .bind = dc_bind, + .unbind = dc_unbind, +}; + +static const struct of_device_id dc_driver_dt_match[] = { + { .compatible ="starfive,jh7110-dc8200" , }, + {}, +}; +MODULE_DEVICE_TABLE (of, dc_driver_dt_match); + +static int dc_probe (struct platform_device *pdev) +{ +struct device *dev = &pdev->dev; +struct vs_dc *dc; +int irq, ret, i; + + dc =devm_kzalloc (dev,sizeof (*dc),GFP_KERNEL ); +if (!dc) +return -ENOMEM ; + + dc->hw.hi_base =devm_platform_ioremap_resource (pdev,0 ); +if (IS_ERR (dc->hw.hi_base)) +return PTR_ERR (dc->hw.hi_base); + + dc->hw.reg_base =devm_platform_ioremap_resource (pdev,1 ); +if (IS_ERR (dc->hw.reg_base)) +return PTR_ERR (dc->hw.reg_base); + + dc->nclks =ARRAY_SIZE (dc->clk_vout); +for (i =0 ; i < dc->nclks; ++i) + dc->clk_vout[i].id = vout_clocks[i]; + ret =devm_clk_bulk_get (dev, dc->nclks, dc->clk_vout); +if (ret) { +dev_err (dev,"Failed to get clk controls\n" ); +return ret; + } + + dc->nrsts =ARRAY_SIZE (dc->rst_vout); +for (i =0 ; i < dc->nrsts; ++i) + dc->rst_vout[i].id = vout_resets[i];
drivers/gpu/drm/verisilicon/vs_dc.c line 969
Quoted 10 lines
drivers/gpu/drm/verisilicon/vs_dc.c new file +10
-0+ ret =devm_reset_control_bulk_get_shared (dev, dc->nrsts, + dc->rst_vout); +if (ret) { +dev_err (dev,"Failed to get reset controls\n" ); +return ret; + } + + irq =platform_get_irq (pdev,0 ); + + ret =devm_request_irq (dev, irq, dc_isr,0 ,dev_name (dev), dc);
Are you ready to handle the IRQ at this point?
Quoted 535 lines
drivers/gpu/drm/verisilicon/vs_dc.c new file +33
-0+if (ret <0 ) { +dev_err (dev,"Failed to install irq:%u.\n" , irq); +return ret; + } + +dev_set_drvdata (dev, dc); + +return component_add (dev, &dc_component_ops); +} + +static int dc_remove (struct platform_device *pdev) +{ +struct device *dev = &pdev->dev; + +component_del (dev, &dc_component_ops); + +dev_set_drvdata (dev,NULL ); + +return 0 ; +} + +struct platform_driver dc_platform_driver = { + .probe = dc_probe, + .remove = dc_remove, + .driver = { + .name ="vs-dc" , + .of_match_table =of_match_ptr (dc_driver_dt_match), + }, +}; + +MODULE_AUTHOR ("StarFive Corporation" ); +MODULE_DESCRIPTION ("VeriSilicon DC Driver" ); +MODULE_LICENSE ("GPL" );drivers/gpu/drm/verisilicon/vs_dc.h new file +80
-0@@ -0,0 +1,80 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Copyright (C) 2023 VeriSilicon Holdings Co., Ltd. +*/ + +#ifndef __VS_DC_H__ +#define __VS_DC_H__ + +#include <linux/clk.h> +#include <linux/mm_types.h> +#include <linux/reset.h> + +#include <drm/drm_fourcc.h> +#include <drm/drm_modes.h> + +#include "vs_crtc.h" +#include "vs_dc_hw.h" +#include "vs_plane.h" + +struct vs_dc_plane { +enum dc_hw_plane_id id; +}; + +enum vout_clk { +CLK_VOUT_NOC_DISP =0 , +CLK_VOUT_PIX0 , +CLK_VOUT_PIX1 , +CLK_VOUT_CORE , +CLK_VOUT_AXI , +CLK_VOUT_AHB , +CLK_VOUT_HDMI_PIX , +CLK_VOUT_SOC_PIX , +CLK_VOUT_NUM +}; + +enum rst_vout { +RST_VOUT_AXI =0 , +RST_VOUT_AHB , +RST_VOUT_CORE , +RST_VOUT_NUM +}; + +struct vs_dc { +struct vs_crtc *crtc[DC_DISPLAY_NUM ]; +struct dc_hw hw; +bool first_frame; + +struct vs_dc_plane planes[PLANE_NUM ]; +struct clk_bulk_data clk_vout[CLK_VOUT_NUM ]; +int nclks; +struct reset_control_bulk_data rst_vout[RST_VOUT_NUM ]; +int nrsts; +}; + +void vs_dc_enable (struct vs_dc *dc,struct drm_crtc *crtc); +void vs_dc_disable (struct vs_dc *dc,struct drm_crtc *crtc); + +void vs_dc_set_gamma (struct vs_dc *dc,struct drm_crtc *crtc, +struct drm_color_lut *lut,unsigned int size); +void vs_dc_enable_gamma (struct vs_dc *dc,struct drm_crtc *crtc,bool enable); +void vs_dc_enable_vblank (struct vs_dc *dc,bool enable); +void vs_dc_commit (struct vs_dc *dc); +void vs_dc_update_plane (struct vs_dc *dc,struct vs_plane *plane, +struct drm_plane *drm_plane, +struct drm_atomic_state *drm_state); +void vs_dc_disable_plane (struct vs_dc *dc,struct vs_plane *plane, +struct drm_plane_state *old_state); +int vs_dc_check_plane (struct vs_dc *dc,struct drm_plane *plane, +struct drm_atomic_state *state); +void vs_dc_update_cursor_plane (struct vs_dc *dc,struct vs_plane *plane, +struct drm_plane *drm_plane, +struct drm_atomic_state *drm_state); +void vs_dc_disable_cursor_plane (struct vs_dc *dc,struct vs_plane *plane, +struct drm_plane_state *old_state); +int vs_dc_check_cursor_plane (struct vs_dc *dc,struct drm_plane *plane, +struct drm_atomic_state *state); + +extern struct platform_driver dc_platform_driver; + +#endif /* __VS_DC_H__ */ drivers/gpu/drm/verisilicon/vs_dc_hw.c new file +410
-0@@ -0,0 +1,1959 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Copyright (C) 2023 VeriSilicon Holdings Co., Ltd. +*/ + +#include <linux/bits.h> +#include <linux/io.h> +#include <linux/media-bus-format.h> +#include <drm/drm_atomic_helper.h> +#include <drm/drm_blend.h> +#include <drm/drm_fourcc.h> +#include <drm/vs_drm.h> + +#include "vs_dc_hw.h" +#include "vs_type.h" + +static const u32 horkernel[] = { +0x00000000 ,0x20000000 ,0x00002000 ,0x00000000 , +0x00000000 ,0x00000000 ,0x23fd1c03 ,0x00000000 , +0x00000000 ,0x00000000 ,0x181f0000 ,0x000027e1 , +0x00000000 ,0x00000000 ,0x00000000 ,0x2b981468 , +0x00000000 ,0x00000000 ,0x00000000 ,0x10f00000 , +0x00002f10 ,0x00000000 ,0x00000000 ,0x00000000 , +0x32390dc7 ,0x00000000 ,0x00000000 ,0x00000000 , +0x0af50000 ,0x0000350b ,0x00000000 ,0x00000000 , +0x00000000 ,0x3781087f ,0x00000000 ,0x00000000 , +0x00000000 ,0x06660000 ,0x0000399a ,0x00000000 , +0x00000000 ,0x00000000 ,0x3b5904a7 ,0x00000000 , +0x00000000 ,0x00000000 ,0x033c0000 ,0x00003cc4 , +0x00000000 ,0x00000000 ,0x00000000 ,0x3de1021f , +0x00000000 ,0x00000000 ,0x00000000 ,0x01470000 , +0x00003eb9 ,0x00000000 ,0x00000000 ,0x00000000 , +0x3f5300ad ,0x00000000 ,0x00000000 ,0x00000000 , +0x00480000 ,0x00003fb8 ,0x00000000 ,0x00000000 , +0x00000000 ,0x3fef0011 ,0x00000000 ,0x00000000 , +0x00000000 ,0x00000000 ,0x00004000 ,0x00000000 , +0x00000000 ,0x00000000 ,0x20002000 ,0x00000000 , +0x00000000 ,0x00000000 ,0x1c030000 ,0x000023fd , +0x00000000 ,0x00000000 ,0x00000000 ,0x27e1181f , +0x00000000 ,0x00000000 ,0x00000000 ,0x14680000 , +0x00002b98 ,0x00000000 ,0x00000000 ,0x00000000 , +0x2f1010f0 ,0x00000000 ,0x00000000 ,0x00000000 , +0x0dc70000 ,0x00003239 ,0x00000000 ,0x00000000 , +0x00000000 ,0x350b0af5 ,0x00000000 ,0x00000000 , +0x00000000 ,0x087f0000 ,0x00003781 ,0x00000000 , +0x00000000 ,0x00000000 ,0x399a0666 ,0x00000000 , +0x00000000 ,0x00000000 ,0x04a70000 ,0x00003b59 , +0x00000000 ,0x00000000 ,0x00000000 ,0x3cc4033c , +0x00000000 ,0x00000000 ,0x00000000 ,0x021f0000 , +}; + +#define H_COEF_SIZE (sizeof(horkernel) / sizeof(u32)) + +static const u32 verkernel[] = { +0x00000000 ,0x20000000 ,0x00002000 ,0x00000000 , +0x00000000 ,0x00000000 ,0x23fd1c03 ,0x00000000 , +0x00000000 ,0x00000000 ,0x181f0000 ,0x000027e1 , +0x00000000 ,0x00000000 ,0x00000000 ,0x2b981468 , +0x00000000 ,0x00000000 ,0x00000000 ,0x10f00000 , +0x00002f10 ,0x00000000 ,0x00000000 ,0x00000000 , +0x32390dc7 ,0x00000000 ,0x00000000 ,0x00000000 , +0x0af50000 ,0x0000350b ,0x00000000 ,0x00000000 , +0x00000000 ,0x3781087f ,0x00000000 ,0x00000000 , +0x00000000 ,0x06660000 ,0x0000399a ,0x00000000 , +0x00000000 ,0x00000000 ,0x3b5904a7 ,0x00000000 , +0x00000000 ,0x00000000 ,0x033c0000 ,0x00003cc4 , +0x00000000 ,0x00000000 ,0x00000000 ,0x3de1021f , +0x00000000 ,0x00000000 ,0x00000000 ,0x01470000 , +0x00003eb9 ,0x00000000 ,0x00000000 ,0x00000000 , +0x3f5300ad ,0x00000000 ,0x00000000 ,0x00000000 , +0x00480000 ,0x00003fb8 ,0x00000000 ,0x00000000 , +0x00000000 ,0x3fef0011 ,0x00000000 ,0x00000000 , +0x00000000 ,0x00000000 ,0x00004000 ,0x00000000 , +0xcdcd0000 ,0xfdfdfdfd ,0xabababab ,0xabababab , +0x00000000 ,0x00000000 ,0x5ff5f456 ,0x000f5f58 , +0x02cc6c78 ,0x02cc0c28 ,0xfeeefeee ,0xfeeefeee , +0xfeeefeee ,0xfeeefeee ,0xfeeefeee ,0xfeeefeee , +0xfeeefeee ,0xfeeefeee ,0xfeeefeee ,0xfeeefeee , +0xfeeefeee ,0xfeeefeee ,0xfeeefeee ,0xfeeefeee , +0xfeeefeee ,0xfeeefeee ,0xfeeefeee ,0xfeeefeee , +0xfeeefeee ,0xfeeefeee ,0xfeeefeee ,0xfeeefeee , +0xfeeefeee ,0xfeeefeee ,0xfeeefeee ,0xfeeefeee , +0xfeeefeee ,0xfeeefeee ,0xfeeefeee ,0xfeeefeee , +0xfeeefeee ,0xfeeefeee ,0xfeeefeee ,0xfeeefeee , +0xfeeefeee ,0xfeeefeee ,0xfeeefeee ,0xfeeefeee , +0xfeeefeee ,0xfeeefeee ,0xfeeefeee ,0xfeeefeee , +}; + +#define V_COEF_SIZE (sizeof(verkernel) / sizeof(u32)) + +/* +* RGB 709->2020 conversion parameters +*/ +static u16 RGB2RGB [RGB_TO_RGB_TABLE_SIZE ] = { +10279 ,5395 ,709 , +1132 ,15065 ,187 , +269 ,1442 ,14674 +}; + +/* +* YUV601 to RGB conversion parameters +* YUV2RGB[0] - [8] : C0 - C8; +* YUV2RGB[9] - [11]: D0 - D2; +* YUV2RGB[12] - [13]: Y clamp min & max calue; +* YUV2RGB[14] - [15]: UV clamp min & max calue; +*/ +static s32 YUV601_2RGB [YUV_TO_RGB_TABLE_SIZE ] = { +1196 ,0 ,1640 ,1196 , +-404 ,-836 ,1196 ,2076 , +0 ,-916224 ,558336 ,-1202944 , +64 ,940 ,64 ,960 +}; + +/* +* YUV709 to RGB conversion parameters +* YUV2RGB[0] - [8] : C0 - C8; +* YUV2RGB[9] - [11]: D0 - D2; +* YUV2RGB[12] - [13]: Y clamp min & max calue; +* YUV2RGB[14] - [15]: UV clamp min & max calue; +*/ +static s32 YUV709_2RGB [YUV_TO_RGB_TABLE_SIZE ] = { +1196 ,0 ,1844 ,1196 , +-220 ,-548 ,1196 ,2172 , +0 ,-1020672 ,316672 ,-1188608 , +64 ,940 ,64 ,960 +}; + +/* +* YUV2020 to RGB conversion parameters +* YUV2RGB[0] - [8] : C0 - C8; +* YUV2RGB[9] - [11]: D0 - D2; +* YUV2RGB[12] - [13]: Y clamp min & max calue; +* YUV2RGB[14] - [15]: UV clamp min & max calue; +*/ +static s32 YUV2020_2RGB [YUV_TO_RGB_TABLE_SIZE ] = { +1196 ,0 ,1724 ,1196 , +-192 ,-668 ,1196 ,2200 , +0 ,-959232 ,363776 ,-1202944 , +64 ,940 ,64 ,960 +}; + +/* +* RGB to YUV2020 conversion parameters +* RGB2YUV[0] - [8] : C0 - C8; +* RGB2YUV[9] - [11]: D0 - D2; +*/ +static s16 RGB2YUV [RGB_TO_YUV_TABLE_SIZE ] = { +230 ,594 ,52 , +-125 ,-323 ,448 , +448 ,-412 ,-36 , +64 ,512 ,512 +}; + +/* +* Degamma table for 709 color space data. +*/ +static u16 DEGAMMA_709 [DEGAMMA_SIZE ] = { +0x0000 ,0x0000 ,0x0000 ,0x0000 ,0x0001 ,0x0002 ,0x0004 ,0x0005 , +0x0007 ,0x000a ,0x000d ,0x0011 ,0x0015 ,0x0019 ,0x001e ,0x0024 , +0x002a ,0x0030 ,0x0038 ,0x003f ,0x0048 ,0x0051 ,0x005a ,0x0064 , +0x006f ,0x007b ,0x0087 ,0x0094 ,0x00a1 ,0x00af ,0x00be ,0x00ce , +0x00de ,0x00ef ,0x0101 ,0x0114 ,0x0127 ,0x013b ,0x0150 ,0x0166 , +0x017c ,0x0193 ,0x01ac ,0x01c4 ,0x01de ,0x01f9 ,0x0214 ,0x0230 , +0x024d ,0x026b ,0x028a ,0x02aa ,0x02ca ,0x02ec ,0x030e ,0x0331 , +0x0355 ,0x037a ,0x03a0 ,0x03c7 ,0x03ef ,0x0418 ,0x0441 ,0x046c , +0x0498 ,0x04c4 ,0x04f2 ,0x0520 ,0x0550 ,0x0581 ,0x05b2 ,0x05e5 , +0x0618 ,0x064d ,0x0682 ,0x06b9 ,0x06f0 ,0x0729 ,0x0763 ,0x079d , +0x07d9 ,0x0816 ,0x0854 ,0x0893 ,0x08d3 ,0x0914 ,0x0956 ,0x0999 , +0x09dd ,0x0a23 ,0x0a69 ,0x0ab1 ,0x0afa ,0x0b44 ,0x0b8f ,0x0bdb , +0x0c28 ,0x0c76 ,0x0cc6 ,0x0d17 ,0x0d69 ,0x0dbb ,0x0e10 ,0x0e65 , +0x0ebb ,0x0f13 ,0x0f6c ,0x0fc6 ,0x1021 ,0x107d ,0x10db ,0x113a , +0x119a ,0x11fb ,0x125d ,0x12c1 ,0x1325 ,0x138c ,0x13f3 ,0x145b , +0x14c5 ,0x1530 ,0x159c ,0x160a ,0x1678 ,0x16e8 ,0x175a ,0x17cc , +0x1840 ,0x18b5 ,0x192b ,0x19a3 ,0x1a1c ,0x1a96 ,0x1b11 ,0x1b8e , +0x1c0c ,0x1c8c ,0x1d0c ,0x1d8e ,0x1e12 ,0x1e96 ,0x1f1c ,0x1fa3 , +0x202c ,0x20b6 ,0x2141 ,0x21ce ,0x225c ,0x22eb ,0x237c ,0x240e , +0x24a1 ,0x2536 ,0x25cc ,0x2664 ,0x26fc ,0x2797 ,0x2832 ,0x28cf , +0x296e ,0x2a0e ,0x2aaf ,0x2b51 ,0x2bf5 ,0x2c9b ,0x2d41 ,0x2dea , +0x2e93 ,0x2f3e ,0x2feb ,0x3099 ,0x3148 ,0x31f9 ,0x32ab ,0x335f , +0x3414 ,0x34ca ,0x3582 ,0x363c ,0x36f7 ,0x37b3 ,0x3871 ,0x3930 , +0x39f1 ,0x3ab3 ,0x3b77 ,0x3c3c ,0x3d02 ,0x3dcb ,0x3e94 ,0x3f5f , +0x402c ,0x40fa ,0x41ca ,0x429b ,0x436d ,0x4442 ,0x4517 ,0x45ee , +0x46c7 ,0x47a1 ,0x487d ,0x495a ,0x4a39 ,0x4b19 ,0x4bfb ,0x4cde , +0x4dc3 ,0x4eaa ,0x4f92 ,0x507c ,0x5167 ,0x5253 ,0x5342 ,0x5431 , +0x5523 ,0x5616 ,0x570a ,0x5800 ,0x58f8 ,0x59f1 ,0x5aec ,0x5be9 , +0x5ce7 ,0x5de6 ,0x5ee7 ,0x5fea ,0x60ef ,0x61f5 ,0x62fc ,0x6406 , +0x6510 ,0x661d ,0x672b ,0x683b ,0x694c ,0x6a5f ,0x6b73 ,0x6c8a , +0x6da2 ,0x6ebb ,0x6fd6 ,0x70f3 ,0x7211 ,0x7331 ,0x7453 ,0x7576 , +0x769b ,0x77c2 ,0x78ea ,0x7a14 ,0x7b40 ,0x7c6d ,0x7d9c ,0x7ecd , +0x3f65 ,0x3f8c ,0x3fb2 ,0x3fd8 +}; + +/* +* Degamma table for 2020 color space data. +*/ +static u16 DEGAMMA_2020 [DEGAMMA_SIZE ] = { +0x0000 ,0x0000 ,0x0000 ,0x0000 ,0x0000 ,0x0000 ,0x0000 ,0x0000 , +0x0000 ,0x0000 ,0x0000 ,0x0000 ,0x0000 ,0x0000 ,0x0000 ,0x0000 , +0x0000 ,0x0000 ,0x0000 ,0x0000 ,0x0000 ,0x0000 ,0x0000 ,0x0000 , +0x0000 ,0x0001 ,0x0001 ,0x0001 ,0x0001 ,0x0001 ,0x0001 ,0x0001 , +0x0001 ,0x0002 ,0x0002 ,0x0002 ,0x0002 ,0x0002 ,0x0003 ,0x0003 , +0x0003 ,0x0003 ,0x0004 ,0x0004 ,0x0004 ,0x0005 ,0x0005 ,0x0006 , +0x0006 ,0x0006 ,0x0007 ,0x0007 ,0x0008 ,0x0008 ,0x0009 ,0x000a , +0x000a ,0x000b ,0x000c ,0x000c ,0x000d ,0x000e ,0x000f ,0x000f , +0x0010 ,0x0011 ,0x0012 ,0x0013 ,0x0014 ,0x0016 ,0x0017 ,0x0018 , +0x0019 ,0x001b ,0x001c ,0x001e ,0x001f ,0x0021 ,0x0022 ,0x0024 , +0x0026 ,0x0028 ,0x002a ,0x002c ,0x002e ,0x0030 ,0x0033 ,0x0035 , +0x0038 ,0x003a ,0x003d ,0x0040 ,0x0043 ,0x0046 ,0x0049 ,0x004d , +0x0050 ,0x0054 ,0x0057 ,0x005b ,0x005f ,0x0064 ,0x0068 ,0x006d , +0x0071 ,0x0076 ,0x007c ,0x0081 ,0x0086 ,0x008c ,0x0092 ,0x0098 , +0x009f ,0x00a5 ,0x00ac ,0x00b4 ,0x00bb ,0x00c3 ,0x00cb ,0x00d3 , +0x00dc ,0x00e5 ,0x00ee ,0x00f8 ,0x0102 ,0x010c ,0x0117 ,0x0123 , +0x012e ,0x013a ,0x0147 ,0x0154 ,0x0161 ,0x016f ,0x017e ,0x018d , +0x019c ,0x01ac ,0x01bd ,0x01ce ,0x01e0 ,0x01f3 ,0x0206 ,0x021a , +0x022f ,0x0244 ,0x025a ,0x0272 ,0x0289 ,0x02a2 ,0x02bc ,0x02d6 , +0x02f2 ,0x030f ,0x032c ,0x034b ,0x036b ,0x038b ,0x03ae ,0x03d1 , +0x03f5 ,0x041b ,0x0443 ,0x046b ,0x0495 ,0x04c1 ,0x04ee ,0x051d , +0x054e ,0x0580 ,0x05b4 ,0x05ea ,0x0622 ,0x065c ,0x0698 ,0x06d6 , +0x0717 ,0x075a ,0x079f ,0x07e7 ,0x0831 ,0x087e ,0x08cd ,0x0920 , +0x0976 ,0x09ce ,0x0a2a ,0x0a89 ,0x0aec ,0x0b52 ,0x0bbc ,0x0c2a , +0x0c9b ,0x0d11 ,0x0d8b ,0x0e0a ,0x0e8d ,0x0f15 ,0x0fa1 ,0x1033 , +0x10ca ,0x1167 ,0x120a ,0x12b2 ,0x1360 ,0x1415 ,0x14d1 ,0x1593 , +0x165d ,0x172e ,0x1806 ,0x18e7 ,0x19d0 ,0x1ac1 ,0x1bbb ,0x1cbf , +0x1dcc ,0x1ee3 ,0x2005 ,0x2131 ,0x2268 ,0x23ab ,0x24fa ,0x2656 , +0x27be ,0x2934 ,0x2ab8 ,0x2c4a ,0x2dec ,0x2f9d ,0x315f ,0x3332 , +0x3516 ,0x370d ,0x3916 ,0x3b34 ,0x3d66 ,0x3fad ,0x420b ,0x4480 , +0x470d ,0x49b3 ,0x4c73 ,0x4f4e ,0x5246 ,0x555a ,0x588e ,0x5be1 , +0x5f55 ,0x62eb ,0x66a6 ,0x6a86 ,0x6e8c ,0x72bb ,0x7714 ,0x7b99 , +0x3dcb ,0x3e60 ,0x3ef5 ,0x3f8c +}; + +/* one is for primary plane and the other is for all overlay planes */ +static const struct dc_hw_plane_reg dc_plane_reg[] = { + { + .y_address =DC_FRAMEBUFFER_ADDRESS , + .u_address =DC_FRAMEBUFFER_U_ADDRESS , + .v_address =DC_FRAMEBUFFER_V_ADDRESS , + .y_stride =DC_FRAMEBUFFER_STRIDE , + .u_stride =DC_FRAMEBUFFER_U_STRIDE , + .v_stride =DC_FRAMEBUFFER_V_STRIDE , + .size =DC_FRAMEBUFFER_SIZE , + .top_left =DC_FRAMEBUFFER_TOP_LEFT , + .bottom_right =DC_FRAMEBUFFER_BOTTOM_RIGHT , + .scale_factor_x =DC_FRAMEBUFFER_SCALE_FACTOR_X , + .scale_factor_y =DC_FRAMEBUFFER_SCALE_FACTOR_Y , + .h_filter_coef_index =DC_FRAMEBUFFER_H_FILTER_COEF_INDEX , + .h_filter_coef_data =DC_FRAMEBUFFER_H_FILTER_COEF_DATA , + .v_filter_coef_index =DC_FRAMEBUFFER_V_FILTER_COEF_INDEX , + .v_filter_coef_data =DC_FRAMEBUFFER_V_FILTER_COEF_DATA , + .init_offset =DC_FRAMEBUFFER_INIT_OFFSET , + .color_key =DC_FRAMEBUFFER_COLOR_KEY , + .color_key_high =DC_FRAMEBUFFER_COLOR_KEY_HIGH , + .clear_value =DC_FRAMEBUFFER_CLEAR_VALUE , + .color_table_index =DC_FRAMEBUFFER_COLOR_TABLE_INDEX , + .color_table_data =DC_FRAMEBUFFER_COLOR_TABLE_DATA , + .scale_config =DC_FRAMEBUFFER_SCALE_CONFIG , + .water_mark =DC_FRAMEBUFFER_WATER_MARK , + .degamma_index =DC_FRAMEBUFFER_DEGAMMA_INDEX , + .degamma_data =DC_FRAMEBUFFER_DEGAMMA_DATA , + .degamma_ex_data =DC_FRAMEBUFFER_DEGAMMA_EX_DATA , + .src_global_color =DC_FRAMEBUFFER_SRC_GLOBAL_COLOR , + .dst_global_color =DC_FRAMEBUFFER_DST_GLOBAL_COLOR , + .blend_config =DC_FRAMEBUFFER_BLEND_CONFIG , + .roi_origin =DC_FRAMEBUFFER_ROI_ORIGIN , + .roi_size =DC_FRAMEBUFFER_ROI_SIZE , + .yuv_to_rgb_coef0 =DC_FRAMEBUFFER_YUVTORGB_COEF0 , + .yuv_to_rgb_coef1 =DC_FRAMEBUFFER_YUVTORGB_COEF1 , + .yuv_to_rgb_coef2 =DC_FRAMEBUFFER_YUVTORGB_COEF2 , + .yuv_to_rgb_coef3 =DC_FRAMEBUFFER_YUVTORGB_COEF3 , + .yuv_to_rgb_coef4 =DC_FRAMEBUFFER_YUVTORGB_COEF4 , + .yuv_to_rgb_coefd0 =DC_FRAMEBUFFER_YUVTORGB_COEFD0 , + .yuv_to_rgb_coefd1 =DC_FRAMEBUFFER_YUVTORGB_COEFD1 , + .yuv_to_rgb_coefd2 =DC_FRAMEBUFFER_YUVTORGB_COEFD2 , + .y_clamp_bound =DC_FRAMEBUFFER_Y_CLAMP_BOUND , + .uv_clamp_bound =DC_FRAMEBUFFER_UV_CLAMP_BOUND , + .rgb_to_rgb_coef0 =DC_FRAMEBUFFER_RGBTORGB_COEF0 , + .rgb_to_rgb_coef1 =DC_FRAMEBUFFER_RGBTORGB_COEF1 , + .rgb_to_rgb_coef2 =DC_FRAMEBUFFER_RGBTORGB_COEF2 , + .rgb_to_rgb_coef3 =DC_FRAMEBUFFER_RGBTORGB_COEF3 , + .rgb_to_rgb_coef4 =DC_FRAMEBUFFER_RGBTORGB_COEF4 , + }, + { + .y_address =DC_OVERLAY_ADDRESS , + .u_address =DC_OVERLAY_U_ADDRESS , + .v_address =DC_OVERLAY_V_ADDRESS , + .y_stride =DC_OVERLAY_STRIDE , + .u_stride =DC_OVERLAY_U_STRIDE , + .v_stride =DC_OVERLAY_V_STRIDE , + .size =DC_OVERLAY_SIZE , + .top_left =DC_OVERLAY_TOP_LEFT , + .bottom_right =DC_OVERLAY_BOTTOM_RIGHT , + .scale_factor_x =DC_OVERLAY_SCALE_FACTOR_X , + .scale_factor_y =DC_OVERLAY_SCALE_FACTOR_Y , + .h_filter_coef_index =DC_OVERLAY_H_FILTER_COEF_INDEX , + .h_filter_coef_data =DC_OVERLAY_H_FILTER_COEF_DATA , + .v_filter_coef_index =DC_OVERLAY_V_FILTER_COEF_INDEX , + .v_filter_coef_data =DC_OVERLAY_V_FILTER_COEF_DATA , + .init_offset =DC_OVERLAY_INIT_OFFSET , + .color_key =DC_OVERLAY_COLOR_KEY , + .color_key_high =DC_OVERLAY_COLOR_KEY_HIGH , + .clear_value =DC_OVERLAY_CLEAR_VALUE , + .color_table_index =DC_OVERLAY_COLOR_TABLE_INDEX , + .color_table_data =DC_OVERLAY_COLOR_TABLE_DATA , + .scale_config =DC_OVERLAY_SCALE_CONFIG , + .water_mark =DC_OVERLAY_WATER_MARK , + .degamma_index =DC_OVERLAY_DEGAMMA_INDEX , + .degamma_data =DC_OVERLAY_DEGAMMA_DATA , + .degamma_ex_data =DC_OVERLAY_DEGAMMA_EX_DATA , + .src_global_color =DC_OVERLAY_SRC_GLOBAL_COLOR , + .dst_global_color =DC_OVERLAY_DST_GLOBAL_COLOR , + .blend_config =DC_OVERLAY_BLEND_CONFIG , + .roi_origin =DC_OVERLAY_ROI_ORIGIN , + .roi_size =DC_OVERLAY_ROI_SIZE , + .yuv_to_rgb_coef0 =DC_OVERLAY_YUVTORGB_COEF0 , + .yuv_to_rgb_coef1 =DC_OVERLAY_YUVTORGB_COEF1 , + .yuv_to_rgb_coef2 =DC_OVERLAY_YUVTORGB_COEF2 , + .yuv_to_rgb_coef3 =DC_OVERLAY_YUVTORGB_COEF3 , + .yuv_to_rgb_coef4 =DC_OVERLAY_YUVTORGB_COEF4 , + .yuv_to_rgb_coefd0 =DC_OVERLAY_YUVTORGB_COEFD0 , + .yuv_to_rgb_coefd1 =DC_OVERLAY_YUVTORGB_COEFD1 , + .yuv_to_rgb_coefd2 =DC_OVERLAY_YUVTORGB_COEFD2 , + .y_clamp_bound =DC_OVERLAY_Y_CLAMP_BOUND , + .uv_clamp_bound =DC_OVERLAY_UV_CLAMP_BOUND , + .rgb_to_rgb_coef0 =DC_OVERLAY_RGBTORGB_COEF0 , + .rgb_to_rgb_coef1 =DC_OVERLAY_RGBTORGB_COEF1 , + .rgb_to_rgb_coef2 =DC_OVERLAY_RGBTORGB_COEF2 , + .rgb_to_rgb_coef3 =DC_OVERLAY_RGBTORGB_COEF3 , + .rgb_to_rgb_coef4 =DC_OVERLAY_RGBTORGB_COEF4 , + }, +}; + +static const u32 primary_overlay_format0[] = { +DRM_FORMAT_XRGB4444 , +DRM_FORMAT_XBGR4444 , +DRM_FORMAT_RGBX4444 , +DRM_FORMAT_BGRX4444 , +DRM_FORMAT_ARGB4444 , +DRM_FORMAT_ABGR4444 , +DRM_FORMAT_RGBA4444 , +DRM_FORMAT_BGRA4444 , +DRM_FORMAT_XRGB1555 , +DRM_FORMAT_XBGR1555 , +DRM_FORMAT_RGBX5551 , +DRM_FORMAT_BGRX5551 , +DRM_FORMAT_ARGB1555 , +DRM_FORMAT_ABGR1555 , +DRM_FORMAT_RGBA5551 , +DRM_FORMAT_BGRA5551 , +DRM_FORMAT_RGB565 , +DRM_FORMAT_BGR565 , +DRM_FORMAT_XRGB8888 , +DRM_FORMAT_XBGR8888 , +DRM_FORMAT_RGBX8888 , +DRM_FORMAT_BGRX8888 , +DRM_FORMAT_ARGB8888 , +DRM_FORMAT_ABGR8888 , +DRM_FORMAT_RGBA8888 , +DRM_FORMAT_BGRA8888 , +DRM_FORMAT_ARGB2101010 , +DRM_FORMAT_ABGR2101010 , +DRM_FORMAT_RGBA1010102 , +DRM_FORMAT_BGRA1010102 , +DRM_FORMAT_YUYV , +DRM_FORMAT_YVYU , +DRM_FORMAT_UYVY , +DRM_FORMAT_VYUY , +DRM_FORMAT_YVU420 , +DRM_FORMAT_YUV420 , +DRM_FORMAT_NV12 , +DRM_FORMAT_NV21 , +DRM_FORMAT_NV16 , +DRM_FORMAT_NV61 , +DRM_FORMAT_P010 , +}; + +static const u32 primary_overlay_format1[] = { +DRM_FORMAT_XRGB8888 , +DRM_FORMAT_XBGR8888 , +DRM_FORMAT_RGBX8888 , +DRM_FORMAT_BGRX8888 , +DRM_FORMAT_ARGB8888 , +DRM_FORMAT_ABGR8888 , +DRM_FORMAT_RGBA8888 , +DRM_FORMAT_BGRA8888 , +DRM_FORMAT_ARGB2101010 , +DRM_FORMAT_ABGR2101010 , +DRM_FORMAT_RGBA1010102 , +DRM_FORMAT_BGRA1010102 , +DRM_FORMAT_NV12 , +DRM_FORMAT_NV21 , +DRM_FORMAT_YUV444 , +}; + +static const u32 cursor_formats[] = { +DRM_FORMAT_ARGB8888 +}; + +static const u64 format_modifier0[] = { +DRM_FORMAT_MOD_LINEAR , +fourcc_mod_vs_norm_code (DRM_FORMAT_MOD_VERISILICON_SUPER_TILED_XMAJOR_8X8 ), +fourcc_mod_vs_norm_code (DRM_FORMAT_MOD_VERISILICON_SUPER_TILED_YMAJOR_8X8 ), +fourcc_mod_vs_norm_code (DRM_FORMAT_MOD_VERISILICON_TILE_8X8 ), +fourcc_mod_vs_norm_code (DRM_FORMAT_MOD_VERISILICON_TILE_8X4 ), +fourcc_mod_vs_norm_code (DRM_FORMAT_MOD_VERISILICON_SUPER_TILED_XMAJOR_8X4 ), +fourcc_mod_vs_norm_code (DRM_FORMAT_MOD_VERISILICON_SUPER_TILED_YMAJOR_4X8 ), +DRM_FORMAT_MOD_INVALID +}; + +static const u64 secondary_format_modifiers[] = { +DRM_FORMAT_MOD_LINEAR ,
drivers/gpu/drm/verisilicon/vs_dc_hw.c line 420
Quoted 10 lines
drivers/gpu/drm/verisilicon/vs_dc_hw.c new file +10
-0+DRM_FORMAT_MOD_INVALID +}; + +#define FRAC_16_16 (mult, div) (((mult) << 16) / (div)) + +static const struct vs_plane_info dc_hw_planes[][PLANE_NUM ] = { + { +/* DC_REV_0 */ + { + .name ="Primary" ,
I'd say that the indentation is strange here.
It might be more scalable to split a single array into per-generation data structures and reference them directly from the info struct.
Quoted 600 lines
drivers/gpu/drm/verisilicon/vs_dc_hw.c new file +600
-0+ .id = PRIMARY_PLANE_0, + .type = DRM_PLANE_TYPE_PRIMARY, + .num_formats = ARRAY_SIZE(primary_overlay_format0), + .formats = primary_overlay_format0, + .num_modifiers = ARRAY_SIZE(format_modifier0), + .modifiers = format_modifier0, + .min_width = 0, + .min_height = 0, + .max_width = 4096, + .max_height = 4096, + .rotation =DRM_MODE_ROTATE_0 | +DRM_MODE_ROTATE_90 | +DRM_MODE_ROTATE_180 | +DRM_MODE_ROTATE_270 | +DRM_MODE_REFLECT_X | + DRM_MODE_REFLECT_Y, + .blend_mode =BIT (DRM_MODE_BLEND_PIXEL_NONE ) | +BIT (DRM_MODE_BLEND_PREMULTI ) | + BIT(DRM_MODE_BLEND_COVERAGE), + .color_encoding =BIT (DRM_COLOR_YCBCR_BT709 ) | + BIT(DRM_COLOR_YCBCR_BT2020), + .degamma_size = DEGAMMA_SIZE, + .min_scale = FRAC_16_16(1, 3), + .max_scale = FRAC_16_16(10, 1), + .zpos = 0, + .watermark = true, + .color_mgmt = true, + .roi = true, + }, + { + .name = "Overlay", + .id = OVERLAY_PLANE_0, + .type = DRM_PLANE_TYPE_OVERLAY, + .num_formats = ARRAY_SIZE(primary_overlay_format0), + .formats = primary_overlay_format0, + .num_modifiers = ARRAY_SIZE(format_modifier0), + .modifiers = format_modifier0, + .min_width = 0, + .min_height = 0, + .max_width = 4096, + .max_height = 4096, + .rotation =DRM_MODE_ROTATE_0 | +DRM_MODE_ROTATE_90 | +DRM_MODE_ROTATE_180 | +DRM_MODE_ROTATE_270 | +DRM_MODE_REFLECT_X | + DRM_MODE_REFLECT_Y, + .blend_mode =BIT (DRM_MODE_BLEND_PIXEL_NONE ) | +BIT (DRM_MODE_BLEND_PREMULTI ) | + BIT(DRM_MODE_BLEND_COVERAGE), + .color_encoding =BIT (DRM_COLOR_YCBCR_BT709 ) | + BIT(DRM_COLOR_YCBCR_BT2020), + .degamma_size = DEGAMMA_SIZE, + .min_scale = FRAC_16_16(1, 3), + .max_scale = FRAC_16_16(10, 1), + .zpos = 1, + .watermark = true, + .color_mgmt = true, + .roi = true, + }, + { + .name = "Overlay_1", + .id = OVERLAY_PLANE_1, + .type = DRM_PLANE_TYPE_OVERLAY, + .num_formats = ARRAY_SIZE(primary_overlay_format0), + .formats = primary_overlay_format0, + .num_modifiers = ARRAY_SIZE(secondary_format_modifiers), + .modifiers = secondary_format_modifiers, + .min_width = 0, + .min_height = 0, + .max_width = 4096, + .max_height = 4096, + .rotation = 0, + .blend_mode =BIT (DRM_MODE_BLEND_PIXEL_NONE ) | +BIT (DRM_MODE_BLEND_PREMULTI ) | + BIT(DRM_MODE_BLEND_COVERAGE), + .color_encoding =BIT (DRM_COLOR_YCBCR_BT709 ) | + BIT(DRM_COLOR_YCBCR_BT2020), + .degamma_size = DEGAMMA_SIZE, + .min_scale = DRM_PLANE_NO_SCALING, + .max_scale = DRM_PLANE_NO_SCALING, + .zpos = 2, + .watermark = true, + .color_mgmt = true, + .roi = true, + }, + { + .name = "Primary_1", + .id = PRIMARY_PLANE_1, + .type = DRM_PLANE_TYPE_PRIMARY, + .num_formats = ARRAY_SIZE(primary_overlay_format0), + .formats = primary_overlay_format0, + .num_modifiers = ARRAY_SIZE(format_modifier0), + .modifiers = format_modifier0, + .min_width = 0, + .min_height = 0, + .max_width = 4096, + .max_height = 4096, + .rotation =DRM_MODE_ROTATE_0 | +DRM_MODE_ROTATE_90 | +DRM_MODE_ROTATE_180 | +DRM_MODE_ROTATE_270 | +DRM_MODE_REFLECT_X | + DRM_MODE_REFLECT_Y, + .blend_mode =BIT (DRM_MODE_BLEND_PIXEL_NONE ) | +BIT (DRM_MODE_BLEND_PREMULTI ) | + BIT(DRM_MODE_BLEND_COVERAGE), + .color_encoding =BIT (DRM_COLOR_YCBCR_BT709 ) | + BIT(DRM_COLOR_YCBCR_BT2020), + .degamma_size = DEGAMMA_SIZE, + .min_scale = FRAC_16_16(1, 3), + .max_scale = FRAC_16_16(10, 1), + .zpos = 3, + .watermark = true, + .color_mgmt = true, + .roi = true, + }, + { + .name = "Overlay_2", + .id = OVERLAY_PLANE_2, + .type = DRM_PLANE_TYPE_OVERLAY, + .num_formats = ARRAY_SIZE(primary_overlay_format0), + .formats = primary_overlay_format0, + .num_modifiers = ARRAY_SIZE(format_modifier0), + .modifiers = format_modifier0, + .min_width = 0, + .min_height = 0, + .max_width = 4096, + .max_height = 4096, + .rotation =DRM_MODE_ROTATE_0 | +DRM_MODE_ROTATE_90 | +DRM_MODE_ROTATE_180 | +DRM_MODE_ROTATE_270 | +DRM_MODE_REFLECT_X | + DRM_MODE_REFLECT_Y, + .blend_mode =BIT (DRM_MODE_BLEND_PIXEL_NONE ) | +BIT (DRM_MODE_BLEND_PREMULTI ) | + BIT(DRM_MODE_BLEND_COVERAGE), + .color_encoding =BIT (DRM_COLOR_YCBCR_BT709 ) | + BIT(DRM_COLOR_YCBCR_BT2020), + .degamma_size = DEGAMMA_SIZE, + .min_scale = FRAC_16_16(1, 3), + .max_scale = FRAC_16_16(10, 1), + .zpos = 4, + .watermark = true, + .color_mgmt = true, + .roi = true, + }, + { + .name = "Overlay_3", + .id = OVERLAY_PLANE_3, + .type = DRM_PLANE_TYPE_OVERLAY, + .num_formats = ARRAY_SIZE(primary_overlay_format0), + .formats = primary_overlay_format0, + .num_modifiers = ARRAY_SIZE(secondary_format_modifiers), + .modifiers = secondary_format_modifiers, + .min_width = 0, + .min_height = 0, + .max_width = 4096, + .max_height = 4096, + .rotation = 0, + .blend_mode =BIT (DRM_MODE_BLEND_PIXEL_NONE ) | +BIT (DRM_MODE_BLEND_PREMULTI ) | + BIT(DRM_MODE_BLEND_COVERAGE), + .color_encoding =BIT (DRM_COLOR_YCBCR_BT709 ) | + BIT(DRM_COLOR_YCBCR_BT2020), + .degamma_size = DEGAMMA_SIZE, + .min_scale = DRM_PLANE_NO_SCALING, + .max_scale = DRM_PLANE_NO_SCALING, + .zpos = 5, + .watermark = true, + .color_mgmt = true, + .roi = true, + }, + { + .name = "Cursor", + .id = CURSOR_PLANE_0, + .type = DRM_PLANE_TYPE_CURSOR, + .num_formats = ARRAY_SIZE(cursor_formats), + .formats = cursor_formats, + .num_modifiers = 0, + .modifiers = NULL, + .min_width = 32, + .min_height = 32, + .max_width = 64, + .max_height = 64, + .rotation = 0, + .degamma_size = 0, + .min_scale = DRM_PLANE_NO_SCALING, + .max_scale = DRM_PLANE_NO_SCALING, + .zpos = 255, + .watermark = false, + .color_mgmt = false, + .roi = false, + }, + { + .name = "Cursor_1", + .id = CURSOR_PLANE_1, + .type = DRM_PLANE_TYPE_CURSOR, + .num_formats = ARRAY_SIZE(cursor_formats), + .formats = cursor_formats, + .num_modifiers = 0, + .modifiers = NULL, + .min_width = 32, + .min_height = 32, + .max_width = 64, + .max_height = 64, + .rotation = 0, + .degamma_size = 0, + .min_scale = DRM_PLANE_NO_SCALING, + .max_scale = DRM_PLANE_NO_SCALING, + .zpos = 255, + .watermark = false, + .color_mgmt = false, + .roi = false, + }, + }, + { + /* DC_REV_1 */ + { + .name = "Primary", + .id = PRIMARY_PLANE_0, + .type = DRM_PLANE_TYPE_PRIMARY, + .num_formats = ARRAY_SIZE(primary_overlay_format0), + .formats = primary_overlay_format0, + .num_modifiers = ARRAY_SIZE(format_modifier0), + .modifiers = format_modifier0, + .min_width = 0, + .min_height = 0, + .max_width = 4096, + .max_height = 4096, + .rotation =DRM_MODE_ROTATE_0 | +DRM_MODE_ROTATE_90 | +DRM_MODE_ROTATE_180 | +DRM_MODE_ROTATE_270 | +DRM_MODE_REFLECT_X | + DRM_MODE_REFLECT_Y, + .blend_mode =BIT (DRM_MODE_BLEND_PIXEL_NONE ) | +BIT (DRM_MODE_BLEND_PREMULTI ) | + BIT(DRM_MODE_BLEND_COVERAGE), + .color_encoding =BIT (DRM_COLOR_YCBCR_BT709 ) | + BIT(DRM_COLOR_YCBCR_BT2020), + .degamma_size = DEGAMMA_SIZE, + .min_scale = FRAC_16_16(1, 3), + .max_scale = FRAC_16_16(10, 1), + .zpos = 0, + .watermark = true, + .color_mgmt = true, + .roi = true, + }, + { + .name = "Overlay", + .id = OVERLAY_PLANE_0, + .type = DRM_PLANE_TYPE_OVERLAY, + .num_formats = ARRAY_SIZE(primary_overlay_format0), + .formats = primary_overlay_format0, + .num_modifiers = ARRAY_SIZE(format_modifier0), + .modifiers = format_modifier0, + .min_width = 0, + .min_height = 0, + .max_width = 4096, + .max_height = 4096, + .rotation =DRM_MODE_ROTATE_0 | +DRM_MODE_ROTATE_90 | +DRM_MODE_ROTATE_180 | +DRM_MODE_ROTATE_270 | +DRM_MODE_REFLECT_X | + DRM_MODE_REFLECT_Y, + .blend_mode =BIT (DRM_MODE_BLEND_PIXEL_NONE ) | +BIT (DRM_MODE_BLEND_PREMULTI ) | + BIT(DRM_MODE_BLEND_COVERAGE), + .color_encoding =BIT (DRM_COLOR_YCBCR_BT709 ) | + BIT(DRM_COLOR_YCBCR_BT2020), + .degamma_size = DEGAMMA_SIZE, + .min_scale = FRAC_16_16(1, 3), + .max_scale = FRAC_16_16(10, 1), + .zpos = 1, + .watermark = true, + .color_mgmt = true, + .roi = true, + }, + { + .name = "Primary_1", + .id = PRIMARY_PLANE_1, + .type = DRM_PLANE_TYPE_PRIMARY, + .num_formats = ARRAY_SIZE(primary_overlay_format0), + .formats = primary_overlay_format0, + .num_modifiers = ARRAY_SIZE(format_modifier0), + .modifiers = format_modifier0, + .min_width = 0, + .min_height = 0, + .max_width = 4096, + .max_height = 4096, + .rotation =DRM_MODE_ROTATE_0 | +DRM_MODE_ROTATE_90 | +DRM_MODE_ROTATE_180 | +DRM_MODE_ROTATE_270 | +DRM_MODE_REFLECT_X | + DRM_MODE_REFLECT_Y, + .blend_mode =BIT (DRM_MODE_BLEND_PIXEL_NONE ) | +BIT (DRM_MODE_BLEND_PREMULTI ) | + BIT(DRM_MODE_BLEND_COVERAGE), + .color_encoding =BIT (DRM_COLOR_YCBCR_BT709 ) | + BIT(DRM_COLOR_YCBCR_BT2020), + .degamma_size = DEGAMMA_SIZE, + .min_scale = FRAC_16_16(1, 3), + .max_scale = FRAC_16_16(10, 1), + .zpos = 2, + .watermark = true, + .color_mgmt = true, + .roi = true, + }, + { + .name = "Overlay_2", + .id = OVERLAY_PLANE_2, + .type = DRM_PLANE_TYPE_OVERLAY, + .num_formats = ARRAY_SIZE(primary_overlay_format0), + .formats = primary_overlay_format0, + .num_modifiers = ARRAY_SIZE(format_modifier0), + .modifiers = format_modifier0, + .min_width = 0, + .min_height = 0, + .max_width = 4096, + .max_height = 4096, + .rotation =DRM_MODE_ROTATE_0 | +DRM_MODE_ROTATE_90 | +DRM_MODE_ROTATE_180 | +DRM_MODE_ROTATE_270 | +DRM_MODE_REFLECT_X | + DRM_MODE_REFLECT_Y, + .blend_mode =BIT (DRM_MODE_BLEND_PIXEL_NONE ) | +BIT (DRM_MODE_BLEND_PREMULTI ) | + BIT(DRM_MODE_BLEND_COVERAGE), + .color_encoding =BIT (DRM_COLOR_YCBCR_BT709 ) | + BIT(DRM_COLOR_YCBCR_BT2020), + .degamma_size = DEGAMMA_SIZE, + .min_scale = FRAC_16_16(1, 3), + .max_scale = FRAC_16_16(10, 1), + .zpos = 3, + .watermark = true, + .color_mgmt = true, + .roi = true, + }, + { + .name = "Cursor", + .id = CURSOR_PLANE_0, + .type = DRM_PLANE_TYPE_CURSOR, + .num_formats = ARRAY_SIZE(cursor_formats), + .formats = cursor_formats, + .num_modifiers = 0, + .modifiers = NULL, + .min_width = 32, + .min_height = 32, + .max_width = 64, + .max_height = 64, + .rotation = 0, + .degamma_size = 0, + .min_scale = DRM_PLANE_NO_SCALING, + .max_scale = DRM_PLANE_NO_SCALING, + .zpos = 255, + .watermark = false, + .color_mgmt = false, + .roi = false, + }, + { + .name = "Cursor_1", + .id = CURSOR_PLANE_1, + .type = DRM_PLANE_TYPE_CURSOR, + .num_formats = ARRAY_SIZE(cursor_formats), + .formats = cursor_formats, + .num_modifiers = 0, + .modifiers = NULL, + .min_width = 32, + .min_height = 32, + .max_width = 64, + .max_height = 64, + .rotation = 0, + .degamma_size = 0, + .min_scale = DRM_PLANE_NO_SCALING, + .max_scale = DRM_PLANE_NO_SCALING, + .zpos = 255, + .watermark = false, + .color_mgmt = false, + .roi = false, + }, + }, + { + /* DC_REV_2 */ + { + .name = "Primary", + .id = PRIMARY_PLANE_0, + .type = DRM_PLANE_TYPE_PRIMARY, + .num_formats = ARRAY_SIZE(primary_overlay_format1), + .formats = primary_overlay_format1, + .num_modifiers = ARRAY_SIZE(format_modifier0), + .modifiers = format_modifier0, + .min_width = 0, + .min_height = 0, + .max_width = 4096, + .max_height = 4096, + .rotation =DRM_MODE_ROTATE_0 | +DRM_MODE_ROTATE_90 | +DRM_MODE_ROTATE_180 | +DRM_MODE_ROTATE_270 | +DRM_MODE_REFLECT_X | + DRM_MODE_REFLECT_Y, + .blend_mode =BIT (DRM_MODE_BLEND_PIXEL_NONE ) | +BIT (DRM_MODE_BLEND_PREMULTI ) | + BIT(DRM_MODE_BLEND_COVERAGE), + .color_encoding =BIT (DRM_COLOR_YCBCR_BT709 ) | + BIT(DRM_COLOR_YCBCR_BT2020), + .degamma_size = DEGAMMA_SIZE, + .min_scale = FRAC_16_16(1, 3), + .max_scale = FRAC_16_16(10, 1), + .zpos = 0, + .watermark = true, + .color_mgmt = true, + .roi = true, + }, + { + .name = "Overlay", + .id = OVERLAY_PLANE_0, + .type = DRM_PLANE_TYPE_OVERLAY, + .num_formats = ARRAY_SIZE(primary_overlay_format1), + .formats = primary_overlay_format1, + .num_modifiers = ARRAY_SIZE(format_modifier0), + .modifiers = format_modifier0, + .min_width = 0, + .min_height = 0, + .max_width = 4096, + .max_height = 4096, + .rotation =DRM_MODE_ROTATE_0 | +DRM_MODE_ROTATE_90 | +DRM_MODE_ROTATE_180 | +DRM_MODE_ROTATE_270 | +DRM_MODE_REFLECT_X | + DRM_MODE_REFLECT_Y, + .blend_mode =BIT (DRM_MODE_BLEND_PIXEL_NONE ) | +BIT (DRM_MODE_BLEND_PREMULTI ) | + BIT(DRM_MODE_BLEND_COVERAGE), + .color_encoding =BIT (DRM_COLOR_YCBCR_BT709 ) | + BIT(DRM_COLOR_YCBCR_BT2020), + .degamma_size = DEGAMMA_SIZE, + .min_scale = FRAC_16_16(1, 3), + .max_scale = FRAC_16_16(10, 1), + .zpos = 1, + .watermark = true, + .color_mgmt = true, + .roi = true, + }, + { + .name = "Overlay_1", + .id = OVERLAY_PLANE_1, + .type = DRM_PLANE_TYPE_OVERLAY, + .num_formats = ARRAY_SIZE(primary_overlay_format1), + .formats = primary_overlay_format1, + .num_modifiers = ARRAY_SIZE(secondary_format_modifiers), + .modifiers = secondary_format_modifiers, + .min_width = 0, + .min_height = 0, + .max_width = 4096, + .max_height = 4096, + .rotation = 0, + .blend_mode =BIT (DRM_MODE_BLEND_PIXEL_NONE ) | +BIT (DRM_MODE_BLEND_PREMULTI ) | + BIT(DRM_MODE_BLEND_COVERAGE), + .color_encoding =BIT (DRM_COLOR_YCBCR_BT709 ) | + BIT(DRM_COLOR_YCBCR_BT2020), + .degamma_size = DEGAMMA_SIZE, + .min_scale = DRM_PLANE_NO_SCALING, + .max_scale = DRM_PLANE_NO_SCALING, + .zpos = 2, + .watermark = true, + .color_mgmt = true, + .roi = true, + }, + { + .name = "Primary_1", + .id = PRIMARY_PLANE_1, + .type = DRM_PLANE_TYPE_PRIMARY, + .num_formats = ARRAY_SIZE(primary_overlay_format1), + .formats = primary_overlay_format1, + .num_modifiers = ARRAY_SIZE(format_modifier0), + .modifiers = format_modifier0, + .min_width = 0, + .min_height = 0, + .max_width = 4096, + .max_height = 4096, + .rotation =DRM_MODE_ROTATE_0 | +DRM_MODE_ROTATE_90 | +DRM_MODE_ROTATE_180 | +DRM_MODE_ROTATE_270 | +DRM_MODE_REFLECT_X | + DRM_MODE_REFLECT_Y, + .blend_mode =BIT (DRM_MODE_BLEND_PIXEL_NONE ) | +BIT (DRM_MODE_BLEND_PREMULTI ) | + BIT(DRM_MODE_BLEND_COVERAGE), + .color_encoding =BIT (DRM_COLOR_YCBCR_BT709 ) | + BIT(DRM_COLOR_YCBCR_BT2020), + .degamma_size = DEGAMMA_SIZE, + .min_scale = FRAC_16_16(1, 3), + .max_scale = FRAC_16_16(10, 1), + .zpos = 3, + .watermark = true, + .color_mgmt = true, + .roi = true, + }, + { + .name = "Overlay_2", + .id = OVERLAY_PLANE_2, + .type = DRM_PLANE_TYPE_OVERLAY, + .num_formats = ARRAY_SIZE(primary_overlay_format1), + .formats = primary_overlay_format1, + .num_modifiers = ARRAY_SIZE(format_modifier0), + .modifiers = format_modifier0, + .min_width = 0, + .min_height = 0, + .max_width = 4096, + .max_height = 4096, + .rotation =DRM_MODE_ROTATE_0 | +DRM_MODE_ROTATE_90 | +DRM_MODE_ROTATE_180 | +DRM_MODE_ROTATE_270 | +DRM_MODE_REFLECT_X | + DRM_MODE_REFLECT_Y, + .blend_mode =BIT (DRM_MODE_BLEND_PIXEL_NONE ) | +BIT (DRM_MODE_BLEND_PREMULTI ) | + BIT(DRM_MODE_BLEND_COVERAGE), + .color_encoding =BIT (DRM_COLOR_YCBCR_BT709 ) | + BIT(DRM_COLOR_YCBCR_BT2020), + .degamma_size = DEGAMMA_SIZE, + .min_scale = FRAC_16_16(1, 3), + .max_scale = FRAC_16_16(10, 1), + .zpos = 4, + .watermark = true, + .color_mgmt = true, + .roi = true, + }, + { + .name = "Overlay_3", + .id = OVERLAY_PLANE_3, + .type = DRM_PLANE_TYPE_OVERLAY, + .num_formats = ARRAY_SIZE(primary_overlay_format1), + .formats = primary_overlay_format1, + .num_modifiers = ARRAY_SIZE(secondary_format_modifiers), + .modifiers = secondary_format_modifiers, + .min_width = 0, + .min_height = 0, + .max_width = 4096, + .max_height = 4096, + .rotation = 0, + .blend_mode =BIT (DRM_MODE_BLEND_PIXEL_NONE ) | +BIT (DRM_MODE_BLEND_PREMULTI ) | + BIT(DRM_MODE_BLEND_COVERAGE), + .color_encoding =BIT (DRM_COLOR_YCBCR_BT709 ) | + BIT(DRM_COLOR_YCBCR_BT2020), + .degamma_size = DEGAMMA_SIZE, + .min_scale = DRM_PLANE_NO_SCALING, + .max_scale = DRM_PLANE_NO_SCALING, + .zpos = 5, + .watermark = true, + .color_mgmt = true, + .roi = true, + }, + { + .name = "Cursor", + .id = CURSOR_PLANE_0, + .type = DRM_PLANE_TYPE_CURSOR, + .num_formats = ARRAY_SIZE(cursor_formats), + .formats = cursor_formats, + .num_modifiers = 0, + .modifiers = NULL, + .min_width = 32, + .min_height = 32, + .max_width = 64, + .max_height = 64, + .rotation = 0, + .degamma_size = 0, + .min_scale = DRM_PLANE_NO_SCALING, + .max_scale = DRM_PLANE_NO_SCALING, + .zpos = 255, + .watermark = false, + .color_mgmt = false, + .roi = false, + }, + { + .name = "Cursor_1", + .id = CURSOR_PLANE_1, + .type = DRM_PLANE_TYPE_CURSOR, + .num_formats = ARRAY_SIZE(cursor_formats), + .formats = cursor_formats, + .num_modifiers = 0, + .modifiers = NULL, + .min_width = 32, + .min_height = 32, + .max_width = 64, + .max_height = 64, + .rotation = 0, + .degamma_size = 0, + .min_scale = DRM_PLANE_NO_SCALING,
drivers/gpu/drm/verisilicon/vs_dc_hw.c line 1030
Quoted 10 lines
drivers/gpu/drm/verisilicon/vs_dc_hw.c new file +10
-0+ .max_scale = DRM_PLANE_NO_SCALING, + .zpos = 255, + .watermark = false, + .color_mgmt = false, + .roi = false, + }, + }, +}; + +static const struct vs_dc_info dc_info[] = {
Again, please split into per-generation instances.
Quoted 229 lines
drivers/gpu/drm/verisilicon/vs_dc_hw.c new file +229
-0+ { +/* DC_REV_0 */ + .name = "DC8200", + .panel_num = 2, + .plane_num = 8, + .planes = dc_hw_planes[DC_REV_0], + .layer_num = 6, + .max_bpc = 10, + .color_formats =DRM_COLOR_FORMAT_RGB444 | +DRM_COLOR_FORMAT_YCBCR444 | +DRM_COLOR_FORMAT_YCBCR422 | + DRM_COLOR_FORMAT_YCBCR420, + .gamma_size = GAMMA_EX_SIZE, + .gamma_bits = 12, + .pitch_alignment = 128, + .pipe_sync = false, + .background = true, + .panel_sync = true, + .cap_dec = true, + }, + { +/* DC_REV_1 */ + .name = "DC8200", + .panel_num = 2, + .plane_num = 6, + .planes = dc_hw_planes[DC_REV_1], + .layer_num = 4, + .max_bpc = 10, + .color_formats =DRM_COLOR_FORMAT_RGB444 | +DRM_COLOR_FORMAT_YCBCR444 | +DRM_COLOR_FORMAT_YCBCR422 | + DRM_COLOR_FORMAT_YCBCR420, + .gamma_size = GAMMA_EX_SIZE, + .gamma_bits = 12, + .pitch_alignment = 128, + .pipe_sync = false, + .background = true, + .panel_sync = true, + .cap_dec = true, + }, + { +/* DC_REV_2 */ + .name = "DC8200", + .panel_num = 2, + .plane_num = 8, + .planes = dc_hw_planes[DC_REV_2], + .layer_num = 6, + .max_bpc = 10, + .color_formats =DRM_COLOR_FORMAT_RGB444 | +DRM_COLOR_FORMAT_YCBCR444 | +DRM_COLOR_FORMAT_YCBCR422 | + DRM_COLOR_FORMAT_YCBCR420, + .gamma_size = GAMMA_EX_SIZE, + .gamma_bits = 12, + .pitch_alignment = 128, + .pipe_sync = false, + .background = true, + .panel_sync = true, + .cap_dec = false, + }, +}; + +static const struct dc_hw_funcs hw_func; + +static inline u32 hi_read (struct dc_hw *hw,u32 reg) +{ +return readl (hw->hi_base + reg); +} + +static inline void hi_write (struct dc_hw *hw,u32 reg,u32 value) +{ +writel (value, hw->hi_base + reg); +} + +static inline void dc_write (struct dc_hw *hw,u32 reg,u32 value) +{ +writel (value, hw->reg_base + reg -DC_REG_BASE ); +} + +static inline u32 dc_read (struct dc_hw *hw,u32 reg) +{ +u32 value =readl (hw->reg_base + reg -DC_REG_BASE ); + +return value; +} + +static inline void dc_set_clear (struct dc_hw *hw,u32 reg,u32 set,u32 clear) +{ +u32 value =dc_read (hw, reg); + + value &= ~clear; + value |= set; +dc_write (hw, reg, value); +} + +static void load_default_filter (struct dc_hw *hw, +const struct dc_hw_plane_reg *reg,u32 offset) +{ +u8 i; + +dc_write (hw, reg->scale_config + offset,0x33 ); +dc_write (hw, reg->init_offset + offset,0x80008000 ); +dc_write (hw, reg->h_filter_coef_index + offset,0x00 ); +for (i =0 ; i <H_COEF_SIZE ; i++) +dc_write (hw, reg->h_filter_coef_data + offset, horkernel[i]); + +dc_write (hw, reg->v_filter_coef_index + offset,0x00 ); +for (i =0 ; i <V_COEF_SIZE ; i++) +dc_write (hw, reg->v_filter_coef_data + offset, verkernel[i]); +} + +static void load_rgb_to_rgb (struct dc_hw *hw,const struct dc_hw_plane_reg *reg, +u32 offset,u16 *table) +{ +dc_write (hw, reg->rgb_to_rgb_coef0 + offset, table[0 ] | (table[1 ] <<16 )); +dc_write (hw, reg->rgb_to_rgb_coef1 + offset, table[2 ] | (table[3 ] <<16 )); +dc_write (hw, reg->rgb_to_rgb_coef2 + offset, table[4 ] | (table[5 ] <<16 )); +dc_write (hw, reg->rgb_to_rgb_coef3 + offset, table[6 ] | (table[7 ] <<16 )); +dc_write (hw, reg->rgb_to_rgb_coef4 + offset, table[8 ]); +} + +static void load_yuv_to_rgb (struct dc_hw *hw,const struct dc_hw_plane_reg *reg, +u32 offset,s32 *table) +{ +dc_write (hw, reg->yuv_to_rgb_coef0 + offset, + (0xFFFF & table[0 ]) | (table[1 ] <<16 )); +dc_write (hw, reg->yuv_to_rgb_coef1 + offset, + (0xFFFF & table[2 ]) | (table[3 ] <<16 )); +dc_write (hw, reg->yuv_to_rgb_coef2 + offset, + (0xFFFF & table[4 ]) | (table[5 ] <<16 )); +dc_write (hw, reg->yuv_to_rgb_coef3 + offset, + (0xFFFF & table[6 ]) | (table[7 ] <<16 )); +dc_write (hw, reg->yuv_to_rgb_coef4 + offset, table[8 ]); +dc_write (hw, reg->yuv_to_rgb_coefd0 + offset, table[9 ]); +dc_write (hw, reg->yuv_to_rgb_coefd1 + offset, table[10 ]); +dc_write (hw, reg->yuv_to_rgb_coefd2 + offset, table[11 ]); +dc_write (hw, reg->y_clamp_bound + offset, table[12 ] | (table[13 ] <<16 )); +dc_write (hw, reg->uv_clamp_bound + offset, table[14 ] | (table[15 ] <<16 )); +} + +static void load_rgb_to_yuv (struct dc_hw *hw,u32 offset,s16 *table) +{ +dc_write (hw,DC_DISPLAY_RGBTOYUV_COEF0 + offset, + table[0 ] | (table[1 ] <<16 )); +dc_write (hw,DC_DISPLAY_RGBTOYUV_COEF1 + offset, + table[2 ] | (table[3 ] <<16 )); +dc_write (hw,DC_DISPLAY_RGBTOYUV_COEF2 + offset, + table[4 ] | (table[5 ] <<16 )); +dc_write (hw,DC_DISPLAY_RGBTOYUV_COEF3 + offset, + table[6 ] | (table[7 ] <<16 )); +dc_write (hw,DC_DISPLAY_RGBTOYUV_COEF4 + offset, table[8 ]); +dc_write (hw,DC_DISPLAY_RGBTOYUV_COEFD0 + offset, table[9 ]); +dc_write (hw,DC_DISPLAY_RGBTOYUV_COEFD1 + offset, table[10 ]); +dc_write (hw,DC_DISPLAY_RGBTOYUV_COEFD2 + offset, table[11 ]); +} + +static bool is_rgb (enum dc_hw_color_format format) +{ +switch (format) { +case FORMAT_X4R4G4B4 : +case FORMAT_A4R4G4B4 : +case FORMAT_X1R5G5B5 : +case FORMAT_A1R5G5B5 : +case FORMAT_R5G6B5 : +case FORMAT_X8R8G8B8 : +case FORMAT_A8R8G8B8 : +case FORMAT_A2R10G10B10 : +return true; +default : +return false; + } +} + +static void load_degamma_table (struct dc_hw *hw, +const struct dc_hw_plane_reg *reg, +u32 offset,u16 *table) +{ +u16 i; +u32 value; + +dc_write (hw, reg->degamma_index + offset,0 ); + +for (i =0 ; i <DEGAMMA_SIZE ; i++) { + value = table[i] | (table[i] <<16 ); +dc_write (hw, reg->degamma_data + offset, value); +dc_write (hw, reg->degamma_ex_data + offset, table[i]); + } +} + +static u32 get_addr_offset (u32 id) +{ +u32 offset =0 ; + +switch (id) { +case PRIMARY_PLANE_1 : +case OVERLAY_PLANE_1 : + offset =0x04 ; +break ; +case OVERLAY_PLANE_2 : + offset =0x08 ; +break ; +case OVERLAY_PLANE_3 : + offset =0x0C ; +break ; +default : +break ; + } + +return offset; +} + +int dc_hw_init (struct dc_hw *hw) +{ +u8 i, id, panel_num, layer_num; +u32 offset; +u32 revision =hi_read (hw,DC_HW_REVISION ); +u32 cid =hi_read (hw,DC_HW_CHIP_CID ); +const struct dc_hw_plane_reg *reg; + +switch (revision) { +case 0x5720 : + hw->rev =DC_REV_0 ; +break ; +case 0x5721 : +switch (cid) { +case 0x30B : + hw->rev =DC_REV_1 ; +break ; +case 0x310 :
drivers/gpu/drm/verisilicon/vs_dc_hw.c line 1269
Quoted 10 lines
drivers/gpu/drm/verisilicon/vs_dc_hw.c new file +10
-0+ hw->rev =DC_REV_2 ; +break ; +default : + hw->rev =DC_REV_0 ; +break ; + } +break ; +default : +return -ENXIO ; + }
We (drm/msm) had code like this for a while (and autodetection of the HW ID). And nowadays we are migrating to of_device_get_match_data and per-SoC compat names. It is just easier to handle, it allows one to specify device more precisely and also it simplifies DT schema.
Quoted 237 lines
drivers/gpu/drm/verisilicon/vs_dc_hw.c new file +237
-0+ + hw->info = (struct vs_dc_info *)&dc_info[hw->rev]; + hw->func = (struct dc_hw_funcs *)&hw_func; + + layer_num = hw->info->layer_num; +for (i =0 ; i < layer_num; i++) { + id = hw->info->planes[i].id; + offset =get_addr_offset (id); +if (id ==PRIMARY_PLANE_0 || id ==PRIMARY_PLANE_1 ) + reg = &dc_plane_reg[0 ]; +else + reg = &dc_plane_reg[1 ]; + +load_default_filter (hw, reg, offset); +load_rgb_to_rgb (hw, reg, offset,RGB2RGB ); + } + + panel_num = hw->info->panel_num; +for (i =0 ; i < panel_num; i++) { + offset = i <<2 ; + +load_rgb_to_yuv (hw, offset,RGB2YUV ); +dc_write (hw,DC_DISPLAY_PANEL_CONFIG + offset,0x111 ); + + offset = i ?DC_CURSOR_OFFSET :0 ; +dc_write (hw,DC_CURSOR_BACKGROUND + offset,0x00FFFFFF ); +dc_write (hw,DC_CURSOR_FOREGROUND + offset,0x00AAAAAA ); + } + +return 0 ; +} + +void dc_hw_deinit (struct dc_hw *hw) +{ +/* Nothing to do */ +} + +void dc_hw_update_plane (struct dc_hw *hw,u8 id, +struct dc_hw_fb *fb,struct dc_hw_scale *scale, +struct dc_hw_position *pos,struct dc_hw_blend *blend) +{ +struct dc_hw_plane *plane = &hw->plane[id]; + +if (plane) { +if (fb) { +if (!fb->enable) + plane->fb.enable = false; +else +memcpy (&plane->fb, fb, +sizeof (*fb) -sizeof (fb->dirty)); + plane->fb.dirty = true; + } +if (scale) { +memcpy (&plane->scale, scale, +sizeof (*scale) -sizeof (scale->dirty)); + plane->scale.dirty = true; + } +if (pos) { +memcpy (&plane->pos, pos, +sizeof (*pos) -sizeof (pos->dirty)); + plane->pos.dirty = true; + } +if (blend) { +memcpy (&plane->blend, blend, +sizeof (*blend) -sizeof (blend->dirty)); + plane->blend.dirty = true; + } + } +} + +void dc_hw_update_degamma (struct dc_hw *hw,u8 id,u32 mode) +{ +struct dc_hw_plane *plane = &hw->plane[id]; + +if (plane) { +if (hw->info->planes[id].degamma_size) { + plane->degamma.mode = mode; + plane->degamma.dirty = true; + }else { + plane->degamma.dirty = false; + } + } +} + +void dc_hw_update_roi (struct dc_hw *hw,u8 id,struct dc_hw_roi *roi) +{ +struct dc_hw_plane *plane = &hw->plane[id]; + +if (plane) { +memcpy (&plane->roi, roi,sizeof (*roi) -sizeof (roi->dirty)); + plane->roi.dirty = true; + } +} + +void dc_hw_update_colorkey (struct dc_hw *hw,u8 id, +struct dc_hw_colorkey *colorkey) +{ +struct dc_hw_plane *plane = &hw->plane[id]; + +if (plane) { +memcpy (&plane->colorkey, colorkey, +sizeof (*colorkey) -sizeof (colorkey->dirty)); + plane->colorkey.dirty = true; + } +} + +void dc_hw_update_qos (struct dc_hw *hw,struct dc_hw_qos *qos) +{ +memcpy (&hw->qos, qos,sizeof (*qos) -sizeof (qos->dirty)); + hw->qos.dirty = true; +} + +void dc_hw_update_cursor (struct dc_hw *hw,u8 id,struct dc_hw_cursor *cursor) +{ +memcpy (&hw->cursor[id], cursor,sizeof (*cursor) -sizeof (cursor->dirty)); + hw->cursor[id].dirty = true; +} + +void dc_hw_update_gamma (struct dc_hw *hw,u8 id,u16 index, +u16 r,u16 g,u16 b) +{ +if (index >= hw->info->gamma_size) +return ; + + hw->gamma[id].gamma[index][0 ] = r; + hw->gamma[id].gamma[index][1 ] = g; + hw->gamma[id].gamma[index][2 ] = b; + hw->gamma[id].dirty = true; +} + +void dc_hw_enable_gamma (struct dc_hw *hw,u8 id,bool enable) +{ + hw->gamma[id].enable = enable; + hw->gamma[id].dirty = true; +} + +void dc_hw_setup_display (struct dc_hw *hw,struct dc_hw_display *display) +{ +u8 id = display->id; + +memcpy (&hw->display[id], display,sizeof (*display)); + + hw->func->display (hw, display); +} + +void dc_hw_enable_interrupt (struct dc_hw *hw,bool enable) +{ +if (enable) +hi_write (hw,AQ_INTR_ENBL ,0xFFFFFFFF ); +else +hi_write (hw,AQ_INTR_ENBL ,0 ); +} + +u32 dc_hw_get_interrupt (struct dc_hw *hw) +{ +return hi_read (hw,AQ_INTR_ACKNOWLEDGE ); +} + +bool dc_hw_check_underflow (struct dc_hw *hw) +{ +return dc_read (hw,DC_FRAMEBUFFER_CONFIG ) &BIT (5 ); +} + +void dc_hw_enable_shadow_register (struct dc_hw *hw,bool enable) +{ +u32 i, offset; +u8 id, layer_num = hw->info->layer_num; +u8 panel_num = hw->info->panel_num; + +for (i =0 ; i < layer_num; i++) { + id = hw->info->planes[i].id; + offset =get_addr_offset (id); +if (enable) { +if (id ==PRIMARY_PLANE_0 || id ==PRIMARY_PLANE_1 ) +dc_set_clear (hw,DC_FRAMEBUFFER_CONFIG_EX + offset,BIT (12 ),0 ); +else +dc_set_clear (hw,DC_OVERLAY_CONFIG + offset,BIT (31 ),0 ); + }else { +if (id ==PRIMARY_PLANE_0 || id ==PRIMARY_PLANE_1 ) +dc_set_clear (hw,DC_FRAMEBUFFER_CONFIG_EX + offset,0 ,BIT (12 )); +else +dc_set_clear (hw,DC_OVERLAY_CONFIG + offset,0 ,BIT (31 )); + } + } + +for (i =0 ; i < panel_num; i++) { + offset = i <<2 ; +if (enable) +dc_set_clear (hw,DC_DISPLAY_PANEL_CONFIG_EX + offset,0 ,BIT (0 )); +else +dc_set_clear (hw,DC_DISPLAY_PANEL_CONFIG_EX + offset,BIT (0 ),0 ); + } +} + +void dc_hw_set_out (struct dc_hw *hw,enum dc_hw_out out,u8 id) +{ +if (out <=OUT_DP ) + hw->out[id] = out; +} + +static void gamma_ex_commit (struct dc_hw *hw) +{ +u8 panel_num = hw->info->panel_num; +u16 i, j; +u32 value; + +for (j =0 ; j < panel_num; j++) { +if (hw->gamma[j].dirty) { +if (hw->gamma[j].enable) { +dc_write (hw,DC_DISPLAY_GAMMA_EX_INDEX + (j <<2 ),0x00 ); +for (i =0 ; i <GAMMA_EX_SIZE ; i++) { + value = hw->gamma[j].gamma[i][2 ] | + (hw->gamma[j].gamma[i][1 ] <<12 ); +dc_write (hw,DC_DISPLAY_GAMMA_EX_DATA + (j <<2 ), value); +dc_write (hw,DC_DISPLAY_GAMMA_EX_ONE_DATA + (j <<2 ), + hw->gamma[j].gamma[i][0 ]); + } +dc_set_clear (hw,DC_DISPLAY_PANEL_CONFIG + (j <<2 ), +BIT (13 ),0 ); + }else { +dc_set_clear (hw,DC_DISPLAY_PANEL_CONFIG + (j <<2 ), +0 ,BIT (13 )); + } + hw->gamma[j].dirty = false; + } + } +} + +static void plane_commit (struct dc_hw *hw) +{ +struct dc_hw_plane *plane; +const struct dc_hw_plane_reg *reg; +bool primary = false; +u8 id, layer_num = hw->info->layer_num; +u32 i, offset; + +for (i =0 ; i < layer_num; i++) {
drivers/gpu/drm/verisilicon/vs_dc_hw.c line 1516
Quoted 10 lines
drivers/gpu/drm/verisilicon/vs_dc_hw.c new file +10
-0+ plane = &hw->plane[i]; + id = hw->info->planes[i].id; + offset =get_addr_offset (id); +if (id ==PRIMARY_PLANE_0 || id ==PRIMARY_PLANE_1 ) { + reg = &dc_plane_reg[0 ]; + primary = true; + }else { + reg = &dc_plane_reg[1 ]; + primary = false; + }
Can you please move register defines to some internal hw_plane structure. These details are known at the time of creation of the plane. There is no need to determine them again and again.
drivers/gpu/drm/verisilicon/vs_dc_hw.c line 1519
Quoted 3 lines
drivers/gpu/drm/verisilicon/vs_dc_hw.c new file +3
-0+ +if (plane->fb.dirty) { +if (plane->fb.enable) {
if (plane->fb.dirty && plane->fb.enable) will save you one level of indentation.
However it might be better to use existing DRM flags instead of inventing your own flags.
Quoted 14 lines
drivers/gpu/drm/verisilicon/vs_dc_hw.c new file +14
-0+dc_write (hw, reg->y_address + offset, + plane->fb.y_address); +dc_write (hw, reg->u_address + offset, + plane->fb.u_address); +dc_write (hw, reg->v_address + offset, + plane->fb.v_address); +dc_write (hw, reg->y_stride + offset, + plane->fb.y_stride); +dc_write (hw, reg->u_stride + offset, + plane->fb.u_stride); +dc_write (hw, reg->v_stride + offset, + plane->fb.v_stride); + dc_write(hw, reg->size + offset, + plane->fb.width |
drivers/gpu/drm/verisilicon/vs_dc_hw.c line 1543
Quoted 10 lines
drivers/gpu/drm/verisilicon/vs_dc_hw.c new file +10
-0+ (plane->fb.height << 15)); +dc_write (hw, reg->water_mark + offset, + plane->fb.water_mark); + +if (plane->fb.clear_enable) +dc_write (hw, reg->clear_value + offset, + plane->fb.clear_value); + } + +if (primary) {
You have two kinds of planes. Primary and overlays. Could you please split this code into two separate functions and define two vtables, one for primary planes and one for overlays. There is no need to stick everything into a single funcion that handles everything.
Quoted 11 lines
drivers/gpu/drm/verisilicon/vs_dc_hw.c new file +11
-0+ dc_set_clear(hw, DC_FRAMEBUFFER_CONFIG + offset, + (plane->fb.format << 26) | + (plane->fb.uv_swizzle << 25) | + (plane->fb.swizzle << 23) | + (plane->fb.tile_mode << 17) | + (plane->fb.yuv_color_space << 14) | + (plane->fb.rotation << 11) | + (plane->fb.clear_enable << 8), + (0x1F << 26) | + BIT(25) | + (0x03 << 23) |
drivers/gpu/drm/verisilicon/vs_dc_hw.c line 1564
Quoted 10 lines
drivers/gpu/drm/verisilicon/vs_dc_hw.c new file +10
-0+ (0x1F <<17 ) | + (0x07 <<14 ) | + (0x07 <<11 ) | + BIT(8)); +dc_set_clear (hw,DC_FRAMEBUFFER_CONFIG_EX + offset, + (plane->fb.dec_enable <<1 ) | + (plane->fb.enable <<13 ) | + (plane->fb.zpos <<16 ) | + (plane->fb.display_id <<19 ), +BIT (1 ) |BIT (13 ) | (0x07 <<16 ) |BIT (19 ));
It looks like this code can enjoy defining names for all the magic values. Otherwise it is impossible to support it.
drivers/gpu/drm/verisilicon/vs_dc_hw.h
Quoted 411 lines
drivers/gpu/drm/verisilicon/vs_dc_hw.c new file +395
-0+ }else { +dc_set_clear (hw,DC_OVERLAY_CONFIG + offset, + (plane->fb.dec_enable <<27 ) | + (plane->fb.clear_enable <<25 ) | + (plane->fb.enable <<24 ) | + (plane->fb.format <<16 ) | + (plane->fb.uv_swizzle <<15 ) | + (plane->fb.swizzle <<13 ) | + (plane->fb.tile_mode <<8 ) | + (plane->fb.yuv_color_space <<5 ) | + (plane->fb.rotation <<2 ), +BIT (27 ) | +BIT (25 ) | +BIT (24 ) | + (0x1F <<16 ) | +BIT (15 ) | + (0x03 <<13 ) | + (0x1F <<8 ) | + (0x07 <<5 ) | + (0x07 <<2 )); +dc_set_clear (hw,DC_OVERLAY_CONFIG_EX + offset, + plane->fb.zpos | (plane->fb.display_id <<3 ), +0x07 |BIT (3 )); + } + plane->fb.dirty = false; + } + +if (plane->scale.dirty) { +if (plane->scale.enable) { +dc_write (hw, reg->scale_factor_x + offset, + plane->scale.scale_factor_x); +dc_write (hw, reg->scale_factor_y + offset, + plane->scale.scale_factor_y); +if (primary) +dc_set_clear (hw, +DC_FRAMEBUFFER_CONFIG + offset, +BIT (22 ),0 ); +else +dc_set_clear (hw, +DC_OVERLAY_SCALE_CONFIG + offset, +BIT (8 ),0 );Lines of this file are not shown. View the raw message.
drivers/gpu/drm/verisilicon/vs_dc_hw.h new file +10
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Please take care to align all the defines.
drivers/gpu/drm/verisilicon/vs_dc_hw.h
Quoted 190 lines
drivers/gpu/drm/verisilicon/vs_dc_hw.h new file +190
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Space after the comma will make it more readable. Or just define the values explicitly, it will also be more readable.
drivers/gpu/drm/verisilicon/vs_dc_hw.h
Quoted 73 lines
drivers/gpu/drm/verisilicon/vs_dc_hw.h new file +73
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Can you use defines from <drm/drm_blend.h>?
drivers/gpu/drm/verisilicon/vs_plane.c
Quoted 278 lines
drivers/gpu/drm/verisilicon/vs_dc_hw.h new file +219
-0Lines of this file are not shown. View the raw message.
drivers/gpu/drm/verisilicon/vs_plane.c new file +33
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Use vs_plane_destroy_state directly. This way you won't miss a refcount on blobs.
drivers/gpu/drm/verisilicon/vs_plane.c
Quoted 149 lines
drivers/gpu/drm/verisilicon/vs_plane.c new file +149
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
degamma and color management should use standard properties.
drivers/gpu/drm/verisilicon/vs_plane.c
Quoted 118 lines
drivers/gpu/drm/verisilicon/vs_plane.c new file +118
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
New line after the equal sign will be better.
drivers/gpu/drm/verisilicon/vs_plane.c
Quoted 12 lines
drivers/gpu/drm/verisilicon/vs_plane.c new file +12
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
if (!new_state->visible) ?
drivers/gpu/drm/verisilicon/vs_plane.c
Quoted 35 lines
drivers/gpu/drm/verisilicon/vs_plane.c new file +35
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
and here.
Quoted 318 lines
drivers/gpu/drm/verisilicon/vs_plane.c new file +179
-0Lines of this file are not shown. View the raw message.
drivers/gpu/drm/verisilicon/vs_plane.h new file +58
-0Lines of this file are not shown. View the raw message.
drivers/gpu/drm/verisilicon/vs_type.h new file +69
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Signature · 2 lines
With best wishes Dmitry
Part of the diff is not shown here. View the raw message.
Re: [PATCH v2 5/6] drm/vs: Add KMS crtc&plane
Quoted 225 lines · Dmitry Baryshkov
Quoted 72 lines · Keith Zhao
add 2 crtcs and 8 planes in vs-drm
Signed-off-by Keith Zhao <[email protected]>--- drivers/gpu/drm/verisilicon/Makefile | 8 +- drivers/gpu/drm/verisilicon/vs_crtc.c | 257 ++++ drivers/gpu/drm/verisilicon/vs_crtc.h | 43 + drivers/gpu/drm/verisilicon/vs_dc.c | 1002 ++++++++++++ drivers/gpu/drm/verisilicon/vs_dc.h | 80 + drivers/gpu/drm/verisilicon/vs_dc_hw.c | 1959 ++++++++++++++++++++++++ drivers/gpu/drm/verisilicon/vs_dc_hw.h | 492 ++++++ drivers/gpu/drm/verisilicon/vs_drv.c | 2 + drivers/gpu/drm/verisilicon/vs_plane.c | 526 +++++++ drivers/gpu/drm/verisilicon/vs_plane.h | 58 + drivers/gpu/drm/verisilicon/vs_type.h | 69 + 11 files changed, 4494 insertions(+), 2 deletions(-)create mode 100644
drivers/gpu/drm/verisilicon/vs_crtc.ccreate mode 100644drivers/gpu/drm/verisilicon/vs_crtc.hcreate mode 100644drivers/gpu/drm/verisilicon/vs_dc.ccreate mode 100644drivers/gpu/drm/verisilicon/vs_dc.hcreate mode 100644drivers/gpu/drm/verisilicon/vs_dc_hw.ccreate mode 100644drivers/gpu/drm/verisilicon/vs_dc_hw.hcreate mode 100644drivers/gpu/drm/verisilicon/vs_plane.ccreate mode 100644drivers/gpu/drm/verisilicon/vs_plane.hcreate mode 100644drivers/gpu/drm/verisilicon/vs_type.hdrivers/gpu/drm/verisilicon/Makefile +6
-2@@ -1,7 +1,11 @@ # SPDX-License-Identifier: GPL-2.0 -vs_drm-objs := vs_drv.o \ - vs_modeset.o +vs_drm-objs := vs_dc_hw.o \ + vs_dc.o \ + vs_crtc.o \ + vs_drv.o \ + vs_modeset.o \ + vs_plane.o obj-$(CONFIG_DRM_VERISILICON) += vs_drm.odrivers/gpu/drm/verisilicon/vs_crtc.c new file +22
-0@@ -0,0 +1,257 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Copyright (C) 2023 VeriSilicon Holdings Co., Ltd. +* +*/ + +#include <linux/clk.h> +#include <linux/debugfs.h> +#include <linux/media-bus-format.h> + +#include <drm/drm_atomic_helper.h> +#include <drm/drm_atomic.h> +#include <drm/drm_crtc.h> +#include <drm/drm_gem_atomic_helper.h> +#include <drm/drm_vblank.h> +#include <drm/vs_drm.h> + +#include "vs_crtc.h" +#include "vs_dc.h" +#include "vs_drv.h" + +static void vs_crtc_reset (struct drm_crtc *crtc)drivers/gpu/drm/verisilicon/vs_crtc.c line 32
Quoted 10 lines
drivers/gpu/drm/verisilicon/vs_crtc.c new file +10
-0+{ +struct vs_crtc_state *state; + +if (crtc->state) { +__drm_atomic_helper_crtc_destroy_state (crtc->state); + + state =to_vs_crtc_state (crtc->state); +kfree (state); + crtc->state =NULL ; + }You can call your
crtc_destroy_statefunction directly here.drivers/gpu/drm/verisilicon/vs_crtc.c line 44
Quoted 12 lines
drivers/gpu/drm/verisilicon/vs_crtc.c new file +12
-0+ + state =kzalloc (sizeof (*state),GFP_KERNEL ); +if (!state) +return ; + +__drm_atomic_helper_crtc_reset (crtc, &state->base); +} + +static struct drm_crtc_state * +vs_crtc_atomic_duplicate_state (struct drm_crtc *crtc) +{ +struct vs_crtc_state *ori_state;It might be a matter of taste, but it is usually
old_state.Quoted 6 lines
drivers/gpu/drm/verisilicon/vs_crtc.c new file +6
-0+struct vs_crtc_state *state; + +if (!crtc->state) +return NULL ; + + ori_state =to_vs_crtc_state (crtc->state);drivers/gpu/drm/verisilicon/vs_crtc.c line 60
Quoted 10 lines
drivers/gpu/drm/verisilicon/vs_crtc.c new file +10
-0+ state =kzalloc (sizeof (*state),GFP_KERNEL ); +if (!state) +return NULL ; + +__drm_atomic_helper_crtc_duplicate_state (crtc, &state->base); + + state->output_fmt = ori_state->output_fmt; + state->encoder_type = ori_state->encoder_type; + state->bpp = ori_state->bpp; + state->underflow = ori_state->underflow;Can you use kmemdup instead?
Quoted 22 lines
drivers/gpu/drm/verisilicon/vs_crtc.c new file +22
-0+ +return &state->base; +} + +static void vs_crtc_atomic_destroy_state (struct drm_crtc *crtc, +struct drm_crtc_state *state) +{ +__drm_atomic_helper_crtc_destroy_state (state); +kfree (to_vs_crtc_state (state)); +} + +static int vs_crtc_enable_vblank (struct drm_crtc *crtc) +{ +struct vs_crtc *vs_crtc =to_vs_crtc (crtc); +struct vs_dc *dc =dev_get_drvdata (vs_crtc->dev); + +vs_dc_enable_vblank (dc, true); + +return 0 ; +} + +static void vs_crtc_disable_vblank (struct drm_crtc *crtc)drivers/gpu/drm/verisilicon/vs_crtc.c line 92
Quoted 10 lines
drivers/gpu/drm/verisilicon/vs_crtc.c new file +10
-0+{ +struct vs_crtc *vs_crtc =to_vs_crtc (crtc); +struct vs_dc *dc =dev_get_drvdata (vs_crtc->dev); + +vs_dc_enable_vblank (dc, false); +} + +static const struct drm_crtc_funcs vs_crtc_funcs = { + .set_config = drm_atomic_helper_set_config, + .page_flip = drm_atomic_helper_page_flip,destroy is required, see
drm_mode_config_cleanup()drivers/gpu/drm/verisilicon/vs_crtc.c line 95
Quoted 3 lines
drivers/gpu/drm/verisilicon/vs_crtc.c new file +3
-0+ .reset = vs_crtc_reset, + .atomic_duplicate_state = vs_crtc_atomic_duplicate_state, + .atomic_destroy_state = vs_crtc_atomic_destroy_state,please consider adding
atomic_print_stateto output driver-specific bits.drivers/gpu/drm/verisilicon/vs_crtc.c line 100
Quoted 5 lines
drivers/gpu/drm/verisilicon/vs_crtc.c new file +5
-0+ .enable_vblank = vs_crtc_enable_vblank, + .disable_vblank = vs_crtc_disable_vblank, +}; + +static u8 cal_pixel_bits (u32 bus_format)This looks like a generic helper code, which can go to a common place.
Quoted 56 lines
drivers/gpu/drm/verisilicon/vs_crtc.c new file +56
-0+{ +u8 bpp; + +switch (bus_format) { +case MEDIA_BUS_FMT_RGB565_1X16 : +case MEDIA_BUS_FMT_UYVY8_1X16 : + bpp =16 ; +break ; +case MEDIA_BUS_FMT_RGB666_1X18 : +case MEDIA_BUS_FMT_RGB666_1X24_CPADHI : + bpp =18 ; +break ; +case MEDIA_BUS_FMT_UYVY10_1X20 : + bpp =20 ; +break ; +case MEDIA_BUS_FMT_BGR888_1X24 : +case MEDIA_BUS_FMT_UYYVYY8_0_5X24 : +case MEDIA_BUS_FMT_YUV8_1X24 : + bpp =24 ; +break ; +case MEDIA_BUS_FMT_RGB101010_1X30 : +case MEDIA_BUS_FMT_UYYVYY10_0_5X30 : +case MEDIA_BUS_FMT_YUV10_1X30 : + bpp =30 ; +break ; +default : + bpp =24 ; +break ; + } + +return bpp; +} + +static void vs_crtc_atomic_enable (struct drm_crtc *crtc, +struct drm_atomic_state *state) +{ +struct vs_crtc *vs_crtc =to_vs_crtc (crtc); +struct vs_dc *dc =dev_get_drvdata (vs_crtc->dev); +struct vs_crtc_state *vs_crtc_state =to_vs_crtc_state (crtc->state); + + vs_crtc_state->bpp =cal_pixel_bits (vs_crtc_state->output_fmt); + +vs_dc_enable (dc, crtc); +drm_crtc_vblank_on (crtc); +} + +static void vs_crtc_atomic_disable (struct drm_crtc *crtc, +struct drm_atomic_state *state) +{ +struct vs_crtc *vs_crtc =to_vs_crtc (crtc); +struct vs_dc *dc =dev_get_drvdata (vs_crtc->dev); + +drm_crtc_vblank_off (crtc); + +vs_dc_disable (dc, crtc); +
Quoted 8 lines
drivers/gpu/drm/verisilicon/vs_crtc.c line 162
Quoted 6 lines
drivers/gpu/drm/verisilicon/vs_crtc.c new file +6
-0+if (crtc->state->event && !crtc->state->active) { +spin_lock_irq (&crtc->dev->event_lock); +drm_crtc_send_vblank_event (crtc, crtc->state->event); +spin_unlock_irq (&crtc->dev->event_lock); + + crtc->state->event =NULL ;I think even should be cleared within the lock.
event_lock doesn't protect anything in the crtc state.
But the bigger problem in this code is the prevalent crtc->state usage. That should pretty much never be done, especially in anything that can get called from the actual commit phase where you no longer have the locks held. Instead one should almost always use the get_{new,old}_state() stuff, or the old/new/oldnew state iterators.
Quoted 13 lines
drivers/gpu/drm/verisilicon/vs_crtc.c line 174
Quoted 13 lines
drivers/gpu/drm/verisilicon/vs_crtc.c new file +12
-0+ } +} + +static void vs_crtc_atomic_begin (struct drm_crtc *crtc, +struct drm_atomic_state *state) +{ +struct drm_crtc_state *crtc_state =drm_atomic_get_new_crtc_state (state, + crtc); + +struct vs_crtc *vs_crtc =to_vs_crtc (crtc); +struct device *dev = vs_crtc->dev; +struct drm_property_blob *blob = crtc->state->gamma_lut;
Eg. here you are using drm_atomic_get_new_crtc_state() correctly, but then proceed to directly access crtc->state anyway.
Quoted 14 lines
Quoted 14 lines
drivers/gpu/drm/verisilicon/vs_crtc.c new file +14
-0+struct drm_color_lut *lut; +struct vs_dc *dc =dev_get_drvdata (dev); + +if (crtc_state->color_mgmt_changed) { +if (blob && blob->length) { + lut = blob->data; +vs_dc_set_gamma (dc, crtc, lut, + blob->length /sizeof (*lut)); +vs_dc_enable_gamma (dc, crtc, true); + }else { +vs_dc_enable_gamma (dc, crtc, false); + } + } +}
Signature · 2 lines
Ville Syrjälä Intel
Re: [PATCH v2 5/6] drm/vs: Add KMS crtc&plane
hi Ville:
very glad to receive your feedback
Some of them are very good ideas.
Some are not very clear and hope to get your further reply!
Quoted 78 lines · Ville Syrjälä
Quoted 77 lines · Dmitry Baryshkov
Quoted 76 lines · Keith Zhao
add 2 crtcs and 8 planes in vs-drm
Signed-off-by Keith Zhao <[email protected]>--- drivers/gpu/drm/verisilicon/Makefile | 8 +- drivers/gpu/drm/verisilicon/vs_crtc.c | 257 ++++ drivers/gpu/drm/verisilicon/vs_crtc.h | 43 + drivers/gpu/drm/verisilicon/vs_dc.c | 1002 ++++++++++++ drivers/gpu/drm/verisilicon/vs_dc.h | 80 + drivers/gpu/drm/verisilicon/vs_dc_hw.c | 1959 ++++++++++++++++++++++++ drivers/gpu/drm/verisilicon/vs_dc_hw.h | 492 ++++++ drivers/gpu/drm/verisilicon/vs_drv.c | 2 + drivers/gpu/drm/verisilicon/vs_plane.c | 526 +++++++ drivers/gpu/drm/verisilicon/vs_plane.h | 58 + drivers/gpu/drm/verisilicon/vs_type.h | 69 + 11 files changed, 4494 insertions(+), 2 deletions(-)create mode 100644
drivers/gpu/drm/verisilicon/vs_crtc.ccreate mode 100644drivers/gpu/drm/verisilicon/vs_crtc.hcreate mode 100644drivers/gpu/drm/verisilicon/vs_dc.ccreate mode 100644drivers/gpu/drm/verisilicon/vs_dc.hcreate mode 100644drivers/gpu/drm/verisilicon/vs_dc_hw.ccreate mode 100644drivers/gpu/drm/verisilicon/vs_dc_hw.hcreate mode 100644drivers/gpu/drm/verisilicon/vs_plane.ccreate mode 100644drivers/gpu/drm/verisilicon/vs_plane.hcreate mode 100644drivers/gpu/drm/verisilicon/vs_type.hdrivers/gpu/drm/verisilicon/Makefile +6
-2@@ -1,7 +1,11 @@ # SPDX-License-Identifier: GPL-2.0 -vs_drm-objs := vs_drv.o \ - vs_modeset.o +vs_drm-objs := vs_dc_hw.o \ + vs_dc.o \ + vs_crtc.o \ + vs_drv.o \ + vs_modeset.o \ + vs_plane.o obj-$(CONFIG_DRM_VERISILICON) += vs_drm.odrivers/gpu/drm/verisilicon/vs_crtc.c new file +26
-0@@ -0,0 +1,257 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Copyright (C) 2023 VeriSilicon Holdings Co., Ltd. +* +*/ + +#include <linux/clk.h> +#include <linux/debugfs.h> +#include <linux/media-bus-format.h> + +#include <drm/drm_atomic_helper.h> +#include <drm/drm_atomic.h> +#include <drm/drm_crtc.h> +#include <drm/drm_gem_atomic_helper.h> +#include <drm/drm_vblank.h> +#include <drm/vs_drm.h> + +#include "vs_crtc.h" +#include "vs_dc.h" +#include "vs_drv.h" + +static void vs_crtc_reset (struct drm_crtc *crtc) +{ +struct vs_crtc_state *state; + +if (crtc->state) {
Quoted 8 lines
Quoted 8 lines
drivers/gpu/drm/verisilicon/vs_crtc.c line 32
Quoted 6 lines
drivers/gpu/drm/verisilicon/vs_crtc.c new file +6
-0+__drm_atomic_helper_crtc_destroy_state (crtc->state); + + state =to_vs_crtc_state (crtc->state); +kfree (state); + crtc->state =NULL ; + }You can call your
crtc_destroy_statefunction directly here.
ok got it !
Quoted 26 lines
Quoted 26 lines
drivers/gpu/drm/verisilicon/vs_crtc.c line 44
Quoted 13 lines
drivers/gpu/drm/verisilicon/vs_crtc.c new file +12
-0+ + state =kzalloc (sizeof (*state),GFP_KERNEL ); +if (!state) +return ; + +__drm_atomic_helper_crtc_reset (crtc, &state->base); +} + +static struct drm_crtc_state * +vs_crtc_atomic_duplicate_state (struct drm_crtc *crtc) +{ +struct vs_crtc_state *ori_state;It might be a matter of taste, but it is usually
old_state.Quoted 10 lines
drivers/gpu/drm/verisilicon/vs_crtc.c new file +10
-0+struct vs_crtc_state *state; + +if (!crtc->state) +return NULL ; + + ori_state =to_vs_crtc_state (crtc->state); + state =kzalloc (sizeof (*state),GFP_KERNEL ); +if (!state) +return NULL ; +
Quoted 8 lines
Quoted 8 lines
drivers/gpu/drm/verisilicon/vs_crtc.c line 60
Quoted 6 lines
drivers/gpu/drm/verisilicon/vs_crtc.c new file +6
-0+__drm_atomic_helper_crtc_duplicate_state (crtc, &state->base); + + state->output_fmt = ori_state->output_fmt; + state->encoder_type = ori_state->encoder_type; + state->bpp = ori_state->bpp; + state->underflow = ori_state->underflow;Can you use kmemdup instead?
ok
Quoted 27 lines
Quoted 27 lines
Quoted 27 lines
drivers/gpu/drm/verisilicon/vs_crtc.c new file +26
-0+ +return &state->base; +} + +static void vs_crtc_atomic_destroy_state (struct drm_crtc *crtc, +struct drm_crtc_state *state) +{ +__drm_atomic_helper_crtc_destroy_state (state); +kfree (to_vs_crtc_state (state)); +} + +static int vs_crtc_enable_vblank (struct drm_crtc *crtc) +{ +struct vs_crtc *vs_crtc =to_vs_crtc (crtc); +struct vs_dc *dc =dev_get_drvdata (vs_crtc->dev); + +vs_dc_enable_vblank (dc, true); + +return 0 ; +} + +static void vs_crtc_disable_vblank (struct drm_crtc *crtc) +{ +struct vs_crtc *vs_crtc =to_vs_crtc (crtc); +struct vs_dc *dc =dev_get_drvdata (vs_crtc->dev); +
Quoted 8 lines
Quoted 8 lines
drivers/gpu/drm/verisilicon/vs_crtc.c line 92
Quoted 6 lines
drivers/gpu/drm/verisilicon/vs_crtc.c new file +6
-0+vs_dc_enable_vblank (dc, false); +} + +static const struct drm_crtc_funcs vs_crtc_funcs = { + .set_config = drm_atomic_helper_set_config, + .page_flip = drm_atomic_helper_page_flip,destroy is required, see
drm_mode_config_cleanup()
will add destory
Quoted 7 lines
Quoted 7 lines
drivers/gpu/drm/verisilicon/vs_crtc.c line 95
Quoted 4 lines
drivers/gpu/drm/verisilicon/vs_crtc.c new file +3
-0+ .reset = vs_crtc_reset, + .atomic_duplicate_state = vs_crtc_atomic_duplicate_state, + .atomic_destroy_state = vs_crtc_atomic_destroy_state,please consider adding
atomic_print_stateto output driver-specific bits.
will add atomic_print_state to print my private definitions
Quoted 73 lines
Quoted 64 lines
drivers/gpu/drm/verisilicon/vs_crtc.c line 100
Quoted 5 lines
drivers/gpu/drm/verisilicon/vs_crtc.c new file +5
-0+ .enable_vblank = vs_crtc_enable_vblank, + .disable_vblank = vs_crtc_disable_vblank, +}; + +static u8 cal_pixel_bits (u32 bus_format)This looks like a generic helper code, which can go to a common place.
Quoted 56 lines
drivers/gpu/drm/verisilicon/vs_crtc.c new file +56
-0+{ +u8 bpp; + +switch (bus_format) { +case MEDIA_BUS_FMT_RGB565_1X16 : +case MEDIA_BUS_FMT_UYVY8_1X16 : + bpp =16 ; +break ; +case MEDIA_BUS_FMT_RGB666_1X18 : +case MEDIA_BUS_FMT_RGB666_1X24_CPADHI : + bpp =18 ; +break ; +case MEDIA_BUS_FMT_UYVY10_1X20 : + bpp =20 ; +break ; +case MEDIA_BUS_FMT_BGR888_1X24 : +case MEDIA_BUS_FMT_UYYVYY8_0_5X24 : +case MEDIA_BUS_FMT_YUV8_1X24 : + bpp =24 ; +break ; +case MEDIA_BUS_FMT_RGB101010_1X30 : +case MEDIA_BUS_FMT_UYYVYY10_0_5X30 : +case MEDIA_BUS_FMT_YUV10_1X30 : + bpp =30 ; +break ; +default : + bpp =24 ; +break ; + } + +return bpp; +} + +static void vs_crtc_atomic_enable (struct drm_crtc *crtc, +struct drm_atomic_state *state) +{ +struct vs_crtc *vs_crtc =to_vs_crtc (crtc); +struct vs_dc *dc =dev_get_drvdata (vs_crtc->dev); +struct vs_crtc_state *vs_crtc_state =to_vs_crtc_state (crtc->state); + + vs_crtc_state->bpp =cal_pixel_bits (vs_crtc_state->output_fmt); + +vs_dc_enable (dc, crtc); +drm_crtc_vblank_on (crtc); +} + +static void vs_crtc_atomic_disable (struct drm_crtc *crtc, +struct drm_atomic_state *state) +{ +struct vs_crtc *vs_crtc =to_vs_crtc (crtc); +struct vs_dc *dc =dev_get_drvdata (vs_crtc->dev); + +drm_crtc_vblank_off (crtc); + +vs_dc_disable (dc, crtc); +Quoted 8 lines
drivers/gpu/drm/verisilicon/vs_crtc.c line 162
Quoted 6 lines
drivers/gpu/drm/verisilicon/vs_crtc.c new file +6
-0+if (crtc->state->event && !crtc->state->active) { +spin_lock_irq (&crtc->dev->event_lock); +drm_crtc_send_vblank_event (crtc, crtc->state->event); +spin_unlock_irq (&crtc->dev->event_lock); + + crtc->state->event =NULL ;I think even should be cleared within the lock.
Quoted 1 line
event_lockdoesn't protect anything in the crtc state.
how about match like this:spin_lock_irq(&crtc->dev->event_lock);
if (crtc->state->event) {
drm_crtc_send_vblank_event(crtc, crtc->state->event);
crtc->state->event = NULL;
}spin_unlock_irq(&crtc->dev->event_lock);
Quoted 6 lines
But the bigger problem in this code is the prevalent
crtc->stateusage. That should pretty much never be done, especially in anything that can get called from the actual commit phase where you no longer have the locks held. Instead one should almost always use the get_{new,old}_state() stuff, or the old/new/oldnew state iterators.
the prevalent crtc->state usage :crtc->state should not be used directly? need replace it by get_{new,old}_state()
for example:drm_crtc_send_vblank_event(crtc, crtc->state->event);
should do like this :
struct drm_crtc_state *crtc_state = drm_atomic_get_new_crtc_state(state, crtc);
...drm_crtc_send_vblank_event(crtc, crtc_state->event);
...
If there is a problem, help further correct wish give a example
Thanks
Quoted 18 lines
Quoted 14 lines
Quoted 4 lines
drivers/gpu/drm/verisilicon/vs_crtc.c new file +2
-0+ } +}drivers/gpu/drm/verisilicon/vs_crtc.c line 174
Quoted 10 lines
drivers/gpu/drm/verisilicon/vs_crtc.c new file +10
-0+ +static void vs_crtc_atomic_begin (struct drm_crtc *crtc, +struct drm_atomic_state *state) +{ +struct drm_crtc_state *crtc_state =drm_atomic_get_new_crtc_state (state, + crtc); + +struct vs_crtc *vs_crtc =to_vs_crtc (crtc); +struct device *dev = vs_crtc->dev; +struct drm_property_blob *blob = crtc->state->gamma_lut;Eg. here you are using
drm_atomic_get_new_crtc_state()correctly, but then proceed to directly accesscrtc->stateanyway.
struct drm_property_blob *blob = crtc->state->gamma_lut; change to
struct drm_property_blob *blob = crtc_state ->gamma_lut;
Quoted 15 lines
Quoted 14 lines
Quoted 14 lines
drivers/gpu/drm/verisilicon/vs_crtc.c new file +14
-0+struct drm_color_lut *lut; +struct vs_dc *dc =dev_get_drvdata (dev); + +if (crtc_state->color_mgmt_changed) { +if (blob && blob->length) { + lut = blob->data; +vs_dc_set_gamma (dc, crtc, lut, + blob->length /sizeof (*lut)); +vs_dc_enable_gamma (dc, crtc, true); + }else { +vs_dc_enable_gamma (dc, crtc, false); + } + } +}
Re: [PATCH v2 5/6] drm/vs: Add KMS crtc&plane
sorry
Dmitry ,accidentally wrote the wrong name
Take no offense
Quoted 318 lines · Keith Zhao
hi Ville:
very glad to receive your feedback
Some of them are very good ideas.
Some are not very clear and hope to get your further reply!Quoted 78 lines · Ville Syrjälä
Quoted 77 lines · Dmitry Baryshkov
Quoted 76 lines · Keith Zhao
add 2 crtcs and 8 planes in vs-drm
Signed-off-by Keith Zhao <[email protected]>--- drivers/gpu/drm/verisilicon/Makefile | 8 +- drivers/gpu/drm/verisilicon/vs_crtc.c | 257 ++++ drivers/gpu/drm/verisilicon/vs_crtc.h | 43 + drivers/gpu/drm/verisilicon/vs_dc.c | 1002 ++++++++++++ drivers/gpu/drm/verisilicon/vs_dc.h | 80 + drivers/gpu/drm/verisilicon/vs_dc_hw.c | 1959 ++++++++++++++++++++++++ drivers/gpu/drm/verisilicon/vs_dc_hw.h | 492 ++++++ drivers/gpu/drm/verisilicon/vs_drv.c | 2 + drivers/gpu/drm/verisilicon/vs_plane.c | 526 +++++++ drivers/gpu/drm/verisilicon/vs_plane.h | 58 + drivers/gpu/drm/verisilicon/vs_type.h | 69 + 11 files changed, 4494 insertions(+), 2 deletions(-)create mode 100644
drivers/gpu/drm/verisilicon/vs_crtc.ccreate mode 100644drivers/gpu/drm/verisilicon/vs_crtc.hcreate mode 100644drivers/gpu/drm/verisilicon/vs_dc.ccreate mode 100644drivers/gpu/drm/verisilicon/vs_dc.hcreate mode 100644drivers/gpu/drm/verisilicon/vs_dc_hw.ccreate mode 100644drivers/gpu/drm/verisilicon/vs_dc_hw.hcreate mode 100644drivers/gpu/drm/verisilicon/vs_plane.ccreate mode 100644drivers/gpu/drm/verisilicon/vs_plane.hcreate mode 100644drivers/gpu/drm/verisilicon/vs_type.hdrivers/gpu/drm/verisilicon/Makefile +6
-2@@ -1,7 +1,11 @@ # SPDX-License-Identifier: GPL-2.0 -vs_drm-objs := vs_drv.o \ - vs_modeset.o +vs_drm-objs := vs_dc_hw.o \ + vs_dc.o \ + vs_crtc.o \ + vs_drv.o \ + vs_modeset.o \ + vs_plane.o obj-$(CONFIG_DRM_VERISILICON) += vs_drm.odrivers/gpu/drm/verisilicon/vs_crtc.c new file +26
-0@@ -0,0 +1,257 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Copyright (C) 2023 VeriSilicon Holdings Co., Ltd. +* +*/ + +#include <linux/clk.h> +#include <linux/debugfs.h> +#include <linux/media-bus-format.h> + +#include <drm/drm_atomic_helper.h> +#include <drm/drm_atomic.h> +#include <drm/drm_crtc.h> +#include <drm/drm_gem_atomic_helper.h> +#include <drm/drm_vblank.h> +#include <drm/vs_drm.h> + +#include "vs_crtc.h" +#include "vs_dc.h" +#include "vs_drv.h" + +static void vs_crtc_reset (struct drm_crtc *crtc) +{ +struct vs_crtc_state *state; + +if (crtc->state) {Quoted 8 lines
Quoted 8 lines
drivers/gpu/drm/verisilicon/vs_crtc.c line 32
Quoted 6 lines
drivers/gpu/drm/verisilicon/vs_crtc.c new file +6
-0+__drm_atomic_helper_crtc_destroy_state (crtc->state); + + state =to_vs_crtc_state (crtc->state); +kfree (state); + crtc->state =NULL ; + }You can call your
crtc_destroy_statefunction directly here.ok got it !
Quoted 26 lines
Quoted 26 lines
drivers/gpu/drm/verisilicon/vs_crtc.c line 44
Quoted 13 lines
drivers/gpu/drm/verisilicon/vs_crtc.c new file +12
-0+ + state =kzalloc (sizeof (*state),GFP_KERNEL ); +if (!state) +return ; + +__drm_atomic_helper_crtc_reset (crtc, &state->base); +} + +static struct drm_crtc_state * +vs_crtc_atomic_duplicate_state (struct drm_crtc *crtc) +{ +struct vs_crtc_state *ori_state;It might be a matter of taste, but it is usually
old_state.Quoted 10 lines
drivers/gpu/drm/verisilicon/vs_crtc.c new file +10
-0+struct vs_crtc_state *state; + +if (!crtc->state) +return NULL ; + + ori_state =to_vs_crtc_state (crtc->state); + state =kzalloc (sizeof (*state),GFP_KERNEL ); +if (!state) +return NULL ; +Quoted 8 lines
Quoted 8 lines
drivers/gpu/drm/verisilicon/vs_crtc.c line 60
Quoted 6 lines
drivers/gpu/drm/verisilicon/vs_crtc.c new file +6
-0+__drm_atomic_helper_crtc_duplicate_state (crtc, &state->base); + + state->output_fmt = ori_state->output_fmt; + state->encoder_type = ori_state->encoder_type; + state->bpp = ori_state->bpp; + state->underflow = ori_state->underflow;Can you use kmemdup instead?
ok
Quoted 27 lines
Quoted 27 lines
Quoted 27 lines
drivers/gpu/drm/verisilicon/vs_crtc.c new file +26
-0+ +return &state->base; +} + +static void vs_crtc_atomic_destroy_state (struct drm_crtc *crtc, +struct drm_crtc_state *state) +{ +__drm_atomic_helper_crtc_destroy_state (state); +kfree (to_vs_crtc_state (state)); +} + +static int vs_crtc_enable_vblank (struct drm_crtc *crtc) +{ +struct vs_crtc *vs_crtc =to_vs_crtc (crtc); +struct vs_dc *dc =dev_get_drvdata (vs_crtc->dev); + +vs_dc_enable_vblank (dc, true); + +return 0 ; +} + +static void vs_crtc_disable_vblank (struct drm_crtc *crtc) +{ +struct vs_crtc *vs_crtc =to_vs_crtc (crtc); +struct vs_dc *dc =dev_get_drvdata (vs_crtc->dev); +Quoted 8 lines
Quoted 8 lines
drivers/gpu/drm/verisilicon/vs_crtc.c line 92
Quoted 6 lines
drivers/gpu/drm/verisilicon/vs_crtc.c new file +6
-0+vs_dc_enable_vblank (dc, false); +} + +static const struct drm_crtc_funcs vs_crtc_funcs = { + .set_config = drm_atomic_helper_set_config, + .page_flip = drm_atomic_helper_page_flip,destroy is required, see
drm_mode_config_cleanup()will add destory
Quoted 7 lines
Quoted 7 lines
drivers/gpu/drm/verisilicon/vs_crtc.c line 95
Quoted 4 lines
drivers/gpu/drm/verisilicon/vs_crtc.c new file +3
-0+ .reset = vs_crtc_reset, + .atomic_duplicate_state = vs_crtc_atomic_duplicate_state, + .atomic_destroy_state = vs_crtc_atomic_destroy_state,please consider adding
atomic_print_stateto output driver-specific bits.will add
atomic_print_stateto print my private definitionsQuoted 73 lines
Quoted 64 lines
drivers/gpu/drm/verisilicon/vs_crtc.c line 100
Quoted 5 lines
drivers/gpu/drm/verisilicon/vs_crtc.c new file +5
-0+ .enable_vblank = vs_crtc_enable_vblank, + .disable_vblank = vs_crtc_disable_vblank, +}; + +static u8 cal_pixel_bits (u32 bus_format)This looks like a generic helper code, which can go to a common place.
Quoted 56 lines
drivers/gpu/drm/verisilicon/vs_crtc.c new file +56
-0+{ +u8 bpp; + +switch (bus_format) { +case MEDIA_BUS_FMT_RGB565_1X16 : +case MEDIA_BUS_FMT_UYVY8_1X16 : + bpp =16 ; +break ; +case MEDIA_BUS_FMT_RGB666_1X18 : +case MEDIA_BUS_FMT_RGB666_1X24_CPADHI : + bpp =18 ; +break ; +case MEDIA_BUS_FMT_UYVY10_1X20 : + bpp =20 ; +break ; +case MEDIA_BUS_FMT_BGR888_1X24 : +case MEDIA_BUS_FMT_UYYVYY8_0_5X24 : +case MEDIA_BUS_FMT_YUV8_1X24 : + bpp =24 ; +break ; +case MEDIA_BUS_FMT_RGB101010_1X30 : +case MEDIA_BUS_FMT_UYYVYY10_0_5X30 : +case MEDIA_BUS_FMT_YUV10_1X30 : + bpp =30 ; +break ; +default : + bpp =24 ; +break ; + } + +return bpp; +} + +static void vs_crtc_atomic_enable (struct drm_crtc *crtc, +struct drm_atomic_state *state) +{ +struct vs_crtc *vs_crtc =to_vs_crtc (crtc); +struct vs_dc *dc =dev_get_drvdata (vs_crtc->dev); +struct vs_crtc_state *vs_crtc_state =to_vs_crtc_state (crtc->state); + + vs_crtc_state->bpp =cal_pixel_bits (vs_crtc_state->output_fmt); + +vs_dc_enable (dc, crtc); +drm_crtc_vblank_on (crtc); +} + +static void vs_crtc_atomic_disable (struct drm_crtc *crtc, +struct drm_atomic_state *state) +{ +struct vs_crtc *vs_crtc =to_vs_crtc (crtc); +struct vs_dc *dc =dev_get_drvdata (vs_crtc->dev); + +drm_crtc_vblank_off (crtc); + +vs_dc_disable (dc, crtc); +Quoted 8 lines
drivers/gpu/drm/verisilicon/vs_crtc.c line 162
Quoted 6 lines
drivers/gpu/drm/verisilicon/vs_crtc.c new file +6
-0+if (crtc->state->event && !crtc->state->active) { +spin_lock_irq (&crtc->dev->event_lock); +drm_crtc_send_vblank_event (crtc, crtc->state->event); +spin_unlock_irq (&crtc->dev->event_lock); + + crtc->state->event =NULL ;I think even should be cleared within the lock.
Quoted 1 line
event_lockdoesn't protect anything in the crtc state.how about match like this:
spin_lock_irq(&crtc->dev->event_lock);if (crtc->state->event) { drm_crtc_send_vblank_event(crtc, crtc->state->event); crtc->state->event = NULL; }
spin_unlock_irq(&crtc->dev->event_lock);Quoted 6 lines
But the bigger problem in this code is the prevalent
crtc->stateusage. That should pretty much never be done, especially in anything that can get called from the actual commit phase where you no longer have the locks held. Instead one should almost always use the get_{new,old}_state() stuff, or the old/new/oldnew state iterators.the prevalent
crtc->stateusage :crtc->stateshould not be used directly? need replace it by get_{new,old}_state()for example:
drm_crtc_send_vblank_event(crtc, crtc->state->event);should do like this :
structdrm_crtc_state*crtc_state=drm_atomic_get_new_crtc_state(state, crtc);
...drm_crtc_send_vblank_event(crtc, crtc_state->event);
...If there is a problem, help further correct wish give a example
ThanksQuoted 18 lines
Quoted 14 lines
Quoted 4 lines
drivers/gpu/drm/verisilicon/vs_crtc.c new file +2
-0+ } +}drivers/gpu/drm/verisilicon/vs_crtc.c line 174
Quoted 10 lines
drivers/gpu/drm/verisilicon/vs_crtc.c new file +10
-0+ +static void vs_crtc_atomic_begin (struct drm_crtc *crtc, +struct drm_atomic_state *state) +{ +struct drm_crtc_state *crtc_state =drm_atomic_get_new_crtc_state (state, + crtc); + +struct vs_crtc *vs_crtc =to_vs_crtc (crtc); +struct device *dev = vs_crtc->dev; +struct drm_property_blob *blob = crtc->state->gamma_lut;Eg. here you are using
drm_atomic_get_new_crtc_state()correctly, but then proceed to directly accesscrtc->stateanyway.struct
drm_property_blob*blob =crtc->state->gamma_lut; change to
structdrm_property_blob*blob =crtc_state->gamma_lut;Quoted 15 lines
Quoted 14 lines
Quoted 14 lines
drivers/gpu/drm/verisilicon/vs_crtc.c new file +14
-0+struct drm_color_lut *lut; +struct vs_dc *dc =dev_get_drvdata (dev); + +if (crtc_state->color_mgmt_changed) { +if (blob && blob->length) { + lut = blob->data; +vs_dc_set_gamma (dc, crtc, lut, + blob->length /sizeof (*lut)); +vs_dc_enable_gamma (dc, crtc, true); + }else { +vs_dc_enable_gamma (dc, crtc, false); + } + } +}
Re: [PATCH v2 5/6] drm/vs: Add KMS crtc&plane
In reply to Dmitry BaryshkovQuoted 146 lines · Dmitry Baryshkov
Quoted 72 lines · Keith Zhao
add 2 crtcs and 8 planes in vs-drm
Signed-off-by Keith Zhao <[email protected]>--- drivers/gpu/drm/verisilicon/Makefile | 8 +- drivers/gpu/drm/verisilicon/vs_crtc.c | 257 ++++ drivers/gpu/drm/verisilicon/vs_crtc.h | 43 + drivers/gpu/drm/verisilicon/vs_dc.c | 1002 ++++++++++++ drivers/gpu/drm/verisilicon/vs_dc.h | 80 + drivers/gpu/drm/verisilicon/vs_dc_hw.c | 1959 ++++++++++++++++++++++++ drivers/gpu/drm/verisilicon/vs_dc_hw.h | 492 ++++++ drivers/gpu/drm/verisilicon/vs_drv.c | 2 + drivers/gpu/drm/verisilicon/vs_plane.c | 526 +++++++ drivers/gpu/drm/verisilicon/vs_plane.h | 58 + drivers/gpu/drm/verisilicon/vs_type.h | 69 + 11 files changed, 4494 insertions(+), 2 deletions(-)create mode 100644
drivers/gpu/drm/verisilicon/vs_crtc.ccreate mode 100644drivers/gpu/drm/verisilicon/vs_crtc.hcreate mode 100644drivers/gpu/drm/verisilicon/vs_dc.ccreate mode 100644drivers/gpu/drm/verisilicon/vs_dc.hcreate mode 100644drivers/gpu/drm/verisilicon/vs_dc_hw.ccreate mode 100644drivers/gpu/drm/verisilicon/vs_dc_hw.hcreate mode 100644drivers/gpu/drm/verisilicon/vs_plane.ccreate mode 100644drivers/gpu/drm/verisilicon/vs_plane.hcreate mode 100644drivers/gpu/drm/verisilicon/vs_type.hdrivers/gpu/drm/verisilicon/Makefile +6
-2@@ -1,7 +1,11 @@ # SPDX-License-Identifier: GPL-2.0 -vs_drm-objs := vs_drv.o \ - vs_modeset.o +vs_drm-objs := vs_dc_hw.o \ + vs_dc.o \ + vs_crtc.o \ + vs_drv.o \ + vs_modeset.o \ + vs_plane.o obj-$(CONFIG_DRM_VERISILICON) += vs_drm.odrivers/gpu/drm/verisilicon/vs_crtc.c new file +22
-0@@ -0,0 +1,257 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Copyright (C) 2023 VeriSilicon Holdings Co., Ltd. +* +*/ + +#include <linux/clk.h> +#include <linux/debugfs.h> +#include <linux/media-bus-format.h> + +#include <drm/drm_atomic_helper.h> +#include <drm/drm_atomic.h> +#include <drm/drm_crtc.h> +#include <drm/drm_gem_atomic_helper.h> +#include <drm/drm_vblank.h> +#include <drm/vs_drm.h> + +#include "vs_crtc.h" +#include "vs_dc.h" +#include "vs_drv.h" + +static void vs_crtc_reset (struct drm_crtc *crtc)drivers/gpu/drm/verisilicon/vs_crtc.c line 32
Quoted 10 lines
drivers/gpu/drm/verisilicon/vs_crtc.c new file +10
-0+{ +struct vs_crtc_state *state; + +if (crtc->state) { +__drm_atomic_helper_crtc_destroy_state (crtc->state); + + state =to_vs_crtc_state (crtc->state); +kfree (state); + crtc->state =NULL ; + }You can call your
crtc_destroy_statefunction directly here.drivers/gpu/drm/verisilicon/vs_crtc.c line 44
Quoted 12 lines
drivers/gpu/drm/verisilicon/vs_crtc.c new file +12
-0+ + state =kzalloc (sizeof (*state),GFP_KERNEL ); +if (!state) +return ; + +__drm_atomic_helper_crtc_reset (crtc, &state->base); +} + +static struct drm_crtc_state * +vs_crtc_atomic_duplicate_state (struct drm_crtc *crtc) +{ +struct vs_crtc_state *ori_state;It might be a matter of taste, but it is usually
old_state.Quoted 6 lines
drivers/gpu/drm/verisilicon/vs_crtc.c new file +6
-0+struct vs_crtc_state *state; + +if (!crtc->state) +return NULL ; + + ori_state =to_vs_crtc_state (crtc->state);drivers/gpu/drm/verisilicon/vs_crtc.c line 60
Quoted 10 lines
drivers/gpu/drm/verisilicon/vs_crtc.c new file +10
-0+ state =kzalloc (sizeof (*state),GFP_KERNEL ); +if (!state) +return NULL ; + +__drm_atomic_helper_crtc_duplicate_state (crtc, &state->base); + + state->output_fmt = ori_state->output_fmt; + state->encoder_type = ori_state->encoder_type; + state->bpp = ori_state->bpp; + state->underflow = ori_state->underflow;Can you use kmemdup instead?
Quoted 26 lines
drivers/gpu/drm/verisilicon/vs_crtc.c new file +26
-0+ +return &state->base; +} + +static void vs_crtc_atomic_destroy_state (struct drm_crtc *crtc, +struct drm_crtc_state *state) +{ +__drm_atomic_helper_crtc_destroy_state (state); +kfree (to_vs_crtc_state (state)); +} + +static int vs_crtc_enable_vblank (struct drm_crtc *crtc) +{ +struct vs_crtc *vs_crtc =to_vs_crtc (crtc); +struct vs_dc *dc =dev_get_drvdata (vs_crtc->dev); + +vs_dc_enable_vblank (dc, true); + +return 0 ; +} + +static void vs_crtc_disable_vblank (struct drm_crtc *crtc) +{ +struct vs_crtc *vs_crtc =to_vs_crtc (crtc); +struct vs_dc *dc =dev_get_drvdata (vs_crtc->dev); +
Quoted 8 lines
drivers/gpu/drm/verisilicon/vs_crtc.c line 92
Quoted 6 lines
drivers/gpu/drm/verisilicon/vs_crtc.c new file +6
-0+vs_dc_enable_vblank (dc, false); +} + +static const struct drm_crtc_funcs vs_crtc_funcs = { + .set_config = drm_atomic_helper_set_config, + .page_flip = drm_atomic_helper_page_flip,destroy is required, see
drm_mode_config_cleanup()
hi Dmitry:
if define destroy in drm_crtc_funcs,
it will make __drmm_crtc_init_with_planes unhappy
see:__printf(6, 0)
static int __drmm_crtc_init_with_planes(struct drm_device *dev,
struct drm_crtc *crtc, struct drm_plane *primary, struct drm_plane *cursor, const struct drm_crtc_funcs *funcs, const char *name, va_list args)
{
int ret;
drm_WARN_ON(dev, funcs && funcs->destroy);........
}
It should not need to be defined here, I think
Quoted 4,552 lines
drivers/gpu/drm/verisilicon/vs_crtc.c line 95
Quoted 4 lines
drivers/gpu/drm/verisilicon/vs_crtc.c new file +3
-0+ .reset = vs_crtc_reset, + .atomic_duplicate_state = vs_crtc_atomic_duplicate_state, + .atomic_destroy_state = vs_crtc_atomic_destroy_state,please consider adding
atomic_print_stateto output driver-specific bits.drivers/gpu/drm/verisilicon/vs_crtc.c line 100
Quoted 5 lines
drivers/gpu/drm/verisilicon/vs_crtc.c new file +5
-0+ .enable_vblank = vs_crtc_enable_vblank, + .disable_vblank = vs_crtc_disable_vblank, +}; + +static u8 cal_pixel_bits (u32 bus_format)This looks like a generic helper code, which can go to a common place.
Quoted 52 lines
drivers/gpu/drm/verisilicon/vs_crtc.c new file +52
-0+{ +u8 bpp; + +switch (bus_format) { +case MEDIA_BUS_FMT_RGB565_1X16 : +case MEDIA_BUS_FMT_UYVY8_1X16 : + bpp =16 ; +break ; +case MEDIA_BUS_FMT_RGB666_1X18 : +case MEDIA_BUS_FMT_RGB666_1X24_CPADHI : + bpp =18 ; +break ; +case MEDIA_BUS_FMT_UYVY10_1X20 : + bpp =20 ; +break ; +case MEDIA_BUS_FMT_BGR888_1X24 : +case MEDIA_BUS_FMT_UYYVYY8_0_5X24 : +case MEDIA_BUS_FMT_YUV8_1X24 : + bpp =24 ; +break ; +case MEDIA_BUS_FMT_RGB101010_1X30 : +case MEDIA_BUS_FMT_UYYVYY10_0_5X30 : +case MEDIA_BUS_FMT_YUV10_1X30 : + bpp =30 ; +break ; +default : + bpp =24 ; +break ; + } + +return bpp; +} + +static void vs_crtc_atomic_enable (struct drm_crtc *crtc, +struct drm_atomic_state *state) +{ +struct vs_crtc *vs_crtc =to_vs_crtc (crtc); +struct vs_dc *dc =dev_get_drvdata (vs_crtc->dev); +struct vs_crtc_state *vs_crtc_state =to_vs_crtc_state (crtc->state); + + vs_crtc_state->bpp =cal_pixel_bits (vs_crtc_state->output_fmt); + +vs_dc_enable (dc, crtc); +drm_crtc_vblank_on (crtc); +} + +static void vs_crtc_atomic_disable (struct drm_crtc *crtc, +struct drm_atomic_state *state) +{ +struct vs_crtc *vs_crtc =to_vs_crtc (crtc); +struct vs_dc *dc =dev_get_drvdata (vs_crtc->dev); +drivers/gpu/drm/verisilicon/vs_crtc.c line 162
Quoted 10 lines
drivers/gpu/drm/verisilicon/vs_crtc.c new file +10
-0+drm_crtc_vblank_off (crtc); + +vs_dc_disable (dc, crtc); + +if (crtc->state->event && !crtc->state->active) { +spin_lock_irq (&crtc->dev->event_lock); +drm_crtc_send_vblank_event (crtc, crtc->state->event); +spin_unlock_irq (&crtc->dev->event_lock); + + crtc->state->event =NULL ;I think even should be cleared within the lock.
Quoted 33 lines
drivers/gpu/drm/verisilicon/vs_crtc.c new file +33
-0+ } +} + +static void vs_crtc_atomic_begin (struct drm_crtc *crtc, +struct drm_atomic_state *state) +{ +struct drm_crtc_state *crtc_state =drm_atomic_get_new_crtc_state (state, + crtc); + +struct vs_crtc *vs_crtc =to_vs_crtc (crtc); +struct device *dev = vs_crtc->dev; +struct drm_property_blob *blob = crtc->state->gamma_lut; +struct drm_color_lut *lut; +struct vs_dc *dc =dev_get_drvdata (dev); + +if (crtc_state->color_mgmt_changed) { +if (blob && blob->length) { + lut = blob->data; +vs_dc_set_gamma (dc, crtc, lut, + blob->length /sizeof (*lut)); +vs_dc_enable_gamma (dc, crtc, true); + }else { +vs_dc_enable_gamma (dc, crtc, false); + } + } +} + +static void vs_crtc_atomic_flush (struct drm_crtc *crtc, +struct drm_atomic_state *state) +{ +struct vs_crtc *vs_crtc =to_vs_crtc (crtc); +struct drm_pending_vblank_event *event = crtc->state->event; +struct vs_dc *dc =dev_get_drvdata (vs_crtc->dev);drivers/gpu/drm/verisilicon/vs_crtc.c line 205
Quoted 10 lines
drivers/gpu/drm/verisilicon/vs_crtc.c new file +10
-0+ +vs_dc_commit (dc); + +if (event) { +WARN_ON (drm_crtc_vblank_get (crtc) !=0 ); + +spin_lock_irq (&crtc->dev->event_lock); +drm_crtc_arm_vblank_event (crtc, event); +spin_unlock_irq (&crtc->dev->event_lock); + crtc->state->event =NULL ;I think even should be cleared within the lock.
Quoted 23 lines
drivers/gpu/drm/verisilicon/vs_crtc.c new file +23
-0+ } +} + +static const struct drm_crtc_helper_funcs vs_crtc_helper_funcs = { + .atomic_check = drm_crtc_helper_atomic_check, + .atomic_enable = vs_crtc_atomic_enable, + .atomic_disable = vs_crtc_atomic_disable, + .atomic_begin = vs_crtc_atomic_begin, + .atomic_flush = vs_crtc_atomic_flush, +}; + +static const struct drm_prop_enum_list vs_sync_mode_enum_list[] = { + {VS_SINGLE_DC ,"single dc mode" }, + {VS_MULTI_DC_PRIMARY ,"primary dc for multi dc mode" }, + {VS_MULTI_DC_SECONDARY ,"secondary dc for multi dc mode" }, +}; + +struct vs_crtc *vs_crtc_create (struct drm_device *drm_dev, +struct vs_dc_info *info) +{ +struct vs_crtc *crtc; +int ret; +drivers/gpu/drm/verisilicon/vs_crtc.c line 238
Quoted 10 lines
drivers/gpu/drm/verisilicon/vs_crtc.c new file +10
-0+if (!info) +return NULL ; + + crtc =drmm_kzalloc (drm_dev,sizeof (*crtc),GFP_KERNEL ); +if (!crtc) +return NULL ; + + ret =drmm_crtc_init_with_planes (drm_dev, &crtc->base, +NULL ,NULL , &vs_crtc_funcs, + info->name ? info->name :NULL );It might be better to add
drmm_crtc_init()helper.Quoted 935 lines
drivers/gpu/drm/verisilicon/vs_crtc.c new file +19
-0+if (ret) +return NULL ; + +drm_crtc_helper_add (&crtc->base, &vs_crtc_helper_funcs); + +if (info->gamma_size) { + ret =drm_mode_crtc_set_gamma_size (&crtc->base, + info->gamma_size); +if (ret) +return NULL ; + +drm_crtc_enable_color_mgmt (&crtc->base,0 , false, + info->gamma_size); + } + + crtc->max_bpc = info->max_bpc; + crtc->color_formats = info->color_formats; +return crtc; +}drivers/gpu/drm/verisilicon/vs_crtc.h new file +43
-0@@ -0,0 +1,43 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Copyright (C) 2023 VeriSilicon Holdings Co., Ltd. +*/ + +#ifndef __VS_CRTC_H__ +#define __VS_CRTC_H__ + +#include <drm/drm_crtc.h> +#include <drm/drm_crtc_helper.h> + +#include "vs_type.h" + +struct vs_crtc_state { +struct drm_crtc_state base; + +u32 output_fmt; +u8 encoder_type; +u8 bpp; +bool underflow; +}; + +struct vs_crtc { +struct drm_crtc base; +struct device *dev; +unsigned int max_bpc; +unsigned int color_formats; +}; + +struct vs_crtc *vs_crtc_create (struct drm_device *drm_dev, +struct vs_dc_info *info); + +static inline struct vs_crtc *to_vs_crtc (struct drm_crtc *crtc) +{ + return container_of(crtc, struct vs_crtc, base); +} + +static inline struct vs_crtc_state * +to_vs_crtc_state (struct drm_crtc_state *state) +{ + return container_of(state, struct vs_crtc_state, base); +} +#endif /* __VS_CRTC_H__ */ drivers/gpu/drm/verisilicon/vs_dc.c new file +861
-0@@ -0,0 +1,1002 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Copyright (C) 2023 VeriSilicon Holdings Co., Ltd. +*/ + +#include <linux/component.h> +#include <linux/clk.h> +#include <linux/of.h> +#include <linux/of_device.h> +#include <linux/pm_runtime.h> +#include <linux/reset.h> + +#include <drm/drm_atomic.h> +#include <drm/drm_atomic_helper.h> +#include <drm/drm_blend.h> +#include <drm/drm_framebuffer.h> +#include <drm/drm_vblank.h> +#include <drm/vs_drm.h> + +#include "vs_dc_hw.h" +#include "vs_dc.h" +#include "vs_drv.h" + +static const char *const vout_clocks[] = { +"noc_bus" , +"channel0" , +"channel1" , +"dc_core" , +"axi_core" , +"ahb" , +"hdmi_tx" , +"dc_parent" , + +}; + +static const char *const vout_resets[] = { +"axi" , +"ahb" , +"core" , +}; + +static inline void update_format (u32 format,u64 mod,struct dc_hw_fb *fb) +{ +u8 f =FORMAT_A8R8G8B8 ; + +switch (format) { +case DRM_FORMAT_XRGB4444 : +case DRM_FORMAT_RGBX4444 : +case DRM_FORMAT_XBGR4444 : +case DRM_FORMAT_BGRX4444 : + f =FORMAT_X4R4G4B4 ; +break ; +case DRM_FORMAT_ARGB4444 : +case DRM_FORMAT_RGBA4444 : +case DRM_FORMAT_ABGR4444 : +case DRM_FORMAT_BGRA4444 : + f =FORMAT_A4R4G4B4 ; +break ; +case DRM_FORMAT_XRGB1555 : +case DRM_FORMAT_RGBX5551 : +case DRM_FORMAT_XBGR1555 : +case DRM_FORMAT_BGRX5551 : + f =FORMAT_X1R5G5B5 ; +break ; +case DRM_FORMAT_ARGB1555 : +case DRM_FORMAT_RGBA5551 : +case DRM_FORMAT_ABGR1555 : +case DRM_FORMAT_BGRA5551 : + f =FORMAT_A1R5G5B5 ; +break ; +case DRM_FORMAT_RGB565 : +case DRM_FORMAT_BGR565 : + f =FORMAT_R5G6B5 ; +break ; +case DRM_FORMAT_XRGB8888 : +case DRM_FORMAT_RGBX8888 : +case DRM_FORMAT_XBGR8888 : +case DRM_FORMAT_BGRX8888 : + f =FORMAT_X8R8G8B8 ; +break ; +case DRM_FORMAT_ARGB8888 : +case DRM_FORMAT_RGBA8888 : +case DRM_FORMAT_ABGR8888 : +case DRM_FORMAT_BGRA8888 : + f =FORMAT_A8R8G8B8 ; +break ; +case DRM_FORMAT_YUYV : +case DRM_FORMAT_YVYU : + f =FORMAT_YUY2 ; +break ; +case DRM_FORMAT_UYVY : +case DRM_FORMAT_VYUY : + f =FORMAT_UYVY ; +break ; +case DRM_FORMAT_YUV420 : +case DRM_FORMAT_YVU420 : + f =FORMAT_YV12 ; +break ; +case DRM_FORMAT_NV21 : + f =FORMAT_NV12 ; +break ; +case DRM_FORMAT_NV16 : +case DRM_FORMAT_NV61 : + f =FORMAT_NV16 ; +break ; +case DRM_FORMAT_P010 : + f =FORMAT_P010 ; +break ; +case DRM_FORMAT_ARGB2101010 : +case DRM_FORMAT_RGBA1010102 : +case DRM_FORMAT_ABGR2101010 : +case DRM_FORMAT_BGRA1010102 : + f =FORMAT_A2R10G10B10 ; +break ; +case DRM_FORMAT_NV12 : + f =FORMAT_NV12 ; +break ; +case DRM_FORMAT_YUV444 : + f =FORMAT_YUV444 ; +break ; +default : +break ; + } + + fb->format = f; +} + +static inline void update_swizzle (u32 format,struct dc_hw_fb *fb) +{ + fb->swizzle =SWIZZLE_ARGB ; + fb->uv_swizzle =0 ; + +switch (format) { +case DRM_FORMAT_RGBX4444 : +case DRM_FORMAT_RGBA4444 : +case DRM_FORMAT_RGBX5551 : +case DRM_FORMAT_RGBA5551 : +case DRM_FORMAT_RGBX8888 : +case DRM_FORMAT_RGBA8888 : +case DRM_FORMAT_RGBA1010102 : + fb->swizzle =SWIZZLE_RGBA ; +break ; +case DRM_FORMAT_XBGR4444 : +case DRM_FORMAT_ABGR4444 : +case DRM_FORMAT_XBGR1555 : +case DRM_FORMAT_ABGR1555 : +case DRM_FORMAT_BGR565 : +case DRM_FORMAT_XBGR8888 : +case DRM_FORMAT_ABGR8888 : +case DRM_FORMAT_ABGR2101010 : + fb->swizzle =SWIZZLE_ABGR ; +break ; +case DRM_FORMAT_BGRX4444 : +case DRM_FORMAT_BGRA4444 : +case DRM_FORMAT_BGRX5551 : +case DRM_FORMAT_BGRA5551 : +case DRM_FORMAT_BGRX8888 : +case DRM_FORMAT_BGRA8888 : +case DRM_FORMAT_BGRA1010102 : + fb->swizzle =SWIZZLE_BGRA ; +break ; +case DRM_FORMAT_YVYU : +case DRM_FORMAT_VYUY : +case DRM_FORMAT_NV21 : +case DRM_FORMAT_NV61 : + fb->uv_swizzle =1 ; +break ; +default : +break ; + } +} + +static inline void update_watermark (struct drm_property_blob *watermark, +struct dc_hw_fb *fb) +{ +struct drm_vs_watermark *data; + + fb->water_mark =0 ; + +if (watermark) { + data = watermark->data; + fb->water_mark = data->watermark &0xFFFFF ; + } +} + +static inline u8 to_vs_rotation (unsigned int rotation) +{ +u8 rot; + +switch (rotation &DRM_MODE_REFLECT_MASK ) { +case DRM_MODE_REFLECT_X : + rot =FLIP_X ; +return rot; +case DRM_MODE_REFLECT_Y : + rot =FLIP_Y ; +return rot; +case DRM_MODE_REFLECT_X |DRM_MODE_REFLECT_Y : + rot =FLIP_XY ; +return rot; +default : +break ; + } + +switch (rotation &DRM_MODE_ROTATE_MASK ) { +case DRM_MODE_ROTATE_0 : + rot =ROT_0 ; +break ; +case DRM_MODE_ROTATE_90 : + rot =ROT_90 ; +break ; +case DRM_MODE_ROTATE_180 : + rot =ROT_180 ; +break ; +case DRM_MODE_ROTATE_270 : + rot =ROT_270 ; +break ; +default : + rot =ROT_0 ; +break ; + } + +return rot; +} + +static inline u8 to_vs_yuv_color_space (u32 color_space) +{ +u8 cs; + +switch (color_space) { +case DRM_COLOR_YCBCR_BT601 : + cs =COLOR_SPACE_601 ; +break ; +case DRM_COLOR_YCBCR_BT709 : + cs =COLOR_SPACE_709 ; +break ; +case DRM_COLOR_YCBCR_BT2020 : + cs =COLOR_SPACE_2020 ; +break ; +default : + cs =COLOR_SPACE_601 ; +break ; + } + +return cs; +} + +static inline u8 to_vs_tile_mode (u64 modifier) +{ +if (modifier ==DRM_FORMAT_MOD_VIVANTE_TILED ) +return DC_TILE_MODE4X4 ; + +return (u8)(modifier &DRM_FORMAT_MOD_VERISILICON_NORM_MODE_MASK ); +} + +static inline u8 to_vs_display_id (struct vs_dc *dc,struct drm_crtc *crtc) +{ +u8 panel_num = dc->hw.info->panel_num; +u32 index =drm_crtc_index (crtc); +int i; + +for (i =0 ; i < panel_num; i++) { +if (index == dc->crtc[i]->base.index) +return i; + } + +return 0 ; +} + +static void vs_drm_update_pitch_alignment (struct drm_device *drm_dev, +unsigned int alignment) +{ +struct vs_drm_device *priv =to_vs_drm_private (drm_dev); + +if (alignment > priv->pitch_alignment) + priv->pitch_alignment = alignment; +} + +static int plda_clk_rst_init (struct device *dev) +{ +int ret =0 ; +struct vs_dc *dc =dev_get_drvdata (dev); + + ret =clk_bulk_prepare_enable (dc->nclks, dc->clk_vout); +if (ret) { +dev_err (dev,"failed to enable clocks\n" ); +return ret; + } + + ret =reset_control_bulk_deassert (dc->nrsts, dc->rst_vout); +return ret; +} + +static void plda_clk_rst_deinit (struct device *dev) +{ +struct vs_dc *dc =dev_get_drvdata (dev); + +reset_control_bulk_assert (dc->nrsts, dc->rst_vout); +clk_bulk_disable_unprepare (dc->nclks, dc->clk_vout); +} + +static void dc_deinit (struct device *dev) +{ +struct vs_dc *dc =dev_get_drvdata (dev); + +dc_hw_enable_interrupt (&dc->hw,0 ); +dc_hw_deinit (&dc->hw); +plda_clk_rst_deinit (dev); +} + +static int dc_init (struct device *dev) +{ +struct vs_dc *dc =dev_get_drvdata (dev); +int ret; + + dc->first_frame = true; + + ret =plda_clk_rst_init (dev); +if (ret <0 ) { +dev_err (dev,"failed to init dc clk reset: %d\n" , ret); +return ret; + } + + ret =dc_hw_init (&dc->hw); +if (ret) { +dev_err (dev,"failed to init DC HW\n" ); +return ret; + } +return 0 ; +} + +void vs_dc_enable (struct vs_dc *dc,struct drm_crtc *crtc) +{ +struct vs_crtc_state *crtc_state =to_vs_crtc_state (crtc->state); +struct drm_display_mode *mode = &crtc->state->adjusted_mode; +struct dc_hw_display display; + + display.bus_format = crtc_state->output_fmt; + display.h_active = mode->hdisplay; + display.h_total = mode->htotal; + display.h_sync_start = mode->hsync_start; + display.h_sync_end = mode->hsync_end; +if (mode->flags &DRM_MODE_FLAG_PHSYNC ) + display.h_sync_polarity = true; +else + display.h_sync_polarity = false; + + display.v_active = mode->vdisplay; + display.v_total = mode->vtotal; + display.v_sync_start = mode->vsync_start; + display.v_sync_end = mode->vsync_end; + +if (mode->flags &DRM_MODE_FLAG_PVSYNC ) + display.v_sync_polarity = true; +else + display.v_sync_polarity = false; + + display.id =to_vs_display_id (dc, crtc); + + display.enable = true; + +if (crtc_state->encoder_type ==DRM_MODE_ENCODER_DSI ) { +dc_hw_set_out (&dc->hw,OUT_DPI , display.id); +clk_set_rate (dc->clk_vout[CLK_VOUT_SOC_PIX ].clk, mode->clock *1000 ); +clk_set_parent (dc->clk_vout[CLK_VOUT_PIX1 ].clk, + dc->clk_vout[CLK_VOUT_SOC_PIX ].clk); + }else { +dc_hw_set_out (&dc->hw,OUT_DP , display.id); +clk_set_parent (dc->clk_vout[CLK_VOUT_PIX0 ].clk, + dc->clk_vout[CLK_VOUT_HDMI_PIX ].clk); + } + +dc_hw_setup_display (&dc->hw, &display); +} + +void vs_dc_disable (struct vs_dc *dc,struct drm_crtc *crtc) +{ +struct dc_hw_display display; + + display.id =to_vs_display_id (dc, crtc); + display.enable = false; + +dc_hw_setup_display (&dc->hw, &display); +} + +void vs_dc_set_gamma (struct vs_dc *dc,struct drm_crtc *crtc, +struct drm_color_lut *lut,unsigned int size) +{ +u16 i, r, g, b; +u8 bits, id; + +if (size != dc->hw.info->gamma_size) { +drm_err (crtc->dev,"gamma size does not match!\n" ); +return ; + } + + id =to_vs_display_id (dc, crtc); + + bits = dc->hw.info->gamma_bits; +for (i =0 ; i < size; i++) { + r =drm_color_lut_extract (lut[i].red, bits); + g =drm_color_lut_extract (lut[i].green, bits); + b =drm_color_lut_extract (lut[i].blue, bits); +dc_hw_update_gamma (&dc->hw, id, i, r, g, b); + } +} + +void vs_dc_enable_gamma (struct vs_dc *dc,struct drm_crtc *crtc, +bool enable) +{ +u8 id; + + id =to_vs_display_id (dc, crtc); +dc_hw_enable_gamma (&dc->hw, id, enable); +} + +void vs_dc_enable_vblank (struct vs_dc *dc,bool enable) +{ +dc_hw_enable_interrupt (&dc->hw, enable); +} + +static u32 calc_factor (u32 src,u32 dest) +{ +u32 factor =1 <<16 ; + +if (src >1 && dest >1 ) + factor = ((src -1 ) <<16 ) / (dest -1 ); + +return factor; +} + +static void update_scale (struct drm_plane_state *state,struct dc_hw_roi *roi, +struct dc_hw_scale *scale) +{ +int dst_w =drm_rect_width (&state->dst); +int dst_h =drm_rect_height (&state->dst); +int src_w, src_h, temp; + + scale->enable = false; + +if (roi->enable) { + src_w = roi->width; + src_h = roi->height; + }else { + src_w =drm_rect_width (&state->src) >>16 ; + src_h =drm_rect_height (&state->src) >>16 ; + } + +if (drm_rotation_90_or_270 (state->rotation)) { + temp = src_w; + src_w = src_h; + src_h = temp; + } + +if (src_w != dst_w) { + scale->scale_factor_x =calc_factor (src_w, dst_w); + scale->enable = true; + }else { + scale->scale_factor_x =1 <<16 ; + } +if (src_h != dst_h) { + scale->scale_factor_y =calc_factor (src_h, dst_h); + scale->enable = true; + }else { + scale->scale_factor_y =1 <<16 ; + } +} + +static void update_fb (struct vs_plane *plane,u8 display_id, +struct dc_hw_fb *fb,struct drm_plane_state *state) +{ +struct vs_plane_state *plane_state =to_vs_plane_state (state); +struct drm_framebuffer *drm_fb = state->fb; +struct drm_rect *src = &state->src; + + fb->display_id = display_id; + fb->y_address = plane_state->dma_addr[0 ]; + fb->y_stride = drm_fb->pitches[0 ]; +if (drm_fb->format->format ==DRM_FORMAT_YVU420 ) { + fb->u_address = plane_state->dma_addr[2 ]; + fb->v_address = plane_state->dma_addr[1 ]; + fb->u_stride = drm_fb->pitches[2 ]; + fb->v_stride = drm_fb->pitches[1 ]; + }else { + fb->u_address = plane_state->dma_addr[1 ]; + fb->v_address = plane_state->dma_addr[2 ]; + fb->u_stride = drm_fb->pitches[1 ]; + fb->v_stride = drm_fb->pitches[2 ]; + } + fb->width =drm_rect_width (src) >>16 ; + fb->height =drm_rect_height (src) >>16 ; + fb->tile_mode =to_vs_tile_mode (drm_fb->modifier); + fb->rotation =to_vs_rotation (state->rotation); + fb->yuv_color_space =to_vs_yuv_color_space (state->color_encoding); + fb->zpos = state->zpos; + fb->enable = state->visible; +update_format (drm_fb->format->format, drm_fb->modifier, fb); +update_swizzle (drm_fb->format->format, fb); +update_watermark (plane_state->watermark, fb); + plane_state->status.tile_mode = fb->tile_mode; +} + +static void update_degamma (struct vs_dc *dc,struct vs_plane *plane, +struct vs_plane_state *plane_state) +{ +dc_hw_update_degamma (&dc->hw, plane->id, plane_state->degamma); + plane_state->degamma_changed = false; +} + +static void update_roi (struct vs_dc *dc,u8 id, +struct vs_plane_state *plane_state, +struct dc_hw_roi *roi, +struct drm_plane_state *state) +{ +struct drm_vs_roi *data; +struct drm_rect *src = &state->src; +u16 src_w =drm_rect_width (src) >>16 ; +u16 src_h =drm_rect_height (src) >>16 ; + +if (plane_state->roi) { + data = plane_state->roi->data; + +if (data->enable) { + roi->x = data->roi_x; + roi->y = data->roi_y; + roi->width = (data->roi_x + data->roi_w > src_w) ? + (src_w - data->roi_x) : data->roi_w; + roi->height = (data->roi_y + data->roi_h > src_h) ? + (src_h - data->roi_y) : data->roi_h; + roi->enable = true; + }else { + roi->enable = false; + } + +dc_hw_update_roi (&dc->hw, id, roi); + }else { + roi->enable = false; + } +} + +static void update_color_mgmt (struct vs_dc *dc,u8 id, +struct dc_hw_fb *fb, +struct vs_plane_state *plane_state) +{ +struct drm_vs_color_mgmt *data; +struct dc_hw_colorkey colorkey; + +if (plane_state->color_mgmt) { + data = plane_state->color_mgmt->data; + + fb->clear_enable = data->clear_enable; + fb->clear_value = data->clear_value; + +if (data->colorkey > data->colorkey_high) + data->colorkey = data->colorkey_high; + + colorkey.colorkey = data->colorkey; + colorkey.colorkey_high = data->colorkey_high; + colorkey.transparency = (data->transparency) ? +DC_TRANSPARENCY_KEY :DC_TRANSPARENCY_OPAQUE ; +dc_hw_update_colorkey (&dc->hw, id, &colorkey); + } +} + +static void update_plane (struct vs_dc *dc,struct vs_plane *plane, +struct drm_plane *drm_plane, +struct drm_atomic_state *drm_state) +{ +struct dc_hw_fb fb = {0 }; +struct dc_hw_scale scale; +struct dc_hw_position pos; +struct dc_hw_blend blend; +struct dc_hw_roi roi; +struct drm_plane_state *state =drm_atomic_get_new_plane_state (drm_state, + drm_plane); +struct vs_plane_state *plane_state =to_vs_plane_state (state); +struct drm_rect *dest = &state->dst; +bool dec_enable = false; +u8 display_id =0 ; + + display_id =to_vs_display_id (dc, state->crtc); +update_fb (plane, display_id, &fb, state); + fb.dec_enable = dec_enable; + +update_roi (dc, plane->id, plane_state, &roi, state); + +update_scale (state, &roi, &scale); + +if (plane_state->degamma_changed) +update_degamma (dc, plane, plane_state); + + pos.start_x = dest->x1; + pos.start_y = dest->y1; + pos.end_x = dest->x2; + pos.end_y = dest->y2; + + blend.alpha = (u8)(state->alpha >>8 ); + blend.blend_mode = (u8)(state->pixel_blend_mode); + +update_color_mgmt (dc, plane->id, &fb, plane_state); + +dc_hw_update_plane (&dc->hw, plane->id, &fb, &scale, &pos, &blend); +} + +static void update_qos (struct vs_dc *dc,struct vs_plane *plane, +struct drm_plane *drm_plane, +struct drm_atomic_state *drm_state) +{ +struct drm_plane_state *state =drm_atomic_get_new_plane_state (drm_state, + drm_plane); +struct vs_plane_state *plane_state =to_vs_plane_state (state); +struct drm_vs_watermark *data; +struct dc_hw_qos qos; + +if (plane_state->watermark) { + data = plane_state->watermark->data; + +if (data->qos_high) { +if (data->qos_low > data->qos_high) + data->qos_low = data->qos_high; + + qos.low_value = data->qos_low &0x0F ; + qos.high_value = data->qos_high &0x0F ; +dc_hw_update_qos (&dc->hw, &qos); + } + } +} + +static void update_cursor_size (struct drm_plane_state *state,struct dc_hw_cursor *cursor) +{ +u8 size_type; + +switch (state->crtc_w) { +case 32 : + size_type =CURSOR_SIZE_32X32 ; +break ; +case 64 : + size_type =CURSOR_SIZE_64X64 ; +break ; +default : + size_type =CURSOR_SIZE_32X32 ; +break ; + } + + cursor->size = size_type; +} + +static void update_cursor_plane (struct vs_dc *dc,struct vs_plane *plane, +struct drm_plane *drm_plane, +struct drm_atomic_state *drm_state) +{ +struct drm_plane_state *state =drm_atomic_get_new_plane_state (drm_state, + drm_plane); +struct vs_plane_state *plane_state =to_vs_plane_state (state); +struct drm_framebuffer *drm_fb = state->fb; +struct dc_hw_cursor cursor; + + cursor.address = plane_state->dma_addr[0 ]; + cursor.x = state->crtc_x; + cursor.y = state->crtc_y; + cursor.hot_x = drm_fb->hot_x; + cursor.hot_y = drm_fb->hot_y; + cursor.display_id =to_vs_display_id (dc, state->crtc); +update_cursor_size (state, &cursor); + cursor.enable = true; + +dc_hw_update_cursor (&dc->hw, cursor.display_id, &cursor); +} + +void vs_dc_update_plane (struct vs_dc *dc,struct vs_plane *plane, +struct drm_plane *drm_plane, +struct drm_atomic_state *drm_state) +{ +update_plane (dc, plane, drm_plane, drm_state); +update_qos (dc, plane, drm_plane, drm_state); +} + +void vs_dc_update_cursor_plane (struct vs_dc *dc,struct vs_plane *plane, +struct drm_plane *drm_plane, +struct drm_atomic_state *drm_state) +{ +update_cursor_plane (dc, plane, drm_plane, drm_state); +} + +void vs_dc_disable_plane (struct vs_dc *dc,struct vs_plane *plane, +struct drm_plane_state *old_state) +{ +struct dc_hw_fb fb = {0 }; + + fb.enable = false; +dc_hw_update_plane (&dc->hw, plane->id, &fb,NULL ,NULL ,NULL ); +} + +void vs_dc_disable_cursor_plane (struct vs_dc *dc,struct vs_plane *plane, +struct drm_plane_state *old_state) +{ +struct dc_hw_cursor cursor = {0 }; + + cursor.enable = false; + cursor.display_id =to_vs_display_id (dc, old_state->crtc); +dc_hw_update_cursor (&dc->hw, cursor.display_id, &cursor); +} + +static bool vs_dc_mod_supported (const struct vs_plane_info *plane_info, +u64 modifier) +{ +const u64 *mods; + +if (!plane_info->modifiers) +return false; + +for (mods = plane_info->modifiers; *mods !=DRM_FORMAT_MOD_INVALID ; mods++) { +if (*mods == modifier) +return true; + } + +return false; +} + +int vs_dc_check_plane (struct vs_dc *dc,struct drm_plane *plane, +struct drm_atomic_state *state) +{ +struct drm_plane_state *new_plane_state =drm_atomic_get_new_plane_state (state, + plane); + +struct drm_framebuffer *fb = new_plane_state->fb; +const struct vs_plane_info *plane_info; +struct drm_crtc *crtc = new_plane_state->crtc; +struct drm_crtc_state *crtc_state; +struct vs_plane *vs_plane =to_vs_plane (plane); + + plane_info = &dc->hw.info->planes[vs_plane->id]; + +if (fb->width < plane_info->min_width || + fb->width > plane_info->max_width || + fb->height < plane_info->min_height || + fb->height > plane_info->max_height) +drm_err_once (plane->dev,"buffer size may not support on plane%d.\n" , + vs_plane->id); + +if (!vs_dc_mod_supported (plane_info, fb->modifier)) { +drm_err (plane->dev,"unsupported modifier on plane%d.\n" , vs_plane->id); +return -EINVAL ; + } + + crtc_state =drm_atomic_get_existing_crtc_state (state, crtc); +return drm_atomic_helper_check_plane_state (new_plane_state, crtc_state, + plane_info->min_scale, + plane_info->max_scale, + true, true); +} + +int vs_dc_check_cursor_plane (struct vs_dc *dc,struct drm_plane *plane, +struct drm_atomic_state *state) +{ +struct drm_plane_state *new_plane_state =drm_atomic_get_new_plane_state (state, + plane); +struct drm_framebuffer *fb = new_plane_state->fb; +const struct vs_plane_info *plane_info; +struct drm_crtc *crtc = new_plane_state->crtc; +struct drm_crtc_state *crtc_state; +struct vs_plane *vs_plane =to_vs_plane (plane); + + plane_info = &dc->hw.info->planes[vs_plane->id]; + +if (fb->width < plane_info->min_width || + fb->width > plane_info->max_width || + fb->height < plane_info->min_height || + fb->height > plane_info->max_height) +drm_err_once (plane->dev,"buffer size may not support on plane%d.\n" , vs_plane->id); + + crtc_state =drm_atomic_get_existing_crtc_state (state, crtc); +if (IS_ERR (crtc_state)) +return -EINVAL ; + +return drm_atomic_helper_check_plane_state (new_plane_state, crtc_state, + plane_info->min_scale, + plane_info->max_scale, + true, true); +} + +static void vs_crtc_handle_vblank (struct drm_crtc *crtc,bool underflow) +{ +struct vs_crtc_state *vs_crtc_state =to_vs_crtc_state (crtc->state); + +drm_crtc_handle_vblank (crtc); + + vs_crtc_state->underflow = underflow; +} + +static irqreturn_t dc_isr (int irq,void *data) +{ +struct vs_dc *dc = data; +struct vs_dc_info *dc_info = dc->hw.info; +u32 i, ret; + + ret =dc_hw_get_interrupt (&dc->hw); + +for (i =0 ; i < dc_info->panel_num; i++) +vs_crtc_handle_vblank (&dc->crtc[i]->base,dc_hw_check_underflow (&dc->hw)); + +return IRQ_HANDLED ; +} + +void vs_dc_commit (struct vs_dc *dc) +{ +dc_hw_enable_shadow_register (&dc->hw, false); + +dc_hw_commit (&dc->hw); + +if (dc->first_frame) + dc->first_frame = false; + +dc_hw_enable_shadow_register (&dc->hw, true); +} + +static int dc_bind (struct device *dev,struct device *master,void *data) +{ +struct drm_device *drm_dev = data; +struct vs_dc *dc =dev_get_drvdata (dev); +struct device_node *port; +struct vs_crtc *crtc; +struct vs_dc_info *dc_info; +struct vs_plane *plane; +struct vs_plane_info *plane_info; +int i, ret; +u32 ctrc_mask =0 ; + +if (!drm_dev || !dc) { +dev_err (dev,"devices are not created.\n" ); +return -ENODEV ; + } + + ret =dc_init (dev); +if (ret <0 ) { +drm_err (drm_dev,"Failed to initialize DC hardware.\n" ); +return ret; + } + + port =of_get_child_by_name (dev->of_node,"port" ); +if (!port) { +drm_err (drm_dev,"no port node found\n" ); +return -ENODEV ; + } +of_node_put (port); + + dc_info = dc->hw.info; + +for (i =0 ; i < dc_info->panel_num; i++) { + crtc =vs_crtc_create (drm_dev, dc_info); +if (!crtc) { +drm_err (drm_dev,"Failed to create CRTC.\n" ); + ret = -ENOMEM ; +return ret; + } + + crtc->base.port = port; + crtc->dev = dev; + dc->crtc[i] = crtc; + ctrc_mask |=drm_crtc_mask (&crtc->base); + } +drivers/gpu/drm/verisilicon/vs_dc.c line 871
Quoted 10 lines
drivers/gpu/drm/verisilicon/vs_dc.c new file +10
-0+for (i =0 ; i < dc_info->plane_num; i++) { + plane_info = (struct vs_plane_info *)&dc_info->planes[i]; + +if (!strcmp (plane_info->name,"Primary" ) || !strcmp (plane_info->name,"Cursor" )) { + plane =vs_plane_create (drm_dev, plane_info, dc_info->layer_num, +drm_crtc_mask (&dc->crtc[0 ]->base)); + }else if (!strcmp (plane_info->name,"Primary_1" ) || + !strcmp (plane_info->name,"Cursor_1" )) { + plane =vs_plane_create (drm_dev, plane_info, dc_info->layer_num, +drm_crtc_mask (&dc->crtc[1 ]->base));I'd say, it's not typical to use name to distinguish objects. Maybe you can add indices to the info structure and drop the names instead?
Quoted 8 lines
drivers/gpu/drm/verisilicon/vs_dc.c new file +8
-0+ }else { + plane =vs_plane_create (drm_dev, plane_info, + dc_info->layer_num, ctrc_mask); + } + +if (IS_ERR (plane)) { +dev_err (dev,"failed to construct plane\n" ); +return PTR_ERR (plane);drivers/gpu/drm/verisilicon/vs_dc.c line 889
Quoted 10 lines
drivers/gpu/drm/verisilicon/vs_dc.c new file +10
-0+ } + + plane->id = i; + dc->planes[i].id = plane_info->id; + +if (plane_info->type ==DRM_PLANE_TYPE_PRIMARY ) { +if (!strcmp (plane_info->name,"Primary" )) + dc->crtc[0 ]->base.primary = &plane->base; +else + dc->crtc[1 ]->base.primary = &plane->base;This definitely urges for an index in the plane info /
plane_state.Quoted 70 lines
drivers/gpu/drm/verisilicon/vs_dc.c new file +70
-0+ drm_dev->mode_config.min_width = plane_info->min_width; + drm_dev->mode_config.min_height = + plane_info->min_height; + drm_dev->mode_config.max_width = plane_info->max_width; + drm_dev->mode_config.max_height = + plane_info->max_height; + } + +if (plane_info->type ==DRM_PLANE_TYPE_CURSOR ) { +if (!strcmp (plane_info->name,"Cursor" )) + dc->crtc[0 ]->base.cursor = &plane->base; +else + dc->crtc[1 ]->base.cursor = &plane->base; + drm_dev->mode_config.cursor_width = + plane_info->max_width; + drm_dev->mode_config.cursor_height = + plane_info->max_height; + } + } + +vs_drm_update_pitch_alignment (drm_dev, dc_info->pitch_alignment); +return 0 ; +} + +static void dc_unbind (struct device *dev,struct device *master,void *data) +{ +dc_deinit (dev); +} + +const struct component_ops dc_component_ops = { + .bind = dc_bind, + .unbind = dc_unbind, +}; + +static const struct of_device_id dc_driver_dt_match[] = { + { .compatible ="starfive,jh7110-dc8200" , }, + {}, +}; +MODULE_DEVICE_TABLE (of, dc_driver_dt_match); + +static int dc_probe (struct platform_device *pdev) +{ +struct device *dev = &pdev->dev; +struct vs_dc *dc; +int irq, ret, i; + + dc =devm_kzalloc (dev,sizeof (*dc),GFP_KERNEL ); +if (!dc) +return -ENOMEM ; + + dc->hw.hi_base =devm_platform_ioremap_resource (pdev,0 ); +if (IS_ERR (dc->hw.hi_base)) +return PTR_ERR (dc->hw.hi_base); + + dc->hw.reg_base =devm_platform_ioremap_resource (pdev,1 ); +if (IS_ERR (dc->hw.reg_base)) +return PTR_ERR (dc->hw.reg_base); + + dc->nclks =ARRAY_SIZE (dc->clk_vout); +for (i =0 ; i < dc->nclks; ++i) + dc->clk_vout[i].id = vout_clocks[i]; + ret =devm_clk_bulk_get (dev, dc->nclks, dc->clk_vout); +if (ret) { +dev_err (dev,"Failed to get clk controls\n" ); +return ret; + } + + dc->nrsts =ARRAY_SIZE (dc->rst_vout); +for (i =0 ; i < dc->nrsts; ++i) + dc->rst_vout[i].id = vout_resets[i];drivers/gpu/drm/verisilicon/vs_dc.c line 969
Quoted 10 lines
drivers/gpu/drm/verisilicon/vs_dc.c new file +10
-0+ ret =devm_reset_control_bulk_get_shared (dev, dc->nrsts, + dc->rst_vout); +if (ret) { +dev_err (dev,"Failed to get reset controls\n" ); +return ret; + } + + irq =platform_get_irq (pdev,0 ); + + ret =devm_request_irq (dev, irq, dc_isr,0 ,dev_name (dev), dc);Are you ready to handle the IRQ at this point?
Quoted 535 lines
drivers/gpu/drm/verisilicon/vs_dc.c new file +33
-0+if (ret <0 ) { +dev_err (dev,"Failed to install irq:%u.\n" , irq); +return ret; + } + +dev_set_drvdata (dev, dc); + +return component_add (dev, &dc_component_ops); +} + +static int dc_remove (struct platform_device *pdev) +{ +struct device *dev = &pdev->dev; + +component_del (dev, &dc_component_ops); + +dev_set_drvdata (dev,NULL ); + +return 0 ; +} + +struct platform_driver dc_platform_driver = { + .probe = dc_probe, + .remove = dc_remove, + .driver = { + .name ="vs-dc" , + .of_match_table =of_match_ptr (dc_driver_dt_match), + }, +}; + +MODULE_AUTHOR ("StarFive Corporation" ); +MODULE_DESCRIPTION ("VeriSilicon DC Driver" ); +MODULE_LICENSE ("GPL" );drivers/gpu/drm/verisilicon/vs_dc.h new file +80
-0@@ -0,0 +1,80 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Copyright (C) 2023 VeriSilicon Holdings Co., Ltd. +*/ + +#ifndef __VS_DC_H__ +#define __VS_DC_H__ + +#include <linux/clk.h> +#include <linux/mm_types.h> +#include <linux/reset.h> + +#include <drm/drm_fourcc.h> +#include <drm/drm_modes.h> + +#include "vs_crtc.h" +#include "vs_dc_hw.h" +#include "vs_plane.h" + +struct vs_dc_plane { +enum dc_hw_plane_id id; +}; + +enum vout_clk { +CLK_VOUT_NOC_DISP =0 , +CLK_VOUT_PIX0 , +CLK_VOUT_PIX1 , +CLK_VOUT_CORE , +CLK_VOUT_AXI , +CLK_VOUT_AHB , +CLK_VOUT_HDMI_PIX , +CLK_VOUT_SOC_PIX , +CLK_VOUT_NUM +}; + +enum rst_vout { +RST_VOUT_AXI =0 , +RST_VOUT_AHB , +RST_VOUT_CORE , +RST_VOUT_NUM +}; + +struct vs_dc { +struct vs_crtc *crtc[DC_DISPLAY_NUM ]; +struct dc_hw hw; +bool first_frame; + +struct vs_dc_plane planes[PLANE_NUM ]; +struct clk_bulk_data clk_vout[CLK_VOUT_NUM ]; +int nclks; +struct reset_control_bulk_data rst_vout[RST_VOUT_NUM ]; +int nrsts; +}; + +void vs_dc_enable (struct vs_dc *dc,struct drm_crtc *crtc); +void vs_dc_disable (struct vs_dc *dc,struct drm_crtc *crtc); + +void vs_dc_set_gamma (struct vs_dc *dc,struct drm_crtc *crtc, +struct drm_color_lut *lut,unsigned int size); +void vs_dc_enable_gamma (struct vs_dc *dc,struct drm_crtc *crtc,bool enable); +void vs_dc_enable_vblank (struct vs_dc *dc,bool enable); +void vs_dc_commit (struct vs_dc *dc); +void vs_dc_update_plane (struct vs_dc *dc,struct vs_plane *plane, +struct drm_plane *drm_plane, +struct drm_atomic_state *drm_state); +void vs_dc_disable_plane (struct vs_dc *dc,struct vs_plane *plane, +struct drm_plane_state *old_state); +int vs_dc_check_plane (struct vs_dc *dc,struct drm_plane *plane, +struct drm_atomic_state *state); +void vs_dc_update_cursor_plane (struct vs_dc *dc,struct vs_plane *plane, +struct drm_plane *drm_plane, +struct drm_atomic_state *drm_state); +void vs_dc_disable_cursor_plane (struct vs_dc *dc,struct vs_plane *plane, +struct drm_plane_state *old_state); +int vs_dc_check_cursor_plane (struct vs_dc *dc,struct drm_plane *plane, +struct drm_atomic_state *state); + +extern struct platform_driver dc_platform_driver; + +#endif /* __VS_DC_H__ */ drivers/gpu/drm/verisilicon/vs_dc_hw.c new file +410
-0@@ -0,0 +1,1959 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Copyright (C) 2023 VeriSilicon Holdings Co., Ltd. +*/ + +#include <linux/bits.h> +#include <linux/io.h> +#include <linux/media-bus-format.h> +#include <drm/drm_atomic_helper.h> +#include <drm/drm_blend.h> +#include <drm/drm_fourcc.h> +#include <drm/vs_drm.h> + +#include "vs_dc_hw.h" +#include "vs_type.h" + +static const u32 horkernel[] = { +0x00000000 ,0x20000000 ,0x00002000 ,0x00000000 , +0x00000000 ,0x00000000 ,0x23fd1c03 ,0x00000000 , +0x00000000 ,0x00000000 ,0x181f0000 ,0x000027e1 , +0x00000000 ,0x00000000 ,0x00000000 ,0x2b981468 , +0x00000000 ,0x00000000 ,0x00000000 ,0x10f00000 , +0x00002f10 ,0x00000000 ,0x00000000 ,0x00000000 , +0x32390dc7 ,0x00000000 ,0x00000000 ,0x00000000 , +0x0af50000 ,0x0000350b ,0x00000000 ,0x00000000 , +0x00000000 ,0x3781087f ,0x00000000 ,0x00000000 , +0x00000000 ,0x06660000 ,0x0000399a ,0x00000000 , +0x00000000 ,0x00000000 ,0x3b5904a7 ,0x00000000 , +0x00000000 ,0x00000000 ,0x033c0000 ,0x00003cc4 , +0x00000000 ,0x00000000 ,0x00000000 ,0x3de1021f , +0x00000000 ,0x00000000 ,0x00000000 ,0x01470000 , +0x00003eb9 ,0x00000000 ,0x00000000 ,0x00000000 , +0x3f5300ad ,0x00000000 ,0x00000000 ,0x00000000 , +0x00480000 ,0x00003fb8 ,0x00000000 ,0x00000000 , +0x00000000 ,0x3fef0011 ,0x00000000 ,0x00000000 , +0x00000000 ,0x00000000 ,0x00004000 ,0x00000000 , +0x00000000 ,0x00000000 ,0x20002000 ,0x00000000 , +0x00000000 ,0x00000000 ,0x1c030000 ,0x000023fd , +0x00000000 ,0x00000000 ,0x00000000 ,0x27e1181f , +0x00000000 ,0x00000000 ,0x00000000 ,0x14680000 , +0x00002b98 ,0x00000000 ,0x00000000 ,0x00000000 , +0x2f1010f0 ,0x00000000 ,0x00000000 ,0x00000000 , +0x0dc70000 ,0x00003239 ,0x00000000 ,0x00000000 , +0x00000000 ,0x350b0af5 ,0x00000000 ,0x00000000 , +0x00000000 ,0x087f0000 ,0x00003781 ,0x00000000 , +0x00000000 ,0x00000000 ,0x399a0666 ,0x00000000 , +0x00000000 ,0x00000000 ,0x04a70000 ,0x00003b59 , +0x00000000 ,0x00000000 ,0x00000000 ,0x3cc4033c , +0x00000000 ,0x00000000 ,0x00000000 ,0x021f0000 , +}; + +#define H_COEF_SIZE (sizeof(horkernel) / sizeof(u32)) + +static const u32 verkernel[] = { +0x00000000 ,0x20000000 ,0x00002000 ,0x00000000 , +0x00000000 ,0x00000000 ,0x23fd1c03 ,0x00000000 , +0x00000000 ,0x00000000 ,0x181f0000 ,0x000027e1 , +0x00000000 ,0x00000000 ,0x00000000 ,0x2b981468 , +0x00000000 ,0x00000000 ,0x00000000 ,0x10f00000 , +0x00002f10 ,0x00000000 ,0x00000000 ,0x00000000 , +0x32390dc7 ,0x00000000 ,0x00000000 ,0x00000000 , +0x0af50000 ,0x0000350b ,0x00000000 ,0x00000000 , +0x00000000 ,0x3781087f ,0x00000000 ,0x00000000 , +0x00000000 ,0x06660000 ,0x0000399a ,0x00000000 , +0x00000000 ,0x00000000 ,0x3b5904a7 ,0x00000000 , +0x00000000 ,0x00000000 ,0x033c0000 ,0x00003cc4 , +0x00000000 ,0x00000000 ,0x00000000 ,0x3de1021f , +0x00000000 ,0x00000000 ,0x00000000 ,0x01470000 , +0x00003eb9 ,0x00000000 ,0x00000000 ,0x00000000 , +0x3f5300ad ,0x00000000 ,0x00000000 ,0x00000000 , +0x00480000 ,0x00003fb8 ,0x00000000 ,0x00000000 , +0x00000000 ,0x3fef0011 ,0x00000000 ,0x00000000 , +0x00000000 ,0x00000000 ,0x00004000 ,0x00000000 , +0xcdcd0000 ,0xfdfdfdfd ,0xabababab ,0xabababab , +0x00000000 ,0x00000000 ,0x5ff5f456 ,0x000f5f58 , +0x02cc6c78 ,0x02cc0c28 ,0xfeeefeee ,0xfeeefeee , +0xfeeefeee ,0xfeeefeee ,0xfeeefeee ,0xfeeefeee , +0xfeeefeee ,0xfeeefeee ,0xfeeefeee ,0xfeeefeee , +0xfeeefeee ,0xfeeefeee ,0xfeeefeee ,0xfeeefeee , +0xfeeefeee ,0xfeeefeee ,0xfeeefeee ,0xfeeefeee , +0xfeeefeee ,0xfeeefeee ,0xfeeefeee ,0xfeeefeee , +0xfeeefeee ,0xfeeefeee ,0xfeeefeee ,0xfeeefeee , +0xfeeefeee ,0xfeeefeee ,0xfeeefeee ,0xfeeefeee , +0xfeeefeee ,0xfeeefeee ,0xfeeefeee ,0xfeeefeee , +0xfeeefeee ,0xfeeefeee ,0xfeeefeee ,0xfeeefeee , +0xfeeefeee ,0xfeeefeee ,0xfeeefeee ,0xfeeefeee , +}; + +#define V_COEF_SIZE (sizeof(verkernel) / sizeof(u32)) + +/* +* RGB 709->2020 conversion parameters +*/ +static u16 RGB2RGB [RGB_TO_RGB_TABLE_SIZE ] = { +10279 ,5395 ,709 , +1132 ,15065 ,187 , +269 ,1442 ,14674 +}; + +/* +* YUV601 to RGB conversion parameters +* YUV2RGB[0] - [8] : C0 - C8; +* YUV2RGB[9] - [11]: D0 - D2; +* YUV2RGB[12] - [13]: Y clamp min & max calue; +* YUV2RGB[14] - [15]: UV clamp min & max calue; +*/ +static s32 YUV601_2RGB [YUV_TO_RGB_TABLE_SIZE ] = { +1196 ,0 ,1640 ,1196 , +-404 ,-836 ,1196 ,2076 , +0 ,-916224 ,558336 ,-1202944 , +64 ,940 ,64 ,960 +}; + +/* +* YUV709 to RGB conversion parameters +* YUV2RGB[0] - [8] : C0 - C8; +* YUV2RGB[9] - [11]: D0 - D2; +* YUV2RGB[12] - [13]: Y clamp min & max calue; +* YUV2RGB[14] - [15]: UV clamp min & max calue; +*/ +static s32 YUV709_2RGB [YUV_TO_RGB_TABLE_SIZE ] = { +1196 ,0 ,1844 ,1196 , +-220 ,-548 ,1196 ,2172 , +0 ,-1020672 ,316672 ,-1188608 , +64 ,940 ,64 ,960 +}; + +/* +* YUV2020 to RGB conversion parameters +* YUV2RGB[0] - [8] : C0 - C8; +* YUV2RGB[9] - [11]: D0 - D2; +* YUV2RGB[12] - [13]: Y clamp min & max calue; +* YUV2RGB[14] - [15]: UV clamp min & max calue; +*/ +static s32 YUV2020_2RGB [YUV_TO_RGB_TABLE_SIZE ] = { +1196 ,0 ,1724 ,1196 , +-192 ,-668 ,1196 ,2200 , +0 ,-959232 ,363776 ,-1202944 , +64 ,940 ,64 ,960 +}; + +/* +* RGB to YUV2020 conversion parameters +* RGB2YUV[0] - [8] : C0 - C8; +* RGB2YUV[9] - [11]: D0 - D2; +*/ +static s16 RGB2YUV [RGB_TO_YUV_TABLE_SIZE ] = { +230 ,594 ,52 , +-125 ,-323 ,448 , +448 ,-412 ,-36 , +64 ,512 ,512 +}; + +/* +* Degamma table for 709 color space data. +*/ +static u16 DEGAMMA_709 [DEGAMMA_SIZE ] = { +0x0000 ,0x0000 ,0x0000 ,0x0000 ,0x0001 ,0x0002 ,0x0004 ,0x0005 , +0x0007 ,0x000a ,0x000d ,0x0011 ,0x0015 ,0x0019 ,0x001e ,0x0024 , +0x002a ,0x0030 ,0x0038 ,0x003f ,0x0048 ,0x0051 ,0x005a ,0x0064 , +0x006f ,0x007b ,0x0087 ,0x0094 ,0x00a1 ,0x00af ,0x00be ,0x00ce , +0x00de ,0x00ef ,0x0101 ,0x0114 ,0x0127 ,0x013b ,0x0150 ,0x0166 , +0x017c ,0x0193 ,0x01ac ,0x01c4 ,0x01de ,0x01f9 ,0x0214 ,0x0230 , +0x024d ,0x026b ,0x028a ,0x02aa ,0x02ca ,0x02ec ,0x030e ,0x0331 , +0x0355 ,0x037a ,0x03a0 ,0x03c7 ,0x03ef ,0x0418 ,0x0441 ,0x046c , +0x0498 ,0x04c4 ,0x04f2 ,0x0520 ,0x0550 ,0x0581 ,0x05b2 ,0x05e5 , +0x0618 ,0x064d ,0x0682 ,0x06b9 ,0x06f0 ,0x0729 ,0x0763 ,0x079d , +0x07d9 ,0x0816 ,0x0854 ,0x0893 ,0x08d3 ,0x0914 ,0x0956 ,0x0999 , +0x09dd ,0x0a23 ,0x0a69 ,0x0ab1 ,0x0afa ,0x0b44 ,0x0b8f ,0x0bdb , +0x0c28 ,0x0c76 ,0x0cc6 ,0x0d17 ,0x0d69 ,0x0dbb ,0x0e10 ,0x0e65 , +0x0ebb ,0x0f13 ,0x0f6c ,0x0fc6 ,0x1021 ,0x107d ,0x10db ,0x113a , +0x119a ,0x11fb ,0x125d ,0x12c1 ,0x1325 ,0x138c ,0x13f3 ,0x145b , +0x14c5 ,0x1530 ,0x159c ,0x160a ,0x1678 ,0x16e8 ,0x175a ,0x17cc , +0x1840 ,0x18b5 ,0x192b ,0x19a3 ,0x1a1c ,0x1a96 ,0x1b11 ,0x1b8e , +0x1c0c ,0x1c8c ,0x1d0c ,0x1d8e ,0x1e12 ,0x1e96 ,0x1f1c ,0x1fa3 , +0x202c ,0x20b6 ,0x2141 ,0x21ce ,0x225c ,0x22eb ,0x237c ,0x240e , +0x24a1 ,0x2536 ,0x25cc ,0x2664 ,0x26fc ,0x2797 ,0x2832 ,0x28cf , +0x296e ,0x2a0e ,0x2aaf ,0x2b51 ,0x2bf5 ,0x2c9b ,0x2d41 ,0x2dea , +0x2e93 ,0x2f3e ,0x2feb ,0x3099 ,0x3148 ,0x31f9 ,0x32ab ,0x335f , +0x3414 ,0x34ca ,0x3582 ,0x363c ,0x36f7 ,0x37b3 ,0x3871 ,0x3930 , +0x39f1 ,0x3ab3 ,0x3b77 ,0x3c3c ,0x3d02 ,0x3dcb ,0x3e94 ,0x3f5f , +0x402c ,0x40fa ,0x41ca ,0x429b ,0x436d ,0x4442 ,0x4517 ,0x45ee , +0x46c7 ,0x47a1 ,0x487d ,0x495a ,0x4a39 ,0x4b19 ,0x4bfb ,0x4cde , +0x4dc3 ,0x4eaa ,0x4f92 ,0x507c ,0x5167 ,0x5253 ,0x5342 ,0x5431 , +0x5523 ,0x5616 ,0x570a ,0x5800 ,0x58f8 ,0x59f1 ,0x5aec ,0x5be9 , +0x5ce7 ,0x5de6 ,0x5ee7 ,0x5fea ,0x60ef ,0x61f5 ,0x62fc ,0x6406 , +0x6510 ,0x661d ,0x672b ,0x683b ,0x694c ,0x6a5f ,0x6b73 ,0x6c8a , +0x6da2 ,0x6ebb ,0x6fd6 ,0x70f3 ,0x7211 ,0x7331 ,0x7453 ,0x7576 , +0x769b ,0x77c2 ,0x78ea ,0x7a14 ,0x7b40 ,0x7c6d ,0x7d9c ,0x7ecd , +0x3f65 ,0x3f8c ,0x3fb2 ,0x3fd8 +}; + +/* +* Degamma table for 2020 color space data. +*/ +static u16 DEGAMMA_2020 [DEGAMMA_SIZE ] = { +0x0000 ,0x0000 ,0x0000 ,0x0000 ,0x0000 ,0x0000 ,0x0000 ,0x0000 , +0x0000 ,0x0000 ,0x0000 ,0x0000 ,0x0000 ,0x0000 ,0x0000 ,0x0000 , +0x0000 ,0x0000 ,0x0000 ,0x0000 ,0x0000 ,0x0000 ,0x0000 ,0x0000 , +0x0000 ,0x0001 ,0x0001 ,0x0001 ,0x0001 ,0x0001 ,0x0001 ,0x0001 , +0x0001 ,0x0002 ,0x0002 ,0x0002 ,0x0002 ,0x0002 ,0x0003 ,0x0003 , +0x0003 ,0x0003 ,0x0004 ,0x0004 ,0x0004 ,0x0005 ,0x0005 ,0x0006 , +0x0006 ,0x0006 ,0x0007 ,0x0007 ,0x0008 ,0x0008 ,0x0009 ,0x000a , +0x000a ,0x000b ,0x000c ,0x000c ,0x000d ,0x000e ,0x000f ,0x000f , +0x0010 ,0x0011 ,0x0012 ,0x0013 ,0x0014 ,0x0016 ,0x0017 ,0x0018 , +0x0019 ,0x001b ,0x001c ,0x001e ,0x001f ,0x0021 ,0x0022 ,0x0024 , +0x0026 ,0x0028 ,0x002a ,0x002c ,0x002e ,0x0030 ,0x0033 ,0x0035 , +0x0038 ,0x003a ,0x003d ,0x0040 ,0x0043 ,0x0046 ,0x0049 ,0x004d , +0x0050 ,0x0054 ,0x0057 ,0x005b ,0x005f ,0x0064 ,0x0068 ,0x006d , +0x0071 ,0x0076 ,0x007c ,0x0081 ,0x0086 ,0x008c ,0x0092 ,0x0098 , +0x009f ,0x00a5 ,0x00ac ,0x00b4 ,0x00bb ,0x00c3 ,0x00cb ,0x00d3 , +0x00dc ,0x00e5 ,0x00ee ,0x00f8 ,0x0102 ,0x010c ,0x0117 ,0x0123 , +0x012e ,0x013a ,0x0147 ,0x0154 ,0x0161 ,0x016f ,0x017e ,0x018d , +0x019c ,0x01ac ,0x01bd ,0x01ce ,0x01e0 ,0x01f3 ,0x0206 ,0x021a , +0x022f ,0x0244 ,0x025a ,0x0272 ,0x0289 ,0x02a2 ,0x02bc ,0x02d6 , +0x02f2 ,0x030f ,0x032c ,0x034b ,0x036b ,0x038b ,0x03ae ,0x03d1 , +0x03f5 ,0x041b ,0x0443 ,0x046b ,0x0495 ,0x04c1 ,0x04ee ,0x051d , +0x054e ,0x0580 ,0x05b4 ,0x05ea ,0x0622 ,0x065c ,0x0698 ,0x06d6 , +0x0717 ,0x075a ,0x079f ,0x07e7 ,0x0831 ,0x087e ,0x08cd ,0x0920 , +0x0976 ,0x09ce ,0x0a2a ,0x0a89 ,0x0aec ,0x0b52 ,0x0bbc ,0x0c2a , +0x0c9b ,0x0d11 ,0x0d8b ,0x0e0a ,0x0e8d ,0x0f15 ,0x0fa1 ,0x1033 , +0x10ca ,0x1167 ,0x120a ,0x12b2 ,0x1360 ,0x1415 ,0x14d1 ,0x1593 , +0x165d ,0x172e ,0x1806 ,0x18e7 ,0x19d0 ,0x1ac1 ,0x1bbb ,0x1cbf , +0x1dcc ,0x1ee3 ,0x2005 ,0x2131 ,0x2268 ,0x23ab ,0x24fa ,0x2656 , +0x27be ,0x2934 ,0x2ab8 ,0x2c4a ,0x2dec ,0x2f9d ,0x315f ,0x3332 , +0x3516 ,0x370d ,0x3916 ,0x3b34 ,0x3d66 ,0x3fad ,0x420b ,0x4480 , +0x470d ,0x49b3 ,0x4c73 ,0x4f4e ,0x5246 ,0x555a ,0x588e ,0x5be1 , +0x5f55 ,0x62eb ,0x66a6 ,0x6a86 ,0x6e8c ,0x72bb ,0x7714 ,0x7b99 , +0x3dcb ,0x3e60 ,0x3ef5 ,0x3f8c +}; + +/* one is for primary plane and the other is for all overlay planes */ +static const struct dc_hw_plane_reg dc_plane_reg[] = { + { + .y_address =DC_FRAMEBUFFER_ADDRESS , + .u_address =DC_FRAMEBUFFER_U_ADDRESS , + .v_address =DC_FRAMEBUFFER_V_ADDRESS , + .y_stride =DC_FRAMEBUFFER_STRIDE , + .u_stride =DC_FRAMEBUFFER_U_STRIDE , + .v_stride =DC_FRAMEBUFFER_V_STRIDE , + .size =DC_FRAMEBUFFER_SIZE , + .top_left =DC_FRAMEBUFFER_TOP_LEFT , + .bottom_right =DC_FRAMEBUFFER_BOTTOM_RIGHT , + .scale_factor_x =DC_FRAMEBUFFER_SCALE_FACTOR_X , + .scale_factor_y =DC_FRAMEBUFFER_SCALE_FACTOR_Y , + .h_filter_coef_index =DC_FRAMEBUFFER_H_FILTER_COEF_INDEX , + .h_filter_coef_data =DC_FRAMEBUFFER_H_FILTER_COEF_DATA , + .v_filter_coef_index =DC_FRAMEBUFFER_V_FILTER_COEF_INDEX , + .v_filter_coef_data =DC_FRAMEBUFFER_V_FILTER_COEF_DATA , + .init_offset =DC_FRAMEBUFFER_INIT_OFFSET , + .color_key =DC_FRAMEBUFFER_COLOR_KEY , + .color_key_high =DC_FRAMEBUFFER_COLOR_KEY_HIGH , + .clear_value =DC_FRAMEBUFFER_CLEAR_VALUE , + .color_table_index =DC_FRAMEBUFFER_COLOR_TABLE_INDEX , + .color_table_data =DC_FRAMEBUFFER_COLOR_TABLE_DATA , + .scale_config =DC_FRAMEBUFFER_SCALE_CONFIG , + .water_mark =DC_FRAMEBUFFER_WATER_MARK , + .degamma_index =DC_FRAMEBUFFER_DEGAMMA_INDEX , + .degamma_data =DC_FRAMEBUFFER_DEGAMMA_DATA , + .degamma_ex_data =DC_FRAMEBUFFER_DEGAMMA_EX_DATA , + .src_global_color =DC_FRAMEBUFFER_SRC_GLOBAL_COLOR , + .dst_global_color =DC_FRAMEBUFFER_DST_GLOBAL_COLOR , + .blend_config =DC_FRAMEBUFFER_BLEND_CONFIG , + .roi_origin =DC_FRAMEBUFFER_ROI_ORIGIN , + .roi_size =DC_FRAMEBUFFER_ROI_SIZE , + .yuv_to_rgb_coef0 =DC_FRAMEBUFFER_YUVTORGB_COEF0 , + .yuv_to_rgb_coef1 =DC_FRAMEBUFFER_YUVTORGB_COEF1 , + .yuv_to_rgb_coef2 =DC_FRAMEBUFFER_YUVTORGB_COEF2 , + .yuv_to_rgb_coef3 =DC_FRAMEBUFFER_YUVTORGB_COEF3 , + .yuv_to_rgb_coef4 =DC_FRAMEBUFFER_YUVTORGB_COEF4 , + .yuv_to_rgb_coefd0 =DC_FRAMEBUFFER_YUVTORGB_COEFD0 , + .yuv_to_rgb_coefd1 =DC_FRAMEBUFFER_YUVTORGB_COEFD1 , + .yuv_to_rgb_coefd2 =DC_FRAMEBUFFER_YUVTORGB_COEFD2 , + .y_clamp_bound =DC_FRAMEBUFFER_Y_CLAMP_BOUND , + .uv_clamp_bound =DC_FRAMEBUFFER_UV_CLAMP_BOUND , + .rgb_to_rgb_coef0 =DC_FRAMEBUFFER_RGBTORGB_COEF0 , + .rgb_to_rgb_coef1 =DC_FRAMEBUFFER_RGBTORGB_COEF1 , + .rgb_to_rgb_coef2 =DC_FRAMEBUFFER_RGBTORGB_COEF2 , + .rgb_to_rgb_coef3 =DC_FRAMEBUFFER_RGBTORGB_COEF3 , + .rgb_to_rgb_coef4 =DC_FRAMEBUFFER_RGBTORGB_COEF4 , + }, + { + .y_address =DC_OVERLAY_ADDRESS , + .u_address =DC_OVERLAY_U_ADDRESS , + .v_address =DC_OVERLAY_V_ADDRESS , + .y_stride =DC_OVERLAY_STRIDE , + .u_stride =DC_OVERLAY_U_STRIDE , + .v_stride =DC_OVERLAY_V_STRIDE , + .size =DC_OVERLAY_SIZE , + .top_left =DC_OVERLAY_TOP_LEFT , + .bottom_right =DC_OVERLAY_BOTTOM_RIGHT , + .scale_factor_x =DC_OVERLAY_SCALE_FACTOR_X , + .scale_factor_y =DC_OVERLAY_SCALE_FACTOR_Y , + .h_filter_coef_index =DC_OVERLAY_H_FILTER_COEF_INDEX , + .h_filter_coef_data =DC_OVERLAY_H_FILTER_COEF_DATA , + .v_filter_coef_index =DC_OVERLAY_V_FILTER_COEF_INDEX , + .v_filter_coef_data =DC_OVERLAY_V_FILTER_COEF_DATA , + .init_offset =DC_OVERLAY_INIT_OFFSET , + .color_key =DC_OVERLAY_COLOR_KEY , + .color_key_high =DC_OVERLAY_COLOR_KEY_HIGH , + .clear_value =DC_OVERLAY_CLEAR_VALUE , + .color_table_index =DC_OVERLAY_COLOR_TABLE_INDEX , + .color_table_data =DC_OVERLAY_COLOR_TABLE_DATA , + .scale_config =DC_OVERLAY_SCALE_CONFIG , + .water_mark =DC_OVERLAY_WATER_MARK , + .degamma_index =DC_OVERLAY_DEGAMMA_INDEX , + .degamma_data =DC_OVERLAY_DEGAMMA_DATA , + .degamma_ex_data =DC_OVERLAY_DEGAMMA_EX_DATA , + .src_global_color =DC_OVERLAY_SRC_GLOBAL_COLOR , + .dst_global_color =DC_OVERLAY_DST_GLOBAL_COLOR , + .blend_config =DC_OVERLAY_BLEND_CONFIG , + .roi_origin =DC_OVERLAY_ROI_ORIGIN , + .roi_size =DC_OVERLAY_ROI_SIZE , + .yuv_to_rgb_coef0 =DC_OVERLAY_YUVTORGB_COEF0 , + .yuv_to_rgb_coef1 =DC_OVERLAY_YUVTORGB_COEF1 , + .yuv_to_rgb_coef2 =DC_OVERLAY_YUVTORGB_COEF2 , + .yuv_to_rgb_coef3 =DC_OVERLAY_YUVTORGB_COEF3 , + .yuv_to_rgb_coef4 =DC_OVERLAY_YUVTORGB_COEF4 , + .yuv_to_rgb_coefd0 =DC_OVERLAY_YUVTORGB_COEFD0 , + .yuv_to_rgb_coefd1 =DC_OVERLAY_YUVTORGB_COEFD1 , + .yuv_to_rgb_coefd2 =DC_OVERLAY_YUVTORGB_COEFD2 , + .y_clamp_bound =DC_OVERLAY_Y_CLAMP_BOUND , + .uv_clamp_bound =DC_OVERLAY_UV_CLAMP_BOUND , + .rgb_to_rgb_coef0 =DC_OVERLAY_RGBTORGB_COEF0 , + .rgb_to_rgb_coef1 =DC_OVERLAY_RGBTORGB_COEF1 , + .rgb_to_rgb_coef2 =DC_OVERLAY_RGBTORGB_COEF2 , + .rgb_to_rgb_coef3 =DC_OVERLAY_RGBTORGB_COEF3 , + .rgb_to_rgb_coef4 =DC_OVERLAY_RGBTORGB_COEF4 , + }, +}; + +static const u32 primary_overlay_format0[] = { +DRM_FORMAT_XRGB4444 , +DRM_FORMAT_XBGR4444 , +DRM_FORMAT_RGBX4444 , +DRM_FORMAT_BGRX4444 , +DRM_FORMAT_ARGB4444 , +DRM_FORMAT_ABGR4444 , +DRM_FORMAT_RGBA4444 , +DRM_FORMAT_BGRA4444 , +DRM_FORMAT_XRGB1555 , +DRM_FORMAT_XBGR1555 , +DRM_FORMAT_RGBX5551 , +DRM_FORMAT_BGRX5551 , +DRM_FORMAT_ARGB1555 , +DRM_FORMAT_ABGR1555 , +DRM_FORMAT_RGBA5551 , +DRM_FORMAT_BGRA5551 , +DRM_FORMAT_RGB565 , +DRM_FORMAT_BGR565 , +DRM_FORMAT_XRGB8888 , +DRM_FORMAT_XBGR8888 , +DRM_FORMAT_RGBX8888 , +DRM_FORMAT_BGRX8888 , +DRM_FORMAT_ARGB8888 , +DRM_FORMAT_ABGR8888 , +DRM_FORMAT_RGBA8888 , +DRM_FORMAT_BGRA8888 , +DRM_FORMAT_ARGB2101010 , +DRM_FORMAT_ABGR2101010 , +DRM_FORMAT_RGBA1010102 , +DRM_FORMAT_BGRA1010102 , +DRM_FORMAT_YUYV , +DRM_FORMAT_YVYU , +DRM_FORMAT_UYVY , +DRM_FORMAT_VYUY , +DRM_FORMAT_YVU420 , +DRM_FORMAT_YUV420 , +DRM_FORMAT_NV12 , +DRM_FORMAT_NV21 , +DRM_FORMAT_NV16 , +DRM_FORMAT_NV61 , +DRM_FORMAT_P010 , +}; + +static const u32 primary_overlay_format1[] = { +DRM_FORMAT_XRGB8888 , +DRM_FORMAT_XBGR8888 , +DRM_FORMAT_RGBX8888 , +DRM_FORMAT_BGRX8888 , +DRM_FORMAT_ARGB8888 , +DRM_FORMAT_ABGR8888 , +DRM_FORMAT_RGBA8888 , +DRM_FORMAT_BGRA8888 , +DRM_FORMAT_ARGB2101010 , +DRM_FORMAT_ABGR2101010 , +DRM_FORMAT_RGBA1010102 , +DRM_FORMAT_BGRA1010102 , +DRM_FORMAT_NV12 , +DRM_FORMAT_NV21 , +DRM_FORMAT_YUV444 , +}; + +static const u32 cursor_formats[] = { +DRM_FORMAT_ARGB8888 +}; + +static const u64 format_modifier0[] = { +DRM_FORMAT_MOD_LINEAR , +fourcc_mod_vs_norm_code (DRM_FORMAT_MOD_VERISILICON_SUPER_TILED_XMAJOR_8X8 ), +fourcc_mod_vs_norm_code (DRM_FORMAT_MOD_VERISILICON_SUPER_TILED_YMAJOR_8X8 ), +fourcc_mod_vs_norm_code (DRM_FORMAT_MOD_VERISILICON_TILE_8X8 ), +fourcc_mod_vs_norm_code (DRM_FORMAT_MOD_VERISILICON_TILE_8X4 ), +fourcc_mod_vs_norm_code (DRM_FORMAT_MOD_VERISILICON_SUPER_TILED_XMAJOR_8X4 ), +fourcc_mod_vs_norm_code (DRM_FORMAT_MOD_VERISILICON_SUPER_TILED_YMAJOR_4X8 ), +DRM_FORMAT_MOD_INVALID +}; + +static const u64 secondary_format_modifiers[] = { +DRM_FORMAT_MOD_LINEAR ,drivers/gpu/drm/verisilicon/vs_dc_hw.c line 420
Quoted 10 lines
drivers/gpu/drm/verisilicon/vs_dc_hw.c new file +10
-0+DRM_FORMAT_MOD_INVALID +}; + +#define FRAC_16_16 (mult, div) (((mult) << 16) / (div)) + +static const struct vs_plane_info dc_hw_planes[][PLANE_NUM ] = { + { +/* DC_REV_0 */ + { + .name ="Primary" ,I'd say that the indentation is strange here.
It might be more scalable to split a single array into per-generation data structures and reference them directly from the info struct.Quoted 600 lines
drivers/gpu/drm/verisilicon/vs_dc_hw.c new file +600
-0+ .id = PRIMARY_PLANE_0, + .type = DRM_PLANE_TYPE_PRIMARY, + .num_formats = ARRAY_SIZE(primary_overlay_format0), + .formats = primary_overlay_format0, + .num_modifiers = ARRAY_SIZE(format_modifier0), + .modifiers = format_modifier0, + .min_width = 0, + .min_height = 0, + .max_width = 4096, + .max_height = 4096, + .rotation =DRM_MODE_ROTATE_0 | +DRM_MODE_ROTATE_90 | +DRM_MODE_ROTATE_180 | +DRM_MODE_ROTATE_270 | +DRM_MODE_REFLECT_X | + DRM_MODE_REFLECT_Y, + .blend_mode =BIT (DRM_MODE_BLEND_PIXEL_NONE ) | +BIT (DRM_MODE_BLEND_PREMULTI ) | + BIT(DRM_MODE_BLEND_COVERAGE), + .color_encoding =BIT (DRM_COLOR_YCBCR_BT709 ) | + BIT(DRM_COLOR_YCBCR_BT2020), + .degamma_size = DEGAMMA_SIZE, + .min_scale = FRAC_16_16(1, 3), + .max_scale = FRAC_16_16(10, 1), + .zpos = 0, + .watermark = true, + .color_mgmt = true, + .roi = true, + }, + { + .name = "Overlay", + .id = OVERLAY_PLANE_0, + .type = DRM_PLANE_TYPE_OVERLAY, + .num_formats = ARRAY_SIZE(primary_overlay_format0), + .formats = primary_overlay_format0, + .num_modifiers = ARRAY_SIZE(format_modifier0), + .modifiers = format_modifier0, + .min_width = 0, + .min_height = 0, + .max_width = 4096, + .max_height = 4096, + .rotation =DRM_MODE_ROTATE_0 | +DRM_MODE_ROTATE_90 | +DRM_MODE_ROTATE_180 | +DRM_MODE_ROTATE_270 | +DRM_MODE_REFLECT_X | + DRM_MODE_REFLECT_Y, + .blend_mode =BIT (DRM_MODE_BLEND_PIXEL_NONE ) | +BIT (DRM_MODE_BLEND_PREMULTI ) | + BIT(DRM_MODE_BLEND_COVERAGE), + .color_encoding =BIT (DRM_COLOR_YCBCR_BT709 ) | + BIT(DRM_COLOR_YCBCR_BT2020), + .degamma_size = DEGAMMA_SIZE, + .min_scale = FRAC_16_16(1, 3), + .max_scale = FRAC_16_16(10, 1), + .zpos = 1, + .watermark = true, + .color_mgmt = true, + .roi = true, + }, + { + .name = "Overlay_1", + .id = OVERLAY_PLANE_1, + .type = DRM_PLANE_TYPE_OVERLAY, + .num_formats = ARRAY_SIZE(primary_overlay_format0), + .formats = primary_overlay_format0, + .num_modifiers = ARRAY_SIZE(secondary_format_modifiers), + .modifiers = secondary_format_modifiers, + .min_width = 0, + .min_height = 0, + .max_width = 4096, + .max_height = 4096, + .rotation = 0, + .blend_mode =BIT (DRM_MODE_BLEND_PIXEL_NONE ) | +BIT (DRM_MODE_BLEND_PREMULTI ) | + BIT(DRM_MODE_BLEND_COVERAGE), + .color_encoding =BIT (DRM_COLOR_YCBCR_BT709 ) | + BIT(DRM_COLOR_YCBCR_BT2020), + .degamma_size = DEGAMMA_SIZE, + .min_scale = DRM_PLANE_NO_SCALING, + .max_scale = DRM_PLANE_NO_SCALING, + .zpos = 2, + .watermark = true, + .color_mgmt = true, + .roi = true, + }, + { + .name = "Primary_1", + .id = PRIMARY_PLANE_1, + .type = DRM_PLANE_TYPE_PRIMARY, + .num_formats = ARRAY_SIZE(primary_overlay_format0), + .formats = primary_overlay_format0, + .num_modifiers = ARRAY_SIZE(format_modifier0), + .modifiers = format_modifier0, + .min_width = 0, + .min_height = 0, + .max_width = 4096, + .max_height = 4096, + .rotation =DRM_MODE_ROTATE_0 | +DRM_MODE_ROTATE_90 | +DRM_MODE_ROTATE_180 | +DRM_MODE_ROTATE_270 | +DRM_MODE_REFLECT_X | + DRM_MODE_REFLECT_Y, + .blend_mode =BIT (DRM_MODE_BLEND_PIXEL_NONE ) | +BIT (DRM_MODE_BLEND_PREMULTI ) | + BIT(DRM_MODE_BLEND_COVERAGE), + .color_encoding =BIT (DRM_COLOR_YCBCR_BT709 ) | + BIT(DRM_COLOR_YCBCR_BT2020), + .degamma_size = DEGAMMA_SIZE, + .min_scale = FRAC_16_16(1, 3), + .max_scale = FRAC_16_16(10, 1), + .zpos = 3, + .watermark = true, + .color_mgmt = true, + .roi = true, + }, + { + .name = "Overlay_2", + .id = OVERLAY_PLANE_2, + .type = DRM_PLANE_TYPE_OVERLAY, + .num_formats = ARRAY_SIZE(primary_overlay_format0), + .formats = primary_overlay_format0, + .num_modifiers = ARRAY_SIZE(format_modifier0), + .modifiers = format_modifier0, + .min_width = 0, + .min_height = 0, + .max_width = 4096, + .max_height = 4096, + .rotation =DRM_MODE_ROTATE_0 | +DRM_MODE_ROTATE_90 | +DRM_MODE_ROTATE_180 | +DRM_MODE_ROTATE_270 | +DRM_MODE_REFLECT_X | + DRM_MODE_REFLECT_Y, + .blend_mode =BIT (DRM_MODE_BLEND_PIXEL_NONE ) | +BIT (DRM_MODE_BLEND_PREMULTI ) | + BIT(DRM_MODE_BLEND_COVERAGE), + .color_encoding =BIT (DRM_COLOR_YCBCR_BT709 ) | + BIT(DRM_COLOR_YCBCR_BT2020), + .degamma_size = DEGAMMA_SIZE, + .min_scale = FRAC_16_16(1, 3), + .max_scale = FRAC_16_16(10, 1), + .zpos = 4, + .watermark = true, + .color_mgmt = true, + .roi = true, + }, + { + .name = "Overlay_3", + .id = OVERLAY_PLANE_3, + .type = DRM_PLANE_TYPE_OVERLAY, + .num_formats = ARRAY_SIZE(primary_overlay_format0), + .formats = primary_overlay_format0, + .num_modifiers = ARRAY_SIZE(secondary_format_modifiers), + .modifiers = secondary_format_modifiers, + .min_width = 0, + .min_height = 0, + .max_width = 4096, + .max_height = 4096, + .rotation = 0, + .blend_mode =BIT (DRM_MODE_BLEND_PIXEL_NONE ) | +BIT (DRM_MODE_BLEND_PREMULTI ) | + BIT(DRM_MODE_BLEND_COVERAGE), + .color_encoding =BIT (DRM_COLOR_YCBCR_BT709 ) | + BIT(DRM_COLOR_YCBCR_BT2020), + .degamma_size = DEGAMMA_SIZE, + .min_scale = DRM_PLANE_NO_SCALING, + .max_scale = DRM_PLANE_NO_SCALING, + .zpos = 5, + .watermark = true, + .color_mgmt = true, + .roi = true, + }, + { + .name = "Cursor", + .id = CURSOR_PLANE_0, + .type = DRM_PLANE_TYPE_CURSOR, + .num_formats = ARRAY_SIZE(cursor_formats), + .formats = cursor_formats, + .num_modifiers = 0, + .modifiers = NULL, + .min_width = 32, + .min_height = 32, + .max_width = 64, + .max_height = 64, + .rotation = 0, + .degamma_size = 0, + .min_scale = DRM_PLANE_NO_SCALING, + .max_scale = DRM_PLANE_NO_SCALING, + .zpos = 255, + .watermark = false, + .color_mgmt = false, + .roi = false, + }, + { + .name = "Cursor_1", + .id = CURSOR_PLANE_1, + .type = DRM_PLANE_TYPE_CURSOR, + .num_formats = ARRAY_SIZE(cursor_formats), + .formats = cursor_formats, + .num_modifiers = 0, + .modifiers = NULL, + .min_width = 32, + .min_height = 32, + .max_width = 64, + .max_height = 64, + .rotation = 0, + .degamma_size = 0, + .min_scale = DRM_PLANE_NO_SCALING, + .max_scale = DRM_PLANE_NO_SCALING, + .zpos = 255, + .watermark = false, + .color_mgmt = false, + .roi = false, + }, + }, + { + /* DC_REV_1 */ + { + .name = "Primary", + .id = PRIMARY_PLANE_0, + .type = DRM_PLANE_TYPE_PRIMARY, + .num_formats = ARRAY_SIZE(primary_overlay_format0), + .formats = primary_overlay_format0, + .num_modifiers = ARRAY_SIZE(format_modifier0), + .modifiers = format_modifier0, + .min_width = 0, + .min_height = 0, + .max_width = 4096, + .max_height = 4096, + .rotation =DRM_MODE_ROTATE_0 | +DRM_MODE_ROTATE_90 | +DRM_MODE_ROTATE_180 | +DRM_MODE_ROTATE_270 | +DRM_MODE_REFLECT_X | + DRM_MODE_REFLECT_Y, + .blend_mode =BIT (DRM_MODE_BLEND_PIXEL_NONE ) | +BIT (DRM_MODE_BLEND_PREMULTI ) | + BIT(DRM_MODE_BLEND_COVERAGE), + .color_encoding =BIT (DRM_COLOR_YCBCR_BT709 ) | + BIT(DRM_COLOR_YCBCR_BT2020), + .degamma_size = DEGAMMA_SIZE, + .min_scale = FRAC_16_16(1, 3), + .max_scale = FRAC_16_16(10, 1), + .zpos = 0, + .watermark = true, + .color_mgmt = true, + .roi = true, + }, + { + .name = "Overlay", + .id = OVERLAY_PLANE_0, + .type = DRM_PLANE_TYPE_OVERLAY, + .num_formats = ARRAY_SIZE(primary_overlay_format0), + .formats = primary_overlay_format0, + .num_modifiers = ARRAY_SIZE(format_modifier0), + .modifiers = format_modifier0, + .min_width = 0, + .min_height = 0, + .max_width = 4096, + .max_height = 4096, + .rotation =DRM_MODE_ROTATE_0 | +DRM_MODE_ROTATE_90 | +DRM_MODE_ROTATE_180 | +DRM_MODE_ROTATE_270 | +DRM_MODE_REFLECT_X | + DRM_MODE_REFLECT_Y, + .blend_mode =BIT (DRM_MODE_BLEND_PIXEL_NONE ) | +BIT (DRM_MODE_BLEND_PREMULTI ) | + BIT(DRM_MODE_BLEND_COVERAGE), + .color_encoding =BIT (DRM_COLOR_YCBCR_BT709 ) | + BIT(DRM_COLOR_YCBCR_BT2020), + .degamma_size = DEGAMMA_SIZE, + .min_scale = FRAC_16_16(1, 3), + .max_scale = FRAC_16_16(10, 1), + .zpos = 1, + .watermark = true, + .color_mgmt = true, + .roi = true, + }, + { + .name = "Primary_1", + .id = PRIMARY_PLANE_1, + .type = DRM_PLANE_TYPE_PRIMARY, + .num_formats = ARRAY_SIZE(primary_overlay_format0), + .formats = primary_overlay_format0, + .num_modifiers = ARRAY_SIZE(format_modifier0), + .modifiers = format_modifier0, + .min_width = 0, + .min_height = 0, + .max_width = 4096, + .max_height = 4096, + .rotation =DRM_MODE_ROTATE_0 | +DRM_MODE_ROTATE_90 | +DRM_MODE_ROTATE_180 | +DRM_MODE_ROTATE_270 | +DRM_MODE_REFLECT_X | + DRM_MODE_REFLECT_Y, + .blend_mode =BIT (DRM_MODE_BLEND_PIXEL_NONE ) | +BIT (DRM_MODE_BLEND_PREMULTI ) | + BIT(DRM_MODE_BLEND_COVERAGE), + .color_encoding =BIT (DRM_COLOR_YCBCR_BT709 ) | + BIT(DRM_COLOR_YCBCR_BT2020), + .degamma_size = DEGAMMA_SIZE, + .min_scale = FRAC_16_16(1, 3), + .max_scale = FRAC_16_16(10, 1), + .zpos = 2, + .watermark = true, + .color_mgmt = true, + .roi = true, + }, + { + .name = "Overlay_2", + .id = OVERLAY_PLANE_2, + .type = DRM_PLANE_TYPE_OVERLAY, + .num_formats = ARRAY_SIZE(primary_overlay_format0), + .formats = primary_overlay_format0, + .num_modifiers = ARRAY_SIZE(format_modifier0), + .modifiers = format_modifier0, + .min_width = 0, + .min_height = 0, + .max_width = 4096, + .max_height = 4096, + .rotation =DRM_MODE_ROTATE_0 | +DRM_MODE_ROTATE_90 | +DRM_MODE_ROTATE_180 | +DRM_MODE_ROTATE_270 | +DRM_MODE_REFLECT_X | + DRM_MODE_REFLECT_Y, + .blend_mode =BIT (DRM_MODE_BLEND_PIXEL_NONE ) | +BIT (DRM_MODE_BLEND_PREMULTI ) | + BIT(DRM_MODE_BLEND_COVERAGE), + .color_encoding =BIT (DRM_COLOR_YCBCR_BT709 ) | + BIT(DRM_COLOR_YCBCR_BT2020), + .degamma_size = DEGAMMA_SIZE, + .min_scale = FRAC_16_16(1, 3), + .max_scale = FRAC_16_16(10, 1), + .zpos = 3, + .watermark = true, + .color_mgmt = true, + .roi = true, + }, + { + .name = "Cursor", + .id = CURSOR_PLANE_0, + .type = DRM_PLANE_TYPE_CURSOR, + .num_formats = ARRAY_SIZE(cursor_formats), + .formats = cursor_formats, + .num_modifiers = 0, + .modifiers = NULL, + .min_width = 32, + .min_height = 32, + .max_width = 64, + .max_height = 64, + .rotation = 0, + .degamma_size = 0, + .min_scale = DRM_PLANE_NO_SCALING, + .max_scale = DRM_PLANE_NO_SCALING, + .zpos = 255, + .watermark = false, + .color_mgmt = false, + .roi = false, + }, + { + .name = "Cursor_1", + .id = CURSOR_PLANE_1, + .type = DRM_PLANE_TYPE_CURSOR, + .num_formats = ARRAY_SIZE(cursor_formats), + .formats = cursor_formats, + .num_modifiers = 0, + .modifiers = NULL, + .min_width = 32, + .min_height = 32, + .max_width = 64, + .max_height = 64, + .rotation = 0, + .degamma_size = 0, + .min_scale = DRM_PLANE_NO_SCALING, + .max_scale = DRM_PLANE_NO_SCALING, + .zpos = 255, + .watermark = false, + .color_mgmt = false, + .roi = false, + }, + }, + { + /* DC_REV_2 */ + { + .name = "Primary", + .id = PRIMARY_PLANE_0, + .type = DRM_PLANE_TYPE_PRIMARY, + .num_formats = ARRAY_SIZE(primary_overlay_format1), + .formats = primary_overlay_format1, + .num_modifiers = ARRAY_SIZE(format_modifier0), + .modifiers = format_modifier0, + .min_width = 0, + .min_height = 0, + .max_width = 4096, + .max_height = 4096, + .rotation =DRM_MODE_ROTATE_0 | +DRM_MODE_ROTATE_90 | +DRM_MODE_ROTATE_180 | +DRM_MODE_ROTATE_270 | +DRM_MODE_REFLECT_X | + DRM_MODE_REFLECT_Y, + .blend_mode =BIT (DRM_MODE_BLEND_PIXEL_NONE ) | +BIT (DRM_MODE_BLEND_PREMULTI ) | + BIT(DRM_MODE_BLEND_COVERAGE), + .color_encoding =BIT (DRM_COLOR_YCBCR_BT709 ) | + BIT(DRM_COLOR_YCBCR_BT2020), + .degamma_size = DEGAMMA_SIZE, + .min_scale = FRAC_16_16(1, 3), + .max_scale = FRAC_16_16(10, 1), + .zpos = 0, + .watermark = true, + .color_mgmt = true, + .roi = true, + }, + { + .name = "Overlay", + .id = OVERLAY_PLANE_0, + .type = DRM_PLANE_TYPE_OVERLAY, + .num_formats = ARRAY_SIZE(primary_overlay_format1), + .formats = primary_overlay_format1, + .num_modifiers = ARRAY_SIZE(format_modifier0), + .modifiers = format_modifier0, + .min_width = 0, + .min_height = 0, + .max_width = 4096, + .max_height = 4096, + .rotation =DRM_MODE_ROTATE_0 | +DRM_MODE_ROTATE_90 | +DRM_MODE_ROTATE_180 | +DRM_MODE_ROTATE_270 | +DRM_MODE_REFLECT_X | + DRM_MODE_REFLECT_Y, + .blend_mode =BIT (DRM_MODE_BLEND_PIXEL_NONE ) | +BIT (DRM_MODE_BLEND_PREMULTI ) | + BIT(DRM_MODE_BLEND_COVERAGE), + .color_encoding =BIT (DRM_COLOR_YCBCR_BT709 ) | + BIT(DRM_COLOR_YCBCR_BT2020), + .degamma_size = DEGAMMA_SIZE, + .min_scale = FRAC_16_16(1, 3), + .max_scale = FRAC_16_16(10, 1), + .zpos = 1, + .watermark = true, + .color_mgmt = true, + .roi = true, + }, + { + .name = "Overlay_1", + .id = OVERLAY_PLANE_1, + .type = DRM_PLANE_TYPE_OVERLAY, + .num_formats = ARRAY_SIZE(primary_overlay_format1), + .formats = primary_overlay_format1, + .num_modifiers = ARRAY_SIZE(secondary_format_modifiers), + .modifiers = secondary_format_modifiers, + .min_width = 0, + .min_height = 0, + .max_width = 4096, + .max_height = 4096, + .rotation = 0, + .blend_mode =BIT (DRM_MODE_BLEND_PIXEL_NONE ) | +BIT (DRM_MODE_BLEND_PREMULTI ) | + BIT(DRM_MODE_BLEND_COVERAGE), + .color_encoding =BIT (DRM_COLOR_YCBCR_BT709 ) | + BIT(DRM_COLOR_YCBCR_BT2020), + .degamma_size = DEGAMMA_SIZE, + .min_scale = DRM_PLANE_NO_SCALING, + .max_scale = DRM_PLANE_NO_SCALING, + .zpos = 2, + .watermark = true, + .color_mgmt = true, + .roi = true, + }, + { + .name = "Primary_1", + .id = PRIMARY_PLANE_1, + .type = DRM_PLANE_TYPE_PRIMARY, + .num_formats = ARRAY_SIZE(primary_overlay_format1), + .formats = primary_overlay_format1, + .num_modifiers = ARRAY_SIZE(format_modifier0), + .modifiers = format_modifier0, + .min_width = 0, + .min_height = 0, + .max_width = 4096, + .max_height = 4096, + .rotation =DRM_MODE_ROTATE_0 | +DRM_MODE_ROTATE_90 | +DRM_MODE_ROTATE_180 | +DRM_MODE_ROTATE_270 | +DRM_MODE_REFLECT_X | + DRM_MODE_REFLECT_Y, + .blend_mode =BIT (DRM_MODE_BLEND_PIXEL_NONE ) | +BIT (DRM_MODE_BLEND_PREMULTI ) | + BIT(DRM_MODE_BLEND_COVERAGE), + .color_encoding =BIT (DRM_COLOR_YCBCR_BT709 ) | + BIT(DRM_COLOR_YCBCR_BT2020), + .degamma_size = DEGAMMA_SIZE, + .min_scale = FRAC_16_16(1, 3), + .max_scale = FRAC_16_16(10, 1), + .zpos = 3, + .watermark = true, + .color_mgmt = true, + .roi = true, + }, + { + .name = "Overlay_2", + .id = OVERLAY_PLANE_2, + .type = DRM_PLANE_TYPE_OVERLAY, + .num_formats = ARRAY_SIZE(primary_overlay_format1), + .formats = primary_overlay_format1, + .num_modifiers = ARRAY_SIZE(format_modifier0), + .modifiers = format_modifier0, + .min_width = 0, + .min_height = 0, + .max_width = 4096, + .max_height = 4096, + .rotation =DRM_MODE_ROTATE_0 | +DRM_MODE_ROTATE_90 | +DRM_MODE_ROTATE_180 | +DRM_MODE_ROTATE_270 | +DRM_MODE_REFLECT_X | + DRM_MODE_REFLECT_Y, + .blend_mode =BIT (DRM_MODE_BLEND_PIXEL_NONE ) | +BIT (DRM_MODE_BLEND_PREMULTI ) | + BIT(DRM_MODE_BLEND_COVERAGE), + .color_encoding =BIT (DRM_COLOR_YCBCR_BT709 ) | + BIT(DRM_COLOR_YCBCR_BT2020), + .degamma_size = DEGAMMA_SIZE, + .min_scale = FRAC_16_16(1, 3), + .max_scale = FRAC_16_16(10, 1), + .zpos = 4, + .watermark = true, + .color_mgmt = true, + .roi = true, + }, + { + .name = "Overlay_3", + .id = OVERLAY_PLANE_3, + .type = DRM_PLANE_TYPE_OVERLAY, + .num_formats = ARRAY_SIZE(primary_overlay_format1), + .formats = primary_overlay_format1, + .num_modifiers = ARRAY_SIZE(secondary_format_modifiers), + .modifiers = secondary_format_modifiers, + .min_width = 0, + .min_height = 0, + .max_width = 4096, + .max_height = 4096, + .rotation = 0, + .blend_mode =BIT (DRM_MODE_BLEND_PIXEL_NONE ) | +BIT (DRM_MODE_BLEND_PREMULTI ) | + BIT(DRM_MODE_BLEND_COVERAGE), + .color_encoding =BIT (DRM_COLOR_YCBCR_BT709 ) | + BIT(DRM_COLOR_YCBCR_BT2020), + .degamma_size = DEGAMMA_SIZE, + .min_scale = DRM_PLANE_NO_SCALING, + .max_scale = DRM_PLANE_NO_SCALING, + .zpos = 5, + .watermark = true, + .color_mgmt = true, + .roi = true, + }, + { + .name = "Cursor", + .id = CURSOR_PLANE_0, + .type = DRM_PLANE_TYPE_CURSOR, + .num_formats = ARRAY_SIZE(cursor_formats), + .formats = cursor_formats, + .num_modifiers = 0, + .modifiers = NULL, + .min_width = 32, + .min_height = 32, + .max_width = 64, + .max_height = 64, + .rotation = 0, + .degamma_size = 0, + .min_scale = DRM_PLANE_NO_SCALING, + .max_scale = DRM_PLANE_NO_SCALING, + .zpos = 255, + .watermark = false, + .color_mgmt = false, + .roi = false, + }, + { + .name = "Cursor_1", + .id = CURSOR_PLANE_1, + .type = DRM_PLANE_TYPE_CURSOR, + .num_formats = ARRAY_SIZE(cursor_formats), + .formats = cursor_formats, + .num_modifiers = 0, + .modifiers = NULL, + .min_width = 32, + .min_height = 32, + .max_width = 64, + .max_height = 64, + .rotation = 0, + .degamma_size = 0, + .min_scale = DRM_PLANE_NO_SCALING,drivers/gpu/drm/verisilicon/vs_dc_hw.c line 1030
Quoted 10 lines
drivers/gpu/drm/verisilicon/vs_dc_hw.c new file +10
-0+ .max_scale = DRM_PLANE_NO_SCALING, + .zpos = 255, + .watermark = false, + .color_mgmt = false, + .roi = false, + }, + }, +}; + +static const struct vs_dc_info dc_info[] = {Again, please split into per-generation instances.
Quoted 229 lines
drivers/gpu/drm/verisilicon/vs_dc_hw.c new file +229
-0+ { +/* DC_REV_0 */ + .name = "DC8200", + .panel_num = 2, + .plane_num = 8, + .planes = dc_hw_planes[DC_REV_0], + .layer_num = 6, + .max_bpc = 10, + .color_formats =DRM_COLOR_FORMAT_RGB444 | +DRM_COLOR_FORMAT_YCBCR444 | +DRM_COLOR_FORMAT_YCBCR422 | + DRM_COLOR_FORMAT_YCBCR420, + .gamma_size = GAMMA_EX_SIZE, + .gamma_bits = 12, + .pitch_alignment = 128, + .pipe_sync = false, + .background = true, + .panel_sync = true, + .cap_dec = true, + }, + { +/* DC_REV_1 */ + .name = "DC8200", + .panel_num = 2, + .plane_num = 6, + .planes = dc_hw_planes[DC_REV_1], + .layer_num = 4, + .max_bpc = 10, + .color_formats =DRM_COLOR_FORMAT_RGB444 | +DRM_COLOR_FORMAT_YCBCR444 | +DRM_COLOR_FORMAT_YCBCR422 | + DRM_COLOR_FORMAT_YCBCR420, + .gamma_size = GAMMA_EX_SIZE, + .gamma_bits = 12, + .pitch_alignment = 128, + .pipe_sync = false, + .background = true, + .panel_sync = true, + .cap_dec = true, + }, + { +/* DC_REV_2 */ + .name = "DC8200", + .panel_num = 2, + .plane_num = 8, + .planes = dc_hw_planes[DC_REV_2], + .layer_num = 6, + .max_bpc = 10, + .color_formats =DRM_COLOR_FORMAT_RGB444 | +DRM_COLOR_FORMAT_YCBCR444 | +DRM_COLOR_FORMAT_YCBCR422 | + DRM_COLOR_FORMAT_YCBCR420, + .gamma_size = GAMMA_EX_SIZE, + .gamma_bits = 12, + .pitch_alignment = 128, + .pipe_sync = false, + .background = true, + .panel_sync = true, + .cap_dec = false, + }, +}; + +static const struct dc_hw_funcs hw_func; + +static inline u32 hi_read (struct dc_hw *hw,u32 reg) +{ +return readl (hw->hi_base + reg); +} + +static inline void hi_write (struct dc_hw *hw,u32 reg,u32 value) +{ +writel (value, hw->hi_base + reg); +} + +static inline void dc_write (struct dc_hw *hw,u32 reg,u32 value) +{ +writel (value, hw->reg_base + reg -DC_REG_BASE ); +} + +static inline u32 dc_read (struct dc_hw *hw,u32 reg) +{ +u32 value =readl (hw->reg_base + reg -DC_REG_BASE ); + +return value; +} + +static inline void dc_set_clear (struct dc_hw *hw,u32 reg,u32 set,u32 clear) +{ +u32 value =dc_read (hw, reg); + + value &= ~clear; + value |= set; +dc_write (hw, reg, value); +} + +static void load_default_filter (struct dc_hw *hw, +const struct dc_hw_plane_reg *reg,u32 offset) +{ +u8 i; + +dc_write (hw, reg->scale_config + offset,0x33 ); +dc_write (hw, reg->init_offset + offset,0x80008000 ); +dc_write (hw, reg->h_filter_coef_index + offset,0x00 ); +for (i =0 ; i <H_COEF_SIZE ; i++) +dc_write (hw, reg->h_filter_coef_data + offset, horkernel[i]); + +dc_write (hw, reg->v_filter_coef_index + offset,0x00 ); +for (i =0 ; i <V_COEF_SIZE ; i++) +dc_write (hw, reg->v_filter_coef_data + offset, verkernel[i]); +} + +static void load_rgb_to_rgb (struct dc_hw *hw,const struct dc_hw_plane_reg *reg, +u32 offset,u16 *table) +{ +dc_write (hw, reg->rgb_to_rgb_coef0 + offset, table[0 ] | (table[1 ] <<16 )); +dc_write (hw, reg->rgb_to_rgb_coef1 + offset, table[2 ] | (table[3 ] <<16 )); +dc_write (hw, reg->rgb_to_rgb_coef2 + offset, table[4 ] | (table[5 ] <<16 )); +dc_write (hw, reg->rgb_to_rgb_coef3 + offset, table[6 ] | (table[7 ] <<16 )); +dc_write (hw, reg->rgb_to_rgb_coef4 + offset, table[8 ]); +} + +static void load_yuv_to_rgb (struct dc_hw *hw,const struct dc_hw_plane_reg *reg, +u32 offset,s32 *table) +{ +dc_write (hw, reg->yuv_to_rgb_coef0 + offset, + (0xFFFF & table[0 ]) | (table[1 ] <<16 )); +dc_write (hw, reg->yuv_to_rgb_coef1 + offset, + (0xFFFF & table[2 ]) | (table[3 ] <<16 )); +dc_write (hw, reg->yuv_to_rgb_coef2 + offset, + (0xFFFF & table[4 ]) | (table[5 ] <<16 )); +dc_write (hw, reg->yuv_to_rgb_coef3 + offset, + (0xFFFF & table[6 ]) | (table[7 ] <<16 )); +dc_write (hw, reg->yuv_to_rgb_coef4 + offset, table[8 ]); +dc_write (hw, reg->yuv_to_rgb_coefd0 + offset, table[9 ]); +dc_write (hw, reg->yuv_to_rgb_coefd1 + offset, table[10 ]); +dc_write (hw, reg->yuv_to_rgb_coefd2 + offset, table[11 ]); +dc_write (hw, reg->y_clamp_bound + offset, table[12 ] | (table[13 ] <<16 )); +dc_write (hw, reg->uv_clamp_bound + offset, table[14 ] | (table[15 ] <<16 )); +} + +static void load_rgb_to_yuv (struct dc_hw *hw,u32 offset,s16 *table) +{ +dc_write (hw,DC_DISPLAY_RGBTOYUV_COEF0 + offset, + table[0 ] | (table[1 ] <<16 )); +dc_write (hw,DC_DISPLAY_RGBTOYUV_COEF1 + offset, + table[2 ] | (table[3 ] <<16 )); +dc_write (hw,DC_DISPLAY_RGBTOYUV_COEF2 + offset, + table[4 ] | (table[5 ] <<16 )); +dc_write (hw,DC_DISPLAY_RGBTOYUV_COEF3 + offset, + table[6 ] | (table[7 ] <<16 )); +dc_write (hw,DC_DISPLAY_RGBTOYUV_COEF4 + offset, table[8 ]); +dc_write (hw,DC_DISPLAY_RGBTOYUV_COEFD0 + offset, table[9 ]); +dc_write (hw,DC_DISPLAY_RGBTOYUV_COEFD1 + offset, table[10 ]); +dc_write (hw,DC_DISPLAY_RGBTOYUV_COEFD2 + offset, table[11 ]); +} + +static bool is_rgb (enum dc_hw_color_format format) +{ +switch (format) { +case FORMAT_X4R4G4B4 : +case FORMAT_A4R4G4B4 : +case FORMAT_X1R5G5B5 : +case FORMAT_A1R5G5B5 : +case FORMAT_R5G6B5 : +case FORMAT_X8R8G8B8 : +case FORMAT_A8R8G8B8 : +case FORMAT_A2R10G10B10 : +return true; +default : +return false; + } +} + +static void load_degamma_table (struct dc_hw *hw, +const struct dc_hw_plane_reg *reg, +u32 offset,u16 *table) +{ +u16 i; +u32 value; + +dc_write (hw, reg->degamma_index + offset,0 ); + +for (i =0 ; i <DEGAMMA_SIZE ; i++) { + value = table[i] | (table[i] <<16 ); +dc_write (hw, reg->degamma_data + offset, value); +dc_write (hw, reg->degamma_ex_data + offset, table[i]); + } +} + +static u32 get_addr_offset (u32 id) +{ +u32 offset =0 ; + +switch (id) { +case PRIMARY_PLANE_1 : +case OVERLAY_PLANE_1 : + offset =0x04 ; +break ; +case OVERLAY_PLANE_2 : + offset =0x08 ; +break ; +case OVERLAY_PLANE_3 : + offset =0x0C ; +break ; +default : +break ; + } + +return offset; +} + +int dc_hw_init (struct dc_hw *hw) +{ +u8 i, id, panel_num, layer_num; +u32 offset; +u32 revision =hi_read (hw,DC_HW_REVISION ); +u32 cid =hi_read (hw,DC_HW_CHIP_CID ); +const struct dc_hw_plane_reg *reg; + +switch (revision) { +case 0x5720 : + hw->rev =DC_REV_0 ; +break ; +case 0x5721 : +switch (cid) { +case 0x30B : + hw->rev =DC_REV_1 ; +break ; +case 0x310 :drivers/gpu/drm/verisilicon/vs_dc_hw.c line 1269
Quoted 10 lines
drivers/gpu/drm/verisilicon/vs_dc_hw.c new file +10
-0+ hw->rev =DC_REV_2 ; +break ; +default : + hw->rev =DC_REV_0 ; +break ; + } +break ; +default : +return -ENXIO ; + }We (drm/msm) had code like this for a while (and autodetection of the HW ID). And nowadays we are migrating to
of_device_get_match_dataand per-SoC compat names. It is just easier to handle, it allows one to specify device more precisely and also it simplifies DT schema.Quoted 237 lines
drivers/gpu/drm/verisilicon/vs_dc_hw.c new file +237
-0+ + hw->info = (struct vs_dc_info *)&dc_info[hw->rev]; + hw->func = (struct dc_hw_funcs *)&hw_func; + + layer_num = hw->info->layer_num; +for (i =0 ; i < layer_num; i++) { + id = hw->info->planes[i].id; + offset =get_addr_offset (id); +if (id ==PRIMARY_PLANE_0 || id ==PRIMARY_PLANE_1 ) + reg = &dc_plane_reg[0 ]; +else + reg = &dc_plane_reg[1 ]; + +load_default_filter (hw, reg, offset); +load_rgb_to_rgb (hw, reg, offset,RGB2RGB ); + } + + panel_num = hw->info->panel_num; +for (i =0 ; i < panel_num; i++) { + offset = i <<2 ; + +load_rgb_to_yuv (hw, offset,RGB2YUV ); +dc_write (hw,DC_DISPLAY_PANEL_CONFIG + offset,0x111 ); + + offset = i ?DC_CURSOR_OFFSET :0 ; +dc_write (hw,DC_CURSOR_BACKGROUND + offset,0x00FFFFFF ); +dc_write (hw,DC_CURSOR_FOREGROUND + offset,0x00AAAAAA ); + } + +return 0 ; +} + +void dc_hw_deinit (struct dc_hw *hw) +{ +/* Nothing to do */ +} + +void dc_hw_update_plane (struct dc_hw *hw,u8 id, +struct dc_hw_fb *fb,struct dc_hw_scale *scale, +struct dc_hw_position *pos,struct dc_hw_blend *blend) +{ +struct dc_hw_plane *plane = &hw->plane[id]; + +if (plane) { +if (fb) { +if (!fb->enable) + plane->fb.enable = false; +else +memcpy (&plane->fb, fb, +sizeof (*fb) -sizeof (fb->dirty)); + plane->fb.dirty = true; + } +if (scale) { +memcpy (&plane->scale, scale, +sizeof (*scale) -sizeof (scale->dirty)); + plane->scale.dirty = true; + } +if (pos) { +memcpy (&plane->pos, pos, +sizeof (*pos) -sizeof (pos->dirty)); + plane->pos.dirty = true; + } +if (blend) { +memcpy (&plane->blend, blend, +sizeof (*blend) -sizeof (blend->dirty)); + plane->blend.dirty = true; + } + } +} + +void dc_hw_update_degamma (struct dc_hw *hw,u8 id,u32 mode) +{ +struct dc_hw_plane *plane = &hw->plane[id]; + +if (plane) { +if (hw->info->planes[id].degamma_size) { + plane->degamma.mode = mode; + plane->degamma.dirty = true; + }else { + plane->degamma.dirty = false; + } + } +} + +void dc_hw_update_roi (struct dc_hw *hw,u8 id,struct dc_hw_roi *roi) +{ +struct dc_hw_plane *plane = &hw->plane[id]; + +if (plane) { +memcpy (&plane->roi, roi,sizeof (*roi) -sizeof (roi->dirty)); + plane->roi.dirty = true; + } +} + +void dc_hw_update_colorkey (struct dc_hw *hw,u8 id, +struct dc_hw_colorkey *colorkey) +{ +struct dc_hw_plane *plane = &hw->plane[id]; + +if (plane) { +memcpy (&plane->colorkey, colorkey, +sizeof (*colorkey) -sizeof (colorkey->dirty)); + plane->colorkey.dirty = true; + } +} + +void dc_hw_update_qos (struct dc_hw *hw,struct dc_hw_qos *qos) +{ +memcpy (&hw->qos, qos,sizeof (*qos) -sizeof (qos->dirty)); + hw->qos.dirty = true; +} + +void dc_hw_update_cursor (struct dc_hw *hw,u8 id,struct dc_hw_cursor *cursor) +{ +memcpy (&hw->cursor[id], cursor,sizeof (*cursor) -sizeof (cursor->dirty)); + hw->cursor[id].dirty = true; +} + +void dc_hw_update_gamma (struct dc_hw *hw,u8 id,u16 index, +u16 r,u16 g,u16 b) +{ +if (index >= hw->info->gamma_size) +return ; + + hw->gamma[id].gamma[index][0 ] = r; + hw->gamma[id].gamma[index][1 ] = g; + hw->gamma[id].gamma[index][2 ] = b; + hw->gamma[id].dirty = true; +} + +void dc_hw_enable_gamma (struct dc_hw *hw,u8 id,bool enable) +{ + hw->gamma[id].enable = enable; + hw->gamma[id].dirty = true; +} + +void dc_hw_setup_display (struct dc_hw *hw,struct dc_hw_display *display) +{ +u8 id = display->id; + +memcpy (&hw->display[id], display,sizeof (*display)); + + hw->func->display (hw, display); +} + +void dc_hw_enable_interrupt (struct dc_hw *hw,bool enable) +{ +if (enable) +hi_write (hw,AQ_INTR_ENBL ,0xFFFFFFFF ); +else +hi_write (hw,AQ_INTR_ENBL ,0 ); +} + +u32 dc_hw_get_interrupt (struct dc_hw *hw) +{ +return hi_read (hw,AQ_INTR_ACKNOWLEDGE ); +} + +bool dc_hw_check_underflow (struct dc_hw *hw) +{ +return dc_read (hw,DC_FRAMEBUFFER_CONFIG ) &BIT (5 ); +} + +void dc_hw_enable_shadow_register (struct dc_hw *hw,bool enable) +{ +u32 i, offset; +u8 id, layer_num = hw->info->layer_num; +u8 panel_num = hw->info->panel_num; + +for (i =0 ; i < layer_num; i++) { + id = hw->info->planes[i].id; + offset =get_addr_offset (id); +if (enable) { +if (id ==PRIMARY_PLANE_0 || id ==PRIMARY_PLANE_1 ) +dc_set_clear (hw,DC_FRAMEBUFFER_CONFIG_EX + offset,BIT (12 ),0 ); +else +dc_set_clear (hw,DC_OVERLAY_CONFIG + offset,BIT (31 ),0 ); + }else { +if (id ==PRIMARY_PLANE_0 || id ==PRIMARY_PLANE_1 ) +dc_set_clear (hw,DC_FRAMEBUFFER_CONFIG_EX + offset,0 ,BIT (12 )); +else +dc_set_clear (hw,DC_OVERLAY_CONFIG + offset,0 ,BIT (31 )); + } + } + +for (i =0 ; i < panel_num; i++) { + offset = i <<2 ; +if (enable) +dc_set_clear (hw,DC_DISPLAY_PANEL_CONFIG_EX + offset,0 ,BIT (0 )); +else +dc_set_clear (hw,DC_DISPLAY_PANEL_CONFIG_EX + offset,BIT (0 ),0 ); + } +} + +void dc_hw_set_out (struct dc_hw *hw,enum dc_hw_out out,u8 id) +{ +if (out <=OUT_DP ) + hw->out[id] = out; +} + +static void gamma_ex_commit (struct dc_hw *hw) +{ +u8 panel_num = hw->info->panel_num; +u16 i, j; +u32 value; + +for (j =0 ; j < panel_num; j++) { +if (hw->gamma[j].dirty) { +if (hw->gamma[j].enable) { +dc_write (hw,DC_DISPLAY_GAMMA_EX_INDEX + (j <<2 ),0x00 ); +for (i =0 ; i <GAMMA_EX_SIZE ; i++) { + value = hw->gamma[j].gamma[i][2 ] | + (hw->gamma[j].gamma[i][1 ] <<12 ); +dc_write (hw,DC_DISPLAY_GAMMA_EX_DATA + (j <<2 ), value); +dc_write (hw,DC_DISPLAY_GAMMA_EX_ONE_DATA + (j <<2 ), + hw->gamma[j].gamma[i][0 ]); + } +dc_set_clear (hw,DC_DISPLAY_PANEL_CONFIG + (j <<2 ), +BIT (13 ),0 ); + }else { +dc_set_clear (hw,DC_DISPLAY_PANEL_CONFIG + (j <<2 ), +0 ,BIT (13 )); + } + hw->gamma[j].dirty = false; + } + } +} + +static void plane_commit (struct dc_hw *hw) +{ +struct dc_hw_plane *plane; +const struct dc_hw_plane_reg *reg; +bool primary = false; +u8 id, layer_num = hw->info->layer_num; +u32 i, offset; + +for (i =0 ; i < layer_num; i++) {drivers/gpu/drm/verisilicon/vs_dc_hw.c line 1516
Quoted 10 lines
drivers/gpu/drm/verisilicon/vs_dc_hw.c new file +10
-0+ plane = &hw->plane[i]; + id = hw->info->planes[i].id; + offset =get_addr_offset (id); +if (id ==PRIMARY_PLANE_0 || id ==PRIMARY_PLANE_1 ) { + reg = &dc_plane_reg[0 ]; + primary = true; + }else { + reg = &dc_plane_reg[1 ]; + primary = false; + }Can you please move register defines to some internal
hw_planestructure. These details are known at the time of creation of the plane. There is no need to determine them again and again.drivers/gpu/drm/verisilicon/vs_dc_hw.c line 1519
Quoted 3 lines
drivers/gpu/drm/verisilicon/vs_dc_hw.c new file +3
-0+ +if (plane->fb.dirty) { +if (plane->fb.enable) {if (
plane->fb.dirty&&plane->fb.enable) will save you one level of indentation.However it might be better to use existing DRM flags instead of inventing your own flags.
Quoted 14 lines
drivers/gpu/drm/verisilicon/vs_dc_hw.c new file +14
-0+dc_write (hw, reg->y_address + offset, + plane->fb.y_address); +dc_write (hw, reg->u_address + offset, + plane->fb.u_address); +dc_write (hw, reg->v_address + offset, + plane->fb.v_address); +dc_write (hw, reg->y_stride + offset, + plane->fb.y_stride); +dc_write (hw, reg->u_stride + offset, + plane->fb.u_stride); +dc_write (hw, reg->v_stride + offset, + plane->fb.v_stride); + dc_write(hw, reg->size + offset, + plane->fb.width |drivers/gpu/drm/verisilicon/vs_dc_hw.c line 1543
Quoted 10 lines
drivers/gpu/drm/verisilicon/vs_dc_hw.c new file +10
-0+ (plane->fb.height << 15)); +dc_write (hw, reg->water_mark + offset, + plane->fb.water_mark); + +if (plane->fb.clear_enable) +dc_write (hw, reg->clear_value + offset, + plane->fb.clear_value); + } + +if (primary) {You have two kinds of planes. Primary and overlays. Could you please split this code into two separate functions and define two vtables, one for primary planes and one for overlays. There is no need to stick everything into a single funcion that handles everything.
Quoted 11 lines
drivers/gpu/drm/verisilicon/vs_dc_hw.c new file +11
-0+ dc_set_clear(hw, DC_FRAMEBUFFER_CONFIG + offset, + (plane->fb.format << 26) | + (plane->fb.uv_swizzle << 25) | + (plane->fb.swizzle << 23) | + (plane->fb.tile_mode << 17) | + (plane->fb.yuv_color_space << 14) | + (plane->fb.rotation << 11) | + (plane->fb.clear_enable << 8), + (0x1F << 26) | + BIT(25) | + (0x03 << 23) |drivers/gpu/drm/verisilicon/vs_dc_hw.c line 1564
Quoted 10 lines
drivers/gpu/drm/verisilicon/vs_dc_hw.c new file +10
-0+ (0x1F <<17 ) | + (0x07 <<14 ) | + (0x07 <<11 ) | + BIT(8)); +dc_set_clear (hw,DC_FRAMEBUFFER_CONFIG_EX + offset, + (plane->fb.dec_enable <<1 ) | + (plane->fb.enable <<13 ) | + (plane->fb.zpos <<16 ) | + (plane->fb.display_id <<19 ), +BIT (1 ) |BIT (13 ) | (0x07 <<16 ) |BIT (19 ));It looks like this code can enjoy defining names for all the magic values. Otherwise it is impossible to support it.
drivers/gpu/drm/verisilicon/vs_dc_hw.h
Quoted 411 lines
drivers/gpu/drm/verisilicon/vs_dc_hw.c new file +395
-0+ }else { +dc_set_clear (hw,DC_OVERLAY_CONFIG + offset, + (plane->fb.dec_enable <<27 ) | + (plane->fb.clear_enable <<25 ) | + (plane->fb.enable <<24 ) | + (plane->fb.format <<16 ) | + (plane->fb.uv_swizzle <<15 ) | + (plane->fb.swizzle <<13 ) | + (plane->fb.tile_mode <<8 ) | + (plane->fb.yuv_color_space <<5 ) | + (plane->fb.rotation <<2 ), +BIT (27 ) | +BIT (25 ) | +BIT (24 ) | + (0x1F <<16 ) | +BIT (15 ) | + (0x03 <<13 ) | + (0x1F <<8 ) | + (0x07 <<5 ) | + (0x07 <<2 )); +dc_set_clear (hw,DC_OVERLAY_CONFIG_EX + offset, + plane->fb.zpos | (plane->fb.display_id <<3 ), +0x07 |BIT (3 )); + } + plane->fb.dirty = false; + } + +if (plane->scale.dirty) { +if (plane->scale.enable) { +dc_write (hw, reg->scale_factor_x + offset, + plane->scale.scale_factor_x); +dc_write (hw, reg->scale_factor_y + offset, + plane->scale.scale_factor_y); +if (primary) +dc_set_clear (hw, +DC_FRAMEBUFFER_CONFIG + offset, +BIT (22 ),0 ); +else +dc_set_clear (hw, +DC_OVERLAY_SCALE_CONFIG + offset, +BIT (8 ),0 );Lines of this file are not shown. View the raw message.
drivers/gpu/drm/verisilicon/vs_dc_hw.h new file +10
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Please take care to align all the defines.
drivers/gpu/drm/verisilicon/vs_dc_hw.h
Quoted 190 lines
drivers/gpu/drm/verisilicon/vs_dc_hw.h new file +190
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Space after the comma will make it more readable. Or just define the values explicitly, it will also be more readable.
drivers/gpu/drm/verisilicon/vs_dc_hw.h
Quoted 73 lines
drivers/gpu/drm/verisilicon/vs_dc_hw.h new file +73
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Can you use defines from <
drm/drm_blend.h>?drivers/gpu/drm/verisilicon/vs_plane.c
Quoted 278 lines
drivers/gpu/drm/verisilicon/vs_dc_hw.h new file +219
-0Lines of this file are not shown. View the raw message.
drivers/gpu/drm/verisilicon/vs_plane.c new file +33
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Use
vs_plane_destroy_statedirectly. This way you won't miss a refcount on blobs.drivers/gpu/drm/verisilicon/vs_plane.c
Quoted 149 lines
drivers/gpu/drm/verisilicon/vs_plane.c new file +149
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
degamma and color management should use standard properties.
drivers/gpu/drm/verisilicon/vs_plane.c
Quoted 118 lines
drivers/gpu/drm/verisilicon/vs_plane.c new file +118
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
New line after the equal sign will be better.
drivers/gpu/drm/verisilicon/vs_plane.c
Quoted 12 lines
drivers/gpu/drm/verisilicon/vs_plane.c new file +12
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
if (!new_state->visible) ?
drivers/gpu/drm/verisilicon/vs_plane.c
Quoted 35 lines
drivers/gpu/drm/verisilicon/vs_plane.c new file +35
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
and here.
Quoted 318 lines
drivers/gpu/drm/verisilicon/vs_plane.c new file +179
-0Lines of this file are not shown. View the raw message.
drivers/gpu/drm/verisilicon/vs_plane.h new file +58
-0Lines of this file are not shown. View the raw message.
drivers/gpu/drm/verisilicon/vs_type.h new file +69
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Part of the diff is not shown here. View the raw message.
Re: [PATCH v2 5/6] drm/vs: Add KMS crtc&plane
Quoted 159 lines · Keith Zhao
Quoted 146 lines · Dmitry Baryshkov
Quoted 72 lines · Keith Zhao
add 2 crtcs and 8 planes in vs-drm
Signed-off-by Keith Zhao <[email protected]>--- drivers/gpu/drm/verisilicon/Makefile | 8 +- drivers/gpu/drm/verisilicon/vs_crtc.c | 257 ++++ drivers/gpu/drm/verisilicon/vs_crtc.h | 43 + drivers/gpu/drm/verisilicon/vs_dc.c | 1002 ++++++++++++ drivers/gpu/drm/verisilicon/vs_dc.h | 80 + drivers/gpu/drm/verisilicon/vs_dc_hw.c | 1959 ++++++++++++++++++++++++ drivers/gpu/drm/verisilicon/vs_dc_hw.h | 492 ++++++ drivers/gpu/drm/verisilicon/vs_drv.c | 2 + drivers/gpu/drm/verisilicon/vs_plane.c | 526 +++++++ drivers/gpu/drm/verisilicon/vs_plane.h | 58 + drivers/gpu/drm/verisilicon/vs_type.h | 69 + 11 files changed, 4494 insertions(+), 2 deletions(-)create mode 100644
drivers/gpu/drm/verisilicon/vs_crtc.ccreate mode 100644drivers/gpu/drm/verisilicon/vs_crtc.hcreate mode 100644drivers/gpu/drm/verisilicon/vs_dc.ccreate mode 100644drivers/gpu/drm/verisilicon/vs_dc.hcreate mode 100644drivers/gpu/drm/verisilicon/vs_dc_hw.ccreate mode 100644drivers/gpu/drm/verisilicon/vs_dc_hw.hcreate mode 100644drivers/gpu/drm/verisilicon/vs_plane.ccreate mode 100644drivers/gpu/drm/verisilicon/vs_plane.hcreate mode 100644drivers/gpu/drm/verisilicon/vs_type.hdrivers/gpu/drm/verisilicon/Makefile +6
-2@@ -1,7 +1,11 @@ # SPDX-License-Identifier: GPL-2.0 -vs_drm-objs := vs_drv.o \ - vs_modeset.o +vs_drm-objs := vs_dc_hw.o \ + vs_dc.o \ + vs_crtc.o \ + vs_drv.o \ + vs_modeset.o \ + vs_plane.o obj-$(CONFIG_DRM_VERISILICON) += vs_drm.odrivers/gpu/drm/verisilicon/vs_crtc.c new file +22
-0@@ -0,0 +1,257 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Copyright (C) 2023 VeriSilicon Holdings Co., Ltd. +* +*/ + +#include <linux/clk.h> +#include <linux/debugfs.h> +#include <linux/media-bus-format.h> + +#include <drm/drm_atomic_helper.h> +#include <drm/drm_atomic.h> +#include <drm/drm_crtc.h> +#include <drm/drm_gem_atomic_helper.h> +#include <drm/drm_vblank.h> +#include <drm/vs_drm.h> + +#include "vs_crtc.h" +#include "vs_dc.h" +#include "vs_drv.h" + +static void vs_crtc_reset (struct drm_crtc *crtc)drivers/gpu/drm/verisilicon/vs_crtc.c line 32
Quoted 10 lines
drivers/gpu/drm/verisilicon/vs_crtc.c new file +10
-0+{ +struct vs_crtc_state *state; + +if (crtc->state) { +__drm_atomic_helper_crtc_destroy_state (crtc->state); + + state =to_vs_crtc_state (crtc->state); +kfree (state); + crtc->state =NULL ; + }You can call your
crtc_destroy_statefunction directly here.drivers/gpu/drm/verisilicon/vs_crtc.c line 44
Quoted 12 lines
drivers/gpu/drm/verisilicon/vs_crtc.c new file +12
-0+ + state =kzalloc (sizeof (*state),GFP_KERNEL ); +if (!state) +return ; + +__drm_atomic_helper_crtc_reset (crtc, &state->base); +} + +static struct drm_crtc_state * +vs_crtc_atomic_duplicate_state (struct drm_crtc *crtc) +{ +struct vs_crtc_state *ori_state;It might be a matter of taste, but it is usually
old_state.Quoted 6 lines
drivers/gpu/drm/verisilicon/vs_crtc.c new file +6
-0+struct vs_crtc_state *state; + +if (!crtc->state) +return NULL ; + + ori_state =to_vs_crtc_state (crtc->state);drivers/gpu/drm/verisilicon/vs_crtc.c line 60
Quoted 10 lines
drivers/gpu/drm/verisilicon/vs_crtc.c new file +10
-0+ state =kzalloc (sizeof (*state),GFP_KERNEL ); +if (!state) +return NULL ; + +__drm_atomic_helper_crtc_duplicate_state (crtc, &state->base); + + state->output_fmt = ori_state->output_fmt; + state->encoder_type = ori_state->encoder_type; + state->bpp = ori_state->bpp; + state->underflow = ori_state->underflow;Can you use kmemdup instead?
Quoted 26 lines
drivers/gpu/drm/verisilicon/vs_crtc.c new file +26
-0+ +return &state->base; +} + +static void vs_crtc_atomic_destroy_state (struct drm_crtc *crtc, +struct drm_crtc_state *state) +{ +__drm_atomic_helper_crtc_destroy_state (state); +kfree (to_vs_crtc_state (state)); +} + +static int vs_crtc_enable_vblank (struct drm_crtc *crtc) +{ +struct vs_crtc *vs_crtc =to_vs_crtc (crtc); +struct vs_dc *dc =dev_get_drvdata (vs_crtc->dev); + +vs_dc_enable_vblank (dc, true); + +return 0 ; +} + +static void vs_crtc_disable_vblank (struct drm_crtc *crtc) +{ +struct vs_crtc *vs_crtc =to_vs_crtc (crtc); +struct vs_dc *dc =dev_get_drvdata (vs_crtc->dev); +Quoted 8 lines
drivers/gpu/drm/verisilicon/vs_crtc.c line 92
Quoted 6 lines
drivers/gpu/drm/verisilicon/vs_crtc.c new file +6
-0+vs_dc_enable_vblank (dc, false); +} + +static const struct drm_crtc_funcs vs_crtc_funcs = { + .set_config = drm_atomic_helper_set_config, + .page_flip = drm_atomic_helper_page_flip,destroy is required, see
drm_mode_config_cleanup()
Quoted 3 lines
hi Dmitry:
if define destroy indrm_crtc_funcs,
it will make__drmm_crtc_init_with_planesunhappy
Ack, I missed that you have been using drmm_crtc_init. BTW, I checked your code, you should be able to switch drm drmm_crtc_alloc_with_planes().
Quoted 4,572 lines
see:
__printf(6, 0)
static int __drmm_crtc_init_with_planes(structdrm_device*dev,
structdrm_crtc*crtc, structdrm_plane*primary, structdrm_plane*cursor, const structdrm_crtc_funcs*funcs, const char *name,va_listargs){ int ret; drm_WARN_ON(dev, funcs && funcs->destroy);........
}It should not need to be defined here, I think
Quoted 4,552 lines
drivers/gpu/drm/verisilicon/vs_crtc.c line 95
Quoted 4 lines
drivers/gpu/drm/verisilicon/vs_crtc.c new file +3
-0+ .reset = vs_crtc_reset, + .atomic_duplicate_state = vs_crtc_atomic_duplicate_state, + .atomic_destroy_state = vs_crtc_atomic_destroy_state,please consider adding
atomic_print_stateto output driver-specific bits.drivers/gpu/drm/verisilicon/vs_crtc.c line 100
Quoted 5 lines
drivers/gpu/drm/verisilicon/vs_crtc.c new file +5
-0+ .enable_vblank = vs_crtc_enable_vblank, + .disable_vblank = vs_crtc_disable_vblank, +}; + +static u8 cal_pixel_bits (u32 bus_format)This looks like a generic helper code, which can go to a common place.
Quoted 52 lines
drivers/gpu/drm/verisilicon/vs_crtc.c new file +52
-0+{ +u8 bpp; + +switch (bus_format) { +case MEDIA_BUS_FMT_RGB565_1X16 : +case MEDIA_BUS_FMT_UYVY8_1X16 : + bpp =16 ; +break ; +case MEDIA_BUS_FMT_RGB666_1X18 : +case MEDIA_BUS_FMT_RGB666_1X24_CPADHI : + bpp =18 ; +break ; +case MEDIA_BUS_FMT_UYVY10_1X20 : + bpp =20 ; +break ; +case MEDIA_BUS_FMT_BGR888_1X24 : +case MEDIA_BUS_FMT_UYYVYY8_0_5X24 : +case MEDIA_BUS_FMT_YUV8_1X24 : + bpp =24 ; +break ; +case MEDIA_BUS_FMT_RGB101010_1X30 : +case MEDIA_BUS_FMT_UYYVYY10_0_5X30 : +case MEDIA_BUS_FMT_YUV10_1X30 : + bpp =30 ; +break ; +default : + bpp =24 ; +break ; + } + +return bpp; +} + +static void vs_crtc_atomic_enable (struct drm_crtc *crtc, +struct drm_atomic_state *state) +{ +struct vs_crtc *vs_crtc =to_vs_crtc (crtc); +struct vs_dc *dc =dev_get_drvdata (vs_crtc->dev); +struct vs_crtc_state *vs_crtc_state =to_vs_crtc_state (crtc->state); + + vs_crtc_state->bpp =cal_pixel_bits (vs_crtc_state->output_fmt); + +vs_dc_enable (dc, crtc); +drm_crtc_vblank_on (crtc); +} + +static void vs_crtc_atomic_disable (struct drm_crtc *crtc, +struct drm_atomic_state *state) +{ +struct vs_crtc *vs_crtc =to_vs_crtc (crtc); +struct vs_dc *dc =dev_get_drvdata (vs_crtc->dev); +drivers/gpu/drm/verisilicon/vs_crtc.c line 162
Quoted 10 lines
drivers/gpu/drm/verisilicon/vs_crtc.c new file +10
-0+drm_crtc_vblank_off (crtc); + +vs_dc_disable (dc, crtc); + +if (crtc->state->event && !crtc->state->active) { +spin_lock_irq (&crtc->dev->event_lock); +drm_crtc_send_vblank_event (crtc, crtc->state->event); +spin_unlock_irq (&crtc->dev->event_lock); + + crtc->state->event =NULL ;I think even should be cleared within the lock.
Quoted 33 lines
drivers/gpu/drm/verisilicon/vs_crtc.c new file +33
-0+ } +} + +static void vs_crtc_atomic_begin (struct drm_crtc *crtc, +struct drm_atomic_state *state) +{ +struct drm_crtc_state *crtc_state =drm_atomic_get_new_crtc_state (state, + crtc); + +struct vs_crtc *vs_crtc =to_vs_crtc (crtc); +struct device *dev = vs_crtc->dev; +struct drm_property_blob *blob = crtc->state->gamma_lut; +struct drm_color_lut *lut; +struct vs_dc *dc =dev_get_drvdata (dev); + +if (crtc_state->color_mgmt_changed) { +if (blob && blob->length) { + lut = blob->data; +vs_dc_set_gamma (dc, crtc, lut, + blob->length /sizeof (*lut)); +vs_dc_enable_gamma (dc, crtc, true); + }else { +vs_dc_enable_gamma (dc, crtc, false); + } + } +} + +static void vs_crtc_atomic_flush (struct drm_crtc *crtc, +struct drm_atomic_state *state) +{ +struct vs_crtc *vs_crtc =to_vs_crtc (crtc); +struct drm_pending_vblank_event *event = crtc->state->event; +struct vs_dc *dc =dev_get_drvdata (vs_crtc->dev);drivers/gpu/drm/verisilicon/vs_crtc.c line 205
Quoted 10 lines
drivers/gpu/drm/verisilicon/vs_crtc.c new file +10
-0+ +vs_dc_commit (dc); + +if (event) { +WARN_ON (drm_crtc_vblank_get (crtc) !=0 ); + +spin_lock_irq (&crtc->dev->event_lock); +drm_crtc_arm_vblank_event (crtc, event); +spin_unlock_irq (&crtc->dev->event_lock); + crtc->state->event =NULL ;I think even should be cleared within the lock.
Quoted 23 lines
drivers/gpu/drm/verisilicon/vs_crtc.c new file +23
-0+ } +} + +static const struct drm_crtc_helper_funcs vs_crtc_helper_funcs = { + .atomic_check = drm_crtc_helper_atomic_check, + .atomic_enable = vs_crtc_atomic_enable, + .atomic_disable = vs_crtc_atomic_disable, + .atomic_begin = vs_crtc_atomic_begin, + .atomic_flush = vs_crtc_atomic_flush, +}; + +static const struct drm_prop_enum_list vs_sync_mode_enum_list[] = { + {VS_SINGLE_DC ,"single dc mode" }, + {VS_MULTI_DC_PRIMARY ,"primary dc for multi dc mode" }, + {VS_MULTI_DC_SECONDARY ,"secondary dc for multi dc mode" }, +}; + +struct vs_crtc *vs_crtc_create (struct drm_device *drm_dev, +struct vs_dc_info *info) +{ +struct vs_crtc *crtc; +int ret; +drivers/gpu/drm/verisilicon/vs_crtc.c line 238
Quoted 10 lines
drivers/gpu/drm/verisilicon/vs_crtc.c new file +10
-0+if (!info) +return NULL ; + + crtc =drmm_kzalloc (drm_dev,sizeof (*crtc),GFP_KERNEL ); +if (!crtc) +return NULL ; + + ret =drmm_crtc_init_with_planes (drm_dev, &crtc->base, +NULL ,NULL , &vs_crtc_funcs, + info->name ? info->name :NULL );It might be better to add
drmm_crtc_init()helper.Quoted 935 lines
drivers/gpu/drm/verisilicon/vs_crtc.c new file +19
-0+if (ret) +return NULL ; + +drm_crtc_helper_add (&crtc->base, &vs_crtc_helper_funcs); + +if (info->gamma_size) { + ret =drm_mode_crtc_set_gamma_size (&crtc->base, + info->gamma_size); +if (ret) +return NULL ; + +drm_crtc_enable_color_mgmt (&crtc->base,0 , false, + info->gamma_size); + } + + crtc->max_bpc = info->max_bpc; + crtc->color_formats = info->color_formats; +return crtc; +}drivers/gpu/drm/verisilicon/vs_crtc.h new file +43
-0@@ -0,0 +1,43 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Copyright (C) 2023 VeriSilicon Holdings Co., Ltd. +*/ + +#ifndef __VS_CRTC_H__ +#define __VS_CRTC_H__ + +#include <drm/drm_crtc.h> +#include <drm/drm_crtc_helper.h> + +#include "vs_type.h" + +struct vs_crtc_state { +struct drm_crtc_state base; + +u32 output_fmt; +u8 encoder_type; +u8 bpp; +bool underflow; +}; + +struct vs_crtc { +struct drm_crtc base; +struct device *dev; +unsigned int max_bpc; +unsigned int color_formats; +}; + +struct vs_crtc *vs_crtc_create (struct drm_device *drm_dev, +struct vs_dc_info *info); + +static inline struct vs_crtc *to_vs_crtc (struct drm_crtc *crtc) +{ + return container_of(crtc, struct vs_crtc, base); +} + +static inline struct vs_crtc_state * +to_vs_crtc_state (struct drm_crtc_state *state) +{ + return container_of(state, struct vs_crtc_state, base); +} +#endif /* __VS_CRTC_H__ */ drivers/gpu/drm/verisilicon/vs_dc.c new file +861
-0@@ -0,0 +1,1002 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Copyright (C) 2023 VeriSilicon Holdings Co., Ltd. +*/ + +#include <linux/component.h> +#include <linux/clk.h> +#include <linux/of.h> +#include <linux/of_device.h> +#include <linux/pm_runtime.h> +#include <linux/reset.h> + +#include <drm/drm_atomic.h> +#include <drm/drm_atomic_helper.h> +#include <drm/drm_blend.h> +#include <drm/drm_framebuffer.h> +#include <drm/drm_vblank.h> +#include <drm/vs_drm.h> + +#include "vs_dc_hw.h" +#include "vs_dc.h" +#include "vs_drv.h" + +static const char *const vout_clocks[] = { +"noc_bus" , +"channel0" , +"channel1" , +"dc_core" , +"axi_core" , +"ahb" , +"hdmi_tx" , +"dc_parent" , + +}; + +static const char *const vout_resets[] = { +"axi" , +"ahb" , +"core" , +}; + +static inline void update_format (u32 format,u64 mod,struct dc_hw_fb *fb) +{ +u8 f =FORMAT_A8R8G8B8 ; + +switch (format) { +case DRM_FORMAT_XRGB4444 : +case DRM_FORMAT_RGBX4444 : +case DRM_FORMAT_XBGR4444 : +case DRM_FORMAT_BGRX4444 : + f =FORMAT_X4R4G4B4 ; +break ; +case DRM_FORMAT_ARGB4444 : +case DRM_FORMAT_RGBA4444 : +case DRM_FORMAT_ABGR4444 : +case DRM_FORMAT_BGRA4444 : + f =FORMAT_A4R4G4B4 ; +break ; +case DRM_FORMAT_XRGB1555 : +case DRM_FORMAT_RGBX5551 : +case DRM_FORMAT_XBGR1555 : +case DRM_FORMAT_BGRX5551 : + f =FORMAT_X1R5G5B5 ; +break ; +case DRM_FORMAT_ARGB1555 : +case DRM_FORMAT_RGBA5551 : +case DRM_FORMAT_ABGR1555 : +case DRM_FORMAT_BGRA5551 : + f =FORMAT_A1R5G5B5 ; +break ; +case DRM_FORMAT_RGB565 : +case DRM_FORMAT_BGR565 : + f =FORMAT_R5G6B5 ; +break ; +case DRM_FORMAT_XRGB8888 : +case DRM_FORMAT_RGBX8888 : +case DRM_FORMAT_XBGR8888 : +case DRM_FORMAT_BGRX8888 : + f =FORMAT_X8R8G8B8 ; +break ; +case DRM_FORMAT_ARGB8888 : +case DRM_FORMAT_RGBA8888 : +case DRM_FORMAT_ABGR8888 : +case DRM_FORMAT_BGRA8888 : + f =FORMAT_A8R8G8B8 ; +break ; +case DRM_FORMAT_YUYV : +case DRM_FORMAT_YVYU : + f =FORMAT_YUY2 ; +break ; +case DRM_FORMAT_UYVY : +case DRM_FORMAT_VYUY : + f =FORMAT_UYVY ; +break ; +case DRM_FORMAT_YUV420 : +case DRM_FORMAT_YVU420 : + f =FORMAT_YV12 ; +break ; +case DRM_FORMAT_NV21 : + f =FORMAT_NV12 ; +break ; +case DRM_FORMAT_NV16 : +case DRM_FORMAT_NV61 : + f =FORMAT_NV16 ; +break ; +case DRM_FORMAT_P010 : + f =FORMAT_P010 ; +break ; +case DRM_FORMAT_ARGB2101010 : +case DRM_FORMAT_RGBA1010102 : +case DRM_FORMAT_ABGR2101010 : +case DRM_FORMAT_BGRA1010102 : + f =FORMAT_A2R10G10B10 ; +break ; +case DRM_FORMAT_NV12 : + f =FORMAT_NV12 ; +break ; +case DRM_FORMAT_YUV444 : + f =FORMAT_YUV444 ; +break ; +default : +break ; + } + + fb->format = f; +} + +static inline void update_swizzle (u32 format,struct dc_hw_fb *fb) +{ + fb->swizzle =SWIZZLE_ARGB ; + fb->uv_swizzle =0 ; + +switch (format) { +case DRM_FORMAT_RGBX4444 : +case DRM_FORMAT_RGBA4444 : +case DRM_FORMAT_RGBX5551 : +case DRM_FORMAT_RGBA5551 : +case DRM_FORMAT_RGBX8888 : +case DRM_FORMAT_RGBA8888 : +case DRM_FORMAT_RGBA1010102 : + fb->swizzle =SWIZZLE_RGBA ; +break ; +case DRM_FORMAT_XBGR4444 : +case DRM_FORMAT_ABGR4444 : +case DRM_FORMAT_XBGR1555 : +case DRM_FORMAT_ABGR1555 : +case DRM_FORMAT_BGR565 : +case DRM_FORMAT_XBGR8888 : +case DRM_FORMAT_ABGR8888 : +case DRM_FORMAT_ABGR2101010 : + fb->swizzle =SWIZZLE_ABGR ; +break ; +case DRM_FORMAT_BGRX4444 : +case DRM_FORMAT_BGRA4444 : +case DRM_FORMAT_BGRX5551 : +case DRM_FORMAT_BGRA5551 : +case DRM_FORMAT_BGRX8888 : +case DRM_FORMAT_BGRA8888 : +case DRM_FORMAT_BGRA1010102 : + fb->swizzle =SWIZZLE_BGRA ; +break ; +case DRM_FORMAT_YVYU : +case DRM_FORMAT_VYUY : +case DRM_FORMAT_NV21 : +case DRM_FORMAT_NV61 : + fb->uv_swizzle =1 ; +break ; +default : +break ; + } +} + +static inline void update_watermark (struct drm_property_blob *watermark, +struct dc_hw_fb *fb) +{ +struct drm_vs_watermark *data; + + fb->water_mark =0 ; + +if (watermark) { + data = watermark->data; + fb->water_mark = data->watermark &0xFFFFF ; + } +} + +static inline u8 to_vs_rotation (unsigned int rotation) +{ +u8 rot; + +switch (rotation &DRM_MODE_REFLECT_MASK ) { +case DRM_MODE_REFLECT_X : + rot =FLIP_X ; +return rot; +case DRM_MODE_REFLECT_Y : + rot =FLIP_Y ; +return rot; +case DRM_MODE_REFLECT_X |DRM_MODE_REFLECT_Y : + rot =FLIP_XY ; +return rot; +default : +break ; + } + +switch (rotation &DRM_MODE_ROTATE_MASK ) { +case DRM_MODE_ROTATE_0 : + rot =ROT_0 ; +break ; +case DRM_MODE_ROTATE_90 : + rot =ROT_90 ; +break ; +case DRM_MODE_ROTATE_180 : + rot =ROT_180 ; +break ; +case DRM_MODE_ROTATE_270 : + rot =ROT_270 ; +break ; +default : + rot =ROT_0 ; +break ; + } + +return rot; +} + +static inline u8 to_vs_yuv_color_space (u32 color_space) +{ +u8 cs; + +switch (color_space) { +case DRM_COLOR_YCBCR_BT601 : + cs =COLOR_SPACE_601 ; +break ; +case DRM_COLOR_YCBCR_BT709 : + cs =COLOR_SPACE_709 ; +break ; +case DRM_COLOR_YCBCR_BT2020 : + cs =COLOR_SPACE_2020 ; +break ; +default : + cs =COLOR_SPACE_601 ; +break ; + } + +return cs; +} + +static inline u8 to_vs_tile_mode (u64 modifier) +{ +if (modifier ==DRM_FORMAT_MOD_VIVANTE_TILED ) +return DC_TILE_MODE4X4 ; + +return (u8)(modifier &DRM_FORMAT_MOD_VERISILICON_NORM_MODE_MASK ); +} + +static inline u8 to_vs_display_id (struct vs_dc *dc,struct drm_crtc *crtc) +{ +u8 panel_num = dc->hw.info->panel_num; +u32 index =drm_crtc_index (crtc); +int i; + +for (i =0 ; i < panel_num; i++) { +if (index == dc->crtc[i]->base.index) +return i; + } + +return 0 ; +} + +static void vs_drm_update_pitch_alignment (struct drm_device *drm_dev, +unsigned int alignment) +{ +struct vs_drm_device *priv =to_vs_drm_private (drm_dev); + +if (alignment > priv->pitch_alignment) + priv->pitch_alignment = alignment; +} + +static int plda_clk_rst_init (struct device *dev) +{ +int ret =0 ; +struct vs_dc *dc =dev_get_drvdata (dev); + + ret =clk_bulk_prepare_enable (dc->nclks, dc->clk_vout); +if (ret) { +dev_err (dev,"failed to enable clocks\n" ); +return ret; + } + + ret =reset_control_bulk_deassert (dc->nrsts, dc->rst_vout); +return ret; +} + +static void plda_clk_rst_deinit (struct device *dev) +{ +struct vs_dc *dc =dev_get_drvdata (dev); + +reset_control_bulk_assert (dc->nrsts, dc->rst_vout); +clk_bulk_disable_unprepare (dc->nclks, dc->clk_vout); +} + +static void dc_deinit (struct device *dev) +{ +struct vs_dc *dc =dev_get_drvdata (dev); + +dc_hw_enable_interrupt (&dc->hw,0 ); +dc_hw_deinit (&dc->hw); +plda_clk_rst_deinit (dev); +} + +static int dc_init (struct device *dev) +{ +struct vs_dc *dc =dev_get_drvdata (dev); +int ret; + + dc->first_frame = true; + + ret =plda_clk_rst_init (dev); +if (ret <0 ) { +dev_err (dev,"failed to init dc clk reset: %d\n" , ret); +return ret; + } + + ret =dc_hw_init (&dc->hw); +if (ret) { +dev_err (dev,"failed to init DC HW\n" ); +return ret; + } +return 0 ; +} + +void vs_dc_enable (struct vs_dc *dc,struct drm_crtc *crtc) +{ +struct vs_crtc_state *crtc_state =to_vs_crtc_state (crtc->state); +struct drm_display_mode *mode = &crtc->state->adjusted_mode; +struct dc_hw_display display; + + display.bus_format = crtc_state->output_fmt; + display.h_active = mode->hdisplay; + display.h_total = mode->htotal; + display.h_sync_start = mode->hsync_start; + display.h_sync_end = mode->hsync_end; +if (mode->flags &DRM_MODE_FLAG_PHSYNC ) + display.h_sync_polarity = true; +else + display.h_sync_polarity = false; + + display.v_active = mode->vdisplay; + display.v_total = mode->vtotal; + display.v_sync_start = mode->vsync_start; + display.v_sync_end = mode->vsync_end; + +if (mode->flags &DRM_MODE_FLAG_PVSYNC ) + display.v_sync_polarity = true; +else + display.v_sync_polarity = false; + + display.id =to_vs_display_id (dc, crtc); + + display.enable = true; + +if (crtc_state->encoder_type ==DRM_MODE_ENCODER_DSI ) { +dc_hw_set_out (&dc->hw,OUT_DPI , display.id); +clk_set_rate (dc->clk_vout[CLK_VOUT_SOC_PIX ].clk, mode->clock *1000 ); +clk_set_parent (dc->clk_vout[CLK_VOUT_PIX1 ].clk, + dc->clk_vout[CLK_VOUT_SOC_PIX ].clk); + }else { +dc_hw_set_out (&dc->hw,OUT_DP , display.id); +clk_set_parent (dc->clk_vout[CLK_VOUT_PIX0 ].clk, + dc->clk_vout[CLK_VOUT_HDMI_PIX ].clk); + } + +dc_hw_setup_display (&dc->hw, &display); +} + +void vs_dc_disable (struct vs_dc *dc,struct drm_crtc *crtc) +{ +struct dc_hw_display display; + + display.id =to_vs_display_id (dc, crtc); + display.enable = false; + +dc_hw_setup_display (&dc->hw, &display); +} + +void vs_dc_set_gamma (struct vs_dc *dc,struct drm_crtc *crtc, +struct drm_color_lut *lut,unsigned int size) +{ +u16 i, r, g, b; +u8 bits, id; + +if (size != dc->hw.info->gamma_size) { +drm_err (crtc->dev,"gamma size does not match!\n" ); +return ; + } + + id =to_vs_display_id (dc, crtc); + + bits = dc->hw.info->gamma_bits; +for (i =0 ; i < size; i++) { + r =drm_color_lut_extract (lut[i].red, bits); + g =drm_color_lut_extract (lut[i].green, bits); + b =drm_color_lut_extract (lut[i].blue, bits); +dc_hw_update_gamma (&dc->hw, id, i, r, g, b); + } +} + +void vs_dc_enable_gamma (struct vs_dc *dc,struct drm_crtc *crtc, +bool enable) +{ +u8 id; + + id =to_vs_display_id (dc, crtc); +dc_hw_enable_gamma (&dc->hw, id, enable); +} + +void vs_dc_enable_vblank (struct vs_dc *dc,bool enable) +{ +dc_hw_enable_interrupt (&dc->hw, enable); +} + +static u32 calc_factor (u32 src,u32 dest) +{ +u32 factor =1 <<16 ; + +if (src >1 && dest >1 ) + factor = ((src -1 ) <<16 ) / (dest -1 ); + +return factor; +} + +static void update_scale (struct drm_plane_state *state,struct dc_hw_roi *roi, +struct dc_hw_scale *scale) +{ +int dst_w =drm_rect_width (&state->dst); +int dst_h =drm_rect_height (&state->dst); +int src_w, src_h, temp; + + scale->enable = false; + +if (roi->enable) { + src_w = roi->width; + src_h = roi->height; + }else { + src_w =drm_rect_width (&state->src) >>16 ; + src_h =drm_rect_height (&state->src) >>16 ; + } + +if (drm_rotation_90_or_270 (state->rotation)) { + temp = src_w; + src_w = src_h; + src_h = temp; + } + +if (src_w != dst_w) { + scale->scale_factor_x =calc_factor (src_w, dst_w); + scale->enable = true; + }else { + scale->scale_factor_x =1 <<16 ; + } +if (src_h != dst_h) { + scale->scale_factor_y =calc_factor (src_h, dst_h); + scale->enable = true; + }else { + scale->scale_factor_y =1 <<16 ; + } +} + +static void update_fb (struct vs_plane *plane,u8 display_id, +struct dc_hw_fb *fb,struct drm_plane_state *state) +{ +struct vs_plane_state *plane_state =to_vs_plane_state (state); +struct drm_framebuffer *drm_fb = state->fb; +struct drm_rect *src = &state->src; + + fb->display_id = display_id; + fb->y_address = plane_state->dma_addr[0 ]; + fb->y_stride = drm_fb->pitches[0 ]; +if (drm_fb->format->format ==DRM_FORMAT_YVU420 ) { + fb->u_address = plane_state->dma_addr[2 ]; + fb->v_address = plane_state->dma_addr[1 ]; + fb->u_stride = drm_fb->pitches[2 ]; + fb->v_stride = drm_fb->pitches[1 ]; + }else { + fb->u_address = plane_state->dma_addr[1 ]; + fb->v_address = plane_state->dma_addr[2 ]; + fb->u_stride = drm_fb->pitches[1 ]; + fb->v_stride = drm_fb->pitches[2 ]; + } + fb->width =drm_rect_width (src) >>16 ; + fb->height =drm_rect_height (src) >>16 ; + fb->tile_mode =to_vs_tile_mode (drm_fb->modifier); + fb->rotation =to_vs_rotation (state->rotation); + fb->yuv_color_space =to_vs_yuv_color_space (state->color_encoding); + fb->zpos = state->zpos; + fb->enable = state->visible; +update_format (drm_fb->format->format, drm_fb->modifier, fb); +update_swizzle (drm_fb->format->format, fb); +update_watermark (plane_state->watermark, fb); + plane_state->status.tile_mode = fb->tile_mode; +} + +static void update_degamma (struct vs_dc *dc,struct vs_plane *plane, +struct vs_plane_state *plane_state) +{ +dc_hw_update_degamma (&dc->hw, plane->id, plane_state->degamma); + plane_state->degamma_changed = false; +} + +static void update_roi (struct vs_dc *dc,u8 id, +struct vs_plane_state *plane_state, +struct dc_hw_roi *roi, +struct drm_plane_state *state) +{ +struct drm_vs_roi *data; +struct drm_rect *src = &state->src; +u16 src_w =drm_rect_width (src) >>16 ; +u16 src_h =drm_rect_height (src) >>16 ; + +if (plane_state->roi) { + data = plane_state->roi->data; + +if (data->enable) { + roi->x = data->roi_x; + roi->y = data->roi_y; + roi->width = (data->roi_x + data->roi_w > src_w) ? + (src_w - data->roi_x) : data->roi_w; + roi->height = (data->roi_y + data->roi_h > src_h) ? + (src_h - data->roi_y) : data->roi_h; + roi->enable = true; + }else { + roi->enable = false; + } + +dc_hw_update_roi (&dc->hw, id, roi); + }else { + roi->enable = false; + } +} + +static void update_color_mgmt (struct vs_dc *dc,u8 id, +struct dc_hw_fb *fb, +struct vs_plane_state *plane_state) +{ +struct drm_vs_color_mgmt *data; +struct dc_hw_colorkey colorkey; + +if (plane_state->color_mgmt) { + data = plane_state->color_mgmt->data; + + fb->clear_enable = data->clear_enable; + fb->clear_value = data->clear_value; + +if (data->colorkey > data->colorkey_high) + data->colorkey = data->colorkey_high; + + colorkey.colorkey = data->colorkey; + colorkey.colorkey_high = data->colorkey_high; + colorkey.transparency = (data->transparency) ? +DC_TRANSPARENCY_KEY :DC_TRANSPARENCY_OPAQUE ; +dc_hw_update_colorkey (&dc->hw, id, &colorkey); + } +} + +static void update_plane (struct vs_dc *dc,struct vs_plane *plane, +struct drm_plane *drm_plane, +struct drm_atomic_state *drm_state) +{ +struct dc_hw_fb fb = {0 }; +struct dc_hw_scale scale; +struct dc_hw_position pos; +struct dc_hw_blend blend; +struct dc_hw_roi roi; +struct drm_plane_state *state =drm_atomic_get_new_plane_state (drm_state, + drm_plane); +struct vs_plane_state *plane_state =to_vs_plane_state (state); +struct drm_rect *dest = &state->dst; +bool dec_enable = false; +u8 display_id =0 ; + + display_id =to_vs_display_id (dc, state->crtc); +update_fb (plane, display_id, &fb, state); + fb.dec_enable = dec_enable; + +update_roi (dc, plane->id, plane_state, &roi, state); + +update_scale (state, &roi, &scale); + +if (plane_state->degamma_changed) +update_degamma (dc, plane, plane_state); + + pos.start_x = dest->x1; + pos.start_y = dest->y1; + pos.end_x = dest->x2; + pos.end_y = dest->y2; + + blend.alpha = (u8)(state->alpha >>8 ); + blend.blend_mode = (u8)(state->pixel_blend_mode); + +update_color_mgmt (dc, plane->id, &fb, plane_state); + +dc_hw_update_plane (&dc->hw, plane->id, &fb, &scale, &pos, &blend); +} + +static void update_qos (struct vs_dc *dc,struct vs_plane *plane, +struct drm_plane *drm_plane, +struct drm_atomic_state *drm_state) +{ +struct drm_plane_state *state =drm_atomic_get_new_plane_state (drm_state, + drm_plane); +struct vs_plane_state *plane_state =to_vs_plane_state (state); +struct drm_vs_watermark *data; +struct dc_hw_qos qos; + +if (plane_state->watermark) { + data = plane_state->watermark->data; + +if (data->qos_high) { +if (data->qos_low > data->qos_high) + data->qos_low = data->qos_high; + + qos.low_value = data->qos_low &0x0F ; + qos.high_value = data->qos_high &0x0F ; +dc_hw_update_qos (&dc->hw, &qos); + } + } +} + +static void update_cursor_size (struct drm_plane_state *state,struct dc_hw_cursor *cursor) +{ +u8 size_type; + +switch (state->crtc_w) { +case 32 : + size_type =CURSOR_SIZE_32X32 ; +break ; +case 64 : + size_type =CURSOR_SIZE_64X64 ; +break ; +default : + size_type =CURSOR_SIZE_32X32 ; +break ; + } + + cursor->size = size_type; +} + +static void update_cursor_plane (struct vs_dc *dc,struct vs_plane *plane, +struct drm_plane *drm_plane, +struct drm_atomic_state *drm_state) +{ +struct drm_plane_state *state =drm_atomic_get_new_plane_state (drm_state, + drm_plane); +struct vs_plane_state *plane_state =to_vs_plane_state (state); +struct drm_framebuffer *drm_fb = state->fb; +struct dc_hw_cursor cursor; + + cursor.address = plane_state->dma_addr[0 ]; + cursor.x = state->crtc_x; + cursor.y = state->crtc_y; + cursor.hot_x = drm_fb->hot_x; + cursor.hot_y = drm_fb->hot_y; + cursor.display_id =to_vs_display_id (dc, state->crtc); +update_cursor_size (state, &cursor); + cursor.enable = true; + +dc_hw_update_cursor (&dc->hw, cursor.display_id, &cursor); +} + +void vs_dc_update_plane (struct vs_dc *dc,struct vs_plane *plane, +struct drm_plane *drm_plane, +struct drm_atomic_state *drm_state) +{ +update_plane (dc, plane, drm_plane, drm_state); +update_qos (dc, plane, drm_plane, drm_state); +} + +void vs_dc_update_cursor_plane (struct vs_dc *dc,struct vs_plane *plane, +struct drm_plane *drm_plane, +struct drm_atomic_state *drm_state) +{ +update_cursor_plane (dc, plane, drm_plane, drm_state); +} + +void vs_dc_disable_plane (struct vs_dc *dc,struct vs_plane *plane, +struct drm_plane_state *old_state) +{ +struct dc_hw_fb fb = {0 }; + + fb.enable = false; +dc_hw_update_plane (&dc->hw, plane->id, &fb,NULL ,NULL ,NULL ); +} + +void vs_dc_disable_cursor_plane (struct vs_dc *dc,struct vs_plane *plane, +struct drm_plane_state *old_state) +{ +struct dc_hw_cursor cursor = {0 }; + + cursor.enable = false; + cursor.display_id =to_vs_display_id (dc, old_state->crtc); +dc_hw_update_cursor (&dc->hw, cursor.display_id, &cursor); +} + +static bool vs_dc_mod_supported (const struct vs_plane_info *plane_info, +u64 modifier) +{ +const u64 *mods; + +if (!plane_info->modifiers) +return false; + +for (mods = plane_info->modifiers; *mods !=DRM_FORMAT_MOD_INVALID ; mods++) { +if (*mods == modifier) +return true; + } + +return false; +} + +int vs_dc_check_plane (struct vs_dc *dc,struct drm_plane *plane, +struct drm_atomic_state *state) +{ +struct drm_plane_state *new_plane_state =drm_atomic_get_new_plane_state (state, + plane); + +struct drm_framebuffer *fb = new_plane_state->fb; +const struct vs_plane_info *plane_info; +struct drm_crtc *crtc = new_plane_state->crtc; +struct drm_crtc_state *crtc_state; +struct vs_plane *vs_plane =to_vs_plane (plane); + + plane_info = &dc->hw.info->planes[vs_plane->id]; + +if (fb->width < plane_info->min_width || + fb->width > plane_info->max_width || + fb->height < plane_info->min_height || + fb->height > plane_info->max_height) +drm_err_once (plane->dev,"buffer size may not support on plane%d.\n" , + vs_plane->id); + +if (!vs_dc_mod_supported (plane_info, fb->modifier)) { +drm_err (plane->dev,"unsupported modifier on plane%d.\n" , vs_plane->id); +return -EINVAL ; + } + + crtc_state =drm_atomic_get_existing_crtc_state (state, crtc); +return drm_atomic_helper_check_plane_state (new_plane_state, crtc_state, + plane_info->min_scale, + plane_info->max_scale, + true, true); +} + +int vs_dc_check_cursor_plane (struct vs_dc *dc,struct drm_plane *plane, +struct drm_atomic_state *state) +{ +struct drm_plane_state *new_plane_state =drm_atomic_get_new_plane_state (state, + plane); +struct drm_framebuffer *fb = new_plane_state->fb; +const struct vs_plane_info *plane_info; +struct drm_crtc *crtc = new_plane_state->crtc; +struct drm_crtc_state *crtc_state; +struct vs_plane *vs_plane =to_vs_plane (plane); + + plane_info = &dc->hw.info->planes[vs_plane->id]; + +if (fb->width < plane_info->min_width || + fb->width > plane_info->max_width || + fb->height < plane_info->min_height || + fb->height > plane_info->max_height) +drm_err_once (plane->dev,"buffer size may not support on plane%d.\n" , vs_plane->id); + + crtc_state =drm_atomic_get_existing_crtc_state (state, crtc); +if (IS_ERR (crtc_state)) +return -EINVAL ; + +return drm_atomic_helper_check_plane_state (new_plane_state, crtc_state, + plane_info->min_scale, + plane_info->max_scale, + true, true); +} + +static void vs_crtc_handle_vblank (struct drm_crtc *crtc,bool underflow) +{ +struct vs_crtc_state *vs_crtc_state =to_vs_crtc_state (crtc->state); + +drm_crtc_handle_vblank (crtc); + + vs_crtc_state->underflow = underflow; +} + +static irqreturn_t dc_isr (int irq,void *data) +{ +struct vs_dc *dc = data; +struct vs_dc_info *dc_info = dc->hw.info; +u32 i, ret; + + ret =dc_hw_get_interrupt (&dc->hw); + +for (i =0 ; i < dc_info->panel_num; i++) +vs_crtc_handle_vblank (&dc->crtc[i]->base,dc_hw_check_underflow (&dc->hw)); + +return IRQ_HANDLED ; +} + +void vs_dc_commit (struct vs_dc *dc) +{ +dc_hw_enable_shadow_register (&dc->hw, false); + +dc_hw_commit (&dc->hw); + +if (dc->first_frame) + dc->first_frame = false; + +dc_hw_enable_shadow_register (&dc->hw, true); +} + +static int dc_bind (struct device *dev,struct device *master,void *data) +{ +struct drm_device *drm_dev = data; +struct vs_dc *dc =dev_get_drvdata (dev); +struct device_node *port; +struct vs_crtc *crtc; +struct vs_dc_info *dc_info; +struct vs_plane *plane; +struct vs_plane_info *plane_info; +int i, ret; +u32 ctrc_mask =0 ; + +if (!drm_dev || !dc) { +dev_err (dev,"devices are not created.\n" ); +return -ENODEV ; + } + + ret =dc_init (dev); +if (ret <0 ) { +drm_err (drm_dev,"Failed to initialize DC hardware.\n" ); +return ret; + } + + port =of_get_child_by_name (dev->of_node,"port" ); +if (!port) { +drm_err (drm_dev,"no port node found\n" ); +return -ENODEV ; + } +of_node_put (port); + + dc_info = dc->hw.info; + +for (i =0 ; i < dc_info->panel_num; i++) { + crtc =vs_crtc_create (drm_dev, dc_info); +if (!crtc) { +drm_err (drm_dev,"Failed to create CRTC.\n" ); + ret = -ENOMEM ; +return ret; + } + + crtc->base.port = port; + crtc->dev = dev; + dc->crtc[i] = crtc; + ctrc_mask |=drm_crtc_mask (&crtc->base); + } +drivers/gpu/drm/verisilicon/vs_dc.c line 871
Quoted 10 lines
drivers/gpu/drm/verisilicon/vs_dc.c new file +10
-0+for (i =0 ; i < dc_info->plane_num; i++) { + plane_info = (struct vs_plane_info *)&dc_info->planes[i]; + +if (!strcmp (plane_info->name,"Primary" ) || !strcmp (plane_info->name,"Cursor" )) { + plane =vs_plane_create (drm_dev, plane_info, dc_info->layer_num, +drm_crtc_mask (&dc->crtc[0 ]->base)); + }else if (!strcmp (plane_info->name,"Primary_1" ) || + !strcmp (plane_info->name,"Cursor_1" )) { + plane =vs_plane_create (drm_dev, plane_info, dc_info->layer_num, +drm_crtc_mask (&dc->crtc[1 ]->base));I'd say, it's not typical to use name to distinguish objects. Maybe you can add indices to the info structure and drop the names instead?
Quoted 8 lines
drivers/gpu/drm/verisilicon/vs_dc.c new file +8
-0+ }else { + plane =vs_plane_create (drm_dev, plane_info, + dc_info->layer_num, ctrc_mask); + } + +if (IS_ERR (plane)) { +dev_err (dev,"failed to construct plane\n" ); +return PTR_ERR (plane);drivers/gpu/drm/verisilicon/vs_dc.c line 889
Quoted 10 lines
drivers/gpu/drm/verisilicon/vs_dc.c new file +10
-0+ } + + plane->id = i; + dc->planes[i].id = plane_info->id; + +if (plane_info->type ==DRM_PLANE_TYPE_PRIMARY ) { +if (!strcmp (plane_info->name,"Primary" )) + dc->crtc[0 ]->base.primary = &plane->base; +else + dc->crtc[1 ]->base.primary = &plane->base;This definitely urges for an index in the plane info /
plane_state.Quoted 70 lines
drivers/gpu/drm/verisilicon/vs_dc.c new file +70
-0+ drm_dev->mode_config.min_width = plane_info->min_width; + drm_dev->mode_config.min_height = + plane_info->min_height; + drm_dev->mode_config.max_width = plane_info->max_width; + drm_dev->mode_config.max_height = + plane_info->max_height; + } + +if (plane_info->type ==DRM_PLANE_TYPE_CURSOR ) { +if (!strcmp (plane_info->name,"Cursor" )) + dc->crtc[0 ]->base.cursor = &plane->base; +else + dc->crtc[1 ]->base.cursor = &plane->base; + drm_dev->mode_config.cursor_width = + plane_info->max_width; + drm_dev->mode_config.cursor_height = + plane_info->max_height; + } + } + +vs_drm_update_pitch_alignment (drm_dev, dc_info->pitch_alignment); +return 0 ; +} + +static void dc_unbind (struct device *dev,struct device *master,void *data) +{ +dc_deinit (dev); +} + +const struct component_ops dc_component_ops = { + .bind = dc_bind, + .unbind = dc_unbind, +}; + +static const struct of_device_id dc_driver_dt_match[] = { + { .compatible ="starfive,jh7110-dc8200" , }, + {}, +}; +MODULE_DEVICE_TABLE (of, dc_driver_dt_match); + +static int dc_probe (struct platform_device *pdev) +{ +struct device *dev = &pdev->dev; +struct vs_dc *dc; +int irq, ret, i; + + dc =devm_kzalloc (dev,sizeof (*dc),GFP_KERNEL ); +if (!dc) +return -ENOMEM ; + + dc->hw.hi_base =devm_platform_ioremap_resource (pdev,0 ); +if (IS_ERR (dc->hw.hi_base)) +return PTR_ERR (dc->hw.hi_base); + + dc->hw.reg_base =devm_platform_ioremap_resource (pdev,1 ); +if (IS_ERR (dc->hw.reg_base)) +return PTR_ERR (dc->hw.reg_base); + + dc->nclks =ARRAY_SIZE (dc->clk_vout); +for (i =0 ; i < dc->nclks; ++i) + dc->clk_vout[i].id = vout_clocks[i]; + ret =devm_clk_bulk_get (dev, dc->nclks, dc->clk_vout); +if (ret) { +dev_err (dev,"Failed to get clk controls\n" ); +return ret; + } + + dc->nrsts =ARRAY_SIZE (dc->rst_vout); +for (i =0 ; i < dc->nrsts; ++i) + dc->rst_vout[i].id = vout_resets[i];drivers/gpu/drm/verisilicon/vs_dc.c line 969
Quoted 10 lines
drivers/gpu/drm/verisilicon/vs_dc.c new file +10
-0+ ret =devm_reset_control_bulk_get_shared (dev, dc->nrsts, + dc->rst_vout); +if (ret) { +dev_err (dev,"Failed to get reset controls\n" ); +return ret; + } + + irq =platform_get_irq (pdev,0 ); + + ret =devm_request_irq (dev, irq, dc_isr,0 ,dev_name (dev), dc);Are you ready to handle the IRQ at this point?
Quoted 535 lines
drivers/gpu/drm/verisilicon/vs_dc.c new file +33
-0+if (ret <0 ) { +dev_err (dev,"Failed to install irq:%u.\n" , irq); +return ret; + } + +dev_set_drvdata (dev, dc); + +return component_add (dev, &dc_component_ops); +} + +static int dc_remove (struct platform_device *pdev) +{ +struct device *dev = &pdev->dev; + +component_del (dev, &dc_component_ops); + +dev_set_drvdata (dev,NULL ); + +return 0 ; +} + +struct platform_driver dc_platform_driver = { + .probe = dc_probe, + .remove = dc_remove, + .driver = { + .name ="vs-dc" , + .of_match_table =of_match_ptr (dc_driver_dt_match), + }, +}; + +MODULE_AUTHOR ("StarFive Corporation" ); +MODULE_DESCRIPTION ("VeriSilicon DC Driver" ); +MODULE_LICENSE ("GPL" );drivers/gpu/drm/verisilicon/vs_dc.h new file +80
-0@@ -0,0 +1,80 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Copyright (C) 2023 VeriSilicon Holdings Co., Ltd. +*/ + +#ifndef __VS_DC_H__ +#define __VS_DC_H__ + +#include <linux/clk.h> +#include <linux/mm_types.h> +#include <linux/reset.h> + +#include <drm/drm_fourcc.h> +#include <drm/drm_modes.h> + +#include "vs_crtc.h" +#include "vs_dc_hw.h" +#include "vs_plane.h" + +struct vs_dc_plane { +enum dc_hw_plane_id id; +}; + +enum vout_clk { +CLK_VOUT_NOC_DISP =0 , +CLK_VOUT_PIX0 , +CLK_VOUT_PIX1 , +CLK_VOUT_CORE , +CLK_VOUT_AXI , +CLK_VOUT_AHB , +CLK_VOUT_HDMI_PIX , +CLK_VOUT_SOC_PIX , +CLK_VOUT_NUM +}; + +enum rst_vout { +RST_VOUT_AXI =0 , +RST_VOUT_AHB , +RST_VOUT_CORE , +RST_VOUT_NUM +}; + +struct vs_dc { +struct vs_crtc *crtc[DC_DISPLAY_NUM ]; +struct dc_hw hw; +bool first_frame; + +struct vs_dc_plane planes[PLANE_NUM ]; +struct clk_bulk_data clk_vout[CLK_VOUT_NUM ]; +int nclks; +struct reset_control_bulk_data rst_vout[RST_VOUT_NUM ]; +int nrsts; +}; + +void vs_dc_enable (struct vs_dc *dc,struct drm_crtc *crtc); +void vs_dc_disable (struct vs_dc *dc,struct drm_crtc *crtc); + +void vs_dc_set_gamma (struct vs_dc *dc,struct drm_crtc *crtc, +struct drm_color_lut *lut,unsigned int size); +void vs_dc_enable_gamma (struct vs_dc *dc,struct drm_crtc *crtc,bool enable); +void vs_dc_enable_vblank (struct vs_dc *dc,bool enable); +void vs_dc_commit (struct vs_dc *dc); +void vs_dc_update_plane (struct vs_dc *dc,struct vs_plane *plane, +struct drm_plane *drm_plane, +struct drm_atomic_state *drm_state); +void vs_dc_disable_plane (struct vs_dc *dc,struct vs_plane *plane, +struct drm_plane_state *old_state); +int vs_dc_check_plane (struct vs_dc *dc,struct drm_plane *plane, +struct drm_atomic_state *state); +void vs_dc_update_cursor_plane (struct vs_dc *dc,struct vs_plane *plane, +struct drm_plane *drm_plane, +struct drm_atomic_state *drm_state); +void vs_dc_disable_cursor_plane (struct vs_dc *dc,struct vs_plane *plane, +struct drm_plane_state *old_state); +int vs_dc_check_cursor_plane (struct vs_dc *dc,struct drm_plane *plane, +struct drm_atomic_state *state); + +extern struct platform_driver dc_platform_driver; + +#endif /* __VS_DC_H__ */ drivers/gpu/drm/verisilicon/vs_dc_hw.c new file +410
-0@@ -0,0 +1,1959 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Copyright (C) 2023 VeriSilicon Holdings Co., Ltd. +*/ + +#include <linux/bits.h> +#include <linux/io.h> +#include <linux/media-bus-format.h> +#include <drm/drm_atomic_helper.h> +#include <drm/drm_blend.h> +#include <drm/drm_fourcc.h> +#include <drm/vs_drm.h> + +#include "vs_dc_hw.h" +#include "vs_type.h" + +static const u32 horkernel[] = { +0x00000000 ,0x20000000 ,0x00002000 ,0x00000000 , +0x00000000 ,0x00000000 ,0x23fd1c03 ,0x00000000 , +0x00000000 ,0x00000000 ,0x181f0000 ,0x000027e1 , +0x00000000 ,0x00000000 ,0x00000000 ,0x2b981468 , +0x00000000 ,0x00000000 ,0x00000000 ,0x10f00000 , +0x00002f10 ,0x00000000 ,0x00000000 ,0x00000000 , +0x32390dc7 ,0x00000000 ,0x00000000 ,0x00000000 , +0x0af50000 ,0x0000350b ,0x00000000 ,0x00000000 , +0x00000000 ,0x3781087f ,0x00000000 ,0x00000000 , +0x00000000 ,0x06660000 ,0x0000399a ,0x00000000 , +0x00000000 ,0x00000000 ,0x3b5904a7 ,0x00000000 , +0x00000000 ,0x00000000 ,0x033c0000 ,0x00003cc4 , +0x00000000 ,0x00000000 ,0x00000000 ,0x3de1021f , +0x00000000 ,0x00000000 ,0x00000000 ,0x01470000 , +0x00003eb9 ,0x00000000 ,0x00000000 ,0x00000000 , +0x3f5300ad ,0x00000000 ,0x00000000 ,0x00000000 , +0x00480000 ,0x00003fb8 ,0x00000000 ,0x00000000 , +0x00000000 ,0x3fef0011 ,0x00000000 ,0x00000000 , +0x00000000 ,0x00000000 ,0x00004000 ,0x00000000 , +0x00000000 ,0x00000000 ,0x20002000 ,0x00000000 , +0x00000000 ,0x00000000 ,0x1c030000 ,0x000023fd , +0x00000000 ,0x00000000 ,0x00000000 ,0x27e1181f , +0x00000000 ,0x00000000 ,0x00000000 ,0x14680000 , +0x00002b98 ,0x00000000 ,0x00000000 ,0x00000000 , +0x2f1010f0 ,0x00000000 ,0x00000000 ,0x00000000 , +0x0dc70000 ,0x00003239 ,0x00000000 ,0x00000000 , +0x00000000 ,0x350b0af5 ,0x00000000 ,0x00000000 , +0x00000000 ,0x087f0000 ,0x00003781 ,0x00000000 , +0x00000000 ,0x00000000 ,0x399a0666 ,0x00000000 , +0x00000000 ,0x00000000 ,0x04a70000 ,0x00003b59 , +0x00000000 ,0x00000000 ,0x00000000 ,0x3cc4033c , +0x00000000 ,0x00000000 ,0x00000000 ,0x021f0000 , +}; + +#define H_COEF_SIZE (sizeof(horkernel) / sizeof(u32)) + +static const u32 verkernel[] = { +0x00000000 ,0x20000000 ,0x00002000 ,0x00000000 , +0x00000000 ,0x00000000 ,0x23fd1c03 ,0x00000000 , +0x00000000 ,0x00000000 ,0x181f0000 ,0x000027e1 , +0x00000000 ,0x00000000 ,0x00000000 ,0x2b981468 , +0x00000000 ,0x00000000 ,0x00000000 ,0x10f00000 , +0x00002f10 ,0x00000000 ,0x00000000 ,0x00000000 , +0x32390dc7 ,0x00000000 ,0x00000000 ,0x00000000 , +0x0af50000 ,0x0000350b ,0x00000000 ,0x00000000 , +0x00000000 ,0x3781087f ,0x00000000 ,0x00000000 , +0x00000000 ,0x06660000 ,0x0000399a ,0x00000000 , +0x00000000 ,0x00000000 ,0x3b5904a7 ,0x00000000 , +0x00000000 ,0x00000000 ,0x033c0000 ,0x00003cc4 , +0x00000000 ,0x00000000 ,0x00000000 ,0x3de1021f , +0x00000000 ,0x00000000 ,0x00000000 ,0x01470000 , +0x00003eb9 ,0x00000000 ,0x00000000 ,0x00000000 , +0x3f5300ad ,0x00000000 ,0x00000000 ,0x00000000 , +0x00480000 ,0x00003fb8 ,0x00000000 ,0x00000000 , +0x00000000 ,0x3fef0011 ,0x00000000 ,0x00000000 , +0x00000000 ,0x00000000 ,0x00004000 ,0x00000000 , +0xcdcd0000 ,0xfdfdfdfd ,0xabababab ,0xabababab , +0x00000000 ,0x00000000 ,0x5ff5f456 ,0x000f5f58 , +0x02cc6c78 ,0x02cc0c28 ,0xfeeefeee ,0xfeeefeee , +0xfeeefeee ,0xfeeefeee ,0xfeeefeee ,0xfeeefeee , +0xfeeefeee ,0xfeeefeee ,0xfeeefeee ,0xfeeefeee , +0xfeeefeee ,0xfeeefeee ,0xfeeefeee ,0xfeeefeee , +0xfeeefeee ,0xfeeefeee ,0xfeeefeee ,0xfeeefeee , +0xfeeefeee ,0xfeeefeee ,0xfeeefeee ,0xfeeefeee , +0xfeeefeee ,0xfeeefeee ,0xfeeefeee ,0xfeeefeee , +0xfeeefeee ,0xfeeefeee ,0xfeeefeee ,0xfeeefeee , +0xfeeefeee ,0xfeeefeee ,0xfeeefeee ,0xfeeefeee , +0xfeeefeee ,0xfeeefeee ,0xfeeefeee ,0xfeeefeee , +0xfeeefeee ,0xfeeefeee ,0xfeeefeee ,0xfeeefeee , +}; + +#define V_COEF_SIZE (sizeof(verkernel) / sizeof(u32)) + +/* +* RGB 709->2020 conversion parameters +*/ +static u16 RGB2RGB [RGB_TO_RGB_TABLE_SIZE ] = { +10279 ,5395 ,709 , +1132 ,15065 ,187 , +269 ,1442 ,14674 +}; + +/* +* YUV601 to RGB conversion parameters +* YUV2RGB[0] - [8] : C0 - C8; +* YUV2RGB[9] - [11]: D0 - D2; +* YUV2RGB[12] - [13]: Y clamp min & max calue; +* YUV2RGB[14] - [15]: UV clamp min & max calue; +*/ +static s32 YUV601_2RGB [YUV_TO_RGB_TABLE_SIZE ] = { +1196 ,0 ,1640 ,1196 , +-404 ,-836 ,1196 ,2076 , +0 ,-916224 ,558336 ,-1202944 , +64 ,940 ,64 ,960 +}; + +/* +* YUV709 to RGB conversion parameters +* YUV2RGB[0] - [8] : C0 - C8; +* YUV2RGB[9] - [11]: D0 - D2; +* YUV2RGB[12] - [13]: Y clamp min & max calue; +* YUV2RGB[14] - [15]: UV clamp min & max calue; +*/ +static s32 YUV709_2RGB [YUV_TO_RGB_TABLE_SIZE ] = { +1196 ,0 ,1844 ,1196 , +-220 ,-548 ,1196 ,2172 , +0 ,-1020672 ,316672 ,-1188608 , +64 ,940 ,64 ,960 +}; + +/* +* YUV2020 to RGB conversion parameters +* YUV2RGB[0] - [8] : C0 - C8; +* YUV2RGB[9] - [11]: D0 - D2; +* YUV2RGB[12] - [13]: Y clamp min & max calue; +* YUV2RGB[14] - [15]: UV clamp min & max calue; +*/ +static s32 YUV2020_2RGB [YUV_TO_RGB_TABLE_SIZE ] = { +1196 ,0 ,1724 ,1196 , +-192 ,-668 ,1196 ,2200 , +0 ,-959232 ,363776 ,-1202944 , +64 ,940 ,64 ,960 +}; + +/* +* RGB to YUV2020 conversion parameters +* RGB2YUV[0] - [8] : C0 - C8; +* RGB2YUV[9] - [11]: D0 - D2; +*/ +static s16 RGB2YUV [RGB_TO_YUV_TABLE_SIZE ] = { +230 ,594 ,52 , +-125 ,-323 ,448 , +448 ,-412 ,-36 , +64 ,512 ,512 +}; + +/* +* Degamma table for 709 color space data. +*/ +static u16 DEGAMMA_709 [DEGAMMA_SIZE ] = { +0x0000 ,0x0000 ,0x0000 ,0x0000 ,0x0001 ,0x0002 ,0x0004 ,0x0005 , +0x0007 ,0x000a ,0x000d ,0x0011 ,0x0015 ,0x0019 ,0x001e ,0x0024 , +0x002a ,0x0030 ,0x0038 ,0x003f ,0x0048 ,0x0051 ,0x005a ,0x0064 , +0x006f ,0x007b ,0x0087 ,0x0094 ,0x00a1 ,0x00af ,0x00be ,0x00ce , +0x00de ,0x00ef ,0x0101 ,0x0114 ,0x0127 ,0x013b ,0x0150 ,0x0166 , +0x017c ,0x0193 ,0x01ac ,0x01c4 ,0x01de ,0x01f9 ,0x0214 ,0x0230 , +0x024d ,0x026b ,0x028a ,0x02aa ,0x02ca ,0x02ec ,0x030e ,0x0331 , +0x0355 ,0x037a ,0x03a0 ,0x03c7 ,0x03ef ,0x0418 ,0x0441 ,0x046c , +0x0498 ,0x04c4 ,0x04f2 ,0x0520 ,0x0550 ,0x0581 ,0x05b2 ,0x05e5 , +0x0618 ,0x064d ,0x0682 ,0x06b9 ,0x06f0 ,0x0729 ,0x0763 ,0x079d , +0x07d9 ,0x0816 ,0x0854 ,0x0893 ,0x08d3 ,0x0914 ,0x0956 ,0x0999 , +0x09dd ,0x0a23 ,0x0a69 ,0x0ab1 ,0x0afa ,0x0b44 ,0x0b8f ,0x0bdb , +0x0c28 ,0x0c76 ,0x0cc6 ,0x0d17 ,0x0d69 ,0x0dbb ,0x0e10 ,0x0e65 , +0x0ebb ,0x0f13 ,0x0f6c ,0x0fc6 ,0x1021 ,0x107d ,0x10db ,0x113a , +0x119a ,0x11fb ,0x125d ,0x12c1 ,0x1325 ,0x138c ,0x13f3 ,0x145b , +0x14c5 ,0x1530 ,0x159c ,0x160a ,0x1678 ,0x16e8 ,0x175a ,0x17cc , +0x1840 ,0x18b5 ,0x192b ,0x19a3 ,0x1a1c ,0x1a96 ,0x1b11 ,0x1b8e , +0x1c0c ,0x1c8c ,0x1d0c ,0x1d8e ,0x1e12 ,0x1e96 ,0x1f1c ,0x1fa3 , +0x202c ,0x20b6 ,0x2141 ,0x21ce ,0x225c ,0x22eb ,0x237c ,0x240e , +0x24a1 ,0x2536 ,0x25cc ,0x2664 ,0x26fc ,0x2797 ,0x2832 ,0x28cf , +0x296e ,0x2a0e ,0x2aaf ,0x2b51 ,0x2bf5 ,0x2c9b ,0x2d41 ,0x2dea , +0x2e93 ,0x2f3e ,0x2feb ,0x3099 ,0x3148 ,0x31f9 ,0x32ab ,0x335f , +0x3414 ,0x34ca ,0x3582 ,0x363c ,0x36f7 ,0x37b3 ,0x3871 ,0x3930 , +0x39f1 ,0x3ab3 ,0x3b77 ,0x3c3c ,0x3d02 ,0x3dcb ,0x3e94 ,0x3f5f , +0x402c ,0x40fa ,0x41ca ,0x429b ,0x436d ,0x4442 ,0x4517 ,0x45ee , +0x46c7 ,0x47a1 ,0x487d ,0x495a ,0x4a39 ,0x4b19 ,0x4bfb ,0x4cde , +0x4dc3 ,0x4eaa ,0x4f92 ,0x507c ,0x5167 ,0x5253 ,0x5342 ,0x5431 , +0x5523 ,0x5616 ,0x570a ,0x5800 ,0x58f8 ,0x59f1 ,0x5aec ,0x5be9 , +0x5ce7 ,0x5de6 ,0x5ee7 ,0x5fea ,0x60ef ,0x61f5 ,0x62fc ,0x6406 , +0x6510 ,0x661d ,0x672b ,0x683b ,0x694c ,0x6a5f ,0x6b73 ,0x6c8a , +0x6da2 ,0x6ebb ,0x6fd6 ,0x70f3 ,0x7211 ,0x7331 ,0x7453 ,0x7576 , +0x769b ,0x77c2 ,0x78ea ,0x7a14 ,0x7b40 ,0x7c6d ,0x7d9c ,0x7ecd , +0x3f65 ,0x3f8c ,0x3fb2 ,0x3fd8 +}; + +/* +* Degamma table for 2020 color space data. +*/ +static u16 DEGAMMA_2020 [DEGAMMA_SIZE ] = { +0x0000 ,0x0000 ,0x0000 ,0x0000 ,0x0000 ,0x0000 ,0x0000 ,0x0000 , +0x0000 ,0x0000 ,0x0000 ,0x0000 ,0x0000 ,0x0000 ,0x0000 ,0x0000 , +0x0000 ,0x0000 ,0x0000 ,0x0000 ,0x0000 ,0x0000 ,0x0000 ,0x0000 , +0x0000 ,0x0001 ,0x0001 ,0x0001 ,0x0001 ,0x0001 ,0x0001 ,0x0001 , +0x0001 ,0x0002 ,0x0002 ,0x0002 ,0x0002 ,0x0002 ,0x0003 ,0x0003 , +0x0003 ,0x0003 ,0x0004 ,0x0004 ,0x0004 ,0x0005 ,0x0005 ,0x0006 , +0x0006 ,0x0006 ,0x0007 ,0x0007 ,0x0008 ,0x0008 ,0x0009 ,0x000a , +0x000a ,0x000b ,0x000c ,0x000c ,0x000d ,0x000e ,0x000f ,0x000f , +0x0010 ,0x0011 ,0x0012 ,0x0013 ,0x0014 ,0x0016 ,0x0017 ,0x0018 , +0x0019 ,0x001b ,0x001c ,0x001e ,0x001f ,0x0021 ,0x0022 ,0x0024 , +0x0026 ,0x0028 ,0x002a ,0x002c ,0x002e ,0x0030 ,0x0033 ,0x0035 , +0x0038 ,0x003a ,0x003d ,0x0040 ,0x0043 ,0x0046 ,0x0049 ,0x004d , +0x0050 ,0x0054 ,0x0057 ,0x005b ,0x005f ,0x0064 ,0x0068 ,0x006d , +0x0071 ,0x0076 ,0x007c ,0x0081 ,0x0086 ,0x008c ,0x0092 ,0x0098 , +0x009f ,0x00a5 ,0x00ac ,0x00b4 ,0x00bb ,0x00c3 ,0x00cb ,0x00d3 , +0x00dc ,0x00e5 ,0x00ee ,0x00f8 ,0x0102 ,0x010c ,0x0117 ,0x0123 , +0x012e ,0x013a ,0x0147 ,0x0154 ,0x0161 ,0x016f ,0x017e ,0x018d , +0x019c ,0x01ac ,0x01bd ,0x01ce ,0x01e0 ,0x01f3 ,0x0206 ,0x021a , +0x022f ,0x0244 ,0x025a ,0x0272 ,0x0289 ,0x02a2 ,0x02bc ,0x02d6 , +0x02f2 ,0x030f ,0x032c ,0x034b ,0x036b ,0x038b ,0x03ae ,0x03d1 , +0x03f5 ,0x041b ,0x0443 ,0x046b ,0x0495 ,0x04c1 ,0x04ee ,0x051d , +0x054e ,0x0580 ,0x05b4 ,0x05ea ,0x0622 ,0x065c ,0x0698 ,0x06d6 , +0x0717 ,0x075a ,0x079f ,0x07e7 ,0x0831 ,0x087e ,0x08cd ,0x0920 , +0x0976 ,0x09ce ,0x0a2a ,0x0a89 ,0x0aec ,0x0b52 ,0x0bbc ,0x0c2a , +0x0c9b ,0x0d11 ,0x0d8b ,0x0e0a ,0x0e8d ,0x0f15 ,0x0fa1 ,0x1033 , +0x10ca ,0x1167 ,0x120a ,0x12b2 ,0x1360 ,0x1415 ,0x14d1 ,0x1593 , +0x165d ,0x172e ,0x1806 ,0x18e7 ,0x19d0 ,0x1ac1 ,0x1bbb ,0x1cbf , +0x1dcc ,0x1ee3 ,0x2005 ,0x2131 ,0x2268 ,0x23ab ,0x24fa ,0x2656 , +0x27be ,0x2934 ,0x2ab8 ,0x2c4a ,0x2dec ,0x2f9d ,0x315f ,0x3332 , +0x3516 ,0x370d ,0x3916 ,0x3b34 ,0x3d66 ,0x3fad ,0x420b ,0x4480 , +0x470d ,0x49b3 ,0x4c73 ,0x4f4e ,0x5246 ,0x555a ,0x588e ,0x5be1 , +0x5f55 ,0x62eb ,0x66a6 ,0x6a86 ,0x6e8c ,0x72bb ,0x7714 ,0x7b99 , +0x3dcb ,0x3e60 ,0x3ef5 ,0x3f8c +}; + +/* one is for primary plane and the other is for all overlay planes */ +static const struct dc_hw_plane_reg dc_plane_reg[] = { + { + .y_address =DC_FRAMEBUFFER_ADDRESS , + .u_address =DC_FRAMEBUFFER_U_ADDRESS , + .v_address =DC_FRAMEBUFFER_V_ADDRESS , + .y_stride =DC_FRAMEBUFFER_STRIDE , + .u_stride =DC_FRAMEBUFFER_U_STRIDE , + .v_stride =DC_FRAMEBUFFER_V_STRIDE , + .size =DC_FRAMEBUFFER_SIZE , + .top_left =DC_FRAMEBUFFER_TOP_LEFT , + .bottom_right =DC_FRAMEBUFFER_BOTTOM_RIGHT , + .scale_factor_x =DC_FRAMEBUFFER_SCALE_FACTOR_X , + .scale_factor_y =DC_FRAMEBUFFER_SCALE_FACTOR_Y , + .h_filter_coef_index =DC_FRAMEBUFFER_H_FILTER_COEF_INDEX , + .h_filter_coef_data =DC_FRAMEBUFFER_H_FILTER_COEF_DATA , + .v_filter_coef_index =DC_FRAMEBUFFER_V_FILTER_COEF_INDEX , + .v_filter_coef_data =DC_FRAMEBUFFER_V_FILTER_COEF_DATA , + .init_offset =DC_FRAMEBUFFER_INIT_OFFSET , + .color_key =DC_FRAMEBUFFER_COLOR_KEY , + .color_key_high =DC_FRAMEBUFFER_COLOR_KEY_HIGH , + .clear_value =DC_FRAMEBUFFER_CLEAR_VALUE , + .color_table_index =DC_FRAMEBUFFER_COLOR_TABLE_INDEX , + .color_table_data =DC_FRAMEBUFFER_COLOR_TABLE_DATA , + .scale_config =DC_FRAMEBUFFER_SCALE_CONFIG , + .water_mark =DC_FRAMEBUFFER_WATER_MARK , + .degamma_index =DC_FRAMEBUFFER_DEGAMMA_INDEX , + .degamma_data =DC_FRAMEBUFFER_DEGAMMA_DATA , + .degamma_ex_data =DC_FRAMEBUFFER_DEGAMMA_EX_DATA , + .src_global_color =DC_FRAMEBUFFER_SRC_GLOBAL_COLOR , + .dst_global_color =DC_FRAMEBUFFER_DST_GLOBAL_COLOR , + .blend_config =DC_FRAMEBUFFER_BLEND_CONFIG , + .roi_origin =DC_FRAMEBUFFER_ROI_ORIGIN , + .roi_size =DC_FRAMEBUFFER_ROI_SIZE , + .yuv_to_rgb_coef0 =DC_FRAMEBUFFER_YUVTORGB_COEF0 , + .yuv_to_rgb_coef1 =DC_FRAMEBUFFER_YUVTORGB_COEF1 , + .yuv_to_rgb_coef2 =DC_FRAMEBUFFER_YUVTORGB_COEF2 , + .yuv_to_rgb_coef3 =DC_FRAMEBUFFER_YUVTORGB_COEF3 , + .yuv_to_rgb_coef4 =DC_FRAMEBUFFER_YUVTORGB_COEF4 , + .yuv_to_rgb_coefd0 =DC_FRAMEBUFFER_YUVTORGB_COEFD0 , + .yuv_to_rgb_coefd1 =DC_FRAMEBUFFER_YUVTORGB_COEFD1 , + .yuv_to_rgb_coefd2 =DC_FRAMEBUFFER_YUVTORGB_COEFD2 , + .y_clamp_bound =DC_FRAMEBUFFER_Y_CLAMP_BOUND , + .uv_clamp_bound =DC_FRAMEBUFFER_UV_CLAMP_BOUND , + .rgb_to_rgb_coef0 =DC_FRAMEBUFFER_RGBTORGB_COEF0 , + .rgb_to_rgb_coef1 =DC_FRAMEBUFFER_RGBTORGB_COEF1 , + .rgb_to_rgb_coef2 =DC_FRAMEBUFFER_RGBTORGB_COEF2 , + .rgb_to_rgb_coef3 =DC_FRAMEBUFFER_RGBTORGB_COEF3 , + .rgb_to_rgb_coef4 =DC_FRAMEBUFFER_RGBTORGB_COEF4 , + }, + { + .y_address =DC_OVERLAY_ADDRESS , + .u_address =DC_OVERLAY_U_ADDRESS , + .v_address =DC_OVERLAY_V_ADDRESS , + .y_stride =DC_OVERLAY_STRIDE , + .u_stride =DC_OVERLAY_U_STRIDE , + .v_stride =DC_OVERLAY_V_STRIDE , + .size =DC_OVERLAY_SIZE , + .top_left =DC_OVERLAY_TOP_LEFT , + .bottom_right =DC_OVERLAY_BOTTOM_RIGHT , + .scale_factor_x =DC_OVERLAY_SCALE_FACTOR_X , + .scale_factor_y =DC_OVERLAY_SCALE_FACTOR_Y , + .h_filter_coef_index =DC_OVERLAY_H_FILTER_COEF_INDEX , + .h_filter_coef_data =DC_OVERLAY_H_FILTER_COEF_DATA , + .v_filter_coef_index =DC_OVERLAY_V_FILTER_COEF_INDEX , + .v_filter_coef_data =DC_OVERLAY_V_FILTER_COEF_DATA , + .init_offset =DC_OVERLAY_INIT_OFFSET , + .color_key =DC_OVERLAY_COLOR_KEY , + .color_key_high =DC_OVERLAY_COLOR_KEY_HIGH , + .clear_value =DC_OVERLAY_CLEAR_VALUE , + .color_table_index =DC_OVERLAY_COLOR_TABLE_INDEX , + .color_table_data =DC_OVERLAY_COLOR_TABLE_DATA , + .scale_config =DC_OVERLAY_SCALE_CONFIG , + .water_mark =DC_OVERLAY_WATER_MARK , + .degamma_index =DC_OVERLAY_DEGAMMA_INDEX , + .degamma_data =DC_OVERLAY_DEGAMMA_DATA , + .degamma_ex_data =DC_OVERLAY_DEGAMMA_EX_DATA , + .src_global_color =DC_OVERLAY_SRC_GLOBAL_COLOR , + .dst_global_color =DC_OVERLAY_DST_GLOBAL_COLOR , + .blend_config =DC_OVERLAY_BLEND_CONFIG , + .roi_origin =DC_OVERLAY_ROI_ORIGIN , + .roi_size =DC_OVERLAY_ROI_SIZE , + .yuv_to_rgb_coef0 =DC_OVERLAY_YUVTORGB_COEF0 , + .yuv_to_rgb_coef1 =DC_OVERLAY_YUVTORGB_COEF1 , + .yuv_to_rgb_coef2 =DC_OVERLAY_YUVTORGB_COEF2 , + .yuv_to_rgb_coef3 =DC_OVERLAY_YUVTORGB_COEF3 , + .yuv_to_rgb_coef4 =DC_OVERLAY_YUVTORGB_COEF4 , + .yuv_to_rgb_coefd0 =DC_OVERLAY_YUVTORGB_COEFD0 , + .yuv_to_rgb_coefd1 =DC_OVERLAY_YUVTORGB_COEFD1 , + .yuv_to_rgb_coefd2 =DC_OVERLAY_YUVTORGB_COEFD2 , + .y_clamp_bound =DC_OVERLAY_Y_CLAMP_BOUND , + .uv_clamp_bound =DC_OVERLAY_UV_CLAMP_BOUND , + .rgb_to_rgb_coef0 =DC_OVERLAY_RGBTORGB_COEF0 , + .rgb_to_rgb_coef1 =DC_OVERLAY_RGBTORGB_COEF1 , + .rgb_to_rgb_coef2 =DC_OVERLAY_RGBTORGB_COEF2 , + .rgb_to_rgb_coef3 =DC_OVERLAY_RGBTORGB_COEF3 , + .rgb_to_rgb_coef4 =DC_OVERLAY_RGBTORGB_COEF4 , + }, +}; + +static const u32 primary_overlay_format0[] = { +DRM_FORMAT_XRGB4444 , +DRM_FORMAT_XBGR4444 , +DRM_FORMAT_RGBX4444 , +DRM_FORMAT_BGRX4444 , +DRM_FORMAT_ARGB4444 , +DRM_FORMAT_ABGR4444 , +DRM_FORMAT_RGBA4444 , +DRM_FORMAT_BGRA4444 , +DRM_FORMAT_XRGB1555 , +DRM_FORMAT_XBGR1555 , +DRM_FORMAT_RGBX5551 , +DRM_FORMAT_BGRX5551 , +DRM_FORMAT_ARGB1555 , +DRM_FORMAT_ABGR1555 , +DRM_FORMAT_RGBA5551 , +DRM_FORMAT_BGRA5551 , +DRM_FORMAT_RGB565 , +DRM_FORMAT_BGR565 , +DRM_FORMAT_XRGB8888 , +DRM_FORMAT_XBGR8888 , +DRM_FORMAT_RGBX8888 , +DRM_FORMAT_BGRX8888 , +DRM_FORMAT_ARGB8888 , +DRM_FORMAT_ABGR8888 , +DRM_FORMAT_RGBA8888 , +DRM_FORMAT_BGRA8888 , +DRM_FORMAT_ARGB2101010 , +DRM_FORMAT_ABGR2101010 , +DRM_FORMAT_RGBA1010102 , +DRM_FORMAT_BGRA1010102 , +DRM_FORMAT_YUYV , +DRM_FORMAT_YVYU , +DRM_FORMAT_UYVY , +DRM_FORMAT_VYUY , +DRM_FORMAT_YVU420 , +DRM_FORMAT_YUV420 , +DRM_FORMAT_NV12 , +DRM_FORMAT_NV21 , +DRM_FORMAT_NV16 , +DRM_FORMAT_NV61 , +DRM_FORMAT_P010 , +}; + +static const u32 primary_overlay_format1[] = { +DRM_FORMAT_XRGB8888 , +DRM_FORMAT_XBGR8888 , +DRM_FORMAT_RGBX8888 , +DRM_FORMAT_BGRX8888 , +DRM_FORMAT_ARGB8888 , +DRM_FORMAT_ABGR8888 , +DRM_FORMAT_RGBA8888 , +DRM_FORMAT_BGRA8888 , +DRM_FORMAT_ARGB2101010 , +DRM_FORMAT_ABGR2101010 , +DRM_FORMAT_RGBA1010102 , +DRM_FORMAT_BGRA1010102 , +DRM_FORMAT_NV12 , +DRM_FORMAT_NV21 , +DRM_FORMAT_YUV444 , +}; + +static const u32 cursor_formats[] = { +DRM_FORMAT_ARGB8888 +}; + +static const u64 format_modifier0[] = { +DRM_FORMAT_MOD_LINEAR , +fourcc_mod_vs_norm_code (DRM_FORMAT_MOD_VERISILICON_SUPER_TILED_XMAJOR_8X8 ), +fourcc_mod_vs_norm_code (DRM_FORMAT_MOD_VERISILICON_SUPER_TILED_YMAJOR_8X8 ), +fourcc_mod_vs_norm_code (DRM_FORMAT_MOD_VERISILICON_TILE_8X8 ), +fourcc_mod_vs_norm_code (DRM_FORMAT_MOD_VERISILICON_TILE_8X4 ), +fourcc_mod_vs_norm_code (DRM_FORMAT_MOD_VERISILICON_SUPER_TILED_XMAJOR_8X4 ), +fourcc_mod_vs_norm_code (DRM_FORMAT_MOD_VERISILICON_SUPER_TILED_YMAJOR_4X8 ), +DRM_FORMAT_MOD_INVALID +}; + +static const u64 secondary_format_modifiers[] = { +DRM_FORMAT_MOD_LINEAR ,drivers/gpu/drm/verisilicon/vs_dc_hw.c line 420
Quoted 10 lines
drivers/gpu/drm/verisilicon/vs_dc_hw.c new file +10
-0+DRM_FORMAT_MOD_INVALID +}; + +#define FRAC_16_16 (mult, div) (((mult) << 16) / (div)) + +static const struct vs_plane_info dc_hw_planes[][PLANE_NUM ] = { + { +/* DC_REV_0 */ + { + .name ="Primary" ,I'd say that the indentation is strange here.
It might be more scalable to split a single array into per-generation data structures and reference them directly from the info struct.Quoted 600 lines
drivers/gpu/drm/verisilicon/vs_dc_hw.c new file +600
-0+ .id = PRIMARY_PLANE_0, + .type = DRM_PLANE_TYPE_PRIMARY, + .num_formats = ARRAY_SIZE(primary_overlay_format0), + .formats = primary_overlay_format0, + .num_modifiers = ARRAY_SIZE(format_modifier0), + .modifiers = format_modifier0, + .min_width = 0, + .min_height = 0, + .max_width = 4096, + .max_height = 4096, + .rotation =DRM_MODE_ROTATE_0 | +DRM_MODE_ROTATE_90 | +DRM_MODE_ROTATE_180 | +DRM_MODE_ROTATE_270 | +DRM_MODE_REFLECT_X | + DRM_MODE_REFLECT_Y, + .blend_mode =BIT (DRM_MODE_BLEND_PIXEL_NONE ) | +BIT (DRM_MODE_BLEND_PREMULTI ) | + BIT(DRM_MODE_BLEND_COVERAGE), + .color_encoding =BIT (DRM_COLOR_YCBCR_BT709 ) | + BIT(DRM_COLOR_YCBCR_BT2020), + .degamma_size = DEGAMMA_SIZE, + .min_scale = FRAC_16_16(1, 3), + .max_scale = FRAC_16_16(10, 1), + .zpos = 0, + .watermark = true, + .color_mgmt = true, + .roi = true, + }, + { + .name = "Overlay", + .id = OVERLAY_PLANE_0, + .type = DRM_PLANE_TYPE_OVERLAY, + .num_formats = ARRAY_SIZE(primary_overlay_format0), + .formats = primary_overlay_format0, + .num_modifiers = ARRAY_SIZE(format_modifier0), + .modifiers = format_modifier0, + .min_width = 0, + .min_height = 0, + .max_width = 4096, + .max_height = 4096, + .rotation =DRM_MODE_ROTATE_0 | +DRM_MODE_ROTATE_90 | +DRM_MODE_ROTATE_180 | +DRM_MODE_ROTATE_270 | +DRM_MODE_REFLECT_X | + DRM_MODE_REFLECT_Y, + .blend_mode =BIT (DRM_MODE_BLEND_PIXEL_NONE ) | +BIT (DRM_MODE_BLEND_PREMULTI ) | + BIT(DRM_MODE_BLEND_COVERAGE), + .color_encoding =BIT (DRM_COLOR_YCBCR_BT709 ) | + BIT(DRM_COLOR_YCBCR_BT2020), + .degamma_size = DEGAMMA_SIZE, + .min_scale = FRAC_16_16(1, 3), + .max_scale = FRAC_16_16(10, 1), + .zpos = 1, + .watermark = true, + .color_mgmt = true, + .roi = true, + }, + { + .name = "Overlay_1", + .id = OVERLAY_PLANE_1, + .type = DRM_PLANE_TYPE_OVERLAY, + .num_formats = ARRAY_SIZE(primary_overlay_format0), + .formats = primary_overlay_format0, + .num_modifiers = ARRAY_SIZE(secondary_format_modifiers), + .modifiers = secondary_format_modifiers, + .min_width = 0, + .min_height = 0, + .max_width = 4096, + .max_height = 4096, + .rotation = 0, + .blend_mode =BIT (DRM_MODE_BLEND_PIXEL_NONE ) | +BIT (DRM_MODE_BLEND_PREMULTI ) | + BIT(DRM_MODE_BLEND_COVERAGE), + .color_encoding =BIT (DRM_COLOR_YCBCR_BT709 ) | + BIT(DRM_COLOR_YCBCR_BT2020), + .degamma_size = DEGAMMA_SIZE, + .min_scale = DRM_PLANE_NO_SCALING, + .max_scale = DRM_PLANE_NO_SCALING, + .zpos = 2, + .watermark = true, + .color_mgmt = true, + .roi = true, + }, + { + .name = "Primary_1", + .id = PRIMARY_PLANE_1, + .type = DRM_PLANE_TYPE_PRIMARY, + .num_formats = ARRAY_SIZE(primary_overlay_format0), + .formats = primary_overlay_format0, + .num_modifiers = ARRAY_SIZE(format_modifier0), + .modifiers = format_modifier0, + .min_width = 0, + .min_height = 0, + .max_width = 4096, + .max_height = 4096, + .rotation =DRM_MODE_ROTATE_0 | +DRM_MODE_ROTATE_90 | +DRM_MODE_ROTATE_180 | +DRM_MODE_ROTATE_270 | +DRM_MODE_REFLECT_X | + DRM_MODE_REFLECT_Y, + .blend_mode =BIT (DRM_MODE_BLEND_PIXEL_NONE ) | +BIT (DRM_MODE_BLEND_PREMULTI ) | + BIT(DRM_MODE_BLEND_COVERAGE), + .color_encoding =BIT (DRM_COLOR_YCBCR_BT709 ) | + BIT(DRM_COLOR_YCBCR_BT2020), + .degamma_size = DEGAMMA_SIZE, + .min_scale = FRAC_16_16(1, 3), + .max_scale = FRAC_16_16(10, 1), + .zpos = 3, + .watermark = true, + .color_mgmt = true, + .roi = true, + }, + { + .name = "Overlay_2", + .id = OVERLAY_PLANE_2, + .type = DRM_PLANE_TYPE_OVERLAY, + .num_formats = ARRAY_SIZE(primary_overlay_format0), + .formats = primary_overlay_format0, + .num_modifiers = ARRAY_SIZE(format_modifier0), + .modifiers = format_modifier0, + .min_width = 0, + .min_height = 0, + .max_width = 4096, + .max_height = 4096, + .rotation =DRM_MODE_ROTATE_0 | +DRM_MODE_ROTATE_90 | +DRM_MODE_ROTATE_180 | +DRM_MODE_ROTATE_270 | +DRM_MODE_REFLECT_X | + DRM_MODE_REFLECT_Y, + .blend_mode =BIT (DRM_MODE_BLEND_PIXEL_NONE ) | +BIT (DRM_MODE_BLEND_PREMULTI ) | + BIT(DRM_MODE_BLEND_COVERAGE), + .color_encoding =BIT (DRM_COLOR_YCBCR_BT709 ) | + BIT(DRM_COLOR_YCBCR_BT2020), + .degamma_size = DEGAMMA_SIZE, + .min_scale = FRAC_16_16(1, 3), + .max_scale = FRAC_16_16(10, 1), + .zpos = 4, + .watermark = true, + .color_mgmt = true, + .roi = true, + }, + { + .name = "Overlay_3", + .id = OVERLAY_PLANE_3, + .type = DRM_PLANE_TYPE_OVERLAY, + .num_formats = ARRAY_SIZE(primary_overlay_format0), + .formats = primary_overlay_format0, + .num_modifiers = ARRAY_SIZE(secondary_format_modifiers), + .modifiers = secondary_format_modifiers, + .min_width = 0, + .min_height = 0, + .max_width = 4096, + .max_height = 4096, + .rotation = 0, + .blend_mode =BIT (DRM_MODE_BLEND_PIXEL_NONE ) | +BIT (DRM_MODE_BLEND_PREMULTI ) | + BIT(DRM_MODE_BLEND_COVERAGE), + .color_encoding =BIT (DRM_COLOR_YCBCR_BT709 ) | + BIT(DRM_COLOR_YCBCR_BT2020), + .degamma_size = DEGAMMA_SIZE, + .min_scale = DRM_PLANE_NO_SCALING, + .max_scale = DRM_PLANE_NO_SCALING, + .zpos = 5, + .watermark = true, + .color_mgmt = true, + .roi = true, + }, + { + .name = "Cursor", + .id = CURSOR_PLANE_0, + .type = DRM_PLANE_TYPE_CURSOR, + .num_formats = ARRAY_SIZE(cursor_formats), + .formats = cursor_formats, + .num_modifiers = 0, + .modifiers = NULL, + .min_width = 32, + .min_height = 32, + .max_width = 64, + .max_height = 64, + .rotation = 0, + .degamma_size = 0, + .min_scale = DRM_PLANE_NO_SCALING, + .max_scale = DRM_PLANE_NO_SCALING, + .zpos = 255, + .watermark = false, + .color_mgmt = false, + .roi = false, + }, + { + .name = "Cursor_1", + .id = CURSOR_PLANE_1, + .type = DRM_PLANE_TYPE_CURSOR, + .num_formats = ARRAY_SIZE(cursor_formats), + .formats = cursor_formats, + .num_modifiers = 0, + .modifiers = NULL, + .min_width = 32, + .min_height = 32, + .max_width = 64, + .max_height = 64, + .rotation = 0, + .degamma_size = 0, + .min_scale = DRM_PLANE_NO_SCALING, + .max_scale = DRM_PLANE_NO_SCALING, + .zpos = 255, + .watermark = false, + .color_mgmt = false, + .roi = false, + }, + }, + { + /* DC_REV_1 */ + { + .name = "Primary", + .id = PRIMARY_PLANE_0, + .type = DRM_PLANE_TYPE_PRIMARY, + .num_formats = ARRAY_SIZE(primary_overlay_format0), + .formats = primary_overlay_format0, + .num_modifiers = ARRAY_SIZE(format_modifier0), + .modifiers = format_modifier0, + .min_width = 0, + .min_height = 0, + .max_width = 4096, + .max_height = 4096, + .rotation =DRM_MODE_ROTATE_0 | +DRM_MODE_ROTATE_90 | +DRM_MODE_ROTATE_180 | +DRM_MODE_ROTATE_270 | +DRM_MODE_REFLECT_X | + DRM_MODE_REFLECT_Y, + .blend_mode =BIT (DRM_MODE_BLEND_PIXEL_NONE ) | +BIT (DRM_MODE_BLEND_PREMULTI ) | + BIT(DRM_MODE_BLEND_COVERAGE), + .color_encoding =BIT (DRM_COLOR_YCBCR_BT709 ) | + BIT(DRM_COLOR_YCBCR_BT2020), + .degamma_size = DEGAMMA_SIZE, + .min_scale = FRAC_16_16(1, 3), + .max_scale = FRAC_16_16(10, 1), + .zpos = 0, + .watermark = true, + .color_mgmt = true, + .roi = true, + }, + { + .name = "Overlay", + .id = OVERLAY_PLANE_0, + .type = DRM_PLANE_TYPE_OVERLAY, + .num_formats = ARRAY_SIZE(primary_overlay_format0), + .formats = primary_overlay_format0, + .num_modifiers = ARRAY_SIZE(format_modifier0), + .modifiers = format_modifier0, + .min_width = 0, + .min_height = 0, + .max_width = 4096, + .max_height = 4096, + .rotation =DRM_MODE_ROTATE_0 | +DRM_MODE_ROTATE_90 | +DRM_MODE_ROTATE_180 | +DRM_MODE_ROTATE_270 | +DRM_MODE_REFLECT_X | + DRM_MODE_REFLECT_Y, + .blend_mode =BIT (DRM_MODE_BLEND_PIXEL_NONE ) | +BIT (DRM_MODE_BLEND_PREMULTI ) | + BIT(DRM_MODE_BLEND_COVERAGE), + .color_encoding =BIT (DRM_COLOR_YCBCR_BT709 ) | + BIT(DRM_COLOR_YCBCR_BT2020), + .degamma_size = DEGAMMA_SIZE, + .min_scale = FRAC_16_16(1, 3), + .max_scale = FRAC_16_16(10, 1), + .zpos = 1, + .watermark = true, + .color_mgmt = true, + .roi = true, + }, + { + .name = "Primary_1", + .id = PRIMARY_PLANE_1, + .type = DRM_PLANE_TYPE_PRIMARY, + .num_formats = ARRAY_SIZE(primary_overlay_format0), + .formats = primary_overlay_format0, + .num_modifiers = ARRAY_SIZE(format_modifier0), + .modifiers = format_modifier0, + .min_width = 0, + .min_height = 0, + .max_width = 4096, + .max_height = 4096, + .rotation =DRM_MODE_ROTATE_0 | +DRM_MODE_ROTATE_90 | +DRM_MODE_ROTATE_180 | +DRM_MODE_ROTATE_270 | +DRM_MODE_REFLECT_X | + DRM_MODE_REFLECT_Y, + .blend_mode =BIT (DRM_MODE_BLEND_PIXEL_NONE ) | +BIT (DRM_MODE_BLEND_PREMULTI ) | + BIT(DRM_MODE_BLEND_COVERAGE), + .color_encoding =BIT (DRM_COLOR_YCBCR_BT709 ) | + BIT(DRM_COLOR_YCBCR_BT2020), + .degamma_size = DEGAMMA_SIZE, + .min_scale = FRAC_16_16(1, 3), + .max_scale = FRAC_16_16(10, 1), + .zpos = 2, + .watermark = true, + .color_mgmt = true, + .roi = true, + }, + { + .name = "Overlay_2", + .id = OVERLAY_PLANE_2, + .type = DRM_PLANE_TYPE_OVERLAY, + .num_formats = ARRAY_SIZE(primary_overlay_format0), + .formats = primary_overlay_format0, + .num_modifiers = ARRAY_SIZE(format_modifier0), + .modifiers = format_modifier0, + .min_width = 0, + .min_height = 0, + .max_width = 4096, + .max_height = 4096, + .rotation =DRM_MODE_ROTATE_0 | +DRM_MODE_ROTATE_90 | +DRM_MODE_ROTATE_180 | +DRM_MODE_ROTATE_270 | +DRM_MODE_REFLECT_X | + DRM_MODE_REFLECT_Y, + .blend_mode =BIT (DRM_MODE_BLEND_PIXEL_NONE ) | +BIT (DRM_MODE_BLEND_PREMULTI ) | + BIT(DRM_MODE_BLEND_COVERAGE), + .color_encoding =BIT (DRM_COLOR_YCBCR_BT709 ) | + BIT(DRM_COLOR_YCBCR_BT2020), + .degamma_size = DEGAMMA_SIZE, + .min_scale = FRAC_16_16(1, 3), + .max_scale = FRAC_16_16(10, 1), + .zpos = 3, + .watermark = true, + .color_mgmt = true, + .roi = true, + }, + { + .name = "Cursor", + .id = CURSOR_PLANE_0, + .type = DRM_PLANE_TYPE_CURSOR, + .num_formats = ARRAY_SIZE(cursor_formats), + .formats = cursor_formats, + .num_modifiers = 0, + .modifiers = NULL, + .min_width = 32, + .min_height = 32, + .max_width = 64, + .max_height = 64, + .rotation = 0, + .degamma_size = 0, + .min_scale = DRM_PLANE_NO_SCALING, + .max_scale = DRM_PLANE_NO_SCALING, + .zpos = 255, + .watermark = false, + .color_mgmt = false, + .roi = false, + }, + { + .name = "Cursor_1", + .id = CURSOR_PLANE_1, + .type = DRM_PLANE_TYPE_CURSOR, + .num_formats = ARRAY_SIZE(cursor_formats), + .formats = cursor_formats, + .num_modifiers = 0, + .modifiers = NULL, + .min_width = 32, + .min_height = 32, + .max_width = 64, + .max_height = 64, + .rotation = 0, + .degamma_size = 0, + .min_scale = DRM_PLANE_NO_SCALING, + .max_scale = DRM_PLANE_NO_SCALING, + .zpos = 255, + .watermark = false, + .color_mgmt = false, + .roi = false, + }, + }, + { + /* DC_REV_2 */ + { + .name = "Primary", + .id = PRIMARY_PLANE_0, + .type = DRM_PLANE_TYPE_PRIMARY, + .num_formats = ARRAY_SIZE(primary_overlay_format1), + .formats = primary_overlay_format1, + .num_modifiers = ARRAY_SIZE(format_modifier0), + .modifiers = format_modifier0, + .min_width = 0, + .min_height = 0, + .max_width = 4096, + .max_height = 4096, + .rotation =DRM_MODE_ROTATE_0 | +DRM_MODE_ROTATE_90 | +DRM_MODE_ROTATE_180 | +DRM_MODE_ROTATE_270 | +DRM_MODE_REFLECT_X | + DRM_MODE_REFLECT_Y, + .blend_mode =BIT (DRM_MODE_BLEND_PIXEL_NONE ) | +BIT (DRM_MODE_BLEND_PREMULTI ) | + BIT(DRM_MODE_BLEND_COVERAGE), + .color_encoding =BIT (DRM_COLOR_YCBCR_BT709 ) | + BIT(DRM_COLOR_YCBCR_BT2020), + .degamma_size = DEGAMMA_SIZE, + .min_scale = FRAC_16_16(1, 3), + .max_scale = FRAC_16_16(10, 1), + .zpos = 0, + .watermark = true, + .color_mgmt = true, + .roi = true, + }, + { + .name = "Overlay", + .id = OVERLAY_PLANE_0, + .type = DRM_PLANE_TYPE_OVERLAY, + .num_formats = ARRAY_SIZE(primary_overlay_format1), + .formats = primary_overlay_format1, + .num_modifiers = ARRAY_SIZE(format_modifier0), + .modifiers = format_modifier0, + .min_width = 0, + .min_height = 0, + .max_width = 4096, + .max_height = 4096, + .rotation =DRM_MODE_ROTATE_0 | +DRM_MODE_ROTATE_90 | +DRM_MODE_ROTATE_180 | +DRM_MODE_ROTATE_270 | +DRM_MODE_REFLECT_X | + DRM_MODE_REFLECT_Y, + .blend_mode =BIT (DRM_MODE_BLEND_PIXEL_NONE ) | +BIT (DRM_MODE_BLEND_PREMULTI ) | + BIT(DRM_MODE_BLEND_COVERAGE), + .color_encoding =BIT (DRM_COLOR_YCBCR_BT709 ) | + BIT(DRM_COLOR_YCBCR_BT2020), + .degamma_size = DEGAMMA_SIZE, + .min_scale = FRAC_16_16(1, 3), + .max_scale = FRAC_16_16(10, 1), + .zpos = 1, + .watermark = true, + .color_mgmt = true, + .roi = true, + }, + { + .name = "Overlay_1", + .id = OVERLAY_PLANE_1, + .type = DRM_PLANE_TYPE_OVERLAY, + .num_formats = ARRAY_SIZE(primary_overlay_format1), + .formats = primary_overlay_format1, + .num_modifiers = ARRAY_SIZE(secondary_format_modifiers), + .modifiers = secondary_format_modifiers, + .min_width = 0, + .min_height = 0, + .max_width = 4096, + .max_height = 4096, + .rotation = 0, + .blend_mode =BIT (DRM_MODE_BLEND_PIXEL_NONE ) | +BIT (DRM_MODE_BLEND_PREMULTI ) | + BIT(DRM_MODE_BLEND_COVERAGE), + .color_encoding =BIT (DRM_COLOR_YCBCR_BT709 ) | + BIT(DRM_COLOR_YCBCR_BT2020), + .degamma_size = DEGAMMA_SIZE, + .min_scale = DRM_PLANE_NO_SCALING, + .max_scale = DRM_PLANE_NO_SCALING, + .zpos = 2, + .watermark = true, + .color_mgmt = true, + .roi = true, + }, + { + .name = "Primary_1", + .id = PRIMARY_PLANE_1, + .type = DRM_PLANE_TYPE_PRIMARY, + .num_formats = ARRAY_SIZE(primary_overlay_format1), + .formats = primary_overlay_format1, + .num_modifiers = ARRAY_SIZE(format_modifier0), + .modifiers = format_modifier0, + .min_width = 0, + .min_height = 0, + .max_width = 4096, + .max_height = 4096, + .rotation =DRM_MODE_ROTATE_0 | +DRM_MODE_ROTATE_90 | +DRM_MODE_ROTATE_180 | +DRM_MODE_ROTATE_270 | +DRM_MODE_REFLECT_X | + DRM_MODE_REFLECT_Y, + .blend_mode =BIT (DRM_MODE_BLEND_PIXEL_NONE ) | +BIT (DRM_MODE_BLEND_PREMULTI ) | + BIT(DRM_MODE_BLEND_COVERAGE), + .color_encoding =BIT (DRM_COLOR_YCBCR_BT709 ) | + BIT(DRM_COLOR_YCBCR_BT2020), + .degamma_size = DEGAMMA_SIZE, + .min_scale = FRAC_16_16(1, 3), + .max_scale = FRAC_16_16(10, 1), + .zpos = 3, + .watermark = true, + .color_mgmt = true, + .roi = true, + }, + { + .name = "Overlay_2", + .id = OVERLAY_PLANE_2, + .type = DRM_PLANE_TYPE_OVERLAY, + .num_formats = ARRAY_SIZE(primary_overlay_format1), + .formats = primary_overlay_format1, + .num_modifiers = ARRAY_SIZE(format_modifier0), + .modifiers = format_modifier0, + .min_width = 0, + .min_height = 0, + .max_width = 4096, + .max_height = 4096, + .rotation =DRM_MODE_ROTATE_0 | +DRM_MODE_ROTATE_90 | +DRM_MODE_ROTATE_180 | +DRM_MODE_ROTATE_270 | +DRM_MODE_REFLECT_X | + DRM_MODE_REFLECT_Y, + .blend_mode =BIT (DRM_MODE_BLEND_PIXEL_NONE ) | +BIT (DRM_MODE_BLEND_PREMULTI ) | + BIT(DRM_MODE_BLEND_COVERAGE), + .color_encoding =BIT (DRM_COLOR_YCBCR_BT709 ) | + BIT(DRM_COLOR_YCBCR_BT2020), + .degamma_size = DEGAMMA_SIZE, + .min_scale = FRAC_16_16(1, 3), + .max_scale = FRAC_16_16(10, 1), + .zpos = 4, + .watermark = true, + .color_mgmt = true, + .roi = true, + }, + { + .name = "Overlay_3", + .id = OVERLAY_PLANE_3, + .type = DRM_PLANE_TYPE_OVERLAY, + .num_formats = ARRAY_SIZE(primary_overlay_format1), + .formats = primary_overlay_format1, + .num_modifiers = ARRAY_SIZE(secondary_format_modifiers), + .modifiers = secondary_format_modifiers, + .min_width = 0, + .min_height = 0, + .max_width = 4096, + .max_height = 4096, + .rotation = 0, + .blend_mode =BIT (DRM_MODE_BLEND_PIXEL_NONE ) | +BIT (DRM_MODE_BLEND_PREMULTI ) | + BIT(DRM_MODE_BLEND_COVERAGE), + .color_encoding =BIT (DRM_COLOR_YCBCR_BT709 ) | + BIT(DRM_COLOR_YCBCR_BT2020), + .degamma_size = DEGAMMA_SIZE, + .min_scale = DRM_PLANE_NO_SCALING, + .max_scale = DRM_PLANE_NO_SCALING, + .zpos = 5, + .watermark = true, + .color_mgmt = true, + .roi = true, + }, + { + .name = "Cursor", + .id = CURSOR_PLANE_0, + .type = DRM_PLANE_TYPE_CURSOR, + .num_formats = ARRAY_SIZE(cursor_formats), + .formats = cursor_formats, + .num_modifiers = 0, + .modifiers = NULL, + .min_width = 32, + .min_height = 32, + .max_width = 64, + .max_height = 64, + .rotation = 0, + .degamma_size = 0, + .min_scale = DRM_PLANE_NO_SCALING, + .max_scale = DRM_PLANE_NO_SCALING, + .zpos = 255, + .watermark = false, + .color_mgmt = false, + .roi = false, + }, + { + .name = "Cursor_1", + .id = CURSOR_PLANE_1, + .type = DRM_PLANE_TYPE_CURSOR, + .num_formats = ARRAY_SIZE(cursor_formats), + .formats = cursor_formats, + .num_modifiers = 0, + .modifiers = NULL, + .min_width = 32, + .min_height = 32, + .max_width = 64, + .max_height = 64, + .rotation = 0, + .degamma_size = 0, + .min_scale = DRM_PLANE_NO_SCALING,drivers/gpu/drm/verisilicon/vs_dc_hw.c line 1030
Quoted 10 lines
drivers/gpu/drm/verisilicon/vs_dc_hw.c new file +10
-0+ .max_scale = DRM_PLANE_NO_SCALING, + .zpos = 255, + .watermark = false, + .color_mgmt = false, + .roi = false, + }, + }, +}; + +static const struct vs_dc_info dc_info[] = {Again, please split into per-generation instances.
Quoted 229 lines
drivers/gpu/drm/verisilicon/vs_dc_hw.c new file +229
-0+ { +/* DC_REV_0 */ + .name = "DC8200", + .panel_num = 2, + .plane_num = 8, + .planes = dc_hw_planes[DC_REV_0], + .layer_num = 6, + .max_bpc = 10, + .color_formats =DRM_COLOR_FORMAT_RGB444 | +DRM_COLOR_FORMAT_YCBCR444 | +DRM_COLOR_FORMAT_YCBCR422 | + DRM_COLOR_FORMAT_YCBCR420, + .gamma_size = GAMMA_EX_SIZE, + .gamma_bits = 12, + .pitch_alignment = 128, + .pipe_sync = false, + .background = true, + .panel_sync = true, + .cap_dec = true, + }, + { +/* DC_REV_1 */ + .name = "DC8200", + .panel_num = 2, + .plane_num = 6, + .planes = dc_hw_planes[DC_REV_1], + .layer_num = 4, + .max_bpc = 10, + .color_formats =DRM_COLOR_FORMAT_RGB444 | +DRM_COLOR_FORMAT_YCBCR444 | +DRM_COLOR_FORMAT_YCBCR422 | + DRM_COLOR_FORMAT_YCBCR420, + .gamma_size = GAMMA_EX_SIZE, + .gamma_bits = 12, + .pitch_alignment = 128, + .pipe_sync = false, + .background = true, + .panel_sync = true, + .cap_dec = true, + }, + { +/* DC_REV_2 */ + .name = "DC8200", + .panel_num = 2, + .plane_num = 8, + .planes = dc_hw_planes[DC_REV_2], + .layer_num = 6, + .max_bpc = 10, + .color_formats =DRM_COLOR_FORMAT_RGB444 | +DRM_COLOR_FORMAT_YCBCR444 | +DRM_COLOR_FORMAT_YCBCR422 | + DRM_COLOR_FORMAT_YCBCR420, + .gamma_size = GAMMA_EX_SIZE, + .gamma_bits = 12, + .pitch_alignment = 128, + .pipe_sync = false, + .background = true, + .panel_sync = true, + .cap_dec = false, + }, +}; + +static const struct dc_hw_funcs hw_func; + +static inline u32 hi_read (struct dc_hw *hw,u32 reg) +{ +return readl (hw->hi_base + reg); +} + +static inline void hi_write (struct dc_hw *hw,u32 reg,u32 value) +{ +writel (value, hw->hi_base + reg); +} + +static inline void dc_write (struct dc_hw *hw,u32 reg,u32 value) +{ +writel (value, hw->reg_base + reg -DC_REG_BASE ); +} + +static inline u32 dc_read (struct dc_hw *hw,u32 reg) +{ +u32 value =readl (hw->reg_base + reg -DC_REG_BASE ); + +return value; +} + +static inline void dc_set_clear (struct dc_hw *hw,u32 reg,u32 set,u32 clear) +{ +u32 value =dc_read (hw, reg); + + value &= ~clear; + value |= set; +dc_write (hw, reg, value); +} + +static void load_default_filter (struct dc_hw *hw, +const struct dc_hw_plane_reg *reg,u32 offset) +{ +u8 i; + +dc_write (hw, reg->scale_config + offset,0x33 ); +dc_write (hw, reg->init_offset + offset,0x80008000 ); +dc_write (hw, reg->h_filter_coef_index + offset,0x00 ); +for (i =0 ; i <H_COEF_SIZE ; i++) +dc_write (hw, reg->h_filter_coef_data + offset, horkernel[i]); + +dc_write (hw, reg->v_filter_coef_index + offset,0x00 ); +for (i =0 ; i <V_COEF_SIZE ; i++) +dc_write (hw, reg->v_filter_coef_data + offset, verkernel[i]); +} + +static void load_rgb_to_rgb (struct dc_hw *hw,const struct dc_hw_plane_reg *reg, +u32 offset,u16 *table) +{ +dc_write (hw, reg->rgb_to_rgb_coef0 + offset, table[0 ] | (table[1 ] <<16 )); +dc_write (hw, reg->rgb_to_rgb_coef1 + offset, table[2 ] | (table[3 ] <<16 )); +dc_write (hw, reg->rgb_to_rgb_coef2 + offset, table[4 ] | (table[5 ] <<16 )); +dc_write (hw, reg->rgb_to_rgb_coef3 + offset, table[6 ] | (table[7 ] <<16 )); +dc_write (hw, reg->rgb_to_rgb_coef4 + offset, table[8 ]); +} + +static void load_yuv_to_rgb (struct dc_hw *hw,const struct dc_hw_plane_reg *reg, +u32 offset,s32 *table) +{ +dc_write (hw, reg->yuv_to_rgb_coef0 + offset, + (0xFFFF & table[0 ]) | (table[1 ] <<16 )); +dc_write (hw, reg->yuv_to_rgb_coef1 + offset, + (0xFFFF & table[2 ]) | (table[3 ] <<16 )); +dc_write (hw, reg->yuv_to_rgb_coef2 + offset, + (0xFFFF & table[4 ]) | (table[5 ] <<16 )); +dc_write (hw, reg->yuv_to_rgb_coef3 + offset, + (0xFFFF & table[6 ]) | (table[7 ] <<16 )); +dc_write (hw, reg->yuv_to_rgb_coef4 + offset, table[8 ]); +dc_write (hw, reg->yuv_to_rgb_coefd0 + offset, table[9 ]); +dc_write (hw, reg->yuv_to_rgb_coefd1 + offset, table[10 ]); +dc_write (hw, reg->yuv_to_rgb_coefd2 + offset, table[11 ]); +dc_write (hw, reg->y_clamp_bound + offset, table[12 ] | (table[13 ] <<16 )); +dc_write (hw, reg->uv_clamp_bound + offset, table[14 ] | (table[15 ] <<16 )); +} + +static void load_rgb_to_yuv (struct dc_hw *hw,u32 offset,s16 *table) +{ +dc_write (hw,DC_DISPLAY_RGBTOYUV_COEF0 + offset, + table[0 ] | (table[1 ] <<16 )); +dc_write (hw,DC_DISPLAY_RGBTOYUV_COEF1 + offset, + table[2 ] | (table[3 ] <<16 )); +dc_write (hw,DC_DISPLAY_RGBTOYUV_COEF2 + offset, + table[4 ] | (table[5 ] <<16 )); +dc_write (hw,DC_DISPLAY_RGBTOYUV_COEF3 + offset, + table[6 ] | (table[7 ] <<16 )); +dc_write (hw,DC_DISPLAY_RGBTOYUV_COEF4 + offset, table[8 ]); +dc_write (hw,DC_DISPLAY_RGBTOYUV_COEFD0 + offset, table[9 ]); +dc_write (hw,DC_DISPLAY_RGBTOYUV_COEFD1 + offset, table[10 ]); +dc_write (hw,DC_DISPLAY_RGBTOYUV_COEFD2 + offset, table[11 ]); +} + +static bool is_rgb (enum dc_hw_color_format format) +{ +switch (format) { +case FORMAT_X4R4G4B4 : +case FORMAT_A4R4G4B4 : +case FORMAT_X1R5G5B5 : +case FORMAT_A1R5G5B5 : +case FORMAT_R5G6B5 : +case FORMAT_X8R8G8B8 : +case FORMAT_A8R8G8B8 : +case FORMAT_A2R10G10B10 : +return true; +default : +return false; + } +} + +static void load_degamma_table (struct dc_hw *hw, +const struct dc_hw_plane_reg *reg, +u32 offset,u16 *table) +{ +u16 i; +u32 value; + +dc_write (hw, reg->degamma_index + offset,0 ); + +for (i =0 ; i <DEGAMMA_SIZE ; i++) { + value = table[i] | (table[i] <<16 ); +dc_write (hw, reg->degamma_data + offset, value); +dc_write (hw, reg->degamma_ex_data + offset, table[i]); + } +} + +static u32 get_addr_offset (u32 id) +{ +u32 offset =0 ; + +switch (id) { +case PRIMARY_PLANE_1 : +case OVERLAY_PLANE_1 : + offset =0x04 ; +break ; +case OVERLAY_PLANE_2 : + offset =0x08 ; +break ; +case OVERLAY_PLANE_3 : + offset =0x0C ; +break ; +default : +break ; + } + +return offset; +} + +int dc_hw_init (struct dc_hw *hw) +{ +u8 i, id, panel_num, layer_num; +u32 offset; +u32 revision =hi_read (hw,DC_HW_REVISION ); +u32 cid =hi_read (hw,DC_HW_CHIP_CID ); +const struct dc_hw_plane_reg *reg; + +switch (revision) { +case 0x5720 : + hw->rev =DC_REV_0 ; +break ; +case 0x5721 : +switch (cid) { +case 0x30B : + hw->rev =DC_REV_1 ; +break ; +case 0x310 :drivers/gpu/drm/verisilicon/vs_dc_hw.c line 1269
Quoted 10 lines
drivers/gpu/drm/verisilicon/vs_dc_hw.c new file +10
-0+ hw->rev =DC_REV_2 ; +break ; +default : + hw->rev =DC_REV_0 ; +break ; + } +break ; +default : +return -ENXIO ; + }We (drm/msm) had code like this for a while (and autodetection of the HW ID). And nowadays we are migrating to
of_device_get_match_dataand per-SoC compat names. It is just easier to handle, it allows one to specify device more precisely and also it simplifies DT schema.Quoted 237 lines
drivers/gpu/drm/verisilicon/vs_dc_hw.c new file +237
-0+ + hw->info = (struct vs_dc_info *)&dc_info[hw->rev]; + hw->func = (struct dc_hw_funcs *)&hw_func; + + layer_num = hw->info->layer_num; +for (i =0 ; i < layer_num; i++) { + id = hw->info->planes[i].id; + offset =get_addr_offset (id); +if (id ==PRIMARY_PLANE_0 || id ==PRIMARY_PLANE_1 ) + reg = &dc_plane_reg[0 ]; +else + reg = &dc_plane_reg[1 ]; + +load_default_filter (hw, reg, offset); +load_rgb_to_rgb (hw, reg, offset,RGB2RGB ); + } + + panel_num = hw->info->panel_num; +for (i =0 ; i < panel_num; i++) { + offset = i <<2 ; + +load_rgb_to_yuv (hw, offset,RGB2YUV ); +dc_write (hw,DC_DISPLAY_PANEL_CONFIG + offset,0x111 ); + + offset = i ?DC_CURSOR_OFFSET :0 ; +dc_write (hw,DC_CURSOR_BACKGROUND + offset,0x00FFFFFF ); +dc_write (hw,DC_CURSOR_FOREGROUND + offset,0x00AAAAAA ); + } + +return 0 ; +} + +void dc_hw_deinit (struct dc_hw *hw) +{ +/* Nothing to do */ +} + +void dc_hw_update_plane (struct dc_hw *hw,u8 id, +struct dc_hw_fb *fb,struct dc_hw_scale *scale, +struct dc_hw_position *pos,struct dc_hw_blend *blend) +{ +struct dc_hw_plane *plane = &hw->plane[id]; + +if (plane) { +if (fb) { +if (!fb->enable) + plane->fb.enable = false; +else +memcpy (&plane->fb, fb, +sizeof (*fb) -sizeof (fb->dirty)); + plane->fb.dirty = true; + } +if (scale) { +memcpy (&plane->scale, scale, +sizeof (*scale) -sizeof (scale->dirty)); + plane->scale.dirty = true; + } +if (pos) { +memcpy (&plane->pos, pos, +sizeof (*pos) -sizeof (pos->dirty)); + plane->pos.dirty = true; + } +if (blend) { +memcpy (&plane->blend, blend, +sizeof (*blend) -sizeof (blend->dirty)); + plane->blend.dirty = true; + } + } +} + +void dc_hw_update_degamma (struct dc_hw *hw,u8 id,u32 mode) +{ +struct dc_hw_plane *plane = &hw->plane[id]; + +if (plane) { +if (hw->info->planes[id].degamma_size) { + plane->degamma.mode = mode; + plane->degamma.dirty = true; + }else { + plane->degamma.dirty = false; + } + } +} + +void dc_hw_update_roi (struct dc_hw *hw,u8 id,struct dc_hw_roi *roi) +{ +struct dc_hw_plane *plane = &hw->plane[id]; + +if (plane) { +memcpy (&plane->roi, roi,sizeof (*roi) -sizeof (roi->dirty)); + plane->roi.dirty = true; + } +} + +void dc_hw_update_colorkey (struct dc_hw *hw,u8 id, +struct dc_hw_colorkey *colorkey) +{ +struct dc_hw_plane *plane = &hw->plane[id]; + +if (plane) { +memcpy (&plane->colorkey, colorkey, +sizeof (*colorkey) -sizeof (colorkey->dirty)); + plane->colorkey.dirty = true; + } +} + +void dc_hw_update_qos (struct dc_hw *hw,struct dc_hw_qos *qos) +{ +memcpy (&hw->qos, qos,sizeof (*qos) -sizeof (qos->dirty)); + hw->qos.dirty = true; +} + +void dc_hw_update_cursor (struct dc_hw *hw,u8 id,struct dc_hw_cursor *cursor) +{ +memcpy (&hw->cursor[id], cursor,sizeof (*cursor) -sizeof (cursor->dirty)); + hw->cursor[id].dirty = true; +} + +void dc_hw_update_gamma (struct dc_hw *hw,u8 id,u16 index, +u16 r,u16 g,u16 b) +{ +if (index >= hw->info->gamma_size) +return ; + + hw->gamma[id].gamma[index][0 ] = r; + hw->gamma[id].gamma[index][1 ] = g; + hw->gamma[id].gamma[index][2 ] = b; + hw->gamma[id].dirty = true; +} + +void dc_hw_enable_gamma (struct dc_hw *hw,u8 id,bool enable) +{ + hw->gamma[id].enable = enable; + hw->gamma[id].dirty = true; +} + +void dc_hw_setup_display (struct dc_hw *hw,struct dc_hw_display *display) +{ +u8 id = display->id; + +memcpy (&hw->display[id], display,sizeof (*display)); + + hw->func->display (hw, display); +} + +void dc_hw_enable_interrupt (struct dc_hw *hw,bool enable) +{ +if (enable) +hi_write (hw,AQ_INTR_ENBL ,0xFFFFFFFF ); +else +hi_write (hw,AQ_INTR_ENBL ,0 ); +} + +u32 dc_hw_get_interrupt (struct dc_hw *hw) +{ +return hi_read (hw,AQ_INTR_ACKNOWLEDGE ); +} + +bool dc_hw_check_underflow (struct dc_hw *hw) +{ +return dc_read (hw,DC_FRAMEBUFFER_CONFIG ) &BIT (5 ); +} + +void dc_hw_enable_shadow_register (struct dc_hw *hw,bool enable) +{ +u32 i, offset; +u8 id, layer_num = hw->info->layer_num; +u8 panel_num = hw->info->panel_num; + +for (i =0 ; i < layer_num; i++) { + id = hw->info->planes[i].id; + offset =get_addr_offset (id); +if (enable) { +if (id ==PRIMARY_PLANE_0 || id ==PRIMARY_PLANE_1 ) +dc_set_clear (hw,DC_FRAMEBUFFER_CONFIG_EX + offset,BIT (12 ),0 ); +else +dc_set_clear (hw,DC_OVERLAY_CONFIG + offset,BIT (31 ),0 ); + }else { +if (id ==PRIMARY_PLANE_0 || id ==PRIMARY_PLANE_1 ) +dc_set_clear (hw,DC_FRAMEBUFFER_CONFIG_EX + offset,0 ,BIT (12 )); +else +dc_set_clear (hw,DC_OVERLAY_CONFIG + offset,0 ,BIT (31 )); + } + } + +for (i =0 ; i < panel_num; i++) { + offset = i <<2 ; +if (enable) +dc_set_clear (hw,DC_DISPLAY_PANEL_CONFIG_EX + offset,0 ,BIT (0 )); +else +dc_set_clear (hw,DC_DISPLAY_PANEL_CONFIG_EX + offset,BIT (0 ),0 ); + } +} + +void dc_hw_set_out (struct dc_hw *hw,enum dc_hw_out out,u8 id) +{ +if (out <=OUT_DP ) + hw->out[id] = out; +} + +static void gamma_ex_commit (struct dc_hw *hw) +{ +u8 panel_num = hw->info->panel_num; +u16 i, j; +u32 value; + +for (j =0 ; j < panel_num; j++) { +if (hw->gamma[j].dirty) { +if (hw->gamma[j].enable) { +dc_write (hw,DC_DISPLAY_GAMMA_EX_INDEX + (j <<2 ),0x00 ); +for (i =0 ; i <GAMMA_EX_SIZE ; i++) { + value = hw->gamma[j].gamma[i][2 ] | + (hw->gamma[j].gamma[i][1 ] <<12 ); +dc_write (hw,DC_DISPLAY_GAMMA_EX_DATA + (j <<2 ), value); +dc_write (hw,DC_DISPLAY_GAMMA_EX_ONE_DATA + (j <<2 ), + hw->gamma[j].gamma[i][0 ]); + } +dc_set_clear (hw,DC_DISPLAY_PANEL_CONFIG + (j <<2 ), +BIT (13 ),0 ); + }else { +dc_set_clear (hw,DC_DISPLAY_PANEL_CONFIG + (j <<2 ), +0 ,BIT (13 )); + } + hw->gamma[j].dirty = false; + } + } +} + +static void plane_commit (struct dc_hw *hw) +{ +struct dc_hw_plane *plane; +const struct dc_hw_plane_reg *reg; +bool primary = false; +u8 id, layer_num = hw->info->layer_num; +u32 i, offset; + +for (i =0 ; i < layer_num; i++) {drivers/gpu/drm/verisilicon/vs_dc_hw.c line 1516
Quoted 10 lines
drivers/gpu/drm/verisilicon/vs_dc_hw.c new file +10
-0+ plane = &hw->plane[i]; + id = hw->info->planes[i].id; + offset =get_addr_offset (id); +if (id ==PRIMARY_PLANE_0 || id ==PRIMARY_PLANE_1 ) { + reg = &dc_plane_reg[0 ]; + primary = true; + }else { + reg = &dc_plane_reg[1 ]; + primary = false; + }Can you please move register defines to some internal
hw_planestructure. These details are known at the time of creation of the plane. There is no need to determine them again and again.drivers/gpu/drm/verisilicon/vs_dc_hw.c line 1519
Quoted 3 lines
drivers/gpu/drm/verisilicon/vs_dc_hw.c new file +3
-0+ +if (plane->fb.dirty) { +if (plane->fb.enable) {if (
plane->fb.dirty&&plane->fb.enable) will save you one level of indentation.However it might be better to use existing DRM flags instead of inventing your own flags.
Quoted 14 lines
drivers/gpu/drm/verisilicon/vs_dc_hw.c new file +14
-0+dc_write (hw, reg->y_address + offset, + plane->fb.y_address); +dc_write (hw, reg->u_address + offset, + plane->fb.u_address); +dc_write (hw, reg->v_address + offset, + plane->fb.v_address); +dc_write (hw, reg->y_stride + offset, + plane->fb.y_stride); +dc_write (hw, reg->u_stride + offset, + plane->fb.u_stride); +dc_write (hw, reg->v_stride + offset, + plane->fb.v_stride); + dc_write(hw, reg->size + offset, + plane->fb.width |drivers/gpu/drm/verisilicon/vs_dc_hw.c line 1543
Quoted 10 lines
drivers/gpu/drm/verisilicon/vs_dc_hw.c new file +10
-0+ (plane->fb.height << 15)); +dc_write (hw, reg->water_mark + offset, + plane->fb.water_mark); + +if (plane->fb.clear_enable) +dc_write (hw, reg->clear_value + offset, + plane->fb.clear_value); + } + +if (primary) {You have two kinds of planes. Primary and overlays. Could you please split this code into two separate functions and define two vtables, one for primary planes and one for overlays. There is no need to stick everything into a single funcion that handles everything.
Quoted 11 lines
drivers/gpu/drm/verisilicon/vs_dc_hw.c new file +11
-0+ dc_set_clear(hw, DC_FRAMEBUFFER_CONFIG + offset, + (plane->fb.format << 26) | + (plane->fb.uv_swizzle << 25) | + (plane->fb.swizzle << 23) | + (plane->fb.tile_mode << 17) | + (plane->fb.yuv_color_space << 14) | + (plane->fb.rotation << 11) | + (plane->fb.clear_enable << 8), + (0x1F << 26) | + BIT(25) | + (0x03 << 23) |drivers/gpu/drm/verisilicon/vs_dc_hw.c line 1564
Quoted 10 lines
drivers/gpu/drm/verisilicon/vs_dc_hw.c new file +10
-0+ (0x1F <<17 ) | + (0x07 <<14 ) | + (0x07 <<11 ) | + BIT(8)); +dc_set_clear (hw,DC_FRAMEBUFFER_CONFIG_EX + offset, + (plane->fb.dec_enable <<1 ) | + (plane->fb.enable <<13 ) | + (plane->fb.zpos <<16 ) | + (plane->fb.display_id <<19 ), +BIT (1 ) |BIT (13 ) | (0x07 <<16 ) |BIT (19 ));It looks like this code can enjoy defining names for all the magic values. Otherwise it is impossible to support it.
drivers/gpu/drm/verisilicon/vs_dc_hw.h
Quoted 411 lines
drivers/gpu/drm/verisilicon/vs_dc_hw.c new file +395
-0+ }else { +dc_set_clear (hw,DC_OVERLAY_CONFIG + offset, + (plane->fb.dec_enable <<27 ) | + (plane->fb.clear_enable <<25 ) | + (plane->fb.enable <<24 ) | + (plane->fb.format <<16 ) | + (plane->fb.uv_swizzle <<15 ) | + (plane->fb.swizzle <<13 ) | + (plane->fb.tile_mode <<8 ) | + (plane->fb.yuv_color_space <<5 ) | + (plane->fb.rotation <<2 ), +BIT (27 ) | +BIT (25 ) | +BIT (24 ) | + (0x1F <<16 ) | +BIT (15 ) | + (0x03 <<13 ) | + (0x1F <<8 ) | + (0x07 <<5 ) | + (0x07 <<2 )); +dc_set_clear (hw,DC_OVERLAY_CONFIG_EX + offset, + plane->fb.zpos | (plane->fb.display_id <<3 ), +0x07 |BIT (3 )); + } + plane->fb.dirty = false; + } + +if (plane->scale.dirty) { +if (plane->scale.enable) { +dc_write (hw, reg->scale_factor_x + offset, + plane->scale.scale_factor_x); +dc_write (hw, reg->scale_factor_y + offset, + plane->scale.scale_factor_y); +if (primary) +dc_set_clear (hw, +DC_FRAMEBUFFER_CONFIG + offset, +BIT (22 ),0 ); +else +dc_set_clear (hw, +DC_OVERLAY_SCALE_CONFIG + offset, +BIT (8 ),0 );Lines of this file are not shown. View the raw message.
drivers/gpu/drm/verisilicon/vs_dc_hw.h new file +10
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Please take care to align all the defines.
drivers/gpu/drm/verisilicon/vs_dc_hw.h
Quoted 190 lines
drivers/gpu/drm/verisilicon/vs_dc_hw.h new file +190
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Space after the comma will make it more readable. Or just define the values explicitly, it will also be more readable.
drivers/gpu/drm/verisilicon/vs_dc_hw.h
Quoted 73 lines
drivers/gpu/drm/verisilicon/vs_dc_hw.h new file +73
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Can you use defines from <
drm/drm_blend.h>?drivers/gpu/drm/verisilicon/vs_plane.c
Quoted 278 lines
drivers/gpu/drm/verisilicon/vs_dc_hw.h new file +219
-0Lines of this file are not shown. View the raw message.
drivers/gpu/drm/verisilicon/vs_plane.c new file +33
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Use
vs_plane_destroy_statedirectly. This way you won't miss a refcount on blobs.drivers/gpu/drm/verisilicon/vs_plane.c
Quoted 149 lines
drivers/gpu/drm/verisilicon/vs_plane.c new file +149
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
degamma and color management should use standard properties.
drivers/gpu/drm/verisilicon/vs_plane.c
Quoted 118 lines
drivers/gpu/drm/verisilicon/vs_plane.c new file +118
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
New line after the equal sign will be better.
drivers/gpu/drm/verisilicon/vs_plane.c
Quoted 12 lines
drivers/gpu/drm/verisilicon/vs_plane.c new file +12
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
if (!new_state->visible) ?
drivers/gpu/drm/verisilicon/vs_plane.c
Quoted 35 lines
drivers/gpu/drm/verisilicon/vs_plane.c new file +35
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
and here.
Quoted 318 lines
drivers/gpu/drm/verisilicon/vs_plane.c new file +179
-0Lines of this file are not shown. View the raw message.
drivers/gpu/drm/verisilicon/vs_plane.h new file +58
-0Lines of this file are not shown. View the raw message.
drivers/gpu/drm/verisilicon/vs_type.h new file +69
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Signature · 2 lines
With best wishes Dmitry
Part of the diff is not shown here. View the raw message.