* [PATCH v15 0/5] Add RZ/{G2L,G2LC} and RZ/V2L Display Unit support
@ 2023-11-28 10:51 Biju Das
2023-11-28 10:51 ` [PATCH v15 1/5] dt-bindings: display: Document Renesas RZ/G2L DU bindings Biju Das
` (6 more replies)
0 siblings, 7 replies; 39+ messages in thread
From: Biju Das @ 2023-11-28 10:51 UTC (permalink / raw)
To: Maarten Lankhorst, Maxime Ripard, Thomas Zimmermann,
David Airlie, Daniel Vetter, Biju Das, Philipp Zabel
Cc: Fabrizio Castro, Biju Das, Geert Uytterhoeven, Magnus Damm,
Prabhakar Mahadev Lad, dri-devel, linux-renesas-soc,
Kieran Bingham, Laurent Pinchart, Jacopo Mondi
This path series aims to add support for RZ/G2L DU DRM driver.
RZ/G2L LCD controller composed of Frame compression Processor(FCPVD), Video
signal processor (VSPD) and Display unit(DU). The output of LCDC is
connected to Display parallel interface and MIPI link video interface.
The output from DSI is connected to ADV7535.
Ref:
https://lore.kernel.org/linux-renesas-soc/OS0PR01MB5922717E4CCFE07F3C25FBC986989@OS0PR01MB5922.jpnprd01.prod.outlook.com/#t
This patch series is tested with [2]
[2] https://patchwork.kernel.org/project/linux-renesas-soc/list/?series=742810
Test logs kmscube: [3]
v14->v15:
* Added patch#4, The rcar-du has never been maintained in drm-misc. So
exclude only this driver from drm-misc. Also, add the tree entry for
sh_mobile.
* Added drm-misc tree entry.
* Sorted the entry(Placed before SHMOBILE)
v13->v14:
* Replaced the label 'error'->'done' in rzg2l_du_vsps_init() as it
applies to non-error case as well.
* Update the error check condition for rcar_du_vsp_init() to avoid
breakage in future, if it returns positive value.
* Now SHMOBILE has maintainer entries. So dropped updating
DRM DRIVERS FOR RENESAS RCAR AND SHMOBILE.
* Updated comment header and description for maintainer entry patch.
v12->v13:
* Dropped DU_MCR0_DPI_OE and unused macros.
* Dropped unneeded backward compatibility with old DTBs as it is new driver.
* Replaced "cells > 1"-> "cells != 1" in rzg2l_du_vsps_init().
* Fixed memory leak in rzg2l_du_vsps_init().
* Dropped drm_plane_create_{alpha,zpos,blend_mode}_property().
v11->v12:
* Dropped quotes in ref handle for renesas,vsps property.
* Retained tags as it is trivial change.
* Replaced rzg2l_du_write()->writel().
v10->v11:
* Replaced CONFIG_DRM_RCAR_VSP->CONFIG_VIDEO_RENESAS_VSP1 for building
rzg2l_du_vsp driver.
* Dropped "rzg2l_du_regs.h" instead the relevant definitions defined in
.c file.
* Dropped setting ditr5 based on latest HW manual 1.3.0/1.4.0
* Updated the comment for auto clear.
* Replaced writel()->rzg2l_du_write() in rzg2l_du_start_stop().
* Dropped CRC related functions as it does not have DISCOM.
* Replaced the variable possible_crtcs->possible_outputs in
struct rzg2l_du_output_routing.
* Updated DMA_BIT_MASK from 40->32.
* Dropped unneeded struct drm_bridge from rzg2l_du_drv.h.
* Dropped colour keying support as it doesn't have planes.
* Added only RGB formats in rzg2l_du_format_infos.
* Dropped chroma planes from rzg2l_du_fb_create().
* Updated the comment for max_pitch in rzg2l_du_fb_create().
* Dropped possible_crtcs check in rzg2l_du_encoders_init().
* Dropped additional empty line from struct rzg2l_du_device.
v9->v10:
* patch#1 is mainlined, so dropped from this series.
* Added Rb tag from Laurent for the binding patch.
* Updated the commit description.
* Updated description of the port by dropping the text "specified in
Documentation/devicetree/bindings/graph.txt."
* Dropped empty endpoint from example.
* Dropped ARM64 dependency from Kconfig.
* Sorted the configs alphabetically in Kconfig.
* Dropped DRM_RCAR_VSP config option and make DRM_RZG2L_DU depend on
VIDEO_RENESAS_VSP1.
* On rzg2l_du_crtc_set_display_timing() replaced the setting of parent
clk rate with dclk rate.
* Added rzg2l_du_write() wrapper function.
* Updated the comment atomic_begin->atomic_flush.
* Dropped .atomic_check and .atomic_begin callback
* Renamed __rzg2l_du_crtc_plane_atomic_check->__rzg2l_du_vsp_plane_atomic
_check and moved it to rzg2l_du_vsp.c
* Added struct clk in rzg2l_du_crtc.h
* Dropped the variables mmio_offset,index,vblank_lock,vblank_wait,
vblank_count from struct rzg2l_du_crtc.
* Replaced the macro to_rzg2l_crtc with static inline functions.
* Dropped the unneeded header files clk.h, io.h, mm.h, pm.h, slab.h,
wait.h and drm_managed.h from rzg2l_du_drv.c.
* Replaced DRM_INFO->drm_info
* Dropped the callbacks prime_handle_to_fd, prime_fd_to_handle and
gem_prime_mmap.
* Replaced the callback remove->remove_new.
* Dropped header file wait.h and added forward declarations struct clk and
rzg2l_du_device from rzg2l_du_drv.h.
* Dropped the dsi and dpad0_source variables from struct rzg2l_du_device.
* Replaced the macro to_rzg2l_encoder with static inline functions.
* Dropped header files dma-buf.h and wait.h from rzg2l_du_kms.c.
* Dropped struct sg_table and added the scatterlist.h header file in
rzg2l_du_vsp.h
* Added container_of.h header file, forward declarations struct device and
struct rzg2l_du_device in rzg2l_du_vsp.h.
v8->v9:
* Added Rb tag from Laurent and Acked-by tag from Kieran for patch#1.
* Added Rb tag from Laurent and Geert for patch#3.
* Dropped reset_control_assert() from error patch for rzg2l_du_crtc_get() as
suggested by Philipp Zabel.
* Added Rb tag from Laurent oatch#5.
* Updated MAINTAINERS entries for common parts(Makefile and Kconfig).
v7->v8:
* Moved rcar-du and shmobile DRM drivers to renesas specific vendor directory.
* Fixed the typo vsp2->du in RZ/V2L DU bindings patch.
* Added Rb tag from Rob for RZ/V2L DU bindings patch.
* Dropped RCar du lib and created RZ/G2L DU DRM driver by creating rz_du folder.
* Updated MAINTAINERS entries.
v6->v7:
* Split DU lib and RZ/G2L du driver as separate patch series as
DU support added to more platforms based on RZ/G2L alike SoCs.
* Rebased to latest drm-tip.
* Added patch #2 for binding support for RZ/V2L DU
* Added patch #4 for driver support for RZ/V2L DU
* Added patch #5 for SoC DTSI support for RZ/G2L DU
* Added patch #6 for SoC DTSI support for RZ/V2L DU
* Added patch #7 for Enabling DU on SMARC EVK based on RZ/{G2L,V2L} SoCs.
* Added patch #8 for Enabling DU on SMARC EVK based on RZ/G2LC SoC.
v5->v6:
* Merged DU lib and RZ/G2L du driver in same patch series
* Rebased to latest drm-misc.
* Merged patch#1 to RZ/G2L Driver patch.
* Updated KConfig dependency from ARCH_RENESAS->ARCH_RZG2L.
* Optimized rzg2l_du_output_name() by removing unsupported outputs.
v4->v5:
* Added Rb tag from Rob for binding patch.
* Started using RCar DU libs(kms, vsp and encoder)
* Started using rcar_du_device, rcar_du_write, rcar_du_crtc,
rcar_du_format_info and rcar_du_encoder.
v3->v4:
* Changed compatible name from renesas,du-r9a07g044->renesas,r9a07g044-du
* started using same compatible for RZ/G2{L,LC}
* Removed rzg2l_du_group.h and struct rzg2l_du_group
* Renamed __rzg2l_du_group_start_stop->rzg2l_du_start_stop
* Removed rzg2l_du_group_restart
* Updated rzg2l_du_crtc_set_display_timing
* Removed mode_valid callback.
* Updated rzg2l_du_crtc_create() parameters
* Updated compatible
* Removed RZG2L_DU_MAX_GROUPS
V2->v3:
* Added new bindings for RZ/G2L DU
* Removed indirection and created new DRM driver based on R-Car DU
v1->v2:
* Based on [1], all references to 'rzg2l_lcdc' replaced with 'rzg2l_du'
* Updated commit description for bindings
* Removed LCDC references from bindings
* Changed clock name from du.0->aclk from bindings
* Changed reset name from du.0->du from bindings
* Replaced crtc_helper_funcs->rcar_crtc_helper_funcs
* Updated macro DRM_RZG2L_LCDC->DRM_RZG2L_DU
* Replaced rzg2l-lcdc-drm->rzg2l-du-drm
* Added forward declaration for struct reset_control
[1] https://patchwork.kernel.org/project/linux-renesas-soc/patch/20220312084205.31462-2-biju.das.jz@bp.renesas.com/
[3]
root@smarc-rzv2l:/cip-test-scripts# kmscube
Using display 0xaaaad2a6a160 with EGL version 1.4
===================================
EGL information:
version: "1.4"
vendor: "Mesa Project"
client extensions: "EGL_EXT_client_extensions EGL_EXT_device_base EGL_EXT_device_enumeration EGL_EXT_device_query EGL_EXT_platform_base EGL_KHR_client_get_all_proc_addresses EGL_KHR_debug EGL_EXT_platform_device EGL_EXT_platform_wayland EGL_KHR_platform_wayland EGL_MESA_platform_gbm EGL_KHR_platform_gbm EGL_MESA_platform_surfaceless"
display extensions: "EGL_ANDROID_blob_cache EGL_EXT_buffer_age EGL_EXT_image_dma_buf_import EGL_EXT_image_dma_buf_import_modifiers EGL_KHR_cl_event2 EGL_KHR_config_attribs EGL_KHR_create_context EGL_KHR_create_context_no_error EGL_KHR_fence_sync EGL_KHR_get_all_proc_addresses EGL_KHR_gl_colorspace EGL_KHR_gl_renderbuffer_image EGL_KHR_gl_texture_2D_image EGL_KHR_gl_texture_3D_image EGL_KHR_gl_texture_cubemap_image EGL_KHR_image EGL_KHR_image_base EGL_KHR_image_pixmap EGL_KHR_no_config_context EGL_KHR_partial_update EGL_KHR_reusable_sync EGL_KHR_surfaceless_context EGL_EXT_pixel_format_float EGL_KHR_wait_sync EGL_MESA_configless_context EGL_MESA_drm_image EGL_MESA_image_dma_buf_export EGL_MESA_query_driver EGL_WL_bind_wayland_display "
===================================
OpenGL ES 2.x information:
version: "OpenGL ES 3.1 Mesa 21.3.7"
shading language version: "OpenGL ES GLSL ES 3.10"
vendor: "Panfrost"
renderer: "Mali-G31 (Panfrost)"
extensions: "GL_EXT_blend_minmax GL_EXT_multi_draw_arrays GL_EXT_texture_filter_anisotropic GL_EXT_texture_compression_rgtc GL_EXT_texture_format_BGRA8888 GL_OES_compressed_ETC1_RGB8_texture GL_OES_depth24 GL_OES_element_index_uint GL_OES_fbo_render_mipmap GL_OES_mapbuffer GL_OES_rgb8_rgba8 GL_OES_standard_derivatives GL_OES_stencil8 GL_OES_texture_3D GL_OES_texture_float GL_OES_texture_float_linear GL_OES_texture_half_float GL_OES_texture_half_float_linear GL_OES_texture_npot GL_OES_vertex_half_float GL_EXT_draw_instanced GL_EXT_texture_sRGB_decode GL_OES_EGL_image GL_OES_depth_texture GL_OES_packed_depth_stencil GL_EXT_texture_type_2_10_10_10_REV GL_NV_conditional_render GL_OES_get_program_binary GL_APPLE_texture_max_level GL_EXT_discard_framebuffer GL_EXT_read_format_bgra GL_EXT_frag_depth GL_NV_fbo_color_attachments GL_OES_EGL_image_external GL_OES_EGL_sync GL_OES_vertex_array_object GL_ANGLE_pack_reverse_row_order GL_EXT_occlusion_query_boolean GL_EXT_texture_rg GL_EXT_unpack_subimage GL_NV_draw_buffers GL_NV_read_buffer GL_NV_read_depth GL_NV_read_depth_stencil GL_NV_read_stencil GL_EXT_draw_buffers GL_EXT_map_buffer_range GL_KHR_debug GL_KHR_texture_compression_astc_ldr GL_NV_pixel_buffer_object GL_OES_depth_texture_cube_map GL_OES_required_internalformat GL_OES_surfaceless_context GL_EXT_color_buffer_float GL_EXT_sRGB_write_control GL_EXT_separate_shader_objects GL_EXT_shader_framebuffer_fetch GL_EXT_shader_implicit_conversions GL_EXT_shader_integer_mix GL_EXT_base_instance GL_EXT_compressed_ETC1_RGB8_sub_texture GL_EXT_draw_buffers_indexed GL_EXT_draw_elements_base_vertex GL_EXT_gpu_shader5 GL_EXT_primitive_bounding_box GL_EXT_shader_io_blocks GL_EXT_texture_border_clamp GL_EXT_texture_buffer GL_EXT_texture_view GL_KHR_blend_equation_advanced GL_KHR_blend_equation_advanced_coherent GL_KHR_context_flush_control GL_NV_image_formats GL_OES_draw_buffers_indexed GL_OES_draw_elements_base_vertex GL_OES_gpu_shader5 GL_OES_primitive_bounding_box GL_OES_sample_shading GL_OES_sample_variables GL_OES_shader_io_blocks GL_OES_shader_multisample_interpolation GL_OES_texture_border_clamp GL_OES_texture_buffer GL_OES_texture_stencil8 GL_OES_texture_storage_multisample_2d_array GL_OES_texture_view GL_EXT_blend_func_extended GL_EXT_float_blend GL_EXT_texture_sRGB_R8 GL_EXT_texture_sRGB_RG8 GL_KHR_no_error GL_KHR_texture_compression_astc_sliced_3d GL_OES_EGL_image_external_essl3 GL_OES_shader_image_atomic GL_EXT_multisampled_render_to_texture GL_EXT_multisampled_render_to_texture2 GL_MESA_shader_integer_functions GL_EXT_color_buffer_half_float GL_EXT_texture_mirror_clamp_to_edge GL_KHR_parallel_shader_compile GL_EXT_EGL_image_storage GL_EXT_shader_framebuffer_fetch_non_coherent GL_INTEL_blackhole_render GL_MESA_framebuffer_flip_y GL_EXT_depth_clamp GL_MESA_bgra "
===================================
cat /sys/class/devfreq/11840000.gpu/trans_stat
[INFO] From : To
[INFO] : 50000000 62500000 100000000 125000000 200000000 250000000 400000000 500000000 time(ms)
[INFO] 50000000: 0 0 0 0 0 0 0 2 380
[INFO] 62500000: 0 0 0 0 0 0 0 0 0
[INFO] 100000000: 0 0 0 0 0 0 0 0 0
[INFO] 125000000: 0 0 0 0 0 0 0 0 0
[INFO] * 200000000: 1 0 0 0 0 0 0 79 4576
[INFO] 250000000: 0 0 0 0 69 0 0 0 5292
[INFO] 400000000: 0 0 0 0 5 0 0 2 440
[INFO] 500000000: 1 0 0 0 7 69 7 0 5340
[INFO] Total transition : 242
Biju Das (5):
dt-bindings: display: Document Renesas RZ/G2L DU bindings
dt-bindings: display: renesas,rzg2l-du: Document RZ/V2L DU bindings
drm: renesas: Add RZ/G2L DU Support
MAINTAINERS: Update entries for Renesas DRM drivers
MAINTAINERS: Create entry for Renesas RZ DRM drivers
.../bindings/display/renesas,rzg2l-du.yaml | 126 +++++
MAINTAINERS | 12 +-
drivers/gpu/drm/renesas/Kconfig | 1 +
drivers/gpu/drm/renesas/Makefile | 1 +
drivers/gpu/drm/renesas/rz-du/Kconfig | 12 +
drivers/gpu/drm/renesas/rz-du/Makefile | 8 +
drivers/gpu/drm/renesas/rz-du/rzg2l_du_crtc.c | 431 ++++++++++++++++
drivers/gpu/drm/renesas/rz-du/rzg2l_du_crtc.h | 89 ++++
drivers/gpu/drm/renesas/rz-du/rzg2l_du_drv.c | 176 +++++++
drivers/gpu/drm/renesas/rz-du/rzg2l_du_drv.h | 78 +++
.../gpu/drm/renesas/rz-du/rzg2l_du_encoder.c | 72 +++
.../gpu/drm/renesas/rz-du/rzg2l_du_encoder.h | 32 ++
drivers/gpu/drm/renesas/rz-du/rzg2l_du_kms.c | 433 +++++++++++++++++
drivers/gpu/drm/renesas/rz-du/rzg2l_du_kms.h | 43 ++
drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c | 460 ++++++++++++++++++
drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h | 97 ++++
16 files changed, 2070 insertions(+), 1 deletion(-)
create mode 100644 Documentation/devicetree/bindings/display/renesas,rzg2l-du.yaml
create mode 100644 drivers/gpu/drm/renesas/rz-du/Kconfig
create mode 100644 drivers/gpu/drm/renesas/rz-du/Makefile
create mode 100644 drivers/gpu/drm/renesas/rz-du/rzg2l_du_crtc.c
create mode 100644 drivers/gpu/drm/renesas/rz-du/rzg2l_du_crtc.h
create mode 100644 drivers/gpu/drm/renesas/rz-du/rzg2l_du_drv.c
create mode 100644 drivers/gpu/drm/renesas/rz-du/rzg2l_du_drv.h
create mode 100644 drivers/gpu/drm/renesas/rz-du/rzg2l_du_encoder.c
create mode 100644 drivers/gpu/drm/renesas/rz-du/rzg2l_du_encoder.h
create mode 100644 drivers/gpu/drm/renesas/rz-du/rzg2l_du_kms.c
create mode 100644 drivers/gpu/drm/renesas/rz-du/rzg2l_du_kms.h
create mode 100644 drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c
create mode 100644 drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h
base-commit: e17049148678725248a57ecbf9c21df0fde3b434
--
2.25.1
^ permalink raw reply [flat|nested] 39+ messages in thread
* [PATCH v15 1/5] dt-bindings: display: Document Renesas RZ/G2L DU bindings
2023-11-28 10:51 [PATCH v15 0/5] Add RZ/{G2L,G2LC} and RZ/V2L Display Unit support Biju Das
@ 2023-11-28 10:51 ` Biju Das
2023-11-28 10:51 ` [PATCH v15 2/5] dt-bindings: display: renesas, rzg2l-du: Document RZ/V2L " Biju Das
` (5 subsequent siblings)
6 siblings, 0 replies; 39+ messages in thread
From: Biju Das @ 2023-11-28 10:51 UTC (permalink / raw)
To: Biju Das, Maarten Lankhorst, Maxime Ripard, Thomas Zimmermann,
David Airlie, Daniel Vetter, Rob Herring, Krzysztof Kozlowski,
Conor Dooley
Cc: Biju Das, devicetree, Laurent Pinchart, Geert Uytterhoeven,
Magnus Damm, Prabhakar Mahadev Lad, dri-devel, linux-renesas-soc,
Fabrizio Castro, Jacopo Mondi
The RZ/G2L LCD controller is composed of Frame Compression Processor
(FCPVD), Video Signal Processor (VSPD), and Display Unit (DU).
The DU module supports the following hardware features
− Display Parallel Interface (DPI) and MIPI LINK Video Interface
− Display timing master
− Generates video timings
− Selecting the polarity of output DCLK, HSYNC, VSYNC, and DE
− Supports Progressive
− Input data format (from VSPD): RGB888, RGB666
− Output data format: same as Input data format
− Supporting Full HD (1920 pixels x 1080 lines) for MIPI-DSI Output
− Supporting WXGA (1280 pixels x 800 lines) for Parallel Output
This patch documents the DU module found on RZ/G2L LCDC.
Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
Reviewed-by: Rob Herring <robh@kernel.org>
Reviewed-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
---
v14->v15:
* No change.
v13->v14:
* No change.
v12->v13:
* No change.
v11->v12:
* Dropped quotes in ref handle for renesas,vsps property.
* Retained tags as it is trivial change.
v10->v11:
* No change
v9->v10:
* Added Rb tag from Laurent
* Updated the commit description.
* Updated description of the port by dropping the text "specified in
Documentation/devicetree/bindings/graph.txt."
* Dropped empty endpoint from example.
v8->v9:
* No change
v7->v8:
* No change
v6->v7:
* No change
v5->v6:
* No change.
v4->v5:
* Added Rb tag from Rob.
v3->v4:
* Changed compatible name from renesas,du-r9a07g044->renesas,r9a07g044-du
* started using same compatible for RZ/G2{L,LC}
v3: New patch
---
.../bindings/display/renesas,rzg2l-du.yaml | 121 ++++++++++++++++++
1 file changed, 121 insertions(+)
create mode 100644 Documentation/devicetree/bindings/display/renesas,rzg2l-du.yaml
diff --git a/Documentation/devicetree/bindings/display/renesas,rzg2l-du.yaml b/Documentation/devicetree/bindings/display/renesas,rzg2l-du.yaml
new file mode 100644
index 000000000000..c0ad194c538d
--- /dev/null
+++ b/Documentation/devicetree/bindings/display/renesas,rzg2l-du.yaml
@@ -0,0 +1,121 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/display/renesas,rzg2l-du.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Renesas RZ/G2L Display Unit (DU)
+
+maintainers:
+ - Biju Das <biju.das.jz@bp.renesas.com>
+ - Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
+
+description: |
+ These DT bindings describe the Display Unit embedded in the Renesas RZ/G2L
+ and RZ/V2L SoCs.
+
+properties:
+ compatible:
+ enum:
+ - renesas,r9a07g044-du # RZ/G2{L,LC}
+
+ reg:
+ maxItems: 1
+
+ interrupts:
+ maxItems: 1
+
+ clocks:
+ items:
+ - description: Main clock
+ - description: Register access clock
+ - description: Video clock
+
+ clock-names:
+ items:
+ - const: aclk
+ - const: pclk
+ - const: vclk
+
+ resets:
+ maxItems: 1
+
+ power-domains:
+ maxItems: 1
+
+ ports:
+ $ref: /schemas/graph.yaml#/properties/ports
+ description: |
+ The connections to the DU output video ports are modeled using the OF
+ graph bindings. The number of ports and their assignment are
+ model-dependent. Each port shall have a single endpoint.
+
+ patternProperties:
+ "^port@[0-1]$":
+ $ref: /schemas/graph.yaml#/properties/port
+ unevaluatedProperties: false
+
+ required:
+ - port@0
+
+ unevaluatedProperties: false
+
+ renesas,vsps:
+ $ref: /schemas/types.yaml#/definitions/phandle-array
+ items:
+ items:
+ - description: phandle to VSP instance that serves the DU channel
+ - description: Channel index identifying the LIF instance in that VSP
+ description:
+ A list of phandle and channel index tuples to the VSPs that handle the
+ memory interfaces for the DU channels.
+
+required:
+ - compatible
+ - reg
+ - interrupts
+ - clocks
+ - clock-names
+ - resets
+ - power-domains
+ - ports
+ - renesas,vsps
+
+additionalProperties: false
+
+examples:
+ # RZ/G2L DU
+ - |
+ #include <dt-bindings/clock/r9a07g044-cpg.h>
+ #include <dt-bindings/interrupt-controller/arm-gic.h>
+
+ display@10890000 {
+ compatible = "renesas,r9a07g044-du";
+ reg = <0x10890000 0x10000>;
+ interrupts = <GIC_SPI 152 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&cpg CPG_MOD R9A07G044_LCDC_CLK_A>,
+ <&cpg CPG_MOD R9A07G044_LCDC_CLK_P>,
+ <&cpg CPG_MOD R9A07G044_LCDC_CLK_D>;
+ clock-names = "aclk", "pclk", "vclk";
+ resets = <&cpg R9A07G044_LCDC_RESET_N>;
+ power-domains = <&cpg>;
+
+ renesas,vsps = <&vspd0 0>;
+
+ ports {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ port@0 {
+ reg = <0>;
+ endpoint {
+ remote-endpoint = <&dsi0_in>;
+ };
+ };
+ port@1 {
+ reg = <1>;
+ };
+ };
+ };
+
+...
--
2.25.1
^ permalink raw reply related [flat|nested] 39+ messages in thread
* [PATCH v15 2/5] dt-bindings: display: renesas, rzg2l-du: Document RZ/V2L DU bindings
2023-11-28 10:51 [PATCH v15 0/5] Add RZ/{G2L,G2LC} and RZ/V2L Display Unit support Biju Das
2023-11-28 10:51 ` [PATCH v15 1/5] dt-bindings: display: Document Renesas RZ/G2L DU bindings Biju Das
@ 2023-11-28 10:51 ` Biju Das
2023-11-28 10:51 ` [PATCH v15 3/5] drm: renesas: Add RZ/G2L DU Support Biju Das
` (4 subsequent siblings)
6 siblings, 0 replies; 39+ messages in thread
From: Biju Das @ 2023-11-28 10:51 UTC (permalink / raw)
To: Biju Das, David Airlie, Daniel Vetter, Maarten Lankhorst,
Maxime Ripard, Thomas Zimmermann, Rob Herring,
Krzysztof Kozlowski, Conor Dooley
Cc: Biju Das, devicetree, Laurent Pinchart, Geert Uytterhoeven,
Magnus Damm, Prabhakar Mahadev Lad, dri-devel, linux-renesas-soc,
Fabrizio Castro, Jacopo Mondi
Document DU found in RZ/V2L SoC. The DU block is identical to RZ/G2L
SoC and therefore use RZ/G2L fallback to avoid any driver changes.
Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
Reviewed-by: Rob Herring <robh@kernel.org>
Reviewed-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
v14->v15:
* No change.
v13->v14:
* No change.
v12->v13:
* No change.
v11->v12:
* No change.
v10->v11:
* No change.
v9->v10:
* No change.
V8->v9:
* Added Rb tag from Laurent and Geert.
v7->v8:
* Fixed the typo vsp2->du
* Added Rb tag from Rob as the change is trivial.
v7:
* New patch.
---
.../devicetree/bindings/display/renesas,rzg2l-du.yaml | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/Documentation/devicetree/bindings/display/renesas,rzg2l-du.yaml b/Documentation/devicetree/bindings/display/renesas,rzg2l-du.yaml
index c0ad194c538d..08e5b9478051 100644
--- a/Documentation/devicetree/bindings/display/renesas,rzg2l-du.yaml
+++ b/Documentation/devicetree/bindings/display/renesas,rzg2l-du.yaml
@@ -16,8 +16,13 @@ description: |
properties:
compatible:
- enum:
- - renesas,r9a07g044-du # RZ/G2{L,LC}
+ oneOf:
+ - enum:
+ - renesas,r9a07g044-du # RZ/G2{L,LC}
+ - items:
+ - enum:
+ - renesas,r9a07g054-du # RZ/V2L
+ - const: renesas,r9a07g044-du # RZ/G2L fallback
reg:
maxItems: 1
--
2.25.1
^ permalink raw reply related [flat|nested] 39+ messages in thread
* [PATCH v15 3/5] drm: renesas: Add RZ/G2L DU Support
2023-11-28 10:51 [PATCH v15 0/5] Add RZ/{G2L,G2LC} and RZ/V2L Display Unit support Biju Das
2023-11-28 10:51 ` [PATCH v15 1/5] dt-bindings: display: Document Renesas RZ/G2L DU bindings Biju Das
2023-11-28 10:51 ` [PATCH v15 2/5] dt-bindings: display: renesas, rzg2l-du: Document RZ/V2L " Biju Das
@ 2023-11-28 10:51 ` Biju Das
2023-12-13 15:47 ` Maxime Ripard
2023-11-28 10:51 ` [PATCH v15 4/5] MAINTAINERS: Update entries for Renesas DRM drivers Biju Das
` (3 subsequent siblings)
6 siblings, 1 reply; 39+ messages in thread
From: Biju Das @ 2023-11-28 10:51 UTC (permalink / raw)
To: Maarten Lankhorst, Maxime Ripard, Thomas Zimmermann,
David Airlie, Daniel Vetter, Biju Das, Philipp Zabel
Cc: Fabrizio Castro, Biju Das, Geert Uytterhoeven, Magnus Damm,
Prabhakar Mahadev Lad, dri-devel, linux-renesas-soc,
Kieran Bingham, Laurent Pinchart, Jacopo Mondi
The LCD controller is composed of Frame Compression Processor (FCPVD),
Video Signal Processor (VSPD), and Display Unit (DU).
It has DPI/DSI interfaces and supports a maximum resolution of 1080p
along with 2 RPFs to support the blending of two picture layers and
raster operations (ROPs).
The DU module is connected to VSPD. Add RZ/G2L DU support for RZ/G2L
alike SoCs.
Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
---
Ref:
https://lore.kernel.org/linux-renesas-soc/OS0PR01MB5922717E4CCFE07F3C25FBC986989@OS0PR01MB5922.jpnprd01.prod.outlook.com/#t
v14->v15:
* No change.
v13->v14:
* Done similar change like [1]
* Replaced the label 'error'->'done' as it applies to non-error case as
well.
* Update the error check condition for rcar_du_vsp_init() to avoid
breakage in future, if it returns positive value.
[1] https://patchwork.kernel.org/project/linux-renesas-soc/patch/20231116122424.80136-1-biju.das.jz@bp.renesas.com/
v12->v13:
* Dropped DU_MCR0_DPI_OE and unused macros.
* Dropped unneeded backward compatibility with old DTBs as it is new driver.
* Replaced "cells > 1"-> "cells != 1" in rzg2l_du_vsps_init().
* Fixed memory leak in rzg2l_du_vsps_init().
* Dropped drm_plane_create_{alpha,zpos,blend_mode}_property().
v11->v12:
* Replaced rzg2l_du_write() with writel().
v10->v11:
* Replaced CONFIG_DRM_RCAR_VSP->CONFIG_VIDEO_RENESAS_VSP1 for building
rzg2l_du_vsp driver.
* Dropped "rzg2l_du_regs.h" instead the relevant definitions defined in
.c file.
* Dropped setting ditr5 based on latest HW manual 1.3.0/1.4.0
* Updated the comment for auto clear.
* Replaced writel()->rzg2l_du_write() in rzg2l_du_start_stop().
* Dropped CRC related functions as it does not have DISCOM.
* Replaced the variable possible_crtcs->possible_outputs in
struct rzg2l_du_output_routing.
* Updated DMA_BIT_MASK from 40->32.
* Dropped unneeded struct drm_bridge from rzg2l_du_drv.h.
* Dropped colour keying support as it doesn't have planes.
* Added only RGB formats in rzg2l_du_format_infos.
* Dropped chroma planes from rzg2l_du_fb_create().
* Updated the comment for max_pitch in rzg2l_du_fb_create().
* Dropped possible_crtcs check in rzg2l_du_encoders_init().
* Dropped additional empty line from struct rzg2l_du_device.
v9->v10:
* Dropped ARM64 dependency from Kconfig.
* Sorted the configs alphabetically in Kconfig.
* Dropped DRM_RCAR_VSP config option and make DRM_RZG2L_DU depend on
VIDEO_RENESAS_VSP1.
* On rzg2l_du_crtc_set_display_timing() replaced the setting of parent
clk rate with dclk rate.
* Added rzg2l_du_write() wrapper function.
* Updated the comment atomic_begin->atomic_flush.
* Dropped .atomic_check and .atomic_begin callback
* Renamed __rzg2l_du_crtc_plane_atomic_check->__rzg2l_du_vsp_plane_atomic
_check and moved it to rzg2l_du_vsp.c
* Added struct clk in rzg2l_du_crtc.h
* Dropped the variables mmio_offset,index,vblank_lock,vblank_wait,
vblank_count from struct rzg2l_du_crtc.
* Replaced the macro to_rzg2l_crtc with static inline functions.
* Dropped the unneeded header files clk.h, io.h, mm.h, pm.h, slab.h,
wait.h and drm_managed.h from rzg2l_du_drv.c.
* Replaced DRM_INFO->drm_info
* Dropped the callbacks prime_handle_to_fd, prime_fd_to_handle and
gem_prime_mmap.
* Replaced the callback remove->remove_new.
* Dropped header file wait.h and added forward declarations struct clk and
rzg2l_du_device from rzg2l_du_drv.h.
* Dropped the dsi and dpad0_source variables from struct rzg2l_du_device.
* Replaced the macro to_rzg2l_encoder with static inline functions.
* Dropped header files dma-buf.h and wait.h from rzg2l_du_kms.c.
* Dropped struct sg_table and added the scatterlist.h header file in
rzg2l_du_vsp.h
* Added container_of.h header file, forward declarations struct device and
struct rzg2l_du_device in rzg2l_du_vsp.h.
v8->v9:
* Dropped reset_control_assert() from error patch for rzg2l_du_crtc_get() as
suggested by Philipp Zabel.
v7->v8:
* Dropped RCar du lib and created RZ/G2L DU DRM driver by creating rz_du folder.
* Updated KConfig and Makefile.
v6->v7:
* Split DU lib and RZ/G2L du driver as separate patch series as
DU support added to more platforms based on RZ/G2L alike SoCs.
* Rebased to latest drm-tip.
* Added patch #2 for binding support for RZ/V2L DU
* Added patch #4 for driver support for RZ/V2L DU
* Added patch #5 for SoC DTSI support for RZ/G2L DU
* Added patch #6 for SoC DTSI support for RZ/V2L DU
* Added patch #7 for Enabling DU on SMARC EVK based on RZ/{G2L,V2L} SoCs.
* Added patch #8 for Enabling DU on SMARC EVK based on RZ/G2LC SoC.
---
drivers/gpu/drm/renesas/Kconfig | 1 +
drivers/gpu/drm/renesas/Makefile | 1 +
drivers/gpu/drm/renesas/rz-du/Kconfig | 12 +
drivers/gpu/drm/renesas/rz-du/Makefile | 8 +
drivers/gpu/drm/renesas/rz-du/rzg2l_du_crtc.c | 431 ++++++++++++++++
drivers/gpu/drm/renesas/rz-du/rzg2l_du_crtc.h | 89 ++++
drivers/gpu/drm/renesas/rz-du/rzg2l_du_drv.c | 176 +++++++
drivers/gpu/drm/renesas/rz-du/rzg2l_du_drv.h | 78 +++
.../gpu/drm/renesas/rz-du/rzg2l_du_encoder.c | 72 +++
.../gpu/drm/renesas/rz-du/rzg2l_du_encoder.h | 32 ++
drivers/gpu/drm/renesas/rz-du/rzg2l_du_kms.c | 433 +++++++++++++++++
drivers/gpu/drm/renesas/rz-du/rzg2l_du_kms.h | 43 ++
drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c | 460 ++++++++++++++++++
drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h | 97 ++++
14 files changed, 1933 insertions(+)
create mode 100644 drivers/gpu/drm/renesas/rz-du/Kconfig
create mode 100644 drivers/gpu/drm/renesas/rz-du/Makefile
create mode 100644 drivers/gpu/drm/renesas/rz-du/rzg2l_du_crtc.c
create mode 100644 drivers/gpu/drm/renesas/rz-du/rzg2l_du_crtc.h
create mode 100644 drivers/gpu/drm/renesas/rz-du/rzg2l_du_drv.c
create mode 100644 drivers/gpu/drm/renesas/rz-du/rzg2l_du_drv.h
create mode 100644 drivers/gpu/drm/renesas/rz-du/rzg2l_du_encoder.c
create mode 100644 drivers/gpu/drm/renesas/rz-du/rzg2l_du_encoder.h
create mode 100644 drivers/gpu/drm/renesas/rz-du/rzg2l_du_kms.c
create mode 100644 drivers/gpu/drm/renesas/rz-du/rzg2l_du_kms.h
create mode 100644 drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c
create mode 100644 drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h
diff --git a/drivers/gpu/drm/renesas/Kconfig b/drivers/gpu/drm/renesas/Kconfig
index 3777dad17f81..21862a8ef710 100644
--- a/drivers/gpu/drm/renesas/Kconfig
+++ b/drivers/gpu/drm/renesas/Kconfig
@@ -1,4 +1,5 @@
# SPDX-License-Identifier: GPL-2.0-only
source "drivers/gpu/drm/renesas/rcar-du/Kconfig"
+source "drivers/gpu/drm/renesas/rz-du/Kconfig"
source "drivers/gpu/drm/renesas/shmobile/Kconfig"
diff --git a/drivers/gpu/drm/renesas/Makefile b/drivers/gpu/drm/renesas/Makefile
index ec0e89e7a592..b8d8bc53967f 100644
--- a/drivers/gpu/drm/renesas/Makefile
+++ b/drivers/gpu/drm/renesas/Makefile
@@ -1,4 +1,5 @@
# SPDX-License-Identifier: GPL-2.0
obj-y += rcar-du/
+obj-y += rz-du/
obj-$(CONFIG_DRM_SHMOBILE) += shmobile/
diff --git a/drivers/gpu/drm/renesas/rz-du/Kconfig b/drivers/gpu/drm/renesas/rz-du/Kconfig
new file mode 100644
index 000000000000..5f0db2c5fee6
--- /dev/null
+++ b/drivers/gpu/drm/renesas/rz-du/Kconfig
@@ -0,0 +1,12 @@
+# SPDX-License-Identifier: GPL-2.0
+config DRM_RZG2L_DU
+ tristate "DRM Support for RZ/G2L Display Unit"
+ depends on ARCH_RZG2L || COMPILE_TEST
+ depends on DRM && OF
+ depends on VIDEO_RENESAS_VSP1
+ select DRM_GEM_DMA_HELPER
+ select DRM_KMS_HELPER
+ select VIDEOMODE_HELPERS
+ help
+ Choose this option if you have an RZ/G2L alike chipset.
+ If M is selected the module will be called rzg2l-du-drm.
diff --git a/drivers/gpu/drm/renesas/rz-du/Makefile b/drivers/gpu/drm/renesas/rz-du/Makefile
new file mode 100644
index 000000000000..663b82a2577f
--- /dev/null
+++ b/drivers/gpu/drm/renesas/rz-du/Makefile
@@ -0,0 +1,8 @@
+# SPDX-License-Identifier: GPL-2.0
+rzg2l-du-drm-y := rzg2l_du_crtc.o \
+ rzg2l_du_drv.o \
+ rzg2l_du_encoder.o \
+ rzg2l_du_kms.o \
+
+rzg2l-du-drm-$(CONFIG_VIDEO_RENESAS_VSP1) += rzg2l_du_vsp.o
+obj-$(CONFIG_DRM_RZG2L_DU) += rzg2l-du-drm.o
diff --git a/drivers/gpu/drm/renesas/rz-du/rzg2l_du_crtc.c b/drivers/gpu/drm/renesas/rz-du/rzg2l_du_crtc.c
new file mode 100644
index 000000000000..6c7efff98495
--- /dev/null
+++ b/drivers/gpu/drm/renesas/rz-du/rzg2l_du_crtc.c
@@ -0,0 +1,431 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * RZ/G2L Display Unit CRTCs
+ *
+ * Copyright (C) 2023 Renesas Electronics Corporation
+ *
+ * Based on rcar_du_crtc.c
+ */
+
+#include <linux/clk.h>
+#include <linux/mutex.h>
+#include <linux/platform_device.h>
+#include <linux/reset.h>
+
+#include <drm/drm_atomic.h>
+#include <drm/drm_atomic_helper.h>
+#include <drm/drm_bridge.h>
+#include <drm/drm_crtc.h>
+#include <drm/drm_device.h>
+#include <drm/drm_framebuffer.h>
+#include <drm/drm_gem_dma_helper.h>
+#include <drm/drm_vblank.h>
+
+#include "rzg2l_du_crtc.h"
+#include "rzg2l_du_drv.h"
+#include "rzg2l_du_encoder.h"
+#include "rzg2l_du_kms.h"
+#include "rzg2l_du_vsp.h"
+
+#define DU_MCR0 0x00
+#define DU_MCR0_DI_EN BIT(8)
+
+#define DU_DITR0 0x10
+#define DU_DITR0_DEMD_HIGH (BIT(8) | BIT(9))
+#define DU_DITR0_VSPOL BIT(16)
+#define DU_DITR0_HSPOL BIT(17)
+
+#define DU_DITR1 0x14
+#define DU_DITR1_VSA(x) ((x) << 0)
+#define DU_DITR1_VACTIVE(x) ((x) << 16)
+
+#define DU_DITR2 0x18
+#define DU_DITR2_VBP(x) ((x) << 0)
+#define DU_DITR2_VFP(x) ((x) << 16)
+
+#define DU_DITR3 0x1c
+#define DU_DITR3_HSA(x) ((x) << 0)
+#define DU_DITR3_HACTIVE(x) ((x) << 16)
+
+#define DU_DITR4 0x20
+#define DU_DITR4_HBP(x) ((x) << 0)
+#define DU_DITR4_HFP(x) ((x) << 16)
+
+#define DU_MCR1 0x40
+#define DU_MCR1_PB_AUTOCLR BIT(16)
+
+#define DU_PBCR0 0x4c
+#define DU_PBCR0_PB_DEP(x) ((x) << 0)
+
+/* -----------------------------------------------------------------------------
+ * Hardware Setup
+ */
+
+static void rzg2l_du_crtc_set_display_timing(struct rzg2l_du_crtc *rcrtc)
+{
+ const struct drm_display_mode *mode = &rcrtc->crtc.state->adjusted_mode;
+ unsigned long mode_clock = mode->clock * 1000;
+ u32 ditr0, ditr1, ditr2, ditr3, ditr4, pbcr0;
+ struct rzg2l_du_device *rcdu = rcrtc->dev;
+
+ clk_prepare_enable(rcrtc->rzg2l_clocks.dclk);
+ clk_set_rate(rcrtc->rzg2l_clocks.dclk, mode_clock);
+
+ ditr0 = (DU_DITR0_DEMD_HIGH
+ | ((mode->flags & DRM_MODE_FLAG_PVSYNC) ? DU_DITR0_VSPOL : 0)
+ | ((mode->flags & DRM_MODE_FLAG_PHSYNC) ? DU_DITR0_HSPOL : 0));
+
+ ditr1 = DU_DITR1_VSA(mode->vsync_end - mode->vsync_start)
+ | DU_DITR1_VACTIVE(mode->vdisplay);
+
+ ditr2 = DU_DITR2_VBP(mode->vtotal - mode->vsync_end)
+ | DU_DITR2_VFP(mode->vsync_start - mode->vdisplay);
+
+ ditr3 = DU_DITR3_HSA(mode->hsync_end - mode->hsync_start)
+ | DU_DITR3_HACTIVE(mode->hdisplay);
+
+ ditr4 = DU_DITR4_HBP(mode->htotal - mode->hsync_end)
+ | DU_DITR4_HFP(mode->hsync_start - mode->hdisplay);
+
+ pbcr0 = DU_PBCR0_PB_DEP(0x1f);
+
+ writel(ditr0, rcdu->mmio + DU_DITR0);
+ writel(ditr1, rcdu->mmio + DU_DITR1);
+ writel(ditr2, rcdu->mmio + DU_DITR2);
+ writel(ditr3, rcdu->mmio + DU_DITR3);
+ writel(ditr4, rcdu->mmio + DU_DITR4);
+ writel(pbcr0, rcdu->mmio + DU_PBCR0);
+
+ /* Enable auto clear */
+ writel(DU_MCR1_PB_AUTOCLR, rcdu->mmio + DU_MCR1);
+}
+
+/* -----------------------------------------------------------------------------
+ * Page Flip
+ */
+
+void rzg2l_du_crtc_finish_page_flip(struct rzg2l_du_crtc *rcrtc)
+{
+ struct drm_pending_vblank_event *event;
+ struct drm_device *dev = rcrtc->crtc.dev;
+ unsigned long flags;
+
+ spin_lock_irqsave(&dev->event_lock, flags);
+ event = rcrtc->event;
+ rcrtc->event = NULL;
+ spin_unlock_irqrestore(&dev->event_lock, flags);
+
+ if (!event)
+ return;
+
+ spin_lock_irqsave(&dev->event_lock, flags);
+ drm_crtc_send_vblank_event(&rcrtc->crtc, event);
+ wake_up(&rcrtc->flip_wait);
+ spin_unlock_irqrestore(&dev->event_lock, flags);
+
+ drm_crtc_vblank_put(&rcrtc->crtc);
+}
+
+static bool rzg2l_du_crtc_page_flip_pending(struct rzg2l_du_crtc *rcrtc)
+{
+ struct drm_device *dev = rcrtc->crtc.dev;
+ unsigned long flags;
+ bool pending;
+
+ spin_lock_irqsave(&dev->event_lock, flags);
+ pending = rcrtc->event;
+ spin_unlock_irqrestore(&dev->event_lock, flags);
+
+ return pending;
+}
+
+static void rzg2l_du_crtc_wait_page_flip(struct rzg2l_du_crtc *rcrtc)
+{
+ struct rzg2l_du_device *rcdu = rcrtc->dev;
+
+ if (wait_event_timeout(rcrtc->flip_wait,
+ !rzg2l_du_crtc_page_flip_pending(rcrtc),
+ msecs_to_jiffies(50)))
+ return;
+
+ dev_warn(rcdu->dev, "page flip timeout\n");
+
+ rzg2l_du_crtc_finish_page_flip(rcrtc);
+}
+
+/* -----------------------------------------------------------------------------
+ * Start/Stop and Suspend/Resume
+ */
+
+static void rzg2l_du_crtc_setup(struct rzg2l_du_crtc *rcrtc)
+{
+ /* Configure display timings and output routing */
+ rzg2l_du_crtc_set_display_timing(rcrtc);
+
+ /* Enable the VSP compositor. */
+ rzg2l_du_vsp_enable(rcrtc);
+
+ /* Turn vertical blanking interrupt reporting on. */
+ drm_crtc_vblank_on(&rcrtc->crtc);
+}
+
+static int rzg2l_du_crtc_get(struct rzg2l_du_crtc *rcrtc)
+{
+ int ret;
+
+ /*
+ * Guard against double-get, as the function is called from both the
+ * .atomic_enable() and .atomic_flush() handlers.
+ */
+ if (rcrtc->initialized)
+ return 0;
+
+ ret = clk_prepare_enable(rcrtc->rzg2l_clocks.aclk);
+ if (ret < 0)
+ return ret;
+
+ ret = clk_prepare_enable(rcrtc->rzg2l_clocks.pclk);
+ if (ret < 0)
+ goto error_bus_clock;
+
+ ret = reset_control_deassert(rcrtc->rstc);
+ if (ret < 0)
+ goto error_peri_clock;
+
+ rzg2l_du_crtc_setup(rcrtc);
+ rcrtc->initialized = true;
+
+ return 0;
+
+error_peri_clock:
+ clk_disable_unprepare(rcrtc->rzg2l_clocks.pclk);
+error_bus_clock:
+ clk_disable_unprepare(rcrtc->rzg2l_clocks.aclk);
+ return ret;
+}
+
+static void rzg2l_du_crtc_put(struct rzg2l_du_crtc *rcrtc)
+{
+ clk_disable_unprepare(rcrtc->rzg2l_clocks.dclk);
+ reset_control_assert(rcrtc->rstc);
+ clk_disable_unprepare(rcrtc->rzg2l_clocks.pclk);
+ clk_disable_unprepare(rcrtc->rzg2l_clocks.aclk);
+
+ rcrtc->initialized = false;
+}
+
+static void rzg2l_du_start_stop(struct rzg2l_du_crtc *rcrtc, bool start)
+{
+ struct rzg2l_du_device *rcdu = rcrtc->dev;
+
+ writel(start ? DU_MCR0_DI_EN : 0, rcdu->mmio + DU_MCR0);
+}
+
+static void rzg2l_du_crtc_start(struct rzg2l_du_crtc *rcrtc)
+{
+ rzg2l_du_start_stop(rcrtc, true);
+}
+
+static void rzg2l_du_crtc_stop(struct rzg2l_du_crtc *rcrtc)
+{
+ struct drm_crtc *crtc = &rcrtc->crtc;
+
+ /*
+ * Disable vertical blanking interrupt reporting. We first need to wait
+ * for page flip completion before stopping the CRTC as userspace
+ * expects page flips to eventually complete.
+ */
+ rzg2l_du_crtc_wait_page_flip(rcrtc);
+ drm_crtc_vblank_off(crtc);
+
+ /* Disable the VSP compositor. */
+ rzg2l_du_vsp_disable(rcrtc);
+
+ rzg2l_du_start_stop(rcrtc, false);
+}
+
+/* -----------------------------------------------------------------------------
+ * CRTC Functions
+ */
+
+static void rzg2l_du_crtc_atomic_enable(struct drm_crtc *crtc,
+ struct drm_atomic_state *state)
+{
+ struct rzg2l_du_crtc *rcrtc = to_rzg2l_crtc(crtc);
+
+ rzg2l_du_crtc_get(rcrtc);
+
+ rzg2l_du_crtc_start(rcrtc);
+}
+
+static void rzg2l_du_crtc_atomic_disable(struct drm_crtc *crtc,
+ struct drm_atomic_state *state)
+{
+ struct rzg2l_du_crtc *rcrtc = to_rzg2l_crtc(crtc);
+
+ rzg2l_du_crtc_stop(rcrtc);
+ rzg2l_du_crtc_put(rcrtc);
+
+ 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);
+}
+
+static void rzg2l_du_crtc_atomic_flush(struct drm_crtc *crtc,
+ struct drm_atomic_state *state)
+{
+ struct rzg2l_du_crtc *rcrtc = to_rzg2l_crtc(crtc);
+ struct drm_device *dev = rcrtc->crtc.dev;
+ unsigned long flags;
+
+ WARN_ON(!crtc->state->enable);
+
+ /*
+ * If a mode set is in progress we can be called with the CRTC disabled.
+ * We thus need to first get and setup the CRTC in order to configure
+ * planes. We must *not* put the CRTC, as it must be kept awake until
+ * the .atomic_enable() call that will follow. The get operation in
+ * .atomic_enable() will in that case be a no-op, and the CRTC will be
+ * put later in .atomic_disable().
+ */
+ rzg2l_du_crtc_get(rcrtc);
+
+ if (crtc->state->event) {
+ WARN_ON(drm_crtc_vblank_get(crtc) != 0);
+
+ spin_lock_irqsave(&dev->event_lock, flags);
+ rcrtc->event = crtc->state->event;
+ crtc->state->event = NULL;
+ spin_unlock_irqrestore(&dev->event_lock, flags);
+ }
+
+ rzg2l_du_vsp_atomic_flush(rcrtc);
+}
+
+static const struct drm_crtc_helper_funcs crtc_helper_funcs = {
+ .atomic_flush = rzg2l_du_crtc_atomic_flush,
+ .atomic_enable = rzg2l_du_crtc_atomic_enable,
+ .atomic_disable = rzg2l_du_crtc_atomic_disable,
+};
+
+static struct drm_crtc_state *
+rzg2l_du_crtc_atomic_duplicate_state(struct drm_crtc *crtc)
+{
+ struct rzg2l_du_crtc_state *state;
+ struct rzg2l_du_crtc_state *copy;
+
+ if (WARN_ON(!crtc->state))
+ return NULL;
+
+ state = to_rzg2l_crtc_state(crtc->state);
+ copy = kmemdup(state, sizeof(*state), GFP_KERNEL);
+ if (!copy)
+ return NULL;
+
+ __drm_atomic_helper_crtc_duplicate_state(crtc, ©->state);
+
+ return ©->state;
+}
+
+static void rzg2l_du_crtc_atomic_destroy_state(struct drm_crtc *crtc,
+ struct drm_crtc_state *state)
+{
+ __drm_atomic_helper_crtc_destroy_state(state);
+ kfree(to_rzg2l_crtc_state(state));
+}
+
+static void rzg2l_du_crtc_reset(struct drm_crtc *crtc)
+{
+ struct rzg2l_du_crtc_state *state;
+
+ if (crtc->state) {
+ rzg2l_du_crtc_atomic_destroy_state(crtc, crtc->state);
+ crtc->state = NULL;
+ }
+
+ state = kzalloc(sizeof(*state), GFP_KERNEL);
+ if (!state)
+ return;
+
+ __drm_atomic_helper_crtc_reset(crtc, &state->state);
+}
+
+static int rzg2l_du_crtc_enable_vblank(struct drm_crtc *crtc)
+{
+ struct rzg2l_du_crtc *rcrtc = to_rzg2l_crtc(crtc);
+
+ rcrtc->vblank_enable = true;
+
+ return 0;
+}
+
+static void rzg2l_du_crtc_disable_vblank(struct drm_crtc *crtc)
+{
+ struct rzg2l_du_crtc *rcrtc = to_rzg2l_crtc(crtc);
+
+ rcrtc->vblank_enable = false;
+}
+
+static const struct drm_crtc_funcs crtc_funcs_rz = {
+ .reset = rzg2l_du_crtc_reset,
+ .destroy = drm_crtc_cleanup,
+ .set_config = drm_atomic_helper_set_config,
+ .page_flip = drm_atomic_helper_page_flip,
+ .atomic_duplicate_state = rzg2l_du_crtc_atomic_duplicate_state,
+ .atomic_destroy_state = rzg2l_du_crtc_atomic_destroy_state,
+ .enable_vblank = rzg2l_du_crtc_enable_vblank,
+ .disable_vblank = rzg2l_du_crtc_disable_vblank,
+};
+
+/* -----------------------------------------------------------------------------
+ * Initialization
+ */
+
+int rzg2l_du_crtc_create(struct rzg2l_du_device *rcdu)
+{
+ struct rzg2l_du_crtc *rcrtc = &rcdu->crtcs[0];
+ struct drm_crtc *crtc = &rcrtc->crtc;
+ struct drm_plane *primary;
+ int ret;
+
+ rcrtc->rstc = devm_reset_control_get_shared(rcdu->dev, NULL);
+ if (IS_ERR(rcrtc->rstc)) {
+ dev_err(rcdu->dev, "can't get cpg reset\n");
+ return PTR_ERR(rcrtc->rstc);
+ }
+
+ rcrtc->rzg2l_clocks.aclk = devm_clk_get(rcdu->dev, "aclk");
+ if (IS_ERR(rcrtc->rzg2l_clocks.aclk)) {
+ dev_err(rcdu->dev, "no axi clock for DU\n");
+ return PTR_ERR(rcrtc->rzg2l_clocks.aclk);
+ }
+
+ rcrtc->rzg2l_clocks.pclk = devm_clk_get(rcdu->dev, "pclk");
+ if (IS_ERR(rcrtc->rzg2l_clocks.pclk)) {
+ dev_err(rcdu->dev, "no peripheral clock for DU\n");
+ return PTR_ERR(rcrtc->rzg2l_clocks.pclk);
+ }
+
+ rcrtc->rzg2l_clocks.dclk = devm_clk_get(rcdu->dev, "vclk");
+ if (IS_ERR(rcrtc->rzg2l_clocks.dclk)) {
+ dev_err(rcdu->dev, "no video clock for DU\n");
+ return PTR_ERR(rcrtc->rzg2l_clocks.dclk);
+ }
+
+ init_waitqueue_head(&rcrtc->flip_wait);
+ rcrtc->dev = rcdu;
+
+ primary = &rcrtc->vsp->planes[rcrtc->vsp_pipe].plane;
+
+ ret = drm_crtc_init_with_planes(&rcdu->ddev, crtc, primary, NULL,
+ &crtc_funcs_rz, NULL);
+ if (ret < 0)
+ return ret;
+
+ drm_crtc_helper_add(crtc, &crtc_helper_funcs);
+
+ return 0;
+}
diff --git a/drivers/gpu/drm/renesas/rz-du/rzg2l_du_crtc.h b/drivers/gpu/drm/renesas/rz-du/rzg2l_du_crtc.h
new file mode 100644
index 000000000000..cbba38acc377
--- /dev/null
+++ b/drivers/gpu/drm/renesas/rz-du/rzg2l_du_crtc.h
@@ -0,0 +1,89 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * RZ/G2L Display Unit CRTCs
+ *
+ * Copyright (C) 2023 Renesas Electronics Corporation
+ *
+ * Based on rcar_du_crtc.h
+ */
+
+#ifndef __RZG2L_DU_CRTC_H__
+#define __RZG2L_DU_CRTC_H__
+
+#include <linux/container_of.h>
+#include <linux/mutex.h>
+#include <linux/spinlock.h>
+#include <linux/wait.h>
+
+#include <drm/drm_crtc.h>
+#include <drm/drm_writeback.h>
+
+#include <media/vsp1.h>
+
+struct clk;
+struct reset_control;
+struct rzg2l_du_vsp;
+struct rzg2l_du_format_info;
+
+/**
+ * struct rzg2l_du_crtc - the CRTC, representing a DU superposition processor
+ * @crtc: base DRM CRTC
+ * @dev: the DU device
+ * @initialized: whether the CRTC has been initialized and clocks enabled
+ * @vblank_enable: whether vblank events are enabled on this CRTC
+ * @event: event to post when the pending page flip completes
+ * @flip_wait: wait queue used to signal page flip completion
+ * @vsp: VSP feeding video to this CRTC
+ * @vsp_pipe: index of the VSP pipeline feeding video to this CRTC
+ * @rstc: reset controller
+ * @rzg2l_clocks: the bus, main and video clock
+ */
+struct rzg2l_du_crtc {
+ struct drm_crtc crtc;
+
+ struct rzg2l_du_device *dev;
+ bool initialized;
+
+ bool vblank_enable;
+ struct drm_pending_vblank_event *event;
+ wait_queue_head_t flip_wait;
+
+ struct rzg2l_du_vsp *vsp;
+ unsigned int vsp_pipe;
+
+ const char *const *sources;
+ unsigned int sources_count;
+
+ struct reset_control *rstc;
+ struct {
+ struct clk *aclk;
+ struct clk *pclk;
+ struct clk *dclk;
+ } rzg2l_clocks;
+};
+
+static inline struct rzg2l_du_crtc *to_rzg2l_crtc(struct drm_crtc *c)
+{
+ return container_of(c, struct rzg2l_du_crtc, crtc);
+}
+
+/**
+ * struct rzg2l_du_crtc_state - Driver-specific CRTC state
+ * @state: base DRM CRTC state
+ * @outputs: bitmask of the outputs (enum rzg2l_du_output) driven by this CRTC
+ */
+struct rzg2l_du_crtc_state {
+ struct drm_crtc_state state;
+ unsigned int outputs;
+};
+
+static inline struct rzg2l_du_crtc_state *to_rzg2l_crtc_state(struct drm_crtc_state *s)
+{
+ return container_of(s, struct rzg2l_du_crtc_state, state);
+}
+
+int rzg2l_du_crtc_create(struct rzg2l_du_device *rcdu);
+
+void rzg2l_du_crtc_finish_page_flip(struct rzg2l_du_crtc *rcrtc);
+
+#endif /* __RZG2L_DU_CRTC_H__ */
diff --git a/drivers/gpu/drm/renesas/rz-du/rzg2l_du_drv.c b/drivers/gpu/drm/renesas/rz-du/rzg2l_du_drv.c
new file mode 100644
index 000000000000..2f3ced999c4f
--- /dev/null
+++ b/drivers/gpu/drm/renesas/rz-du/rzg2l_du_drv.c
@@ -0,0 +1,176 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * RZ/G2L Display Unit DRM driver
+ *
+ * Copyright (C) 2023 Renesas Electronics Corporation
+ *
+ * Based on rcar_du_drv.c
+ */
+
+#include <linux/dma-mapping.h>
+#include <linux/module.h>
+#include <linux/of.h>
+#include <linux/platform_device.h>
+
+#include <drm/drm_atomic_helper.h>
+#include <drm/drm_drv.h>
+#include <drm/drm_fbdev_generic.h>
+#include <drm/drm_gem_dma_helper.h>
+#include <drm/drm_probe_helper.h>
+
+#include "rzg2l_du_drv.h"
+#include "rzg2l_du_kms.h"
+
+/* -----------------------------------------------------------------------------
+ * Device Information
+ */
+
+static const struct rzg2l_du_device_info rzg2l_du_r9a07g044_info = {
+ .channels_mask = BIT(0),
+ .routes = {
+ [RZG2L_DU_OUTPUT_DSI0] = {
+ .possible_outputs = BIT(0),
+ .port = 0,
+ },
+ [RZG2L_DU_OUTPUT_DPAD0] = {
+ .possible_outputs = BIT(0),
+ .port = 1,
+ }
+ }
+};
+
+static const struct of_device_id rzg2l_du_of_table[] = {
+ { .compatible = "renesas,r9a07g044-du", .data = &rzg2l_du_r9a07g044_info },
+ { /* sentinel */ }
+};
+
+MODULE_DEVICE_TABLE(of, rzg2l_du_of_table);
+
+const char *rzg2l_du_output_name(enum rzg2l_du_output output)
+{
+ static const char * const names[] = {
+ [RZG2L_DU_OUTPUT_DSI0] = "DSI0",
+ [RZG2L_DU_OUTPUT_DPAD0] = "DPAD0"
+ };
+
+ if (output >= ARRAY_SIZE(names))
+ return "UNKNOWN";
+
+ return names[output];
+}
+
+/* -----------------------------------------------------------------------------
+ * DRM operations
+ */
+
+DEFINE_DRM_GEM_DMA_FOPS(rzg2l_du_fops);
+
+static const struct drm_driver rzg2l_du_driver = {
+ .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC,
+ .dumb_create = rzg2l_du_dumb_create,
+ .gem_prime_import_sg_table = rzg2l_du_gem_prime_import_sg_table,
+ .fops = &rzg2l_du_fops,
+ .name = "rzg2l-du",
+ .desc = "Renesas RZ/G2L Display Unit",
+ .date = "20230410",
+ .major = 1,
+ .minor = 0,
+};
+
+/* -----------------------------------------------------------------------------
+ * Platform driver
+ */
+
+static void rzg2l_du_remove(struct platform_device *pdev)
+{
+ struct rzg2l_du_device *rcdu = platform_get_drvdata(pdev);
+ struct drm_device *ddev = &rcdu->ddev;
+
+ drm_dev_unregister(ddev);
+ drm_atomic_helper_shutdown(ddev);
+
+ drm_kms_helper_poll_fini(ddev);
+}
+
+static void rzg2l_du_shutdown(struct platform_device *pdev)
+{
+ struct rzg2l_du_device *rcdu = platform_get_drvdata(pdev);
+
+ drm_atomic_helper_shutdown(&rcdu->ddev);
+}
+
+static int rzg2l_du_probe(struct platform_device *pdev)
+{
+ struct rzg2l_du_device *rcdu;
+ int ret;
+
+ if (drm_firmware_drivers_only())
+ return -ENODEV;
+
+ /* Allocate and initialize the RZ/G2L device structure. */
+ rcdu = devm_drm_dev_alloc(&pdev->dev, &rzg2l_du_driver,
+ struct rzg2l_du_device, ddev);
+ if (IS_ERR(rcdu))
+ return PTR_ERR(rcdu);
+
+ rcdu->dev = &pdev->dev;
+ rcdu->info = of_device_get_match_data(rcdu->dev);
+
+ platform_set_drvdata(pdev, rcdu);
+
+ /* I/O resources */
+ rcdu->mmio = devm_platform_ioremap_resource(pdev, 0);
+ if (IS_ERR(rcdu->mmio))
+ return PTR_ERR(rcdu->mmio);
+
+ ret = dma_coerce_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
+ if (ret)
+ return ret;
+
+ /* DRM/KMS objects */
+ ret = rzg2l_du_modeset_init(rcdu);
+ if (ret < 0) {
+ /*
+ * Don't use dev_err_probe(), as it would overwrite the probe
+ * deferral reason recorded in rzg2l_du_modeset_init().
+ */
+ if (ret != -EPROBE_DEFER)
+ dev_err(&pdev->dev,
+ "failed to initialize DRM/KMS (%d)\n", ret);
+ goto error;
+ }
+
+ /*
+ * Register the DRM device with the core and the connectors with
+ * sysfs.
+ */
+ ret = drm_dev_register(&rcdu->ddev, 0);
+ if (ret)
+ goto error;
+
+ drm_info(&rcdu->ddev, "Device %s probed\n", dev_name(&pdev->dev));
+
+ drm_fbdev_generic_setup(&rcdu->ddev, 32);
+
+ return 0;
+
+error:
+ drm_kms_helper_poll_fini(&rcdu->ddev);
+ return ret;
+}
+
+static struct platform_driver rzg2l_du_platform_driver = {
+ .probe = rzg2l_du_probe,
+ .remove_new = rzg2l_du_remove,
+ .shutdown = rzg2l_du_shutdown,
+ .driver = {
+ .name = "rzg2l-du",
+ .of_match_table = rzg2l_du_of_table,
+ },
+};
+
+module_platform_driver(rzg2l_du_platform_driver);
+
+MODULE_AUTHOR("Biju Das <biju.das.jz@bp.renesas.com>");
+MODULE_DESCRIPTION("Renesas RZ/G2L Display Unit DRM Driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/gpu/drm/renesas/rz-du/rzg2l_du_drv.h b/drivers/gpu/drm/renesas/rz-du/rzg2l_du_drv.h
new file mode 100644
index 000000000000..58806c2a8f2b
--- /dev/null
+++ b/drivers/gpu/drm/renesas/rz-du/rzg2l_du_drv.h
@@ -0,0 +1,78 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * RZ/G2L Display Unit DRM driver
+ *
+ * Copyright (C) 2023 Renesas Electronics Corporation
+ *
+ * Based on rcar_du_drv.h
+ */
+
+#ifndef __RZG2L_DU_DRV_H__
+#define __RZG2L_DU_DRV_H__
+
+#include <linux/kernel.h>
+
+#include <drm/drm_device.h>
+
+#include "rzg2l_du_crtc.h"
+#include "rzg2l_du_vsp.h"
+
+struct device;
+struct drm_property;
+
+enum rzg2l_du_output {
+ RZG2L_DU_OUTPUT_DSI0,
+ RZG2L_DU_OUTPUT_DPAD0,
+ RZG2L_DU_OUTPUT_MAX,
+};
+
+/*
+ * struct rzg2l_du_output_routing - Output routing specification
+ * @possible_outputs: bitmask of possible outputs
+ * @port: device tree port number corresponding to this output route
+ *
+ * The DU has 2 possible outputs (DPAD0, DSI0). Output routing data
+ * specify the valid SoC outputs, which CRTC can drive the output, and the type
+ * of in-SoC encoder for the output.
+ */
+struct rzg2l_du_output_routing {
+ unsigned int possible_outputs;
+ unsigned int port;
+};
+
+/*
+ * struct rzg2l_du_device_info - DU model-specific information
+ * @channels_mask: bit mask of available DU channels
+ * @routes: array of CRTC to output routes, indexed by output (RZG2L_DU_OUTPUT_*)
+ */
+struct rzg2l_du_device_info {
+ unsigned int channels_mask;
+ struct rzg2l_du_output_routing routes[RZG2L_DU_OUTPUT_MAX];
+};
+
+#define RZG2L_DU_MAX_CRTCS 1
+#define RZG2L_DU_MAX_VSPS 1
+#define RZG2L_DU_MAX_DSI 1
+
+struct rzg2l_du_device {
+ struct device *dev;
+ const struct rzg2l_du_device_info *info;
+
+ void __iomem *mmio;
+
+ struct drm_device ddev;
+
+ struct rzg2l_du_crtc crtcs[RZG2L_DU_MAX_CRTCS];
+ unsigned int num_crtcs;
+
+ struct rzg2l_du_vsp vsps[RZG2L_DU_MAX_VSPS];
+};
+
+static inline struct rzg2l_du_device *to_rzg2l_du_device(struct drm_device *dev)
+{
+ return container_of(dev, struct rzg2l_du_device, ddev);
+}
+
+const char *rzg2l_du_output_name(enum rzg2l_du_output output);
+
+#endif /* __RZG2L_DU_DRV_H__ */
diff --git a/drivers/gpu/drm/renesas/rz-du/rzg2l_du_encoder.c b/drivers/gpu/drm/renesas/rz-du/rzg2l_du_encoder.c
new file mode 100644
index 000000000000..339cbaaea0b5
--- /dev/null
+++ b/drivers/gpu/drm/renesas/rz-du/rzg2l_du_encoder.c
@@ -0,0 +1,72 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * RZ/G2L Display Unit Encoder
+ *
+ * Copyright (C) 2023 Renesas Electronics Corporation
+ *
+ * Based on rcar_du_encoder.c
+ */
+
+#include <linux/export.h>
+#include <linux/of.h>
+
+#include <drm/drm_bridge.h>
+#include <drm/drm_bridge_connector.h>
+#include <drm/drm_panel.h>
+
+#include "rzg2l_du_drv.h"
+#include "rzg2l_du_encoder.h"
+
+/* -----------------------------------------------------------------------------
+ * Encoder
+ */
+
+static const struct drm_encoder_funcs rzg2l_du_encoder_funcs = {
+};
+
+int rzg2l_du_encoder_init(struct rzg2l_du_device *rcdu,
+ enum rzg2l_du_output output,
+ struct device_node *enc_node)
+{
+ struct rzg2l_du_encoder *renc;
+ struct drm_connector *connector;
+ struct drm_bridge *bridge;
+ int ret;
+
+ /* Locate the DRM bridge from the DT node. */
+ bridge = of_drm_find_bridge(enc_node);
+ if (!bridge)
+ return -EPROBE_DEFER;
+
+ dev_dbg(rcdu->dev, "initializing encoder %pOF for output %s\n",
+ enc_node, rzg2l_du_output_name(output));
+
+ renc = drmm_encoder_alloc(&rcdu->ddev, struct rzg2l_du_encoder, base,
+ &rzg2l_du_encoder_funcs, DRM_MODE_ENCODER_NONE,
+ NULL);
+ if (IS_ERR(renc))
+ return PTR_ERR(renc);
+
+ renc->output = output;
+
+ /* Attach the bridge to the encoder. */
+ ret = drm_bridge_attach(&renc->base, bridge, NULL,
+ DRM_BRIDGE_ATTACH_NO_CONNECTOR);
+ if (ret) {
+ dev_err(rcdu->dev,
+ "failed to attach bridge %pOF for output %s (%d)\n",
+ bridge->of_node, rzg2l_du_output_name(output), ret);
+ return ret;
+ }
+
+ /* Create the connector for the chain of bridges. */
+ connector = drm_bridge_connector_init(&rcdu->ddev, &renc->base);
+ if (IS_ERR(connector)) {
+ dev_err(rcdu->dev,
+ "failed to created connector for output %s (%ld)\n",
+ rzg2l_du_output_name(output), PTR_ERR(connector));
+ return PTR_ERR(connector);
+ }
+
+ return drm_connector_attach_encoder(connector, &renc->base);
+}
diff --git a/drivers/gpu/drm/renesas/rz-du/rzg2l_du_encoder.h b/drivers/gpu/drm/renesas/rz-du/rzg2l_du_encoder.h
new file mode 100644
index 000000000000..3e430c1f6132
--- /dev/null
+++ b/drivers/gpu/drm/renesas/rz-du/rzg2l_du_encoder.h
@@ -0,0 +1,32 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * RZ/G2L Display Unit Encoder
+ *
+ * Copyright (C) 2023 Renesas Electronics Corporation
+ *
+ * Based on rcar_du_encoder.h
+ */
+
+#ifndef __RZG2L_DU_ENCODER_H__
+#define __RZG2L_DU_ENCODER_H__
+
+#include <drm/drm_encoder.h>
+#include <linux/container_of.h>
+
+struct rzg2l_du_device;
+
+struct rzg2l_du_encoder {
+ struct drm_encoder base;
+ enum rzg2l_du_output output;
+};
+
+static inline struct rzg2l_du_encoder *to_rzg2l_encoder(struct drm_encoder *e)
+{
+ return container_of(e, struct rzg2l_du_encoder, base);
+}
+
+int rzg2l_du_encoder_init(struct rzg2l_du_device *rcdu,
+ enum rzg2l_du_output output,
+ struct device_node *enc_node);
+
+#endif /* __RZG2L_DU_ENCODER_H__ */
diff --git a/drivers/gpu/drm/renesas/rz-du/rzg2l_du_kms.c b/drivers/gpu/drm/renesas/rz-du/rzg2l_du_kms.c
new file mode 100644
index 000000000000..74c9ba806021
--- /dev/null
+++ b/drivers/gpu/drm/renesas/rz-du/rzg2l_du_kms.c
@@ -0,0 +1,433 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * RZ/G2L Display Unit Mode Setting
+ *
+ * Copyright (C) 2023 Renesas Electronics Corporation
+ *
+ * Based on rcar_du_kms.c
+ */
+
+#include <drm/drm_atomic.h>
+#include <drm/drm_atomic_helper.h>
+#include <drm/drm_crtc.h>
+#include <drm/drm_device.h>
+#include <drm/drm_framebuffer.h>
+#include <drm/drm_gem_dma_helper.h>
+#include <drm/drm_gem_framebuffer_helper.h>
+#include <drm/drm_managed.h>
+#include <drm/drm_probe_helper.h>
+#include <drm/drm_vblank.h>
+
+#include <linux/device.h>
+#include <linux/of.h>
+#include <linux/of_graph.h>
+#include <linux/of_platform.h>
+#include <linux/platform_device.h>
+
+#include "rzg2l_du_crtc.h"
+#include "rzg2l_du_drv.h"
+#include "rzg2l_du_encoder.h"
+#include "rzg2l_du_kms.h"
+#include "rzg2l_du_vsp.h"
+
+/* -----------------------------------------------------------------------------
+ * Format helpers
+ */
+
+static const struct rzg2l_du_format_info rzg2l_du_format_infos[] = {
+ {
+ .fourcc = DRM_FORMAT_XRGB8888,
+ .v4l2 = V4L2_PIX_FMT_XBGR32,
+ .bpp = 32,
+ .planes = 1,
+ .hsub = 1,
+ }, {
+ .fourcc = DRM_FORMAT_ARGB8888,
+ .v4l2 = V4L2_PIX_FMT_ABGR32,
+ .bpp = 32,
+ .planes = 1,
+ .hsub = 1,
+ }, {
+ .fourcc = DRM_FORMAT_RGB888,
+ .v4l2 = V4L2_PIX_FMT_BGR24,
+ .bpp = 24,
+ .planes = 1,
+ .hsub = 1,
+ }
+};
+
+const struct rzg2l_du_format_info *rzg2l_du_format_info(u32 fourcc)
+{
+ unsigned int i;
+
+ for (i = 0; i < ARRAY_SIZE(rzg2l_du_format_infos); ++i) {
+ if (rzg2l_du_format_infos[i].fourcc == fourcc)
+ return &rzg2l_du_format_infos[i];
+ }
+
+ return NULL;
+}
+
+/* -----------------------------------------------------------------------------
+ * Frame buffer
+ */
+
+static const struct drm_gem_object_funcs rzg2l_du_gem_funcs = {
+ .free = drm_gem_dma_object_free,
+ .print_info = drm_gem_dma_object_print_info,
+ .get_sg_table = drm_gem_dma_object_get_sg_table,
+ .vmap = drm_gem_dma_object_vmap,
+ .mmap = drm_gem_dma_object_mmap,
+ .vm_ops = &drm_gem_dma_vm_ops,
+};
+
+struct drm_gem_object *
+rzg2l_du_gem_prime_import_sg_table(struct drm_device *dev,
+ struct dma_buf_attachment *attach,
+ struct sg_table *sgt)
+{
+ struct drm_gem_dma_object *dma_obj;
+ struct drm_gem_object *gem_obj;
+ int ret;
+
+ /* Create a DMA GEM buffer. */
+ dma_obj = kzalloc(sizeof(*dma_obj), GFP_KERNEL);
+ if (!dma_obj)
+ return ERR_PTR(-ENOMEM);
+
+ gem_obj = &dma_obj->base;
+ gem_obj->funcs = &rzg2l_du_gem_funcs;
+
+ drm_gem_private_object_init(dev, gem_obj, attach->dmabuf->size);
+ dma_obj->map_noncoherent = false;
+
+ ret = drm_gem_create_mmap_offset(gem_obj);
+ if (ret) {
+ drm_gem_object_release(gem_obj);
+ kfree(dma_obj);
+ return ERR_PTR(ret);
+ }
+
+ dma_obj->dma_addr = 0;
+ dma_obj->sgt = sgt;
+
+ return gem_obj;
+}
+
+int rzg2l_du_dumb_create(struct drm_file *file, struct drm_device *dev,
+ struct drm_mode_create_dumb *args)
+{
+ unsigned int min_pitch = DIV_ROUND_UP(args->width * args->bpp, 8);
+ unsigned int align = 16 * args->bpp / 8;
+
+ args->pitch = roundup(min_pitch, align);
+
+ return drm_gem_dma_dumb_create_internal(file, dev, args);
+}
+
+static struct drm_framebuffer *
+rzg2l_du_fb_create(struct drm_device *dev, struct drm_file *file_priv,
+ const struct drm_mode_fb_cmd2 *mode_cmd)
+{
+ const struct rzg2l_du_format_info *format;
+ unsigned int max_pitch;
+
+ format = rzg2l_du_format_info(mode_cmd->pixel_format);
+ if (!format) {
+ dev_dbg(dev->dev, "unsupported pixel format %p4cc\n",
+ &mode_cmd->pixel_format);
+ return ERR_PTR(-EINVAL);
+ }
+
+ /*
+ * On RZ/G2L the memory interface is handled by the VSP that limits the
+ * pitch to 65535 bytes.
+ */
+ max_pitch = 65535;
+ if (mode_cmd->pitches[0] > max_pitch) {
+ dev_dbg(dev->dev, "invalid pitch value %u\n",
+ mode_cmd->pitches[0]);
+ return ERR_PTR(-EINVAL);
+ }
+
+ return drm_gem_fb_create(dev, file_priv, mode_cmd);
+}
+
+/* -----------------------------------------------------------------------------
+ * Atomic Check and Update
+ */
+
+static void rzg2l_du_atomic_commit_tail(struct drm_atomic_state *old_state)
+{
+ struct drm_device *dev = old_state->dev;
+
+ /* Apply the atomic update. */
+ drm_atomic_helper_commit_modeset_disables(dev, old_state);
+ drm_atomic_helper_commit_planes(dev, old_state,
+ DRM_PLANE_COMMIT_ACTIVE_ONLY);
+ drm_atomic_helper_commit_modeset_enables(dev, old_state);
+
+ drm_atomic_helper_commit_hw_done(old_state);
+ drm_atomic_helper_wait_for_flip_done(dev, old_state);
+
+ drm_atomic_helper_cleanup_planes(dev, old_state);
+}
+
+/* -----------------------------------------------------------------------------
+ * Initialization
+ */
+
+static const struct drm_mode_config_helper_funcs rzg2l_du_mode_config_helper = {
+ .atomic_commit_tail = rzg2l_du_atomic_commit_tail,
+};
+
+static const struct drm_mode_config_funcs rzg2l_du_mode_config_funcs = {
+ .fb_create = rzg2l_du_fb_create,
+ .atomic_check = drm_atomic_helper_check,
+ .atomic_commit = drm_atomic_helper_commit,
+};
+
+static int rzg2l_du_encoders_init_one(struct rzg2l_du_device *rcdu,
+ enum rzg2l_du_output output,
+ struct of_endpoint *ep)
+{
+ struct device_node *entity;
+ int ret;
+
+ /* Locate the connected entity and initialize the encoder. */
+ entity = of_graph_get_remote_port_parent(ep->local_node);
+ if (!entity) {
+ dev_dbg(rcdu->dev, "unconnected endpoint %pOF, skipping\n",
+ ep->local_node);
+ return -ENODEV;
+ }
+
+ if (!of_device_is_available(entity)) {
+ dev_dbg(rcdu->dev,
+ "connected entity %pOF is disabled, skipping\n",
+ entity);
+ of_node_put(entity);
+ return -ENODEV;
+ }
+
+ ret = rzg2l_du_encoder_init(rcdu, output, entity);
+ if (ret && ret != -EPROBE_DEFER && ret != -ENOLINK)
+ dev_warn(rcdu->dev,
+ "failed to initialize encoder %pOF on output %s (%d), skipping\n",
+ entity, rzg2l_du_output_name(output), ret);
+
+ of_node_put(entity);
+
+ return ret;
+}
+
+static int rzg2l_du_encoders_init(struct rzg2l_du_device *rcdu)
+{
+ struct device_node *np = rcdu->dev->of_node;
+ struct device_node *ep_node;
+ unsigned int num_encoders = 0;
+
+ /*
+ * Iterate over the endpoints and create one encoder for each output
+ * pipeline.
+ */
+ for_each_endpoint_of_node(np, ep_node) {
+ enum rzg2l_du_output output;
+ struct of_endpoint ep;
+ unsigned int i;
+ int ret;
+
+ ret = of_graph_parse_endpoint(ep_node, &ep);
+ if (ret < 0) {
+ of_node_put(ep_node);
+ return ret;
+ }
+
+ /* Find the output route corresponding to the port number. */
+ for (i = 0; i < RZG2L_DU_OUTPUT_MAX; ++i) {
+ if (rcdu->info->routes[i].port == ep.port) {
+ output = i;
+ break;
+ }
+ }
+
+ if (i == RZG2L_DU_OUTPUT_MAX) {
+ dev_warn(rcdu->dev,
+ "port %u references unexisting output, skipping\n",
+ ep.port);
+ continue;
+ }
+
+ /* Process the output pipeline. */
+ ret = rzg2l_du_encoders_init_one(rcdu, output, &ep);
+ if (ret < 0) {
+ if (ret == -EPROBE_DEFER) {
+ of_node_put(ep_node);
+ return ret;
+ }
+
+ continue;
+ }
+
+ num_encoders++;
+ }
+
+ return num_encoders;
+}
+
+static int rzg2l_du_vsps_init(struct rzg2l_du_device *rcdu)
+{
+ const struct device_node *np = rcdu->dev->of_node;
+ const char *vsps_prop_name = "renesas,vsps";
+ struct of_phandle_args args;
+ struct {
+ struct device_node *np;
+ unsigned int crtcs_mask;
+ } vsps[RZG2L_DU_MAX_VSPS] = { { NULL, }, };
+ unsigned int vsps_count = 0;
+ unsigned int cells;
+ unsigned int i;
+ int ret;
+
+ /*
+ * First parse the DT vsps property to populate the list of VSPs. Each
+ * entry contains a pointer to the VSP DT node and a bitmask of the
+ * connected DU CRTCs.
+ */
+ ret = of_property_count_u32_elems(np, vsps_prop_name);
+ cells = ret / rcdu->num_crtcs - 1;
+ if (cells != 1)
+ return -EINVAL;
+
+ for (i = 0; i < rcdu->num_crtcs; ++i) {
+ unsigned int j;
+
+ ret = of_parse_phandle_with_fixed_args(np, vsps_prop_name,
+ cells, i, &args);
+ if (ret < 0)
+ goto done;
+
+ /*
+ * Add the VSP to the list or update the corresponding existing
+ * entry if the VSP has already been added.
+ */
+ for (j = 0; j < vsps_count; ++j) {
+ if (vsps[j].np == args.np)
+ break;
+ }
+
+ if (j < vsps_count)
+ of_node_put(args.np);
+ else
+ vsps[vsps_count++].np = args.np;
+
+ vsps[j].crtcs_mask |= BIT(i);
+
+ /*
+ * Store the VSP pointer and pipe index in the CRTC. If the
+ * second cell of the 'renesas,vsps' specifier isn't present,
+ * default to 0 to remain compatible with older DT bindings.
+ */
+ rcdu->crtcs[i].vsp = &rcdu->vsps[j];
+ rcdu->crtcs[i].vsp_pipe = cells >= 1 ? args.args[0] : 0;
+ }
+
+ /*
+ * Then initialize all the VSPs from the node pointers and CRTCs bitmask
+ * computed previously.
+ */
+ for (i = 0; i < vsps_count; ++i) {
+ struct rzg2l_du_vsp *vsp = &rcdu->vsps[i];
+
+ vsp->index = i;
+ vsp->dev = rcdu;
+
+ ret = rzg2l_du_vsp_init(vsp, vsps[i].np, vsps[i].crtcs_mask);
+ if (ret)
+ goto done;
+ }
+
+done:
+ for (i = 0; i < ARRAY_SIZE(vsps); ++i)
+ of_node_put(vsps[i].np);
+
+ return ret;
+}
+
+int rzg2l_du_modeset_init(struct rzg2l_du_device *rcdu)
+{
+ struct drm_device *dev = &rcdu->ddev;
+ struct drm_encoder *encoder;
+ unsigned int num_encoders;
+ int ret;
+
+ ret = drmm_mode_config_init(dev);
+ if (ret)
+ return ret;
+
+ dev->mode_config.min_width = 0;
+ dev->mode_config.min_height = 0;
+ dev->mode_config.normalize_zpos = true;
+ dev->mode_config.funcs = &rzg2l_du_mode_config_funcs;
+ dev->mode_config.helper_private = &rzg2l_du_mode_config_helper;
+
+ /*
+ * The RZ DU uses the VSP1 for memory access, and is limited
+ * to frame sizes of 1920x1080.
+ */
+ dev->mode_config.max_width = 1920;
+ dev->mode_config.max_height = 1080;
+
+ rcdu->num_crtcs = hweight8(rcdu->info->channels_mask);
+
+ /*
+ * Initialize vertical blanking interrupts handling. Start with vblank
+ * disabled for all CRTCs.
+ */
+ ret = drm_vblank_init(dev, rcdu->num_crtcs);
+ if (ret < 0)
+ return ret;
+
+ /* Initialize the compositors. */
+ ret = rzg2l_du_vsps_init(rcdu);
+ if (ret < 0)
+ return ret;
+
+ /* Create the CRTCs. */
+ ret = rzg2l_du_crtc_create(rcdu);
+ if (ret < 0)
+ return ret;
+
+ /* Initialize the encoders. */
+ ret = rzg2l_du_encoders_init(rcdu);
+ if (ret < 0)
+ return dev_err_probe(rcdu->dev, ret,
+ "failed to initialize encoders\n");
+
+ if (ret == 0) {
+ dev_err(rcdu->dev, "error: no encoder could be initialized\n");
+ return -EINVAL;
+ }
+
+ num_encoders = ret;
+
+ /*
+ * Set the possible CRTCs and possible clones. There's always at least
+ * one way for all encoders to clone each other, set all bits in the
+ * possible clones field.
+ */
+ list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
+ struct rzg2l_du_encoder *renc = to_rzg2l_encoder(encoder);
+ const struct rzg2l_du_output_routing *route =
+ &rcdu->info->routes[renc->output];
+
+ encoder->possible_crtcs = route->possible_outputs;
+ encoder->possible_clones = (1 << num_encoders) - 1;
+ }
+
+ drm_mode_config_reset(dev);
+
+ drm_kms_helper_poll_init(dev);
+
+ return 0;
+}
diff --git a/drivers/gpu/drm/renesas/rz-du/rzg2l_du_kms.h b/drivers/gpu/drm/renesas/rz-du/rzg2l_du_kms.h
new file mode 100644
index 000000000000..876e97cfbf45
--- /dev/null
+++ b/drivers/gpu/drm/renesas/rz-du/rzg2l_du_kms.h
@@ -0,0 +1,43 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * RZ/G2L Display Unit Mode Setting
+ *
+ * Copyright (C) 2023 Renesas Electronics Corporation
+ *
+ * Based on rcar_du_kms.h
+ */
+
+#ifndef __RZG2L_DU_KMS_H__
+#define __RZG2L_DU_KMS_H__
+
+#include <linux/types.h>
+
+struct dma_buf_attachment;
+struct drm_file;
+struct drm_device;
+struct drm_gem_object;
+struct drm_mode_create_dumb;
+struct rzg2l_du_device;
+struct sg_table;
+
+struct rzg2l_du_format_info {
+ u32 fourcc;
+ u32 v4l2;
+ unsigned int bpp;
+ unsigned int planes;
+ unsigned int hsub;
+};
+
+const struct rzg2l_du_format_info *rzg2l_du_format_info(u32 fourcc);
+
+int rzg2l_du_modeset_init(struct rzg2l_du_device *rcdu);
+
+int rzg2l_du_dumb_create(struct drm_file *file, struct drm_device *dev,
+ struct drm_mode_create_dumb *args);
+
+struct drm_gem_object *
+rzg2l_du_gem_prime_import_sg_table(struct drm_device *dev,
+ struct dma_buf_attachment *attach,
+ struct sg_table *sgt);
+
+#endif /* __RZG2L_DU_KMS_H__ */
diff --git a/drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c b/drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c
new file mode 100644
index 000000000000..5bb1b2c491d4
--- /dev/null
+++ b/drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c
@@ -0,0 +1,460 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * RZ/G2L Display Unit VSP-Based Compositor
+ *
+ * Copyright (C) 2023 Renesas Electronics Corporation
+ *
+ * Based on rcar_du_vsp.c
+ */
+
+#include <drm/drm_atomic.h>
+#include <drm/drm_atomic_helper.h>
+#include <drm/drm_blend.h>
+#include <drm/drm_crtc.h>
+#include <drm/drm_fb_dma_helper.h>
+#include <drm/drm_fourcc.h>
+#include <drm/drm_framebuffer.h>
+#include <drm/drm_gem_atomic_helper.h>
+#include <drm/drm_gem_dma_helper.h>
+#include <drm/drm_managed.h>
+#include <drm/drm_vblank.h>
+
+#include <linux/bitops.h>
+#include <linux/dma-mapping.h>
+#include <linux/of_platform.h>
+#include <linux/platform_device.h>
+#include <linux/scatterlist.h>
+
+#include <media/vsp1.h>
+
+#include "rzg2l_du_drv.h"
+#include "rzg2l_du_kms.h"
+#include "rzg2l_du_vsp.h"
+
+static void rzg2l_du_vsp_complete(void *private, unsigned int status, u32 crc)
+{
+ struct rzg2l_du_crtc *crtc = private;
+
+ if (crtc->vblank_enable)
+ drm_crtc_handle_vblank(&crtc->crtc);
+
+ if (status & VSP1_DU_STATUS_COMPLETE)
+ rzg2l_du_crtc_finish_page_flip(crtc);
+
+ drm_crtc_add_crc_entry(&crtc->crtc, false, 0, &crc);
+}
+
+void rzg2l_du_vsp_enable(struct rzg2l_du_crtc *crtc)
+{
+ const struct drm_display_mode *mode = &crtc->crtc.state->adjusted_mode;
+ struct vsp1_du_lif_config cfg = {
+ .width = mode->hdisplay,
+ .height = mode->vdisplay,
+ .interlaced = mode->flags & DRM_MODE_FLAG_INTERLACE,
+ .callback = rzg2l_du_vsp_complete,
+ .callback_data = crtc,
+ };
+
+ vsp1_du_setup_lif(crtc->vsp->vsp, crtc->vsp_pipe, &cfg);
+}
+
+void rzg2l_du_vsp_disable(struct rzg2l_du_crtc *crtc)
+{
+ vsp1_du_setup_lif(crtc->vsp->vsp, crtc->vsp_pipe, NULL);
+}
+
+void rzg2l_du_vsp_atomic_begin(struct rzg2l_du_crtc *crtc)
+{
+ vsp1_du_atomic_begin(crtc->vsp->vsp, crtc->vsp_pipe);
+}
+
+void rzg2l_du_vsp_atomic_flush(struct rzg2l_du_crtc *crtc)
+{
+ struct vsp1_du_atomic_pipe_config cfg = { { 0, } };
+ struct rzg2l_du_crtc_state *state;
+
+ state = to_rzg2l_crtc_state(crtc->crtc.state);
+
+ vsp1_du_atomic_flush(crtc->vsp->vsp, crtc->vsp_pipe, &cfg);
+}
+
+static const u32 rzg2l_du_vsp_formats[] = {
+ DRM_FORMAT_RGB332,
+ DRM_FORMAT_ARGB4444,
+ DRM_FORMAT_XRGB4444,
+ DRM_FORMAT_ARGB1555,
+ DRM_FORMAT_XRGB1555,
+ DRM_FORMAT_RGB565,
+ DRM_FORMAT_BGR888,
+ DRM_FORMAT_RGB888,
+ DRM_FORMAT_BGRA8888,
+ DRM_FORMAT_BGRX8888,
+ DRM_FORMAT_ARGB8888,
+ DRM_FORMAT_XRGB8888,
+ DRM_FORMAT_UYVY,
+ DRM_FORMAT_YUYV,
+ DRM_FORMAT_YVYU,
+ DRM_FORMAT_NV12,
+ DRM_FORMAT_NV21,
+ DRM_FORMAT_NV16,
+ DRM_FORMAT_NV61,
+ DRM_FORMAT_YUV420,
+ DRM_FORMAT_YVU420,
+ DRM_FORMAT_YUV422,
+ DRM_FORMAT_YVU422,
+ DRM_FORMAT_YUV444,
+ DRM_FORMAT_YVU444,
+};
+
+static void rzg2l_du_vsp_plane_setup(struct rzg2l_du_vsp_plane *plane)
+{
+ struct rzg2l_du_vsp_plane_state *state =
+ to_rzg2l_vsp_plane_state(plane->plane.state);
+ struct rzg2l_du_crtc *crtc = to_rzg2l_crtc(state->state.crtc);
+ struct drm_framebuffer *fb = plane->plane.state->fb;
+ const struct rzg2l_du_format_info *format;
+ struct vsp1_du_atomic_config cfg = {
+ .pixelformat = 0,
+ .pitch = fb->pitches[0],
+ .alpha = state->state.alpha >> 8,
+ .zpos = state->state.zpos,
+ };
+ u32 fourcc = state->format->fourcc;
+ unsigned int i;
+
+ cfg.src.left = state->state.src.x1 >> 16;
+ cfg.src.top = state->state.src.y1 >> 16;
+ cfg.src.width = drm_rect_width(&state->state.src) >> 16;
+ cfg.src.height = drm_rect_height(&state->state.src) >> 16;
+
+ cfg.dst.left = state->state.dst.x1;
+ cfg.dst.top = state->state.dst.y1;
+ cfg.dst.width = drm_rect_width(&state->state.dst);
+ cfg.dst.height = drm_rect_height(&state->state.dst);
+
+ for (i = 0; i < state->format->planes; ++i)
+ cfg.mem[i] = sg_dma_address(state->sg_tables[i].sgl)
+ + fb->offsets[i];
+
+ if (state->state.pixel_blend_mode == DRM_MODE_BLEND_PIXEL_NONE) {
+ switch (fourcc) {
+ case DRM_FORMAT_ARGB1555:
+ fourcc = DRM_FORMAT_XRGB1555;
+ break;
+
+ case DRM_FORMAT_ARGB4444:
+ fourcc = DRM_FORMAT_XRGB4444;
+ break;
+
+ case DRM_FORMAT_ARGB8888:
+ fourcc = DRM_FORMAT_XRGB8888;
+ break;
+ }
+ }
+
+ format = rzg2l_du_format_info(fourcc);
+ cfg.pixelformat = format->v4l2;
+
+ cfg.premult = state->state.pixel_blend_mode == DRM_MODE_BLEND_PREMULTI;
+
+ vsp1_du_atomic_update(plane->vsp->vsp, crtc->vsp_pipe,
+ plane->index, &cfg);
+}
+
+int rzg2l_du_vsp_map_fb(struct rzg2l_du_vsp *vsp, struct drm_framebuffer *fb,
+ struct sg_table sg_tables[3])
+{
+ struct rzg2l_du_device *rcdu = vsp->dev;
+ unsigned int i, j;
+ int ret;
+
+ for (i = 0; i < fb->format->num_planes; ++i) {
+ struct drm_gem_dma_object *gem = drm_fb_dma_get_gem_obj(fb, i);
+ struct sg_table *sgt = &sg_tables[i];
+
+ if (gem->sgt) {
+ struct scatterlist *src;
+ struct scatterlist *dst;
+
+ /*
+ * If the GEM buffer has a scatter gather table, it has
+ * been imported from a dma-buf and has no physical
+ * address as it might not be physically contiguous.
+ * Copy the original scatter gather table to map it to
+ * the VSP.
+ */
+ ret = sg_alloc_table(sgt, gem->sgt->orig_nents,
+ GFP_KERNEL);
+ if (ret)
+ goto fail;
+
+ src = gem->sgt->sgl;
+ dst = sgt->sgl;
+ for (j = 0; j < gem->sgt->orig_nents; ++j) {
+ sg_set_page(dst, sg_page(src), src->length,
+ src->offset);
+ src = sg_next(src);
+ dst = sg_next(dst);
+ }
+ } else {
+ ret = dma_get_sgtable(rcdu->dev, sgt, gem->vaddr,
+ gem->dma_addr, gem->base.size);
+ if (ret)
+ goto fail;
+ }
+
+ ret = vsp1_du_map_sg(vsp->vsp, sgt);
+ if (ret) {
+ sg_free_table(sgt);
+ goto fail;
+ }
+ }
+
+ return 0;
+
+fail:
+ while (i--) {
+ struct sg_table *sgt = &sg_tables[i];
+
+ vsp1_du_unmap_sg(vsp->vsp, sgt);
+ sg_free_table(sgt);
+ }
+
+ return ret;
+}
+
+static int rzg2l_du_vsp_plane_prepare_fb(struct drm_plane *plane,
+ struct drm_plane_state *state)
+{
+ struct rzg2l_du_vsp_plane_state *rstate = to_rzg2l_vsp_plane_state(state);
+ struct rzg2l_du_vsp *vsp = to_rzg2l_vsp_plane(plane)->vsp;
+ int ret;
+
+ /*
+ * There's no need to prepare (and unprepare) the framebuffer when the
+ * plane is not visible, as it will not be displayed.
+ */
+ if (!state->visible)
+ return 0;
+
+ ret = rzg2l_du_vsp_map_fb(vsp, state->fb, rstate->sg_tables);
+ if (ret < 0)
+ return ret;
+
+ return drm_gem_plane_helper_prepare_fb(plane, state);
+}
+
+void rzg2l_du_vsp_unmap_fb(struct rzg2l_du_vsp *vsp, struct drm_framebuffer *fb,
+ struct sg_table sg_tables[3])
+{
+ unsigned int i;
+
+ for (i = 0; i < fb->format->num_planes; ++i) {
+ struct sg_table *sgt = &sg_tables[i];
+
+ vsp1_du_unmap_sg(vsp->vsp, sgt);
+ sg_free_table(sgt);
+ }
+}
+
+static void rzg2l_du_vsp_plane_cleanup_fb(struct drm_plane *plane,
+ struct drm_plane_state *state)
+{
+ struct rzg2l_du_vsp_plane_state *rstate = to_rzg2l_vsp_plane_state(state);
+ struct rzg2l_du_vsp *vsp = to_rzg2l_vsp_plane(plane)->vsp;
+
+ if (!state->visible)
+ return;
+
+ rzg2l_du_vsp_unmap_fb(vsp, state->fb, rstate->sg_tables);
+}
+
+static int __rzg2l_du_vsp_plane_atomic_check(struct drm_plane *plane,
+ struct drm_plane_state *state,
+ const struct rzg2l_du_format_info **format)
+{
+ struct drm_crtc_state *crtc_state;
+ int ret;
+
+ if (!state->crtc) {
+ /*
+ * The visible field is not reset by the DRM core but only
+ * updated by drm_atomic_helper_check_plane_state, set it
+ * manually.
+ */
+ state->visible = false;
+ *format = NULL;
+ return 0;
+ }
+
+ crtc_state = drm_atomic_get_crtc_state(state->state, state->crtc);
+ if (IS_ERR(crtc_state))
+ return PTR_ERR(crtc_state);
+
+ ret = drm_atomic_helper_check_plane_state(state, crtc_state,
+ DRM_PLANE_NO_SCALING,
+ DRM_PLANE_NO_SCALING,
+ true, true);
+ if (ret < 0)
+ return ret;
+
+ if (!state->visible) {
+ *format = NULL;
+ return 0;
+ }
+
+ *format = rzg2l_du_format_info(state->fb->format->format);
+
+ return 0;
+}
+
+static int rzg2l_du_vsp_plane_atomic_check(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 rzg2l_du_vsp_plane_state *rstate = to_rzg2l_vsp_plane_state(new_plane_state);
+
+ return __rzg2l_du_vsp_plane_atomic_check(plane, new_plane_state, &rstate->format);
+}
+
+static void rzg2l_du_vsp_plane_atomic_update(struct drm_plane *plane,
+ struct drm_atomic_state *state)
+{
+ struct drm_plane_state *old_state = drm_atomic_get_old_plane_state(state, plane);
+ struct drm_plane_state *new_state = drm_atomic_get_new_plane_state(state, plane);
+ struct rzg2l_du_vsp_plane *rplane = to_rzg2l_vsp_plane(plane);
+ struct rzg2l_du_crtc *crtc = to_rzg2l_crtc(old_state->crtc);
+
+ if (new_state->visible)
+ rzg2l_du_vsp_plane_setup(rplane);
+ else if (old_state->crtc)
+ vsp1_du_atomic_update(rplane->vsp->vsp, crtc->vsp_pipe,
+ rplane->index, NULL);
+}
+
+static const struct drm_plane_helper_funcs rzg2l_du_vsp_plane_helper_funcs = {
+ .prepare_fb = rzg2l_du_vsp_plane_prepare_fb,
+ .cleanup_fb = rzg2l_du_vsp_plane_cleanup_fb,
+ .atomic_check = rzg2l_du_vsp_plane_atomic_check,
+ .atomic_update = rzg2l_du_vsp_plane_atomic_update,
+};
+
+static struct drm_plane_state *
+rzg2l_du_vsp_plane_atomic_duplicate_state(struct drm_plane *plane)
+{
+ struct rzg2l_du_vsp_plane_state *copy;
+
+ if (WARN_ON(!plane->state))
+ return NULL;
+
+ copy = kzalloc(sizeof(*copy), GFP_KERNEL);
+ if (!copy)
+ return NULL;
+
+ __drm_atomic_helper_plane_duplicate_state(plane, ©->state);
+
+ return ©->state;
+}
+
+static void rzg2l_du_vsp_plane_atomic_destroy_state(struct drm_plane *plane,
+ struct drm_plane_state *state)
+{
+ __drm_atomic_helper_plane_destroy_state(state);
+ kfree(to_rzg2l_vsp_plane_state(state));
+}
+
+static void rzg2l_du_vsp_plane_reset(struct drm_plane *plane)
+{
+ struct rzg2l_du_vsp_plane_state *state;
+
+ if (plane->state) {
+ rzg2l_du_vsp_plane_atomic_destroy_state(plane, plane->state);
+ plane->state = NULL;
+ }
+
+ state = kzalloc(sizeof(*state), GFP_KERNEL);
+ if (!state)
+ return;
+
+ __drm_atomic_helper_plane_reset(plane, &state->state);
+}
+
+static const struct drm_plane_funcs rzg2l_du_vsp_plane_funcs = {
+ .update_plane = drm_atomic_helper_update_plane,
+ .disable_plane = drm_atomic_helper_disable_plane,
+ .reset = rzg2l_du_vsp_plane_reset,
+ .destroy = drm_plane_cleanup,
+ .atomic_duplicate_state = rzg2l_du_vsp_plane_atomic_duplicate_state,
+ .atomic_destroy_state = rzg2l_du_vsp_plane_atomic_destroy_state,
+};
+
+static void rzg2l_du_vsp_cleanup(struct drm_device *dev, void *res)
+{
+ struct rzg2l_du_vsp *vsp = res;
+ unsigned int i;
+
+ for (i = 0; i < vsp->num_planes; ++i) {
+ struct rzg2l_du_vsp_plane *plane = &vsp->planes[i];
+
+ drm_plane_cleanup(&plane->plane);
+ }
+
+ kfree(vsp->planes);
+
+ put_device(vsp->vsp);
+}
+
+int rzg2l_du_vsp_init(struct rzg2l_du_vsp *vsp, struct device_node *np,
+ unsigned int crtcs)
+{
+ struct rzg2l_du_device *rcdu = vsp->dev;
+ struct platform_device *pdev;
+ unsigned int num_crtcs = hweight32(crtcs);
+ unsigned int num_planes = 2;
+ unsigned int i;
+ int ret;
+
+ /* Find the VSP device and initialize it. */
+ pdev = of_find_device_by_node(np);
+ if (!pdev)
+ return -ENXIO;
+
+ vsp->vsp = &pdev->dev;
+
+ ret = drmm_add_action_or_reset(&rcdu->ddev, rzg2l_du_vsp_cleanup, vsp);
+ if (ret < 0)
+ return ret;
+
+ ret = vsp1_du_init(vsp->vsp);
+ if (ret < 0)
+ return ret;
+
+ vsp->planes = kcalloc(num_planes, sizeof(*vsp->planes), GFP_KERNEL);
+ if (!vsp->planes)
+ return -ENOMEM;
+
+ for (i = 0; i < num_planes; ++i) {
+ enum drm_plane_type type = i < num_crtcs
+ ? DRM_PLANE_TYPE_PRIMARY
+ : DRM_PLANE_TYPE_OVERLAY;
+ struct rzg2l_du_vsp_plane *plane = &vsp->planes[i];
+
+ plane->vsp = vsp;
+ plane->index = i;
+ ret = drm_universal_plane_init(&rcdu->ddev, &plane->plane,
+ crtcs, &rzg2l_du_vsp_plane_funcs,
+ rzg2l_du_vsp_formats,
+ ARRAY_SIZE(rzg2l_du_vsp_formats),
+ NULL, type, NULL);
+ if (ret < 0)
+ return ret;
+
+ drm_plane_helper_add(&plane->plane,
+ &rzg2l_du_vsp_plane_helper_funcs);
+
+ vsp->num_planes++;
+ }
+
+ return 0;
+}
diff --git a/drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h b/drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h
new file mode 100644
index 000000000000..d73d49a6930c
--- /dev/null
+++ b/drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h
@@ -0,0 +1,97 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * RZ/G2L Display Unit VSP-Based Compositor
+ *
+ * Copyright (C) 2023 Renesas Electronics Corporation
+ *
+ * Based on rcar_du_vsp.h
+ */
+
+#ifndef __RZG2L_DU_VSP_H__
+#define __RZG2L_DU_VSP_H__
+
+#include <drm/drm_plane.h>
+#include <linux/container_of.h>
+#include <linux/scatterlist.h>
+
+struct device;
+struct drm_framebuffer;
+struct rzg2l_du_device;
+struct rzg2l_du_format_info;
+struct rzg2l_du_vsp;
+
+struct rzg2l_du_vsp_plane {
+ struct drm_plane plane;
+ struct rzg2l_du_vsp *vsp;
+ unsigned int index;
+};
+
+struct rzg2l_du_vsp {
+ unsigned int index;
+ struct device *vsp;
+ struct rzg2l_du_device *dev;
+ struct rzg2l_du_vsp_plane *planes;
+ unsigned int num_planes;
+};
+
+static inline struct rzg2l_du_vsp_plane *to_rzg2l_vsp_plane(struct drm_plane *p)
+{
+ return container_of(p, struct rzg2l_du_vsp_plane, plane);
+}
+
+/**
+ * struct rzg2l_du_vsp_plane_state - Driver-specific plane state
+ * @state: base DRM plane state
+ * @format: information about the pixel format used by the plane
+ * @sg_tables: scatter-gather tables for the frame buffer memory
+ */
+struct rzg2l_du_vsp_plane_state {
+ struct drm_plane_state state;
+
+ const struct rzg2l_du_format_info *format;
+ struct sg_table sg_tables[3];
+};
+
+static inline struct rzg2l_du_vsp_plane_state *
+to_rzg2l_vsp_plane_state(struct drm_plane_state *state)
+{
+ return container_of(state, struct rzg2l_du_vsp_plane_state, state);
+}
+
+#ifdef CONFIG_DRM_RCAR_VSP
+int rzg2l_du_vsp_init(struct rzg2l_du_vsp *vsp, struct device_node *np,
+ unsigned int crtcs);
+void rzg2l_du_vsp_enable(struct rzg2l_du_crtc *crtc);
+void rzg2l_du_vsp_disable(struct rzg2l_du_crtc *crtc);
+void rzg2l_du_vsp_atomic_begin(struct rzg2l_du_crtc *crtc);
+void rzg2l_du_vsp_atomic_flush(struct rzg2l_du_crtc *crtc);
+int rzg2l_du_vsp_map_fb(struct rzg2l_du_vsp *vsp, struct drm_framebuffer *fb,
+ struct sg_table sg_tables[3]);
+void rzg2l_du_vsp_unmap_fb(struct rzg2l_du_vsp *vsp, struct drm_framebuffer *fb,
+ struct sg_table sg_tables[3]);
+#else
+static inline int rzg2l_du_vsp_init(struct rzg2l_du_vsp *vsp, struct device_node *np,
+ unsigned int crtcs)
+{
+ return -ENXIO;
+}
+
+static inline void rzg2l_du_vsp_enable(struct rzg2l_du_crtc *crtc) { };
+static inline void rzg2l_du_vsp_disable(struct rzg2l_du_crtc *crtc) { };
+static inline void rzg2l_du_vsp_atomic_begin(struct rzg2l_du_crtc *crtc) { };
+static inline void rzg2l_du_vsp_atomic_flush(struct rzg2l_du_crtc *crtc) { };
+static inline int rzg2l_du_vsp_map_fb(struct rzg2l_du_vsp *vsp,
+ struct drm_framebuffer *fb,
+ struct sg_table sg_tables[3])
+{
+ return -ENXIO;
+}
+
+static inline void rzg2l_du_vsp_unmap_fb(struct rzg2l_du_vsp *vsp,
+ struct drm_framebuffer *fb,
+ struct sg_table sg_tables[3])
+{
+}
+#endif
+
+#endif /* __RZG2L_DU_VSP_H__ */
--
2.25.1
^ permalink raw reply related [flat|nested] 39+ messages in thread
* [PATCH v15 4/5] MAINTAINERS: Update entries for Renesas DRM drivers
2023-11-28 10:51 [PATCH v15 0/5] Add RZ/{G2L,G2LC} and RZ/V2L Display Unit support Biju Das
` (2 preceding siblings ...)
2023-11-28 10:51 ` [PATCH v15 3/5] drm: renesas: Add RZ/G2L DU Support Biju Das
@ 2023-11-28 10:51 ` Biju Das
2023-11-28 11:05 ` Geert Uytterhoeven
2023-11-28 10:51 ` [PATCH v15 5/5] MAINTAINERS: Create entry for Renesas RZ " Biju Das
` (2 subsequent siblings)
6 siblings, 1 reply; 39+ messages in thread
From: Biju Das @ 2023-11-28 10:51 UTC (permalink / raw)
To: David Airlie, Daniel Vetter, Geert Uytterhoeven,
Laurent Pinchart, Maarten Lankhorst, Maxime Ripard,
Thomas Zimmermann, Krzysztof Kozlowski
Cc: Biju Das, Prabhakar Mahadev Lad, dri-devel, linux-renesas-soc,
Jacopo Mondi, Fabrizio Castro, Biju Das
The rcar-du has never been maintained in drm-misc. So exclude only
this driver from drm-misc. Also, add the tree entry for sh_mobile.
Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
---
v15:
* New patch
---
MAINTAINERS | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/MAINTAINERS b/MAINTAINERS
index a6d8a15a23dd..2604cb3d9f99 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6976,7 +6976,7 @@ X: drivers/gpu/drm/mediatek/
X: drivers/gpu/drm/msm/
X: drivers/gpu/drm/nouveau/
X: drivers/gpu/drm/radeon/
-X: drivers/gpu/drm/renesas/
+X: drivers/gpu/drm/renesas/rcar-du/
X: drivers/gpu/drm/tegra/
DRM DRIVERS FOR ALLWINNER A10
@@ -7150,6 +7150,7 @@ M: Geert Uytterhoeven <geert+renesas@glider.be>
L: dri-devel@lists.freedesktop.org
L: linux-renesas-soc@vger.kernel.org
S: Supported
+T: git git://anongit.freedesktop.org/drm/drm-misc
F: Documentation/devicetree/bindings/display/renesas,shmobile-lcdc.yaml
F: drivers/gpu/drm/renesas/shmobile/
F: include/linux/platform_data/shmob_drm.h
--
2.25.1
^ permalink raw reply related [flat|nested] 39+ messages in thread
* [PATCH v15 5/5] MAINTAINERS: Create entry for Renesas RZ DRM drivers
2023-11-28 10:51 [PATCH v15 0/5] Add RZ/{G2L,G2LC} and RZ/V2L Display Unit support Biju Das
` (3 preceding siblings ...)
2023-11-28 10:51 ` [PATCH v15 4/5] MAINTAINERS: Update entries for Renesas DRM drivers Biju Das
@ 2023-11-28 10:51 ` Biju Das
2023-12-11 12:10 ` [PATCH v15 0/5] Add RZ/{G2L, G2LC} and RZ/V2L Display Unit support Biju Das
2024-02-21 16:24 ` [PATCH v15 0/5] Add RZ/{G2L,G2LC} " Maxime Ripard
6 siblings, 0 replies; 39+ messages in thread
From: Biju Das @ 2023-11-28 10:51 UTC (permalink / raw)
To: David Airlie, Daniel Vetter, Geert Uytterhoeven,
Laurent Pinchart, Maarten Lankhorst, Maxime Ripard,
Thomas Zimmermann, Krzysztof Kozlowski
Cc: Biju Das, Prabhakar Mahadev Lad, dri-devel, linux-renesas-soc,
Jacopo Mondi, Fabrizio Castro, Biju Das
Create entry for Renesas RZ DRM drivers and add my self as a maintainer.
Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
---
v14->v15:
* Added drm-misc tree entry.
* Sorted the entry(Placed before SHMOBILE)
v13->v14:
* Now SHMOBILE has maintainer entries. So dropped updating
DRM DRIVERS FOR RENESAS RCAR AND SHMOBILE.
* Updated comment header and description.
* The above changes are trivial, so kept the Rb tag from Laurent.
v12->v13:
* No change.
v11->v12:
* No change.
v10->v11:
* No change.
v9->v10:
* No change.
v8->v9:
* Added Rb tag from Laurent.
* Updated entries for common parts(Makefile and Kconfig).
v8:
* New patch
---
MAINTAINERS | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/MAINTAINERS b/MAINTAINERS
index 2604cb3d9f99..30fabdbf42c1 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -7144,6 +7144,15 @@ F: Documentation/devicetree/bindings/display/bridge/renesas,lvds.yaml
F: Documentation/devicetree/bindings/display/renesas,du.yaml
F: drivers/gpu/drm/renesas/rcar-du/
+DRM DRIVERS FOR RENESAS RZ
+M: Biju Das <biju.das.jz@bp.renesas.com>
+L: dri-devel@lists.freedesktop.org
+L: linux-renesas-soc@vger.kernel.org
+S: Maintained
+T: git git://anongit.freedesktop.org/drm/drm-misc
+F: Documentation/devicetree/bindings/display/renesas,rzg2l-du.yaml
+F: drivers/gpu/drm/renesas/rz-du/
+
DRM DRIVERS FOR RENESAS SHMOBILE
M: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
M: Geert Uytterhoeven <geert+renesas@glider.be>
--
2.25.1
^ permalink raw reply related [flat|nested] 39+ messages in thread
* Re: [PATCH v15 4/5] MAINTAINERS: Update entries for Renesas DRM drivers
2023-11-28 10:51 ` [PATCH v15 4/5] MAINTAINERS: Update entries for Renesas DRM drivers Biju Das
@ 2023-11-28 11:05 ` Geert Uytterhoeven
0 siblings, 0 replies; 39+ messages in thread
From: Geert Uytterhoeven @ 2023-11-28 11:05 UTC (permalink / raw)
To: Biju Das
Cc: Biju Das, Laurent Pinchart, Thomas Zimmermann,
Krzysztof Kozlowski, dri-devel, Prabhakar Mahadev Lad,
Maxime Ripard, linux-renesas-soc, Fabrizio Castro, Jacopo Mondi
On Tue, Nov 28, 2023 at 11:52 AM Biju Das <biju.das.jz@bp.renesas.com> wrote:
> The rcar-du has never been maintained in drm-misc. So exclude only
> this driver from drm-misc. Also, add the tree entry for sh_mobile.
>
> Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be> # shmob_drm
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply [flat|nested] 39+ messages in thread
* RE: [PATCH v15 0/5] Add RZ/{G2L, G2LC} and RZ/V2L Display Unit support
2023-11-28 10:51 [PATCH v15 0/5] Add RZ/{G2L,G2LC} and RZ/V2L Display Unit support Biju Das
` (4 preceding siblings ...)
2023-11-28 10:51 ` [PATCH v15 5/5] MAINTAINERS: Create entry for Renesas RZ " Biju Das
@ 2023-12-11 12:10 ` Biju Das
2024-02-21 16:24 ` [PATCH v15 0/5] Add RZ/{G2L,G2LC} " Maxime Ripard
6 siblings, 0 replies; 39+ messages in thread
From: Biju Das @ 2023-12-11 12:10 UTC (permalink / raw)
To: Maarten Lankhorst, Maxime Ripard, Thomas Zimmermann,
David Airlie, Daniel Vetter, Philipp Zabel
Cc: Fabrizio Castro, biju.das.au, Geert Uytterhoeven, Magnus Damm,
Prabhakar Mahadev Lad, dri-devel, linux-renesas-soc,
Kieran Bingham, Laurent Pinchart, Jacopo Mondi
Hi All,
Gentle ping.
Can it be applied to drm-misc-next, if you all are happy with this patch series?
Cheers,
Biju
> -----Original Message-----
> From: Biju Das <biju.das.jz@bp.renesas.com>
> Sent: Tuesday, November 28, 2023 10:51 AM
> Subject: [PATCH v15 0/5] Add RZ/{G2L,G2LC} and RZ/V2L Display Unit support
>
> This path series aims to add support for RZ/G2L DU DRM driver.
>
> RZ/G2L LCD controller composed of Frame compression Processor(FCPVD),
> Video signal processor (VSPD) and Display unit(DU). The output of LCDC is
> connected to Display parallel interface and MIPI link video interface.
>
> The output from DSI is connected to ADV7535.
>
> Ref:
https://lore.kernel.org/linux-renesas-soc/OS0PR01MB5922717E4CCFE07F3C25FBC986989@OS0PR01MB5922.jpnprd01.prod.outlook.com/#t
>
> This patch series is tested with [2]
> [2]
https://patchwork.kernel.org/project/linux-renesas-soc/list/?series=742810
>
> Test logs kmscube: [3]
> v14->v15:
> * Added patch#4, The rcar-du has never been maintained in drm-misc. So
> exclude only this driver from drm-misc. Also, add the tree entry for
> sh_mobile.
> * Added drm-misc tree entry.
> * Sorted the entry(Placed before SHMOBILE)
> v13->v14:
> * Replaced the label 'error'->'done' in rzg2l_du_vsps_init() as it
> applies to non-error case as well.
> * Update the error check condition for rcar_du_vsp_init() to avoid
> breakage in future, if it returns positive value.
> * Now SHMOBILE has maintainer entries. So dropped updating
> DRM DRIVERS FOR RENESAS RCAR AND SHMOBILE.
> * Updated comment header and description for maintainer entry patch.
> v12->v13:
> * Dropped DU_MCR0_DPI_OE and unused macros.
> * Dropped unneeded backward compatibility with old DTBs as it is new
> driver.
> * Replaced "cells > 1"-> "cells != 1" in rzg2l_du_vsps_init().
> * Fixed memory leak in rzg2l_du_vsps_init().
> * Dropped drm_plane_create_{alpha,zpos,blend_mode}_property().
> v11->v12:
> * Dropped quotes in ref handle for renesas,vsps property.
> * Retained tags as it is trivial change.
> * Replaced rzg2l_du_write()->writel().
> v10->v11:
> * Replaced CONFIG_DRM_RCAR_VSP->CONFIG_VIDEO_RENESAS_VSP1 for building
> rzg2l_du_vsp driver.
> * Dropped "rzg2l_du_regs.h" instead the relevant definitions defined in
> .c file.
> * Dropped setting ditr5 based on latest HW manual 1.3.0/1.4.0
> * Updated the comment for auto clear.
> * Replaced writel()->rzg2l_du_write() in rzg2l_du_start_stop().
> * Dropped CRC related functions as it does not have DISCOM.
> * Replaced the variable possible_crtcs->possible_outputs in
> struct rzg2l_du_output_routing.
> * Updated DMA_BIT_MASK from 40->32.
> * Dropped unneeded struct drm_bridge from rzg2l_du_drv.h.
> * Dropped colour keying support as it doesn't have planes.
> * Added only RGB formats in rzg2l_du_format_infos.
> * Dropped chroma planes from rzg2l_du_fb_create().
> * Updated the comment for max_pitch in rzg2l_du_fb_create().
> * Dropped possible_crtcs check in rzg2l_du_encoders_init().
> * Dropped additional empty line from struct rzg2l_du_device.
> v9->v10:
> * patch#1 is mainlined, so dropped from this series.
> * Added Rb tag from Laurent for the binding patch.
> * Updated the commit description.
> * Updated description of the port by dropping the text "specified in
> Documentation/devicetree/bindings/graph.txt."
> * Dropped empty endpoint from example.
> * Dropped ARM64 dependency from Kconfig.
> * Sorted the configs alphabetically in Kconfig.
> * Dropped DRM_RCAR_VSP config option and make DRM_RZG2L_DU depend on
> VIDEO_RENESAS_VSP1.
> * On rzg2l_du_crtc_set_display_timing() replaced the setting of parent
> clk rate with dclk rate.
> * Added rzg2l_du_write() wrapper function.
> * Updated the comment atomic_begin->atomic_flush.
> * Dropped .atomic_check and .atomic_begin callback
> * Renamed __rzg2l_du_crtc_plane_atomic_check->__rzg2l_du_vsp_plane_atomic
> _check and moved it to rzg2l_du_vsp.c
> * Added struct clk in rzg2l_du_crtc.h
> * Dropped the variables mmio_offset,index,vblank_lock,vblank_wait,
> vblank_count from struct rzg2l_du_crtc.
> * Replaced the macro to_rzg2l_crtc with static inline functions.
> * Dropped the unneeded header files clk.h, io.h, mm.h, pm.h, slab.h,
> wait.h and drm_managed.h from rzg2l_du_drv.c.
> * Replaced DRM_INFO->drm_info
> * Dropped the callbacks prime_handle_to_fd, prime_fd_to_handle and
> gem_prime_mmap.
> * Replaced the callback remove->remove_new.
> * Dropped header file wait.h and added forward declarations struct clk
> and
> rzg2l_du_device from rzg2l_du_drv.h.
> * Dropped the dsi and dpad0_source variables from struct rzg2l_du_device.
> * Replaced the macro to_rzg2l_encoder with static inline functions.
> * Dropped header files dma-buf.h and wait.h from rzg2l_du_kms.c.
> * Dropped struct sg_table and added the scatterlist.h header file in
> rzg2l_du_vsp.h
> * Added container_of.h header file, forward declarations struct device
> and
> struct rzg2l_du_device in rzg2l_du_vsp.h.
> v8->v9:
> * Added Rb tag from Laurent and Acked-by tag from Kieran for patch#1.
> * Added Rb tag from Laurent and Geert for patch#3.
> * Dropped reset_control_assert() from error patch for rzg2l_du_crtc_get()
> as
> suggested by Philipp Zabel.
> * Added Rb tag from Laurent oatch#5.
> * Updated MAINTAINERS entries for common parts(Makefile and Kconfig).
> v7->v8:
> * Moved rcar-du and shmobile DRM drivers to renesas specific vendor
> directory.
> * Fixed the typo vsp2->du in RZ/V2L DU bindings patch.
> * Added Rb tag from Rob for RZ/V2L DU bindings patch.
> * Dropped RCar du lib and created RZ/G2L DU DRM driver by creating rz_du
> folder.
> * Updated MAINTAINERS entries.
> v6->v7:
> * Split DU lib and RZ/G2L du driver as separate patch series as
> DU support added to more platforms based on RZ/G2L alike SoCs.
> * Rebased to latest drm-tip.
> * Added patch #2 for binding support for RZ/V2L DU
> * Added patch #4 for driver support for RZ/V2L DU
> * Added patch #5 for SoC DTSI support for RZ/G2L DU
> * Added patch #6 for SoC DTSI support for RZ/V2L DU
> * Added patch #7 for Enabling DU on SMARC EVK based on RZ/{G2L,V2L} SoCs.
> * Added patch #8 for Enabling DU on SMARC EVK based on RZ/G2LC SoC.
> v5->v6:
> * Merged DU lib and RZ/G2L du driver in same patch series
> * Rebased to latest drm-misc.
> * Merged patch#1 to RZ/G2L Driver patch.
> * Updated KConfig dependency from ARCH_RENESAS->ARCH_RZG2L.
> * Optimized rzg2l_du_output_name() by removing unsupported outputs.
>
> v4->v5:
> * Added Rb tag from Rob for binding patch.
> * Started using RCar DU libs(kms, vsp and encoder)
> * Started using rcar_du_device, rcar_du_write, rcar_du_crtc,
> rcar_du_format_info and rcar_du_encoder.
> v3->v4:
> * Changed compatible name from renesas,du-r9a07g044->renesas,r9a07g044-du
> * started using same compatible for RZ/G2{L,LC}
> * Removed rzg2l_du_group.h and struct rzg2l_du_group
> * Renamed __rzg2l_du_group_start_stop->rzg2l_du_start_stop
> * Removed rzg2l_du_group_restart
> * Updated rzg2l_du_crtc_set_display_timing
> * Removed mode_valid callback.
> * Updated rzg2l_du_crtc_create() parameters
> * Updated compatible
> * Removed RZG2L_DU_MAX_GROUPS
> V2->v3:
> * Added new bindings for RZ/G2L DU
> * Removed indirection and created new DRM driver based on R-Car DU
> v1->v2:
> * Based on [1], all references to 'rzg2l_lcdc' replaced with 'rzg2l_du'
> * Updated commit description for bindings
> * Removed LCDC references from bindings
> * Changed clock name from du.0->aclk from bindings
> * Changed reset name from du.0->du from bindings
> * Replaced crtc_helper_funcs->rcar_crtc_helper_funcs
> * Updated macro DRM_RZG2L_LCDC->DRM_RZG2L_DU
> * Replaced rzg2l-lcdc-drm->rzg2l-du-drm
> * Added forward declaration for struct reset_control
>
> [1]
> https://jpn01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fpatchwor
> k.kernel.org%2Fproject%2Flinux-renesas-soc%2Fpatch%2F20220312084205.31462-
> 2-
> biju.das.jz%40bp.renesas.com%2F&data=05%7C01%7Cbiju.das.jz%40bp.renesas.co
> m%7C1366ff80247547c90f5608dbefffff15%7C53d82571da1947e49cb4625a166a4a2a%7C
> 0%7C0%7C638367655000855154%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJ
> QIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sdata=W29hWtb6
> aLweEsamSQBhNkav%2FNEtT77%2BMbwhvfjHZtc%3D&reserved=0
>
> [3]
> root@smarc-rzv2l:/cip-test-scripts# kmscube Using display 0xaaaad2a6a160
> with EGL version 1.4 ===================================
> EGL information:
> version: "1.4"
> vendor: "Mesa Project"
> client extensions: "EGL_EXT_client_extensions EGL_EXT_device_base
> EGL_EXT_device_enumeration EGL_EXT_device_query EGL_EXT_platform_base
> EGL_KHR_client_get_all_proc_addresses EGL_KHR_debug
> EGL_EXT_platform_device EGL_EXT_platform_wayland EGL_KHR_platform_wayland
> EGL_MESA_platform_gbm EGL_KHR_platform_gbm EGL_MESA_platform_surfaceless"
> display extensions: "EGL_ANDROID_blob_cache EGL_EXT_buffer_age
> EGL_EXT_image_dma_buf_import EGL_EXT_image_dma_buf_import_modifiers
> EGL_KHR_cl_event2 EGL_KHR_config_attribs EGL_KHR_create_context
> EGL_KHR_create_context_no_error EGL_KHR_fence_sync
> EGL_KHR_get_all_proc_addresses EGL_KHR_gl_colorspace
> EGL_KHR_gl_renderbuffer_image EGL_KHR_gl_texture_2D_image
> EGL_KHR_gl_texture_3D_image EGL_KHR_gl_texture_cubemap_image EGL_KHR_image
> EGL_KHR_image_base EGL_KHR_image_pixmap EGL_KHR_no_config_context
> EGL_KHR_partial_update EGL_KHR_reusable_sync EGL_KHR_surfaceless_context
> EGL_EXT_pixel_format_float EGL_KHR_wait_sync EGL_MESA_configless_context
> EGL_MESA_drm_image EGL_MESA_image_dma_buf_export EGL_MESA_query_driver
> EGL_WL_bind_wayland_display "
> ===================================
> OpenGL ES 2.x information:
> version: "OpenGL ES 3.1 Mesa 21.3.7"
> shading language version: "OpenGL ES GLSL ES 3.10"
> vendor: "Panfrost"
> renderer: "Mali-G31 (Panfrost)"
> extensions: "GL_EXT_blend_minmax GL_EXT_multi_draw_arrays
> GL_EXT_texture_filter_anisotropic GL_EXT_texture_compression_rgtc
> GL_EXT_texture_format_BGRA8888 GL_OES_compressed_ETC1_RGB8_texture
> GL_OES_depth24 GL_OES_element_index_uint GL_OES_fbo_render_mipmap
> GL_OES_mapbuffer GL_OES_rgb8_rgba8 GL_OES_standard_derivatives
> GL_OES_stencil8 GL_OES_texture_3D GL_OES_texture_float
> GL_OES_texture_float_linear GL_OES_texture_half_float
> GL_OES_texture_half_float_linear GL_OES_texture_npot
> GL_OES_vertex_half_float GL_EXT_draw_instanced GL_EXT_texture_sRGB_decode
> GL_OES_EGL_image GL_OES_depth_texture GL_OES_packed_depth_stencil
> GL_EXT_texture_type_2_10_10_10_REV GL_NV_conditional_render
> GL_OES_get_program_binary GL_APPLE_texture_max_level
> GL_EXT_discard_framebuffer GL_EXT_read_format_bgra GL_EXT_frag_depth
> GL_NV_fbo_color_attachments GL_OES_EGL_image_external GL_OES_EGL_sync
> GL_OES_vertex_array_object GL_ANGLE_pack_reverse_row_order
> GL_EXT_occlusion_query_boolean GL_EXT_texture_rg GL_EXT_unpack_subimage
> GL_NV_draw_buffers GL_NV_read_buffer GL_NV_read_depth
> GL_NV_read_depth_stencil GL_NV_read_stencil GL_EXT_draw_buffers
> GL_EXT_map_buffer_range GL_KHR_debug GL_KHR_texture_compression_astc_ldr
> GL_NV_pixel_buffer_object GL_OES_depth_texture_cube_map
> GL_OES_required_internalformat GL_OES_surfaceless_context
> GL_EXT_color_buffer_float GL_EXT_sRGB_write_control
> GL_EXT_separate_shader_objects GL_EXT_shader_framebuffer_fetch
> GL_EXT_shader_implicit_conversions GL_EXT_shader_integer_mix
> GL_EXT_base_instance GL_EXT_compressed_ETC1_RGB8_sub_texture
> GL_EXT_draw_buffers_indexed GL_EXT_draw_elements_base_vertex
> GL_EXT_gpu_shader5 GL_EXT_primitive_bounding_box GL_EXT_shader_io_blocks
> GL_EXT_texture_border_clamp GL_EXT_texture_buffer GL_EXT_texture_view
> GL_KHR_blend_equation_advanced GL_KHR_blend_equation_advanced_coherent
> GL_KHR_context_flush_control GL_NV_image_formats
> GL_OES_draw_buffers_indexed GL_OES_draw_elements_base_vertex
> GL_OES_gpu_shader5 GL_OES_primitive_bounding_box GL_OES_sample_shading
> GL_OES_sample_variables GL_OES_shader_io_blocks
> GL_OES_shader_multisample_interpolation GL_OES_texture_border_clamp
> GL_OES_texture_buffer GL_OES_texture_stencil8
> GL_OES_texture_storage_multisample_2d_array GL_OES_texture_view
> GL_EXT_blend_func_extended GL_EXT_float_blend GL_EXT_texture_sRGB_R8
> GL_EXT_texture_sRGB_RG8 GL_KHR_no_error
> GL_KHR_texture_compression_astc_sliced_3d GL_OES_EGL_image_external_essl3
> GL_OES_shader_image_atomic GL_EXT_multisampled_render_to_texture
> GL_EXT_multisampled_render_to_texture2 GL_MESA_shader_integer_functions
> GL_EXT_color_buffer_half_float GL_EXT_texture_mirror_clamp_to_edge
> GL_KHR_parallel_shader_compile GL_EXT_EGL_image_storage
> GL_EXT_shader_framebuffer_fetch_non_coherent GL_INTEL_blackhole_render
> GL_MESA_framebuffer_flip_y GL_EXT_depth_clamp GL_MESA_bgra "
> ===================================
>
> cat /sys/class/devfreq/11840000.gpu/trans_stat
> [INFO] From : To
> [INFO] : 50000000 62500000 100000000 125000000 200000000
> 250000000 400000000 500000000 time(ms)
> [INFO] 50000000: 0 0 0 0 0
> 0 0 2 380
> [INFO] 62500000: 0 0 0 0 0
> 0 0 0 0
> [INFO] 100000000: 0 0 0 0 0
> 0 0 0 0
> [INFO] 125000000: 0 0 0 0 0
> 0 0 0 0
> [INFO] * 200000000: 1 0 0 0 0
> 0 0 79 4576
> [INFO] 250000000: 0 0 0 0 69
> 0 0 0 5292
> [INFO] 400000000: 0 0 0 0 5
> 0 0 2 440
> [INFO] 500000000: 1 0 0 0 7
> 69 7 0 5340
> [INFO] Total transition : 242
>
> Biju Das (5):
> dt-bindings: display: Document Renesas RZ/G2L DU bindings
> dt-bindings: display: renesas,rzg2l-du: Document RZ/V2L DU bindings
> drm: renesas: Add RZ/G2L DU Support
> MAINTAINERS: Update entries for Renesas DRM drivers
> MAINTAINERS: Create entry for Renesas RZ DRM drivers
>
> .../bindings/display/renesas,rzg2l-du.yaml | 126 +++++
> MAINTAINERS | 12 +-
> drivers/gpu/drm/renesas/Kconfig | 1 +
> drivers/gpu/drm/renesas/Makefile | 1 +
> drivers/gpu/drm/renesas/rz-du/Kconfig | 12 +
> drivers/gpu/drm/renesas/rz-du/Makefile | 8 +
> drivers/gpu/drm/renesas/rz-du/rzg2l_du_crtc.c | 431 ++++++++++++++++
> drivers/gpu/drm/renesas/rz-du/rzg2l_du_crtc.h | 89 ++++
> drivers/gpu/drm/renesas/rz-du/rzg2l_du_drv.c | 176 +++++++
> drivers/gpu/drm/renesas/rz-du/rzg2l_du_drv.h | 78
> +++ .../gpu/drm/renesas/rz-du/rzg2l_du_encoder.c | 72
> +++ .../gpu/drm/renesas/rz-du/rzg2l_du_encoder.h | 32 ++
> drivers/gpu/drm/renesas/rz-du/rzg2l_du_kms.c | 433 +++++++++++++++++
> drivers/gpu/drm/renesas/rz-du/rzg2l_du_kms.h | 43 ++
> drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c | 460 ++++++++++++++++++
> drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h | 97 ++++
> 16 files changed, 2070 insertions(+), 1 deletion(-) create mode 100644
> Documentation/devicetree/bindings/display/renesas,rzg2l-du.yaml
> create mode 100644 drivers/gpu/drm/renesas/rz-du/Kconfig
> create mode 100644 drivers/gpu/drm/renesas/rz-du/Makefile
> create mode 100644 drivers/gpu/drm/renesas/rz-du/rzg2l_du_crtc.c
> create mode 100644 drivers/gpu/drm/renesas/rz-du/rzg2l_du_crtc.h
> create mode 100644 drivers/gpu/drm/renesas/rz-du/rzg2l_du_drv.c
> create mode 100644 drivers/gpu/drm/renesas/rz-du/rzg2l_du_drv.h
> create mode 100644 drivers/gpu/drm/renesas/rz-du/rzg2l_du_encoder.c
> create mode 100644 drivers/gpu/drm/renesas/rz-du/rzg2l_du_encoder.h
> create mode 100644 drivers/gpu/drm/renesas/rz-du/rzg2l_du_kms.c
> create mode 100644 drivers/gpu/drm/renesas/rz-du/rzg2l_du_kms.h
> create mode 100644 drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c
> create mode 100644 drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h
>
>
> base-commit: e17049148678725248a57ecbf9c21df0fde3b434
> --
> 2.25.1
^ permalink raw reply [flat|nested] 39+ messages in thread
* Re: [PATCH v15 3/5] drm: renesas: Add RZ/G2L DU Support
2023-11-28 10:51 ` [PATCH v15 3/5] drm: renesas: Add RZ/G2L DU Support Biju Das
@ 2023-12-13 15:47 ` Maxime Ripard
2023-12-13 15:48 ` Maxime Ripard
` (2 more replies)
0 siblings, 3 replies; 39+ messages in thread
From: Maxime Ripard @ 2023-12-13 15:47 UTC (permalink / raw)
To: Biju Das
Cc: Fabrizio Castro, Biju Das, Magnus Damm, Geert Uytterhoeven,
Thomas Zimmermann, Prabhakar Mahadev Lad, dri-devel,
linux-renesas-soc, Kieran Bingham, Laurent Pinchart,
Jacopo Mondi
[-- Attachment #1: Type: text/plain, Size: 8351 bytes --]
On Tue, Nov 28, 2023 at 10:51:27AM +0000, Biju Das wrote:
> The LCD controller is composed of Frame Compression Processor (FCPVD),
> Video Signal Processor (VSPD), and Display Unit (DU).
>
> It has DPI/DSI interfaces and supports a maximum resolution of 1080p
> along with 2 RPFs to support the blending of two picture layers and
> raster operations (ROPs).
>
> The DU module is connected to VSPD. Add RZ/G2L DU support for RZ/G2L
> alike SoCs.
>
> Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
I'd still like a review from Geert or Laurent, I don't know the SoC.
> +static int rzg2l_du_crtc_get(struct rzg2l_du_crtc *rcrtc)
> +{
> + int ret;
> +
> + /*
> + * Guard against double-get, as the function is called from both the
> + * .atomic_enable() and .atomic_flush() handlers.
> + */
> + if (rcrtc->initialized)
> + return 0;
> +
> + ret = clk_prepare_enable(rcrtc->rzg2l_clocks.aclk);
> + if (ret < 0)
> + return ret;
> +
> + ret = clk_prepare_enable(rcrtc->rzg2l_clocks.pclk);
> + if (ret < 0)
> + goto error_bus_clock;
> +
> + ret = reset_control_deassert(rcrtc->rstc);
> + if (ret < 0)
> + goto error_peri_clock;
> +
> + rzg2l_du_crtc_setup(rcrtc);
> + rcrtc->initialized = true;
> +
> + return 0;
> +
> +error_peri_clock:
> + clk_disable_unprepare(rcrtc->rzg2l_clocks.pclk);
> +error_bus_clock:
> + clk_disable_unprepare(rcrtc->rzg2l_clocks.aclk);
> + return ret;
> +}
[...]
> +static void rzg2l_du_crtc_atomic_flush(struct drm_crtc *crtc,
> + struct drm_atomic_state *state)
> +{
> + struct rzg2l_du_crtc *rcrtc = to_rzg2l_crtc(crtc);
> + struct drm_device *dev = rcrtc->crtc.dev;
> + unsigned long flags;
> +
> + WARN_ON(!crtc->state->enable);
> +
> + /*
> + * If a mode set is in progress we can be called with the CRTC disabled.
> + * We thus need to first get and setup the CRTC in order to configure
> + * planes. We must *not* put the CRTC, as it must be kept awake until
> + * the .atomic_enable() call that will follow. The get operation in
> + * .atomic_enable() will in that case be a no-op, and the CRTC will be
> + * put later in .atomic_disable().
> + */
> + rzg2l_du_crtc_get(rcrtc);
That's a bit suspicious. Have you looked at drm_atomic_helper_commit_tail_rpm() ?
> +static int rzg2l_du_crtc_enable_vblank(struct drm_crtc *crtc)
> +{
> + struct rzg2l_du_crtc *rcrtc = to_rzg2l_crtc(crtc);
> +
> + rcrtc->vblank_enable = true;
> +
> + return 0;
> +}
> +
> +static void rzg2l_du_crtc_disable_vblank(struct drm_crtc *crtc)
> +{
> + struct rzg2l_du_crtc *rcrtc = to_rzg2l_crtc(crtc);
> +
> + rcrtc->vblank_enable = false;
> +}
You should enable / disable your interrupts here
> +int rzg2l_du_crtc_create(struct rzg2l_du_device *rcdu)
> +{
> + struct rzg2l_du_crtc *rcrtc = &rcdu->crtcs[0];
> + struct drm_crtc *crtc = &rcrtc->crtc;
> + struct drm_plane *primary;
> + int ret;
> +
> + rcrtc->rstc = devm_reset_control_get_shared(rcdu->dev, NULL);
> + if (IS_ERR(rcrtc->rstc)) {
> + dev_err(rcdu->dev, "can't get cpg reset\n");
> + return PTR_ERR(rcrtc->rstc);
> + }
> +
> + rcrtc->rzg2l_clocks.aclk = devm_clk_get(rcdu->dev, "aclk");
> + if (IS_ERR(rcrtc->rzg2l_clocks.aclk)) {
> + dev_err(rcdu->dev, "no axi clock for DU\n");
> + return PTR_ERR(rcrtc->rzg2l_clocks.aclk);
> + }
> +
> + rcrtc->rzg2l_clocks.pclk = devm_clk_get(rcdu->dev, "pclk");
> + if (IS_ERR(rcrtc->rzg2l_clocks.pclk)) {
> + dev_err(rcdu->dev, "no peripheral clock for DU\n");
> + return PTR_ERR(rcrtc->rzg2l_clocks.pclk);
> + }
> +
> + rcrtc->rzg2l_clocks.dclk = devm_clk_get(rcdu->dev, "vclk");
> + if (IS_ERR(rcrtc->rzg2l_clocks.dclk)) {
> + dev_err(rcdu->dev, "no video clock for DU\n");
> + return PTR_ERR(rcrtc->rzg2l_clocks.dclk);
> + }
> +
> + init_waitqueue_head(&rcrtc->flip_wait);
> + rcrtc->dev = rcdu;
> +
> + primary = &rcrtc->vsp->planes[rcrtc->vsp_pipe].plane;
> +
> + ret = drm_crtc_init_with_planes(&rcdu->ddev, crtc, primary, NULL,
> + &crtc_funcs_rz, NULL);
> + if (ret < 0)
> + return ret;
You should use the drmm variant here
> +static void rzg2l_du_atomic_commit_tail(struct drm_atomic_state *old_state)
> +{
> + struct drm_device *dev = old_state->dev;
> +
> + /* Apply the atomic update. */
> + drm_atomic_helper_commit_modeset_disables(dev, old_state);
> + drm_atomic_helper_commit_planes(dev, old_state,
> + DRM_PLANE_COMMIT_ACTIVE_ONLY);
> + drm_atomic_helper_commit_modeset_enables(dev, old_state);
> +
> + drm_atomic_helper_commit_hw_done(old_state);
> + drm_atomic_helper_wait_for_flip_done(dev, old_state);
> +
> + drm_atomic_helper_cleanup_planes(dev, old_state);
> +}
AFAIK, there's no reason to roll your commit_tail implementation
yourself here. You should at the very least document why you needed to
do so.
> +int rzg2l_du_vsp_map_fb(struct rzg2l_du_vsp *vsp, struct drm_framebuffer *fb,
> + struct sg_table sg_tables[3])
> +{
> + struct rzg2l_du_device *rcdu = vsp->dev;
> + unsigned int i, j;
> + int ret;
> +
> + for (i = 0; i < fb->format->num_planes; ++i) {
> + struct drm_gem_dma_object *gem = drm_fb_dma_get_gem_obj(fb, i);
> + struct sg_table *sgt = &sg_tables[i];
> +
> + if (gem->sgt) {
> + struct scatterlist *src;
> + struct scatterlist *dst;
> +
> + /*
> + * If the GEM buffer has a scatter gather table, it has
> + * been imported from a dma-buf and has no physical
> + * address as it might not be physically contiguous.
> + * Copy the original scatter gather table to map it to
> + * the VSP.
> + */
> + ret = sg_alloc_table(sgt, gem->sgt->orig_nents,
> + GFP_KERNEL);
> + if (ret)
> + goto fail;
> +
> + src = gem->sgt->sgl;
> + dst = sgt->sgl;
> + for (j = 0; j < gem->sgt->orig_nents; ++j) {
> + sg_set_page(dst, sg_page(src), src->length,
> + src->offset);
> + src = sg_next(src);
> + dst = sg_next(dst);
> + }
> + } else {
> + ret = dma_get_sgtable(rcdu->dev, sgt, gem->vaddr,
> + gem->dma_addr, gem->base.size);
> + if (ret)
> + goto fail;
> + }
> +
> + ret = vsp1_du_map_sg(vsp->vsp, sgt);
> + if (ret) {
> + sg_free_table(sgt);
> + goto fail;
> + }
> + }
> +
> + return 0;
> +
> +fail:
> + while (i--) {
> + struct sg_table *sgt = &sg_tables[i];
> +
> + vsp1_du_unmap_sg(vsp->vsp, sgt);
> + sg_free_table(sgt);
> + }
> +
> + return ret;
> +}
Ditto, you should at least document why you're not using the helpers.
> +static void rzg2l_du_vsp_cleanup(struct drm_device *dev, void *res)
> +{
> + struct rzg2l_du_vsp *vsp = res;
> + unsigned int i;
> +
> + for (i = 0; i < vsp->num_planes; ++i) {
> + struct rzg2l_du_vsp_plane *plane = &vsp->planes[i];
> +
> + drm_plane_cleanup(&plane->plane);
> + }
> +
> + kfree(vsp->planes);
> +
> + put_device(vsp->vsp);
> +}
> +
> +int rzg2l_du_vsp_init(struct rzg2l_du_vsp *vsp, struct device_node *np,
> + unsigned int crtcs)
> +{
> + struct rzg2l_du_device *rcdu = vsp->dev;
> + struct platform_device *pdev;
> + unsigned int num_crtcs = hweight32(crtcs);
> + unsigned int num_planes = 2;
> + unsigned int i;
> + int ret;
> +
> + /* Find the VSP device and initialize it. */
> + pdev = of_find_device_by_node(np);
> + if (!pdev)
> + return -ENXIO;
> +
> + vsp->vsp = &pdev->dev;
> +
> + ret = drmm_add_action_or_reset(&rcdu->ddev, rzg2l_du_vsp_cleanup, vsp);
> + if (ret < 0)
> + return ret;
> +
> + ret = vsp1_du_init(vsp->vsp);
> + if (ret < 0)
> + return ret;
> +
> + vsp->planes = kcalloc(num_planes, sizeof(*vsp->planes), GFP_KERNEL);
> + if (!vsp->planes)
> + return -ENOMEM;
drmm_kcalloc or drmm_kmalloc_array
> +
> + for (i = 0; i < num_planes; ++i) {
> + enum drm_plane_type type = i < num_crtcs
> + ? DRM_PLANE_TYPE_PRIMARY
> + : DRM_PLANE_TYPE_OVERLAY;
> + struct rzg2l_du_vsp_plane *plane = &vsp->planes[i];
> +
> + plane->vsp = vsp;
> + plane->index = i;
> + ret = drm_universal_plane_init(&rcdu->ddev, &plane->plane,
> + crtcs, &rzg2l_du_vsp_plane_funcs,
> + rzg2l_du_vsp_formats,
> + ARRAY_SIZE(rzg2l_du_vsp_formats),
> + NULL, type, NULL);
> + if (ret < 0)
> + return ret;
you need to use drmm variant here too.
Maxime
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
^ permalink raw reply [flat|nested] 39+ messages in thread
* Re: [PATCH v15 3/5] drm: renesas: Add RZ/G2L DU Support
2023-12-13 15:47 ` Maxime Ripard
@ 2023-12-13 15:48 ` Maxime Ripard
2023-12-13 15:50 ` Laurent Pinchart
2023-12-14 15:24 ` Biju Das
2 siblings, 0 replies; 39+ messages in thread
From: Maxime Ripard @ 2023-12-13 15:48 UTC (permalink / raw)
To: Biju Das
Cc: Fabrizio Castro, Biju Das, Magnus Damm, Geert Uytterhoeven,
Thomas Zimmermann, Prabhakar Mahadev Lad, dri-devel,
linux-renesas-soc, Kieran Bingham, Laurent Pinchart,
Jacopo Mondi
[-- Attachment #1: Type: text/plain, Size: 1117 bytes --]
On Wed, Dec 13, 2023 at 04:47:09PM +0100, Maxime Ripard wrote:
> On Tue, Nov 28, 2023 at 10:51:27AM +0000, Biju Das wrote:
> > +int rzg2l_du_vsp_init(struct rzg2l_du_vsp *vsp, struct device_node *np,
> > + unsigned int crtcs)
> > +{
> > + struct rzg2l_du_device *rcdu = vsp->dev;
> > + struct platform_device *pdev;
> > + unsigned int num_crtcs = hweight32(crtcs);
> > + unsigned int num_planes = 2;
> > + unsigned int i;
> > + int ret;
> > +
> > + /* Find the VSP device and initialize it. */
> > + pdev = of_find_device_by_node(np);
> > + if (!pdev)
> > + return -ENXIO;
> > +
> > + vsp->vsp = &pdev->dev;
> > +
> > + ret = drmm_add_action_or_reset(&rcdu->ddev, rzg2l_du_vsp_cleanup, vsp);
> > + if (ret < 0)
> > + return ret;
> > +
> > + ret = vsp1_du_init(vsp->vsp);
> > + if (ret < 0)
> > + return ret;
> > +
> > + vsp->planes = kcalloc(num_planes, sizeof(*vsp->planes), GFP_KERNEL);
> > + if (!vsp->planes)
> > + return -ENOMEM;
>
> drmm_kcalloc or drmm_kmalloc_array
Also, it doesn't look like you're using that array anywhere once the
action is gone.
Maxime
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
^ permalink raw reply [flat|nested] 39+ messages in thread
* Re: [PATCH v15 3/5] drm: renesas: Add RZ/G2L DU Support
2023-12-13 15:47 ` Maxime Ripard
2023-12-13 15:48 ` Maxime Ripard
@ 2023-12-13 15:50 ` Laurent Pinchart
2023-12-13 16:11 ` Geert Uytterhoeven
2023-12-13 16:46 ` Biju Das
2023-12-14 15:24 ` Biju Das
2 siblings, 2 replies; 39+ messages in thread
From: Laurent Pinchart @ 2023-12-13 15:50 UTC (permalink / raw)
To: Maxime Ripard
Cc: Biju Das, Magnus Damm, Geert Uytterhoeven, Thomas Zimmermann,
Prabhakar Mahadev Lad, dri-devel, linux-renesas-soc,
Jacopo Mondi, Kieran Bingham, Fabrizio Castro, Biju Das
On Wed, Dec 13, 2023 at 04:47:09PM +0100, Maxime Ripard wrote:
> On Tue, Nov 28, 2023 at 10:51:27AM +0000, Biju Das wrote:
> > The LCD controller is composed of Frame Compression Processor (FCPVD),
> > Video Signal Processor (VSPD), and Display Unit (DU).
> >
> > It has DPI/DSI interfaces and supports a maximum resolution of 1080p
> > along with 2 RPFs to support the blending of two picture layers and
> > raster operations (ROPs).
> >
> > The DU module is connected to VSPD. Add RZ/G2L DU support for RZ/G2L
> > alike SoCs.
> >
> > Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
>
> I'd still like a review from Geert or Laurent, I don't know the SoC.
I won't have time soon, and this driver has been blocked for way too
long due to that :-S
> > +static int rzg2l_du_crtc_get(struct rzg2l_du_crtc *rcrtc)
> > +{
> > + int ret;
> > +
> > + /*
> > + * Guard against double-get, as the function is called from both the
> > + * .atomic_enable() and .atomic_flush() handlers.
> > + */
> > + if (rcrtc->initialized)
> > + return 0;
> > +
> > + ret = clk_prepare_enable(rcrtc->rzg2l_clocks.aclk);
> > + if (ret < 0)
> > + return ret;
> > +
> > + ret = clk_prepare_enable(rcrtc->rzg2l_clocks.pclk);
> > + if (ret < 0)
> > + goto error_bus_clock;
> > +
> > + ret = reset_control_deassert(rcrtc->rstc);
> > + if (ret < 0)
> > + goto error_peri_clock;
> > +
> > + rzg2l_du_crtc_setup(rcrtc);
> > + rcrtc->initialized = true;
> > +
> > + return 0;
> > +
> > +error_peri_clock:
> > + clk_disable_unprepare(rcrtc->rzg2l_clocks.pclk);
> > +error_bus_clock:
> > + clk_disable_unprepare(rcrtc->rzg2l_clocks.aclk);
> > + return ret;
> > +}
>
> [...]
>
> > +static void rzg2l_du_crtc_atomic_flush(struct drm_crtc *crtc,
> > + struct drm_atomic_state *state)
> > +{
> > + struct rzg2l_du_crtc *rcrtc = to_rzg2l_crtc(crtc);
> > + struct drm_device *dev = rcrtc->crtc.dev;
> > + unsigned long flags;
> > +
> > + WARN_ON(!crtc->state->enable);
> > +
> > + /*
> > + * If a mode set is in progress we can be called with the CRTC disabled.
> > + * We thus need to first get and setup the CRTC in order to configure
> > + * planes. We must *not* put the CRTC, as it must be kept awake until
> > + * the .atomic_enable() call that will follow. The get operation in
> > + * .atomic_enable() will in that case be a no-op, and the CRTC will be
> > + * put later in .atomic_disable().
> > + */
> > + rzg2l_du_crtc_get(rcrtc);
>
> That's a bit suspicious. Have you looked at drm_atomic_helper_commit_tail_rpm() ?
>
> > +static int rzg2l_du_crtc_enable_vblank(struct drm_crtc *crtc)
> > +{
> > + struct rzg2l_du_crtc *rcrtc = to_rzg2l_crtc(crtc);
> > +
> > + rcrtc->vblank_enable = true;
> > +
> > + return 0;
> > +}
> > +
> > +static void rzg2l_du_crtc_disable_vblank(struct drm_crtc *crtc)
> > +{
> > + struct rzg2l_du_crtc *rcrtc = to_rzg2l_crtc(crtc);
> > +
> > + rcrtc->vblank_enable = false;
> > +}
>
> You should enable / disable your interrupts here
>
> > +int rzg2l_du_crtc_create(struct rzg2l_du_device *rcdu)
> > +{
> > + struct rzg2l_du_crtc *rcrtc = &rcdu->crtcs[0];
> > + struct drm_crtc *crtc = &rcrtc->crtc;
> > + struct drm_plane *primary;
> > + int ret;
> > +
> > + rcrtc->rstc = devm_reset_control_get_shared(rcdu->dev, NULL);
> > + if (IS_ERR(rcrtc->rstc)) {
> > + dev_err(rcdu->dev, "can't get cpg reset\n");
> > + return PTR_ERR(rcrtc->rstc);
> > + }
> > +
> > + rcrtc->rzg2l_clocks.aclk = devm_clk_get(rcdu->dev, "aclk");
> > + if (IS_ERR(rcrtc->rzg2l_clocks.aclk)) {
> > + dev_err(rcdu->dev, "no axi clock for DU\n");
> > + return PTR_ERR(rcrtc->rzg2l_clocks.aclk);
> > + }
> > +
> > + rcrtc->rzg2l_clocks.pclk = devm_clk_get(rcdu->dev, "pclk");
> > + if (IS_ERR(rcrtc->rzg2l_clocks.pclk)) {
> > + dev_err(rcdu->dev, "no peripheral clock for DU\n");
> > + return PTR_ERR(rcrtc->rzg2l_clocks.pclk);
> > + }
> > +
> > + rcrtc->rzg2l_clocks.dclk = devm_clk_get(rcdu->dev, "vclk");
> > + if (IS_ERR(rcrtc->rzg2l_clocks.dclk)) {
> > + dev_err(rcdu->dev, "no video clock for DU\n");
> > + return PTR_ERR(rcrtc->rzg2l_clocks.dclk);
> > + }
> > +
> > + init_waitqueue_head(&rcrtc->flip_wait);
> > + rcrtc->dev = rcdu;
> > +
> > + primary = &rcrtc->vsp->planes[rcrtc->vsp_pipe].plane;
> > +
> > + ret = drm_crtc_init_with_planes(&rcdu->ddev, crtc, primary, NULL,
> > + &crtc_funcs_rz, NULL);
> > + if (ret < 0)
> > + return ret;
>
> You should use the drmm variant here
>
> > +static void rzg2l_du_atomic_commit_tail(struct drm_atomic_state *old_state)
> > +{
> > + struct drm_device *dev = old_state->dev;
> > +
> > + /* Apply the atomic update. */
> > + drm_atomic_helper_commit_modeset_disables(dev, old_state);
> > + drm_atomic_helper_commit_planes(dev, old_state,
> > + DRM_PLANE_COMMIT_ACTIVE_ONLY);
> > + drm_atomic_helper_commit_modeset_enables(dev, old_state);
> > +
> > + drm_atomic_helper_commit_hw_done(old_state);
> > + drm_atomic_helper_wait_for_flip_done(dev, old_state);
> > +
> > + drm_atomic_helper_cleanup_planes(dev, old_state);
> > +}
>
> AFAIK, there's no reason to roll your commit_tail implementation
> yourself here. You should at the very least document why you needed to
> do so.
>
> > +int rzg2l_du_vsp_map_fb(struct rzg2l_du_vsp *vsp, struct drm_framebuffer *fb,
> > + struct sg_table sg_tables[3])
> > +{
> > + struct rzg2l_du_device *rcdu = vsp->dev;
> > + unsigned int i, j;
> > + int ret;
> > +
> > + for (i = 0; i < fb->format->num_planes; ++i) {
> > + struct drm_gem_dma_object *gem = drm_fb_dma_get_gem_obj(fb, i);
> > + struct sg_table *sgt = &sg_tables[i];
> > +
> > + if (gem->sgt) {
> > + struct scatterlist *src;
> > + struct scatterlist *dst;
> > +
> > + /*
> > + * If the GEM buffer has a scatter gather table, it has
> > + * been imported from a dma-buf and has no physical
> > + * address as it might not be physically contiguous.
> > + * Copy the original scatter gather table to map it to
> > + * the VSP.
> > + */
> > + ret = sg_alloc_table(sgt, gem->sgt->orig_nents,
> > + GFP_KERNEL);
> > + if (ret)
> > + goto fail;
> > +
> > + src = gem->sgt->sgl;
> > + dst = sgt->sgl;
> > + for (j = 0; j < gem->sgt->orig_nents; ++j) {
> > + sg_set_page(dst, sg_page(src), src->length,
> > + src->offset);
> > + src = sg_next(src);
> > + dst = sg_next(dst);
> > + }
> > + } else {
> > + ret = dma_get_sgtable(rcdu->dev, sgt, gem->vaddr,
> > + gem->dma_addr, gem->base.size);
> > + if (ret)
> > + goto fail;
> > + }
> > +
> > + ret = vsp1_du_map_sg(vsp->vsp, sgt);
> > + if (ret) {
> > + sg_free_table(sgt);
> > + goto fail;
> > + }
> > + }
> > +
> > + return 0;
> > +
> > +fail:
> > + while (i--) {
> > + struct sg_table *sgt = &sg_tables[i];
> > +
> > + vsp1_du_unmap_sg(vsp->vsp, sgt);
> > + sg_free_table(sgt);
> > + }
> > +
> > + return ret;
> > +}
>
> Ditto, you should at least document why you're not using the helpers.
>
> > +static void rzg2l_du_vsp_cleanup(struct drm_device *dev, void *res)
> > +{
> > + struct rzg2l_du_vsp *vsp = res;
> > + unsigned int i;
> > +
> > + for (i = 0; i < vsp->num_planes; ++i) {
> > + struct rzg2l_du_vsp_plane *plane = &vsp->planes[i];
> > +
> > + drm_plane_cleanup(&plane->plane);
> > + }
> > +
> > + kfree(vsp->planes);
> > +
> > + put_device(vsp->vsp);
> > +}
> > +
> > +int rzg2l_du_vsp_init(struct rzg2l_du_vsp *vsp, struct device_node *np,
> > + unsigned int crtcs)
> > +{
> > + struct rzg2l_du_device *rcdu = vsp->dev;
> > + struct platform_device *pdev;
> > + unsigned int num_crtcs = hweight32(crtcs);
> > + unsigned int num_planes = 2;
> > + unsigned int i;
> > + int ret;
> > +
> > + /* Find the VSP device and initialize it. */
> > + pdev = of_find_device_by_node(np);
> > + if (!pdev)
> > + return -ENXIO;
> > +
> > + vsp->vsp = &pdev->dev;
> > +
> > + ret = drmm_add_action_or_reset(&rcdu->ddev, rzg2l_du_vsp_cleanup, vsp);
> > + if (ret < 0)
> > + return ret;
> > +
> > + ret = vsp1_du_init(vsp->vsp);
> > + if (ret < 0)
> > + return ret;
> > +
> > + vsp->planes = kcalloc(num_planes, sizeof(*vsp->planes), GFP_KERNEL);
> > + if (!vsp->planes)
> > + return -ENOMEM;
>
> drmm_kcalloc or drmm_kmalloc_array
>
> > +
> > + for (i = 0; i < num_planes; ++i) {
> > + enum drm_plane_type type = i < num_crtcs
> > + ? DRM_PLANE_TYPE_PRIMARY
> > + : DRM_PLANE_TYPE_OVERLAY;
> > + struct rzg2l_du_vsp_plane *plane = &vsp->planes[i];
> > +
> > + plane->vsp = vsp;
> > + plane->index = i;
> > + ret = drm_universal_plane_init(&rcdu->ddev, &plane->plane,
> > + crtcs, &rzg2l_du_vsp_plane_funcs,
> > + rzg2l_du_vsp_formats,
> > + ARRAY_SIZE(rzg2l_du_vsp_formats),
> > + NULL, type, NULL);
> > + if (ret < 0)
> > + return ret;
>
> you need to use drmm variant here too.
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 39+ messages in thread
* Re: [PATCH v15 3/5] drm: renesas: Add RZ/G2L DU Support
2023-12-13 15:50 ` Laurent Pinchart
@ 2023-12-13 16:11 ` Geert Uytterhoeven
2023-12-13 16:46 ` Biju Das
1 sibling, 0 replies; 39+ messages in thread
From: Geert Uytterhoeven @ 2023-12-13 16:11 UTC (permalink / raw)
To: Laurent Pinchart, Kieran Bingham
Cc: Fabrizio Castro, Biju Das, Thomas Zimmermann, Magnus Damm,
Prabhakar Mahadev Lad, Maxime Ripard, linux-renesas-soc,
Jacopo Mondi, dri-devel, Biju Das
On Wed, Dec 13, 2023 at 4:50 PM Laurent Pinchart
<laurent.pinchart@ideasonboard.com> wrote:
> On Wed, Dec 13, 2023 at 04:47:09PM +0100, Maxime Ripard wrote:
> > On Tue, Nov 28, 2023 at 10:51:27AM +0000, Biju Das wrote:
> > > The LCD controller is composed of Frame Compression Processor (FCPVD),
> > > Video Signal Processor (VSPD), and Display Unit (DU).
> > >
> > > It has DPI/DSI interfaces and supports a maximum resolution of 1080p
> > > along with 2 RPFs to support the blending of two picture layers and
> > > raster operations (ROPs).
> > >
> > > The DU module is connected to VSPD. Add RZ/G2L DU support for RZ/G2L
> > > alike SoCs.
> > >
> > > Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
> >
> > I'd still like a review from Geert or Laurent, I don't know the SoC.
I don't consider myself sufficiently familiar with DRM and the DU.
Kieran?
> I won't have time soon, and this driver has been blocked for way too
> long due to that :-S
Indeed...
[deleted 278 lines of needlessly quoted text]
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply [flat|nested] 39+ messages in thread
* RE: [PATCH v15 3/5] drm: renesas: Add RZ/G2L DU Support
2023-12-13 15:50 ` Laurent Pinchart
2023-12-13 16:11 ` Geert Uytterhoeven
@ 2023-12-13 16:46 ` Biju Das
1 sibling, 0 replies; 39+ messages in thread
From: Biju Das @ 2023-12-13 16:46 UTC (permalink / raw)
To: Laurent Pinchart, Maxime Ripard
Cc: biju.das.au, Magnus Damm, Geert Uytterhoeven, Thomas Zimmermann,
Prabhakar Mahadev Lad, dri-devel, linux-renesas-soc,
Kieran Bingham, Fabrizio Castro, Jacopo Mondi
Hi Laurent and Maxime,
> -----Original Message-----
> From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> Sent: Wednesday, December 13, 2023 3:51 PM
> Subject: Re: [PATCH v15 3/5] drm: renesas: Add RZ/G2L DU Support
>
> On Wed, Dec 13, 2023 at 04:47:09PM +0100, Maxime Ripard wrote:
> > On Tue, Nov 28, 2023 at 10:51:27AM +0000, Biju Das wrote:
> > > The LCD controller is composed of Frame Compression Processor
> > > (FCPVD), Video Signal Processor (VSPD), and Display Unit (DU).
> > >
> > > It has DPI/DSI interfaces and supports a maximum resolution of 1080p
> > > along with 2 RPFs to support the blending of two picture layers and
> > > raster operations (ROPs).
> > >
> > > The DU module is connected to VSPD. Add RZ/G2L DU support for RZ/G2L
> > > alike SoCs.
> > >
> > > Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
> >
> > I'd still like a review from Geert or Laurent, I don't know the SoC.
>
> I won't have time soon, and this driver has been blocked for way too long
> due to that :-S
It is blocked for more than year now.
FYI, All the bits and pieces of this display pipeline (FCP, VSPD, DSI, ADV7535)
is mainlined and then backported to linux 5.10.y-cip[1] and linux-6.1.y-cip[2] along with
MALI GPU and MESA support.
[1] https://git.kernel.org/pub/scm/linux/kernel/git/cip/linux-cip.git/log/?h=linux-5.10.y-cip
[2] https://git.kernel.org/pub/scm/linux/kernel/git/cip/linux-cip.git/log/?h=linux-6.1.y-cip
[3] https://github.com/renesas-rz/meta-rz-panfrost/blob/main/recipes-graphics/mesa/files/0001-kmsro-Add-rcar-du-entry-point-for-Renesas-RZ-G2Lx-se.patch
Only DU driver is pending for completion for RZ/G2L family of SoCs.
Cheers,
Biju
^ permalink raw reply [flat|nested] 39+ messages in thread
* RE: [PATCH v15 3/5] drm: renesas: Add RZ/G2L DU Support
2023-12-13 15:47 ` Maxime Ripard
2023-12-13 15:48 ` Maxime Ripard
2023-12-13 15:50 ` Laurent Pinchart
@ 2023-12-14 15:24 ` Biju Das
2023-12-14 18:35 ` Biju Das
` (2 more replies)
2 siblings, 3 replies; 39+ messages in thread
From: Biju Das @ 2023-12-14 15:24 UTC (permalink / raw)
To: Maxime Ripard
Cc: Fabrizio Castro, biju.das.au, Magnus Damm, Geert Uytterhoeven,
Thomas Zimmermann, Prabhakar Mahadev Lad, dri-devel,
linux-renesas-soc, Kieran Bingham, Laurent Pinchart,
Jacopo Mondi
Hi Maxime Ripard,
Thanks for the feedback.
> -----Original Message-----
> From: Maxime Ripard <mripard@kernel.org>
> Sent: Wednesday, December 13, 2023 3:47 PM
> To: Biju Das <biju.das.jz@bp.renesas.com>
> Subject: Re: [PATCH v15 3/5] drm: renesas: Add RZ/G2L DU Support
>
> On Tue, Nov 28, 2023 at 10:51:27AM +0000, Biju Das wrote:
> > The LCD controller is composed of Frame Compression Processor (FCPVD),
> > Video Signal Processor (VSPD), and Display Unit (DU).
> >
> > It has DPI/DSI interfaces and supports a maximum resolution of 1080p
> > along with 2 RPFs to support the blending of two picture layers and
> > raster operations (ROPs).
> >
> > The DU module is connected to VSPD. Add RZ/G2L DU support for RZ/G2L
> > alike SoCs.
> >
> > Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
>
> I'd still like a review from Geert or Laurent, I don't know the SoC.
Since Laurent is super busy, maybe Kieran and Jacopo can provide feedback if any.
The display blocks is shown in [1] and the pipe line is as below
Memory-> fcpvd -->VSPD --> DU --> DSI --> Display panel.
Fcpvd: Frame Compression Processor
VSPD: Video Signal Processor, Basically a blitter engine which directly render images to DU
DU: Display Unit.
On R-Car fpvcd, VSPD and (DU with planes) IPs are separate blocks
whereas here it is integrated inside LCDC.
fcpvd and VSPD are in media subsystem and we are reusing the code here.
The vspd is based on display list, it downloads the register contents from linked list in memory
and execute composite operation and generates interrupts for display start and frame end.
du_vsp registers the frame completion callback with vspd driver in media framework.
and we call the drm_crtc_handle_vblank() in this context.
[1]
https://pasteboard.co/MDmbXdK3psSD.png
● FCPVD
− Support out-of-order for the whole outstanding transactions
− Read linear addressing image data
− Read display list data
− Write image data
● VSPD
− Supports various data formats and conversion
− Supports YCbCr444/422/420, RGB, α RGB, α plane
− Color space conversion and changes to the number of colors by dithering
− Color keying
− Supports combination between pixel alpha and global alpha
− Supports generating pre multiplied alpha
− Video processing
− Blending of two picture layers and raster operations (ROPs)
− Clipping
− 1D look up table
− Vertical flipping in case of output to memory
− Direct connection to display module
− Supporting 1920 pixels in horizontal direction
− Writing back image data which is transferred to Display Unit (DU) to memory
● DU
− Supporting Display Parallel Interface (DPI) and MIPI LINK Video Interface
− Display timing master
− Generating video timings (Front porch, Back porch, Sync active, Active video area)
− Selecting the polarity of output DCLK, HSYNC, VSYNC, and DE
− Supporting Progressive (Non-interlace)
− Not supports Interlace
− Input data format (from VSPD): RGB888, RGB666 (not supports dithering of RGB565)
− Output data format: same as Input data format
− Supporting Full HD (1920 pixels × 1080 lines) for MIPI-DSI Output
− Supporting WXGA (1280 pixels × 800 lines) for Parallel Output
>
> > +static int rzg2l_du_crtc_get(struct rzg2l_du_crtc *rcrtc) {
> > + int ret;
> > +
> > + /*
> > + * Guard against double-get, as the function is called from both the
> > + * .atomic_enable() and .atomic_flush() handlers.
> > + */
> > + if (rcrtc->initialized)
> > + return 0;
> > +
> > + ret = clk_prepare_enable(rcrtc->rzg2l_clocks.aclk);
> > + if (ret < 0)
> > + return ret;
> > +
> > + ret = clk_prepare_enable(rcrtc->rzg2l_clocks.pclk);
> > + if (ret < 0)
> > + goto error_bus_clock;
> > +
> > + ret = reset_control_deassert(rcrtc->rstc);
> > + if (ret < 0)
> > + goto error_peri_clock;
> > +
> > + rzg2l_du_crtc_setup(rcrtc);
> > + rcrtc->initialized = true;
> > +
> > + return 0;
> > +
> > +error_peri_clock:
> > + clk_disable_unprepare(rcrtc->rzg2l_clocks.pclk);
> > +error_bus_clock:
> > + clk_disable_unprepare(rcrtc->rzg2l_clocks.aclk);
> > + return ret;
> > +}
>
> [...]
>
> > +static void rzg2l_du_crtc_atomic_flush(struct drm_crtc *crtc,
> > + struct drm_atomic_state *state) {
> > + struct rzg2l_du_crtc *rcrtc = to_rzg2l_crtc(crtc);
> > + struct drm_device *dev = rcrtc->crtc.dev;
> > + unsigned long flags;
> > +
> > + WARN_ON(!crtc->state->enable);
> > +
> > + /*
> > + * If a mode set is in progress we can be called with the CRTC
> disabled.
> > + * We thus need to first get and setup the CRTC in order to
> configure
> > + * planes. We must *not* put the CRTC, as it must be kept awake
> until
> > + * the .atomic_enable() call that will follow. The get operation in
> > + * .atomic_enable() will in that case be a no-op, and the CRTC will
> be
> > + * put later in .atomic_disable().
> > + */
> > + rzg2l_du_crtc_get(rcrtc);
>
> That's a bit suspicious. Have you looked at
> drm_atomic_helper_commit_tail_rpm() ?
Ok, I will drop this and start using drm_atomic_helper_commit_tail_rpm()
instead of rzg2l_du_atomic_commit_tail().
>
> > +static int rzg2l_du_crtc_enable_vblank(struct drm_crtc *crtc) {
> > + struct rzg2l_du_crtc *rcrtc = to_rzg2l_crtc(crtc);
> > +
> > + rcrtc->vblank_enable = true;
> > +
> > + return 0;
> > +}
> > +
> > +static void rzg2l_du_crtc_disable_vblank(struct drm_crtc *crtc) {
> > + struct rzg2l_du_crtc *rcrtc = to_rzg2l_crtc(crtc);
> > +
> > + rcrtc->vblank_enable = false;
> > +}
>
> You should enable / disable your interrupts here
We don't have dedicated vblank IRQ for enabling/disabling vblank.
vblank is handled by vspd.
vspd is directly rendering images to display,
rcar_du_crtc_finish_page_flip() and drm_crtc_handle_vblank()
called in vspd's pageflip context.
See rzg2l_du_vsp_complete()in rzg2l_du_vsp.c
>
> > +int rzg2l_du_crtc_create(struct rzg2l_du_device *rcdu) {
> > + struct rzg2l_du_crtc *rcrtc = &rcdu->crtcs[0];
> > + struct drm_crtc *crtc = &rcrtc->crtc;
> > + struct drm_plane *primary;
> > + int ret;
> > +
> > + rcrtc->rstc = devm_reset_control_get_shared(rcdu->dev, NULL);
> > + if (IS_ERR(rcrtc->rstc)) {
> > + dev_err(rcdu->dev, "can't get cpg reset\n");
> > + return PTR_ERR(rcrtc->rstc);
> > + }
> > +
> > + rcrtc->rzg2l_clocks.aclk = devm_clk_get(rcdu->dev, "aclk");
> > + if (IS_ERR(rcrtc->rzg2l_clocks.aclk)) {
> > + dev_err(rcdu->dev, "no axi clock for DU\n");
> > + return PTR_ERR(rcrtc->rzg2l_clocks.aclk);
> > + }
> > +
> > + rcrtc->rzg2l_clocks.pclk = devm_clk_get(rcdu->dev, "pclk");
> > + if (IS_ERR(rcrtc->rzg2l_clocks.pclk)) {
> > + dev_err(rcdu->dev, "no peripheral clock for DU\n");
> > + return PTR_ERR(rcrtc->rzg2l_clocks.pclk);
> > + }
> > +
> > + rcrtc->rzg2l_clocks.dclk = devm_clk_get(rcdu->dev, "vclk");
> > + if (IS_ERR(rcrtc->rzg2l_clocks.dclk)) {
> > + dev_err(rcdu->dev, "no video clock for DU\n");
> > + return PTR_ERR(rcrtc->rzg2l_clocks.dclk);
> > + }
> > +
> > + init_waitqueue_head(&rcrtc->flip_wait);
> > + rcrtc->dev = rcdu;
> > +
> > + primary = &rcrtc->vsp->planes[rcrtc->vsp_pipe].plane;
> > +
> > + ret = drm_crtc_init_with_planes(&rcdu->ddev, crtc, primary, NULL,
> > + &crtc_funcs_rz, NULL);
> > + if (ret < 0)
> > + return ret;
>
> You should use the drmm variant here
Agreed.
>
> > +static void rzg2l_du_atomic_commit_tail(struct drm_atomic_state
> > +*old_state) {
> > + struct drm_device *dev = old_state->dev;
> > +
> > + /* Apply the atomic update. */
> > + drm_atomic_helper_commit_modeset_disables(dev, old_state);
> > + drm_atomic_helper_commit_planes(dev, old_state,
> > + DRM_PLANE_COMMIT_ACTIVE_ONLY);
> > + drm_atomic_helper_commit_modeset_enables(dev, old_state);
> > +
> > + drm_atomic_helper_commit_hw_done(old_state);
> > + drm_atomic_helper_wait_for_flip_done(dev, old_state);
> > +
> > + drm_atomic_helper_cleanup_planes(dev, old_state); }
>
> AFAIK, there's no reason to roll your commit_tail implementation yourself
> here. You should at the very least document why you needed to do so.
Will drop this and use drm_atomic_helper_commit_tail_rpm().
>
> > +int rzg2l_du_vsp_map_fb(struct rzg2l_du_vsp *vsp, struct
> drm_framebuffer *fb,
> > + struct sg_table sg_tables[3])
> > +{
> > + struct rzg2l_du_device *rcdu = vsp->dev;
> > + unsigned int i, j;
> > + int ret;
> > +
> > + for (i = 0; i < fb->format->num_planes; ++i) {
> > + struct drm_gem_dma_object *gem = drm_fb_dma_get_gem_obj(fb,
> i);
> > + struct sg_table *sgt = &sg_tables[i];
> > +
> > + if (gem->sgt) {
> > + struct scatterlist *src;
> > + struct scatterlist *dst;
> > +
> > + /*
> > + * If the GEM buffer has a scatter gather table, it has
> > + * been imported from a dma-buf and has no physical
> > + * address as it might not be physically contiguous.
> > + * Copy the original scatter gather table to map it to
> > + * the VSP.
> > + */
> > + ret = sg_alloc_table(sgt, gem->sgt->orig_nents,
> > + GFP_KERNEL);
> > + if (ret)
> > + goto fail;
> > +
> > + src = gem->sgt->sgl;
> > + dst = sgt->sgl;
> > + for (j = 0; j < gem->sgt->orig_nents; ++j) {
> > + sg_set_page(dst, sg_page(src), src->length,
> > + src->offset);
> > + src = sg_next(src);
> > + dst = sg_next(dst);
> > + }
> > + } else {
> > + ret = dma_get_sgtable(rcdu->dev, sgt, gem->vaddr,
> > + gem->dma_addr, gem->base.size);
> > + if (ret)
> > + goto fail;
> > + }
> > +
> > + ret = vsp1_du_map_sg(vsp->vsp, sgt);
> > + if (ret) {
> > + sg_free_table(sgt);
> > + goto fail;
> > + }
> > + }
> > +
> > + return 0;
> > +
> > +fail:
> > + while (i--) {
> > + struct sg_table *sgt = &sg_tables[i];
> > +
> > + vsp1_du_unmap_sg(vsp->vsp, sgt);
> > + sg_free_table(sgt);
> > + }
> > +
> > + return ret;
> > +}
>
> Ditto, you should at least document why you're not using the helpers.
Ok, I will drop these callbacks and directly use drm_fb_dma_get_gem_obj()in
vsp_plane_setup() as there is no iommu here.
+ for (i = 0; i < state->format->planes; ++i) {
+ struct drm_gem_dma_object *gem;
+
+ gem = drm_fb_dma_get_gem_obj(fb, i);
+ cfg.mem[i] = gem->dma_addr + fb->offsets[i];
+ }
>
> > +static void rzg2l_du_vsp_cleanup(struct drm_device *dev, void *res) {
> > + struct rzg2l_du_vsp *vsp = res;
> > + unsigned int i;
> > +
> > + for (i = 0; i < vsp->num_planes; ++i) {
> > + struct rzg2l_du_vsp_plane *plane = &vsp->planes[i];
> > +
> > + drm_plane_cleanup(&plane->plane);
> > + }
> > +
> > + kfree(vsp->planes);
> > +
> > + put_device(vsp->vsp);
> > +}
> > +
> > +int rzg2l_du_vsp_init(struct rzg2l_du_vsp *vsp, struct device_node *np,
> > + unsigned int crtcs)
> > +{
> > + struct rzg2l_du_device *rcdu = vsp->dev;
> > + struct platform_device *pdev;
> > + unsigned int num_crtcs = hweight32(crtcs);
> > + unsigned int num_planes = 2;
> > + unsigned int i;
> > + int ret;
> > +
> > + /* Find the VSP device and initialize it. */
> > + pdev = of_find_device_by_node(np);
> > + if (!pdev)
> > + return -ENXIO;
> > +
> > + vsp->vsp = &pdev->dev;
> > +
> > + ret = drmm_add_action_or_reset(&rcdu->ddev, rzg2l_du_vsp_cleanup,
> vsp);
> > + if (ret < 0)
> > + return ret;
> > +
> > + ret = vsp1_du_init(vsp->vsp);
> > + if (ret < 0)
> > + return ret;
> > +
> > + vsp->planes = kcalloc(num_planes, sizeof(*vsp->planes), GFP_KERNEL);
> > + if (!vsp->planes)
> > + return -ENOMEM;
>
> drmm_kcalloc or drmm_kmalloc_array
I get crashes at random places, if I use drmm_kcalloc().
Not sure it is related to this? There is no crash if I use kcalloc.
>
> > +
> > + for (i = 0; i < num_planes; ++i) {
> > + enum drm_plane_type type = i < num_crtcs
> > + ? DRM_PLANE_TYPE_PRIMARY
> > + : DRM_PLANE_TYPE_OVERLAY;
> > + struct rzg2l_du_vsp_plane *plane = &vsp->planes[i];
> > +
> > + plane->vsp = vsp;
> > + plane->index = i;
> > + ret = drm_universal_plane_init(&rcdu->ddev, &plane->plane,
> > + crtcs, &rzg2l_du_vsp_plane_funcs,
> > + rzg2l_du_vsp_formats,
> > + ARRAY_SIZE(rzg2l_du_vsp_formats),
> > + NULL, type, NULL);
> > + if (ret < 0)
> > + return ret;
>
> you need to use drmm variant here too.
I did rebased to latest drm_misc_next and I don't find the drmm_universal_plane_init()
Can you please point me to the API?
Cheers,
Biju
^ permalink raw reply [flat|nested] 39+ messages in thread
* RE: [PATCH v15 3/5] drm: renesas: Add RZ/G2L DU Support
2023-12-14 15:24 ` Biju Das
@ 2023-12-14 18:35 ` Biju Das
2023-12-14 20:50 ` Biju Das
2023-12-15 10:23 ` Maxime Ripard
2 siblings, 0 replies; 39+ messages in thread
From: Biju Das @ 2023-12-14 18:35 UTC (permalink / raw)
To: Maxime Ripard
Cc: Fabrizio Castro, biju.das.au, Magnus Damm, Geert Uytterhoeven,
Thomas Zimmermann, Prabhakar Mahadev Lad, dri-devel,
linux-renesas-soc, Kieran Bingham, Laurent Pinchart,
Jacopo Mondi
Hi Maxime Ripard,
> -----Original Message-----
> From: Biju Das
> Sent: Thursday, December 14, 2023 3:24 PM
> Subject: RE: [PATCH v15 3/5] drm: renesas: Add RZ/G2L DU Support
>
.
> > > +
> > > + vsp->planes = kcalloc(num_planes, sizeof(*vsp->planes), GFP_KERNEL);
> > > + if (!vsp->planes)
> > > + return -ENOMEM;
> >
> > drmm_kcalloc or drmm_kmalloc_array
>
> I get crashes at random places, if I use drmm_kcalloc().
> Not sure it is related to this? There is no crash if I use kcalloc.
The random crash is fixed it is due to double free. I forgot to remove
kfree in clean up function.
Cheers,
Biju
^ permalink raw reply [flat|nested] 39+ messages in thread
* RE: [PATCH v15 3/5] drm: renesas: Add RZ/G2L DU Support
2023-12-14 15:24 ` Biju Das
2023-12-14 18:35 ` Biju Das
@ 2023-12-14 20:50 ` Biju Das
2023-12-15 7:47 ` Biju Das
2023-12-15 9:22 ` Maxime Ripard
2023-12-15 10:23 ` Maxime Ripard
2 siblings, 2 replies; 39+ messages in thread
From: Biju Das @ 2023-12-14 20:50 UTC (permalink / raw)
To: Maxime Ripard
Cc: Fabrizio Castro, biju.das.au, Magnus Damm, Geert Uytterhoeven,
Thomas Zimmermann, Prabhakar Mahadev Lad, dri-devel,
linux-renesas-soc, Kieran Bingham, Laurent Pinchart,
Jacopo Mondi
Hi Maxime Ripard,
> -----Original Message-----
> From: Biju Das
> Sent: Thursday, December 14, 2023 3:24 PM
> Subject: RE: [PATCH v15 3/5] drm: renesas: Add RZ/G2L DU Support
>
> >
> > > +
> > > + for (i = 0; i < num_planes; ++i) {
> > > + enum drm_plane_type type = i < num_crtcs
> > > + ? DRM_PLANE_TYPE_PRIMARY
> > > + : DRM_PLANE_TYPE_OVERLAY;
> > > + struct rzg2l_du_vsp_plane *plane = &vsp->planes[i];
> > > +
> > > + plane->vsp = vsp;
> > > + plane->index = i;
> > > + ret = drm_universal_plane_init(&rcdu->ddev, &plane->plane,
> > > + crtcs, &rzg2l_du_vsp_plane_funcs,
> > > + rzg2l_du_vsp_formats,
> > > + ARRAY_SIZE(rzg2l_du_vsp_formats),
> > > + NULL, type, NULL);
> > > + if (ret < 0)
> > > + return ret;
> >
> > you need to use drmm variant here too.
>
> I did rebased to latest drm_misc_next and I don't find the
> drmm_universal_plane_init()
>
> Can you please point me to the API?
We cannot use drmm_universal_plane_alloc() in this architecture.
rzg2l_du_vsps_init() stores the VSP pointer and pipe index from DT first.
Then all the planes are created using rzg2l_du_vsp_init()
CRTC uses VSP pointer and pipe_index to set the plane(rzg2l_du_crtc_create()).
CRTC->vsp->planes[rcrtc->vsp_pipe].plane
Cheers,
Biju
^ permalink raw reply [flat|nested] 39+ messages in thread
* RE: [PATCH v15 3/5] drm: renesas: Add RZ/G2L DU Support
2023-12-14 20:50 ` Biju Das
@ 2023-12-15 7:47 ` Biju Das
2023-12-15 9:24 ` Maxime Ripard
2023-12-15 9:22 ` Maxime Ripard
1 sibling, 1 reply; 39+ messages in thread
From: Biju Das @ 2023-12-15 7:47 UTC (permalink / raw)
To: Maxime Ripard
Cc: Fabrizio Castro, biju.das.au, Magnus Damm, Geert Uytterhoeven,
Thomas Zimmermann, Prabhakar Mahadev Lad, dri-devel,
linux-renesas-soc, Kieran Bingham, Laurent Pinchart,
Jacopo Mondi
Hi Maxime Ripard,
> -----Original Message-----
> From: Biju Das
> Sent: Thursday, December 14, 2023 8:50 PM
> Subject: RE: [PATCH v15 3/5] drm: renesas: Add RZ/G2L DU Support
>
> Hi Maxime Ripard,
>
>
> > -----Original Message-----
> > From: Biju Das
> > Sent: Thursday, December 14, 2023 3:24 PM
> > Subject: RE: [PATCH v15 3/5] drm: renesas: Add RZ/G2L DU Support
> >
> > >
> > > > +
> > > > + for (i = 0; i < num_planes; ++i) {
> > > > + enum drm_plane_type type = i < num_crtcs
> > > > + ? DRM_PLANE_TYPE_PRIMARY
> > > > + : DRM_PLANE_TYPE_OVERLAY;
> > > > + struct rzg2l_du_vsp_plane *plane = &vsp->planes[i];
> > > > +
> > > > + plane->vsp = vsp;
> > > > + plane->index = i;
> > > > + ret = drm_universal_plane_init(&rcdu->ddev, &plane-
> >plane,
> > > > + crtcs,
> &rzg2l_du_vsp_plane_funcs,
> > > > + rzg2l_du_vsp_formats,
> > > > +
> ARRAY_SIZE(rzg2l_du_vsp_formats),
> > > > + NULL, type, NULL);
> > > > + if (ret < 0)
> > > > + return ret;
> > >
> > > you need to use drmm variant here too.
> >
> > I did rebased to latest drm_misc_next and I don't find the
> > drmm_universal_plane_init()
> >
> > Can you please point me to the API?
>
> We cannot use drmm_universal_plane_alloc() in this architecture.
>
> rzg2l_du_vsps_init() stores the VSP pointer and pipe index from DT first.
>
> Then all the planes are created using rzg2l_du_vsp_init()
>
> CRTC uses VSP pointer and pipe_index to set the
> plane(rzg2l_du_crtc_create()).
>
> CRTC->vsp->planes[rcrtc->vsp_pipe].plane
>
Thinking again, it is possible to use drmm_universal_plane_alloc() here
Introduce a linked list [1] and use an API [2] to retrieve plane
by matching vsp_pipe index against plane->index.
With this we don't need drmm_kcalloc() any more.
I will implement and test this and send v16, if there are no comments.
[1]
struct rzg2l_du_vsp_plane {
struct drm_plane plane;
struct rzg2l_du_vsp *vsp;
unsigned int index;
struct rzg2l_du_vsp_plane *next;
};
[2]
struct drm_plane *rzg2l_du_vsp_get_drm_plane(struct rzg2l_du_crtc *crtc,
unsigned int pipe_index);
Cheers,
Biju
^ permalink raw reply [flat|nested] 39+ messages in thread
* Re: [PATCH v15 3/5] drm: renesas: Add RZ/G2L DU Support
2023-12-14 20:50 ` Biju Das
2023-12-15 7:47 ` Biju Das
@ 2023-12-15 9:22 ` Maxime Ripard
1 sibling, 0 replies; 39+ messages in thread
From: Maxime Ripard @ 2023-12-15 9:22 UTC (permalink / raw)
To: Biju Das
Cc: Fabrizio Castro, biju.das.au, Magnus Damm, Geert Uytterhoeven,
Thomas Zimmermann, Prabhakar Mahadev Lad, dri-devel,
linux-renesas-soc, Kieran Bingham, Laurent Pinchart,
Jacopo Mondi
[-- Attachment #1: Type: text/plain, Size: 1943 bytes --]
On Thu, Dec 14, 2023 at 08:50:14PM +0000, Biju Das wrote:
> Hi Maxime Ripard,
>
>
> > -----Original Message-----
> > From: Biju Das
> > Sent: Thursday, December 14, 2023 3:24 PM
> > Subject: RE: [PATCH v15 3/5] drm: renesas: Add RZ/G2L DU Support
> >
> > >
> > > > +
> > > > + for (i = 0; i < num_planes; ++i) {
> > > > + enum drm_plane_type type = i < num_crtcs
> > > > + ? DRM_PLANE_TYPE_PRIMARY
> > > > + : DRM_PLANE_TYPE_OVERLAY;
> > > > + struct rzg2l_du_vsp_plane *plane = &vsp->planes[i];
> > > > +
> > > > + plane->vsp = vsp;
> > > > + plane->index = i;
> > > > + ret = drm_universal_plane_init(&rcdu->ddev, &plane->plane,
> > > > + crtcs, &rzg2l_du_vsp_plane_funcs,
> > > > + rzg2l_du_vsp_formats,
> > > > + ARRAY_SIZE(rzg2l_du_vsp_formats),
> > > > + NULL, type, NULL);
> > > > + if (ret < 0)
> > > > + return ret;
> > >
> > > you need to use drmm variant here too.
> >
> > I did rebased to latest drm_misc_next and I don't find the
> > drmm_universal_plane_init()
> >
> > Can you please point me to the API?
>
> We cannot use drmm_universal_plane_alloc() in this architecture.
>
> rzg2l_du_vsps_init() stores the VSP pointer and pipe index from DT first.
>
> Then all the planes are created using rzg2l_du_vsp_init()
>
> CRTC uses VSP pointer and pipe_index to set the plane(rzg2l_du_crtc_create()).
>
> CRTC->vsp->planes[rcrtc->vsp_pipe].plane
Actually, I don't think you need vsp->planes at all. The only real use
you have for it is to find the primary plane in rzg2l_du_crtc_create()
and you could just pass it as an argument to the function, and make
rzg2l_du_vsps_init return it for example (or fill a pointer on success,
or something).
And I also don't think you need to store the crtcs either, you can
probably just get away with storing the vsp pointer in the crtc when you
allocate it.
Maxime
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
^ permalink raw reply [flat|nested] 39+ messages in thread
* Re: [PATCH v15 3/5] drm: renesas: Add RZ/G2L DU Support
2023-12-15 7:47 ` Biju Das
@ 2023-12-15 9:24 ` Maxime Ripard
2023-12-15 11:19 ` Biju Das
0 siblings, 1 reply; 39+ messages in thread
From: Maxime Ripard @ 2023-12-15 9:24 UTC (permalink / raw)
To: Biju Das
Cc: Fabrizio Castro, biju.das.au, Magnus Damm, Geert Uytterhoeven,
Thomas Zimmermann, Prabhakar Mahadev Lad, dri-devel,
linux-renesas-soc, Kieran Bingham, Laurent Pinchart,
Jacopo Mondi
[-- Attachment #1: Type: text/plain, Size: 2690 bytes --]
On Fri, Dec 15, 2023 at 07:47:07AM +0000, Biju Das wrote:
> Hi Maxime Ripard,
>
> > -----Original Message-----
> > From: Biju Das
> > Sent: Thursday, December 14, 2023 8:50 PM
> > Subject: RE: [PATCH v15 3/5] drm: renesas: Add RZ/G2L DU Support
> >
> > Hi Maxime Ripard,
> >
> >
> > > -----Original Message-----
> > > From: Biju Das
> > > Sent: Thursday, December 14, 2023 3:24 PM
> > > Subject: RE: [PATCH v15 3/5] drm: renesas: Add RZ/G2L DU Support
> > >
> > > >
> > > > > +
> > > > > + for (i = 0; i < num_planes; ++i) {
> > > > > + enum drm_plane_type type = i < num_crtcs
> > > > > + ? DRM_PLANE_TYPE_PRIMARY
> > > > > + : DRM_PLANE_TYPE_OVERLAY;
> > > > > + struct rzg2l_du_vsp_plane *plane = &vsp->planes[i];
> > > > > +
> > > > > + plane->vsp = vsp;
> > > > > + plane->index = i;
> > > > > + ret = drm_universal_plane_init(&rcdu->ddev, &plane-
> > >plane,
> > > > > + crtcs,
> > &rzg2l_du_vsp_plane_funcs,
> > > > > + rzg2l_du_vsp_formats,
> > > > > +
> > ARRAY_SIZE(rzg2l_du_vsp_formats),
> > > > > + NULL, type, NULL);
> > > > > + if (ret < 0)
> > > > > + return ret;
> > > >
> > > > you need to use drmm variant here too.
> > >
> > > I did rebased to latest drm_misc_next and I don't find the
> > > drmm_universal_plane_init()
> > >
> > > Can you please point me to the API?
> >
> > We cannot use drmm_universal_plane_alloc() in this architecture.
> >
> > rzg2l_du_vsps_init() stores the VSP pointer and pipe index from DT first.
> >
> > Then all the planes are created using rzg2l_du_vsp_init()
> >
> > CRTC uses VSP pointer and pipe_index to set the
> > plane(rzg2l_du_crtc_create()).
> >
> > CRTC->vsp->planes[rcrtc->vsp_pipe].plane
> >
>
> Thinking again, it is possible to use drmm_universal_plane_alloc() here
>
> Introduce a linked list [1] and use an API [2] to retrieve plane
> by matching vsp_pipe index against plane->index.
>
> With this we don't need drmm_kcalloc() any more.
>
> I will implement and test this and send v16, if there are no comments.
>
>
> [1]
> struct rzg2l_du_vsp_plane {
> struct drm_plane plane;
> struct rzg2l_du_vsp *vsp;
> unsigned int index;
> struct rzg2l_du_vsp_plane *next;
> };
>
> [2]
> struct drm_plane *rzg2l_du_vsp_get_drm_plane(struct rzg2l_du_crtc *crtc,
> unsigned int pipe_index);
Why do you need a linked list for? There's one already: the DRM device
will store all the planes registered in the DRM device, and you can
already iterate over all the planes with drm_for_each_plane, or
drm_for_each_plane_mask if you want to reduce the scope of the iterator.
Maxime
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
^ permalink raw reply [flat|nested] 39+ messages in thread
* Re: [PATCH v15 3/5] drm: renesas: Add RZ/G2L DU Support
2023-12-14 15:24 ` Biju Das
2023-12-14 18:35 ` Biju Das
2023-12-14 20:50 ` Biju Das
@ 2023-12-15 10:23 ` Maxime Ripard
2023-12-15 11:37 ` Biju Das
2023-12-15 13:25 ` Biju Das
2 siblings, 2 replies; 39+ messages in thread
From: Maxime Ripard @ 2023-12-15 10:23 UTC (permalink / raw)
To: Biju Das
Cc: Fabrizio Castro, biju.das.au, Magnus Damm, Geert Uytterhoeven,
Thomas Zimmermann, Prabhakar Mahadev Lad, dri-devel,
linux-renesas-soc, Kieran Bingham, Laurent Pinchart,
Jacopo Mondi
[-- Attachment #1: Type: text/plain, Size: 7067 bytes --]
On Thu, Dec 14, 2023 at 03:24:17PM +0000, Biju Das wrote:
> Hi Maxime Ripard,
>
> Thanks for the feedback.
>
> > -----Original Message-----
> > From: Maxime Ripard <mripard@kernel.org>
> > Sent: Wednesday, December 13, 2023 3:47 PM
> > To: Biju Das <biju.das.jz@bp.renesas.com>
> > Subject: Re: [PATCH v15 3/5] drm: renesas: Add RZ/G2L DU Support
> >
> > On Tue, Nov 28, 2023 at 10:51:27AM +0000, Biju Das wrote:
> > > The LCD controller is composed of Frame Compression Processor (FCPVD),
> > > Video Signal Processor (VSPD), and Display Unit (DU).
> > >
> > > It has DPI/DSI interfaces and supports a maximum resolution of 1080p
> > > along with 2 RPFs to support the blending of two picture layers and
> > > raster operations (ROPs).
> > >
> > > The DU module is connected to VSPD. Add RZ/G2L DU support for RZ/G2L
> > > alike SoCs.
> > >
> > > Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
> >
> > I'd still like a review from Geert or Laurent, I don't know the SoC.
>
> Since Laurent is super busy, maybe Kieran and Jacopo can provide feedback if any.
>
> The display blocks is shown in [1] and the pipe line is as below
>
> Memory-> fcpvd -->VSPD --> DU --> DSI --> Display panel.
>
> Fcpvd: Frame Compression Processor
> VSPD: Video Signal Processor, Basically a blitter engine which directly render images to DU
> DU: Display Unit.
>
> On R-Car fpvcd, VSPD and (DU with planes) IPs are separate blocks
> whereas here it is integrated inside LCDC.
>
> fcpvd and VSPD are in media subsystem and we are reusing the code here.
> The vspd is based on display list, it downloads the register contents from linked list in memory
> and execute composite operation and generates interrupts for display start and frame end.
>
> du_vsp registers the frame completion callback with vspd driver in media framework.
> and we call the drm_crtc_handle_vblank() in this context.
>
> [1]
> https://pasteboard.co/MDmbXdK3psSD.png
>
> ● FCPVD
> − Support out-of-order for the whole outstanding transactions
> − Read linear addressing image data
> − Read display list data
> − Write image data
> ● VSPD
> − Supports various data formats and conversion
> − Supports YCbCr444/422/420, RGB, α RGB, α plane
> − Color space conversion and changes to the number of colors by dithering
> − Color keying
> − Supports combination between pixel alpha and global alpha
> − Supports generating pre multiplied alpha
> − Video processing
> − Blending of two picture layers and raster operations (ROPs)
> − Clipping
> − 1D look up table
> − Vertical flipping in case of output to memory
> − Direct connection to display module
> − Supporting 1920 pixels in horizontal direction
> − Writing back image data which is transferred to Display Unit (DU) to memory
> ● DU
> − Supporting Display Parallel Interface (DPI) and MIPI LINK Video Interface
> − Display timing master
> − Generating video timings (Front porch, Back porch, Sync active, Active video area)
> − Selecting the polarity of output DCLK, HSYNC, VSYNC, and DE
> − Supporting Progressive (Non-interlace)
> − Not supports Interlace
> − Input data format (from VSPD): RGB888, RGB666 (not supports dithering of RGB565)
> − Output data format: same as Input data format
> − Supporting Full HD (1920 pixels × 1080 lines) for MIPI-DSI Output
> − Supporting WXGA (1280 pixels × 800 lines) for Parallel Output
Thanks, that's super helpful. The architecture is thus similar to vc4
Some general questions related to bugs we had at some point with vc4:
* Where is the display list stored? In RAM or in a dedicated SRAM?
* Are the pointer to the current display list latched?
* Is the display list itself latched? If it's not, what happens when
the display list is changed while the frame is being generated?
> >
> > > +static int rzg2l_du_crtc_get(struct rzg2l_du_crtc *rcrtc) {
> > > + int ret;
> > > +
> > > + /*
> > > + * Guard against double-get, as the function is called from both the
> > > + * .atomic_enable() and .atomic_flush() handlers.
> > > + */
> > > + if (rcrtc->initialized)
> > > + return 0;
> > > +
> > > + ret = clk_prepare_enable(rcrtc->rzg2l_clocks.aclk);
> > > + if (ret < 0)
> > > + return ret;
> > > +
> > > + ret = clk_prepare_enable(rcrtc->rzg2l_clocks.pclk);
> > > + if (ret < 0)
> > > + goto error_bus_clock;
> > > +
> > > + ret = reset_control_deassert(rcrtc->rstc);
> > > + if (ret < 0)
> > > + goto error_peri_clock;
> > > +
> > > + rzg2l_du_crtc_setup(rcrtc);
> > > + rcrtc->initialized = true;
> > > +
> > > + return 0;
> > > +
> > > +error_peri_clock:
> > > + clk_disable_unprepare(rcrtc->rzg2l_clocks.pclk);
> > > +error_bus_clock:
> > > + clk_disable_unprepare(rcrtc->rzg2l_clocks.aclk);
> > > + return ret;
> > > +}
> >
> > [...]
> >
> > > +static void rzg2l_du_crtc_atomic_flush(struct drm_crtc *crtc,
> > > + struct drm_atomic_state *state) {
> > > + struct rzg2l_du_crtc *rcrtc = to_rzg2l_crtc(crtc);
> > > + struct drm_device *dev = rcrtc->crtc.dev;
> > > + unsigned long flags;
> > > +
> > > + WARN_ON(!crtc->state->enable);
> > > +
> > > + /*
> > > + * If a mode set is in progress we can be called with the CRTC
> > disabled.
> > > + * We thus need to first get and setup the CRTC in order to
> > configure
> > > + * planes. We must *not* put the CRTC, as it must be kept awake
> > until
> > > + * the .atomic_enable() call that will follow. The get operation in
> > > + * .atomic_enable() will in that case be a no-op, and the CRTC will
> > be
> > > + * put later in .atomic_disable().
> > > + */
> > > + rzg2l_du_crtc_get(rcrtc);
> >
> > That's a bit suspicious. Have you looked at
> > drm_atomic_helper_commit_tail_rpm() ?
>
> Ok, I will drop this and start using drm_atomic_helper_commit_tail_rpm()
> instead of rzg2l_du_atomic_commit_tail().
It was more of a suggestion, really. I'm not sure whether it works for
you, but it usually addresses similar issues in drivers.
> >
> > > +static int rzg2l_du_crtc_enable_vblank(struct drm_crtc *crtc) {
> > > + struct rzg2l_du_crtc *rcrtc = to_rzg2l_crtc(crtc);
> > > +
> > > + rcrtc->vblank_enable = true;
> > > +
> > > + return 0;
> > > +}
> > > +
> > > +static void rzg2l_du_crtc_disable_vblank(struct drm_crtc *crtc) {
> > > + struct rzg2l_du_crtc *rcrtc = to_rzg2l_crtc(crtc);
> > > +
> > > + rcrtc->vblank_enable = false;
> > > +}
> >
> > You should enable / disable your interrupts here
>
> We don't have dedicated vblank IRQ for enabling/disabling vblank.
>
> vblank is handled by vspd.
>
> vspd is directly rendering images to display,
> rcar_du_crtc_finish_page_flip() and drm_crtc_handle_vblank()
> called in vspd's pageflip context.
>
> See rzg2l_du_vsp_complete()in rzg2l_du_vsp.c
Sorry, I couldn't really get how the interrupt flow / vblank reporting
is going to work. Could you explain it a bit more?
Maxime
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
^ permalink raw reply [flat|nested] 39+ messages in thread
* RE: [PATCH v15 3/5] drm: renesas: Add RZ/G2L DU Support
2023-12-15 9:24 ` Maxime Ripard
@ 2023-12-15 11:19 ` Biju Das
0 siblings, 0 replies; 39+ messages in thread
From: Biju Das @ 2023-12-15 11:19 UTC (permalink / raw)
To: Maxime Ripard
Cc: Fabrizio Castro, biju.das.au, Magnus Damm, Geert Uytterhoeven,
Thomas Zimmermann, Prabhakar Mahadev Lad, dri-devel,
linux-renesas-soc, Kieran Bingham, Laurent Pinchart,
Jacopo Mondi
Hi Maxime Ripard,
> -----Original Message-----
> From: Maxime Ripard <mripard@kernel.org>
> Sent: Friday, December 15, 2023 9:25 AM
> Subject: Re: [PATCH v15 3/5] drm: renesas: Add RZ/G2L DU Support
>
> On Fri, Dec 15, 2023 at 07:47:07AM +0000, Biju Das wrote:
> > Hi Maxime Ripard,
> >
> > > -----Original Message-----
> > > From: Biju Das
> > > Sent: Thursday, December 14, 2023 8:50 PM
> > > Subject: RE: [PATCH v15 3/5] drm: renesas: Add RZ/G2L DU Support
> > >
> > > Hi Maxime Ripard,
> > >
> > >
> > > > -----Original Message-----
> > > > From: Biju Das
> > > > Sent: Thursday, December 14, 2023 3:24 PM
> > > > Subject: RE: [PATCH v15 3/5] drm: renesas: Add RZ/G2L DU Support
> > > >
> > > > >
> > > > > > +
> > > > > > + for (i = 0; i < num_planes; ++i) {
> > > > > > + enum drm_plane_type type = i < num_crtcs
> > > > > > + ? DRM_PLANE_TYPE_PRIMARY
> > > > > > + : DRM_PLANE_TYPE_OVERLAY;
> > > > > > + struct rzg2l_du_vsp_plane *plane = &vsp->planes[i];
> > > > > > +
> > > > > > + plane->vsp = vsp;
> > > > > > + plane->index = i;
> > > > > > + ret = drm_universal_plane_init(&rcdu->ddev, &plane-
> > > >plane,
> > > > > > + crtcs,
> > > &rzg2l_du_vsp_plane_funcs,
> > > > > > + rzg2l_du_vsp_formats,
> > > > > > +
> > > ARRAY_SIZE(rzg2l_du_vsp_formats),
> > > > > > + NULL, type, NULL);
> > > > > > + if (ret < 0)
> > > > > > + return ret;
> > > > >
> > > > > you need to use drmm variant here too.
> > > >
> > > > I did rebased to latest drm_misc_next and I don't find the
> > > > drmm_universal_plane_init()
> > > >
> > > > Can you please point me to the API?
> > >
> > > We cannot use drmm_universal_plane_alloc() in this architecture.
> > >
> > > rzg2l_du_vsps_init() stores the VSP pointer and pipe index from DT
> first.
> > >
> > > Then all the planes are created using rzg2l_du_vsp_init()
> > >
> > > CRTC uses VSP pointer and pipe_index to set the
> > > plane(rzg2l_du_crtc_create()).
> > >
> > > CRTC->vsp->planes[rcrtc->vsp_pipe].plane
> > >
> >
> > Thinking again, it is possible to use drmm_universal_plane_alloc()
> > here
> >
> > Introduce a linked list [1] and use an API [2] to retrieve plane by
> > matching vsp_pipe index against plane->index.
> >
> > With this we don't need drmm_kcalloc() any more.
> >
> > I will implement and test this and send v16, if there are no comments.
> >
> >
> > [1]
> > struct rzg2l_du_vsp_plane {
> > struct drm_plane plane;
> > struct rzg2l_du_vsp *vsp;
> > unsigned int index;
> > struct rzg2l_du_vsp_plane *next;
> > };
> >
> > [2]
> > struct drm_plane *rzg2l_du_vsp_get_drm_plane(struct rzg2l_du_crtc *crtc,
> > unsigned int pipe_index);
>
> Why do you need a linked list for? There's one already: the DRM device
> will store all the planes registered in the DRM device, and you can
> already iterate over all the planes with drm_for_each_plane, or
> drm_for_each_plane_mask if you want to reduce the scope of the iterator.
Thanks for the pointer, it is simple now.
Vsp->planes[] aswell as linked list is not required using drm_for_each_plane()
Cheers,
Biju
^ permalink raw reply [flat|nested] 39+ messages in thread
* RE: [PATCH v15 3/5] drm: renesas: Add RZ/G2L DU Support
2023-12-15 10:23 ` Maxime Ripard
@ 2023-12-15 11:37 ` Biju Das
2023-12-15 12:58 ` Maxime Ripard
2023-12-15 13:25 ` Biju Das
1 sibling, 1 reply; 39+ messages in thread
From: Biju Das @ 2023-12-15 11:37 UTC (permalink / raw)
To: Maxime Ripard
Cc: Fabrizio Castro, biju.das.au, Magnus Damm, Geert Uytterhoeven,
Thomas Zimmermann, Prabhakar Mahadev Lad, dri-devel,
linux-renesas-soc, Kieran Bingham, Laurent Pinchart,
Jacopo Mondi
Hi Maxime Ripard,
> -----Original Message-----
> From: Maxime Ripard <mripard@kernel.org>
> Sent: Friday, December 15, 2023 10:24 AM
> To: Biju Das <biju.das.jz@bp.renesas.com>
> Subject: Re: [PATCH v15 3/5] drm: renesas: Add RZ/G2L DU Support
>
> On Thu, Dec 14, 2023 at 03:24:17PM +0000, Biju Das wrote:
> > Hi Maxime Ripard,
> >
> > Thanks for the feedback.
> >
> > > -----Original Message-----
> > > From: Maxime Ripard <mripard@kernel.org>
> > > Sent: Wednesday, December 13, 2023 3:47 PM
> > > To: Biju Das <biju.das.jz@bp.renesas.com>
> > > Subject: Re: [PATCH v15 3/5] drm: renesas: Add RZ/G2L DU Support
> > >
> > > > + */
> > > > + rzg2l_du_crtc_get(rcrtc);
> > >
> > > That's a bit suspicious. Have you looked at
> > > drm_atomic_helper_commit_tail_rpm() ?
> >
> > Ok, I will drop this and start using
> > drm_atomic_helper_commit_tail_rpm()
> > instead of rzg2l_du_atomic_commit_tail().
>
> It was more of a suggestion, really. I'm not sure whether it works for
> you, but it usually addresses similar issues in drivers.
I confirm, it is working in my case, even after removing rzg2l_du_crtc_get()
and using the helper function drm_atomic_helper_commit_tail_rpm().
>
> > >
> > > > +static int rzg2l_du_crtc_enable_vblank(struct drm_crtc *crtc) {
> > > > + struct rzg2l_du_crtc *rcrtc = to_rzg2l_crtc(crtc);
> > > > +
> > > > + rcrtc->vblank_enable = true;
> > > > +
> > > > + return 0;
> > > > +}
> > > > +
> > > > +static void rzg2l_du_crtc_disable_vblank(struct drm_crtc *crtc) {
> > > > + struct rzg2l_du_crtc *rcrtc = to_rzg2l_crtc(crtc);
> > > > +
> > > > + rcrtc->vblank_enable = false;
> > > > +}
> > >
> > > You should enable / disable your interrupts here
> >
> > We don't have dedicated vblank IRQ for enabling/disabling vblank.
> >
> > vblank is handled by vspd.
> >
> > vspd is directly rendering images to display,
> > rcar_du_crtc_finish_page_flip() and drm_crtc_handle_vblank() called in
> > vspd's pageflip context.
> >
> > See rzg2l_du_vsp_complete()in rzg2l_du_vsp.c
>
> Sorry, I couldn't really get how the interrupt flow / vblank reporting is
> going to work. Could you explain it a bit more?
We just need to handle vertical blanking in the VSP frame end handler.
See the code below.
static void rzg2l_du_vsp_complete(void *private, unsigned int status, u32 crc)
{
struct rzg2l_du_crtc *crtc = private;
if (crtc->vblank_enable)
drm_crtc_handle_vblank(&crtc->crtc);
if (status & VSP1_DU_STATUS_COMPLETE)
rzg2l_du_crtc_finish_page_flip(crtc);
drm_crtc_add_crc_entry(&crtc->crtc, false, 0, &crc);
}
Cheers,
Biju
^ permalink raw reply [flat|nested] 39+ messages in thread
* Re: [PATCH v15 3/5] drm: renesas: Add RZ/G2L DU Support
2023-12-15 11:37 ` Biju Das
@ 2023-12-15 12:58 ` Maxime Ripard
2023-12-15 13:52 ` Biju Das
0 siblings, 1 reply; 39+ messages in thread
From: Maxime Ripard @ 2023-12-15 12:58 UTC (permalink / raw)
To: Biju Das
Cc: Fabrizio Castro, biju.das.au, Magnus Damm, Geert Uytterhoeven,
Thomas Zimmermann, Prabhakar Mahadev Lad, dri-devel,
linux-renesas-soc, Kieran Bingham, Laurent Pinchart,
Jacopo Mondi
[-- Attachment #1: Type: text/plain, Size: 2951 bytes --]
On Fri, Dec 15, 2023 at 11:37:07AM +0000, Biju Das wrote:
> Hi Maxime Ripard,
>
> > -----Original Message-----
> > From: Maxime Ripard <mripard@kernel.org>
> > Sent: Friday, December 15, 2023 10:24 AM
> > To: Biju Das <biju.das.jz@bp.renesas.com>
> > Subject: Re: [PATCH v15 3/5] drm: renesas: Add RZ/G2L DU Support
> >
> > On Thu, Dec 14, 2023 at 03:24:17PM +0000, Biju Das wrote:
> > > Hi Maxime Ripard,
> > >
> > > Thanks for the feedback.
> > >
> > > > -----Original Message-----
> > > > From: Maxime Ripard <mripard@kernel.org>
> > > > Sent: Wednesday, December 13, 2023 3:47 PM
> > > > To: Biju Das <biju.das.jz@bp.renesas.com>
> > > > Subject: Re: [PATCH v15 3/5] drm: renesas: Add RZ/G2L DU Support
> > > >
> > > > > + */
> > > > > + rzg2l_du_crtc_get(rcrtc);
> > > >
> > > > That's a bit suspicious. Have you looked at
> > > > drm_atomic_helper_commit_tail_rpm() ?
> > >
> > > Ok, I will drop this and start using
> > > drm_atomic_helper_commit_tail_rpm()
> > > instead of rzg2l_du_atomic_commit_tail().
> >
> > It was more of a suggestion, really. I'm not sure whether it works for
> > you, but it usually addresses similar issues in drivers.
>
> I confirm, it is working in my case, even after removing rzg2l_du_crtc_get()
> and using the helper function drm_atomic_helper_commit_tail_rpm().
>
> >
> > > >
> > > > > +static int rzg2l_du_crtc_enable_vblank(struct drm_crtc *crtc) {
> > > > > + struct rzg2l_du_crtc *rcrtc = to_rzg2l_crtc(crtc);
> > > > > +
> > > > > + rcrtc->vblank_enable = true;
> > > > > +
> > > > > + return 0;
> > > > > +}
> > > > > +
> > > > > +static void rzg2l_du_crtc_disable_vblank(struct drm_crtc *crtc) {
> > > > > + struct rzg2l_du_crtc *rcrtc = to_rzg2l_crtc(crtc);
> > > > > +
> > > > > + rcrtc->vblank_enable = false;
> > > > > +}
> > > >
> > > > You should enable / disable your interrupts here
> > >
> > > We don't have dedicated vblank IRQ for enabling/disabling vblank.
> > >
> > > vblank is handled by vspd.
> > >
> > > vspd is directly rendering images to display,
> > > rcar_du_crtc_finish_page_flip() and drm_crtc_handle_vblank() called in
> > > vspd's pageflip context.
> > >
> > > See rzg2l_du_vsp_complete()in rzg2l_du_vsp.c
> >
> > Sorry, I couldn't really get how the interrupt flow / vblank reporting is
> > going to work. Could you explain it a bit more?
>
> We just need to handle vertical blanking in the VSP frame end handler.
> See the code below.
>
> static void rzg2l_du_vsp_complete(void *private, unsigned int status, u32 crc)
> {
> struct rzg2l_du_crtc *crtc = private;
>
> if (crtc->vblank_enable)
> drm_crtc_handle_vblank(&crtc->crtc);
>
> if (status & VSP1_DU_STATUS_COMPLETE)
> rzg2l_du_crtc_finish_page_flip(crtc);
>
> drm_crtc_add_crc_entry(&crtc->crtc, false, 0, &crc);
> }
Then we're back to the same question :)
Why can't you mask the frame end interrupt?
Maxime
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
^ permalink raw reply [flat|nested] 39+ messages in thread
* RE: [PATCH v15 3/5] drm: renesas: Add RZ/G2L DU Support
2023-12-15 10:23 ` Maxime Ripard
2023-12-15 11:37 ` Biju Das
@ 2023-12-15 13:25 ` Biju Das
2023-12-15 14:24 ` Maxime Ripard
1 sibling, 1 reply; 39+ messages in thread
From: Biju Das @ 2023-12-15 13:25 UTC (permalink / raw)
To: Maxime Ripard
Cc: Fabrizio Castro, biju.das.au, Magnus Damm, Geert Uytterhoeven,
Thomas Zimmermann, Prabhakar Mahadev Lad, dri-devel,
linux-renesas-soc, Kieran Bingham, Laurent Pinchart,
Jacopo Mondi
Hi Maxime Ripard,
> -----Original Message-----
> From: Maxime Ripard <mripard@kernel.org>
> Sent: Friday, December 15, 2023 10:24 AM
> Subject: Re: [PATCH v15 3/5] drm: renesas: Add RZ/G2L DU Support
>
> On Thu, Dec 14, 2023 at 03:24:17PM +0000, Biju Das wrote:
> > Hi Maxime Ripard,
> >
> > Thanks for the feedback.
>
> Thanks, that's super helpful. The architecture is thus similar to vc4
>
> Some general questions related to bugs we had at some point with vc4:
>
> * Where is the display list stored? In RAM or in a dedicated SRAM?
[1] It is in DDR (RAM).
>
> * Are the pointer to the current display list latched?
>
> * Is the display list itself latched? If it's not, what happens when
> the display list is changed while the frame is being generated?
There is some protocol defined for SW side and HW side for updating display list
See [1] 33.4.8.1 Operation flow of VSPD and DU.
All the display list operations are manged here[2]
[1] https://www.renesas.com/us/en/document/mah/rzg2l-group-rzg2lc-group-users-manual-hardware-0
[2] https://elixir.bootlin.com/linux/v6.7-rc5/source/drivers/media/platform/renesas/vsp1/vsp1_dl.c#L863
Cheers,
Biju
^ permalink raw reply [flat|nested] 39+ messages in thread
* RE: [PATCH v15 3/5] drm: renesas: Add RZ/G2L DU Support
2023-12-15 12:58 ` Maxime Ripard
@ 2023-12-15 13:52 ` Biju Das
2023-12-15 14:18 ` Maxime Ripard
2023-12-15 14:19 ` Biju Das
0 siblings, 2 replies; 39+ messages in thread
From: Biju Das @ 2023-12-15 13:52 UTC (permalink / raw)
To: Maxime Ripard
Cc: Fabrizio Castro, biju.das.au, Magnus Damm, Geert Uytterhoeven,
Thomas Zimmermann, Prabhakar Mahadev Lad, dri-devel,
linux-renesas-soc, Kieran Bingham, Laurent Pinchart,
Jacopo Mondi
Hi Maxime Ripard,
> -----Original Message-----
> From: Maxime Ripard <mripard@kernel.org>
> Sent: Friday, December 15, 2023 12:58 PM
> Subject: Re: [PATCH v15 3/5] drm: renesas: Add RZ/G2L DU Support
>
> On Fri, Dec 15, 2023 at 11:37:07AM +0000, Biju Das wrote:
> > Hi Maxime Ripard,
> >
> > > -----Original Message-----
> > > From: Maxime Ripard <mripard@kernel.org>
> > > Sent: Friday, December 15, 2023 10:24 AM
> > > To: Biju Das <biju.das.jz@bp.renesas.com>
> > > Subject: Re: [PATCH v15 3/5] drm: renesas: Add RZ/G2L DU Support
> > >
> > > On Thu, Dec 14, 2023 at 03:24:17PM +0000, Biju Das wrote:
> > > > Hi Maxime Ripard,
> > > >
> > > > Thanks for the feedback.
> > > >
> > > > > -----Original Message-----
> > > > > From: Maxime Ripard <mripard@kernel.org>
> > > > > Sent: Wednesday, December 13, 2023 3:47 PM
> > > > > To: Biju Das <biju.das.jz@bp.renesas.com>
> > > > > Subject: Re: [PATCH v15 3/5] drm: renesas: Add RZ/G2L DU Support
> > > > >
> > > > > > + */
> > > > > > + rzg2l_du_crtc_get(rcrtc);
> > > > >
> > > > > That's a bit suspicious. Have you looked at
> > > > > drm_atomic_helper_commit_tail_rpm() ?
> > > >
> > > > Ok, I will drop this and start using
> > > > drm_atomic_helper_commit_tail_rpm()
> > > > instead of rzg2l_du_atomic_commit_tail().
> > >
> > > It was more of a suggestion, really. I'm not sure whether it works
> > > for you, but it usually addresses similar issues in drivers.
> >
> > I confirm, it is working in my case, even after removing
> > rzg2l_du_crtc_get() and using the helper function
> drm_atomic_helper_commit_tail_rpm().
> >
> > >
> > > > >
> > > > > > +static int rzg2l_du_crtc_enable_vblank(struct drm_crtc *crtc) {
> > > > > > + struct rzg2l_du_crtc *rcrtc = to_rzg2l_crtc(crtc);
> > > > > > +
> > > > > > + rcrtc->vblank_enable = true;
> > > > > > +
> > > > > > + return 0;
> > > > > > +}
> > > > > > +
> > > > > > +static void rzg2l_du_crtc_disable_vblank(struct drm_crtc *crtc)
> {
> > > > > > + struct rzg2l_du_crtc *rcrtc = to_rzg2l_crtc(crtc);
> > > > > > +
> > > > > > + rcrtc->vblank_enable = false; }
> > > > >
> > > > > You should enable / disable your interrupts here
> > > >
> > > > We don't have dedicated vblank IRQ for enabling/disabling vblank.
> > > >
> > > > vblank is handled by vspd.
> > > >
> > > > vspd is directly rendering images to display,
> > > > rcar_du_crtc_finish_page_flip() and drm_crtc_handle_vblank()
> > > > called in vspd's pageflip context.
> > > >
> > > > See rzg2l_du_vsp_complete()in rzg2l_du_vsp.c
> > >
> > > Sorry, I couldn't really get how the interrupt flow / vblank
> > > reporting is going to work. Could you explain it a bit more?
> >
> > We just need to handle vertical blanking in the VSP frame end handler.
> > See the code below.
> >
> > static void rzg2l_du_vsp_complete(void *private, unsigned int status,
> > u32 crc) {
> > struct rzg2l_du_crtc *crtc = private;
> >
> > if (crtc->vblank_enable)
> > drm_crtc_handle_vblank(&crtc->crtc);
> >
> > if (status & VSP1_DU_STATUS_COMPLETE)
> > rzg2l_du_crtc_finish_page_flip(crtc);
> >
> > drm_crtc_add_crc_entry(&crtc->crtc, false, 0, &crc); }
>
> Then we're back to the same question :)
>
> Why can't you mask the frame end interrupt?
We are masking interrupts.
[ 70.639139] #######rzg2l_du_crtc_disable_vblank#######
[ 70.650243] #########rzg2l_du_vsp_disable ############
[ 70.652003] ########## vsp1_wpf_stop###
Unmask is,
[ 176.354520] #######rzg2l_du_crtc_enable_vblank#######
[ 176.354922] #########rzg2l_du_vsp_atomic_flush ############
[ 176.355198] ########## wpf_configure_stream###
Cheers,
Biju
^ permalink raw reply [flat|nested] 39+ messages in thread
* Re: [PATCH v15 3/5] drm: renesas: Add RZ/G2L DU Support
2023-12-15 13:52 ` Biju Das
@ 2023-12-15 14:18 ` Maxime Ripard
2023-12-15 14:55 ` Biju Das
2023-12-15 14:19 ` Biju Das
1 sibling, 1 reply; 39+ messages in thread
From: Maxime Ripard @ 2023-12-15 14:18 UTC (permalink / raw)
To: Biju Das
Cc: Fabrizio Castro, biju.das.au, Magnus Damm, Geert Uytterhoeven,
Thomas Zimmermann, Prabhakar Mahadev Lad, dri-devel,
linux-renesas-soc, Kieran Bingham, Laurent Pinchart,
Jacopo Mondi
[-- Attachment #1: Type: text/plain, Size: 2339 bytes --]
On Fri, Dec 15, 2023 at 01:52:28PM +0000, Biju Das wrote:
> > > > > > > +static int rzg2l_du_crtc_enable_vblank(struct drm_crtc *crtc) {
> > > > > > > + struct rzg2l_du_crtc *rcrtc = to_rzg2l_crtc(crtc);
> > > > > > > +
> > > > > > > + rcrtc->vblank_enable = true;
> > > > > > > +
> > > > > > > + return 0;
> > > > > > > +}
> > > > > > > +
> > > > > > > +static void rzg2l_du_crtc_disable_vblank(struct drm_crtc *crtc)
> > {
> > > > > > > + struct rzg2l_du_crtc *rcrtc = to_rzg2l_crtc(crtc);
> > > > > > > +
> > > > > > > + rcrtc->vblank_enable = false; }
> > > > > >
> > > > > > You should enable / disable your interrupts here
> > > > >
> > > > > We don't have dedicated vblank IRQ for enabling/disabling vblank.
> > > > >
> > > > > vblank is handled by vspd.
> > > > >
> > > > > vspd is directly rendering images to display,
> > > > > rcar_du_crtc_finish_page_flip() and drm_crtc_handle_vblank()
> > > > > called in vspd's pageflip context.
> > > > >
> > > > > See rzg2l_du_vsp_complete()in rzg2l_du_vsp.c
> > > >
> > > > Sorry, I couldn't really get how the interrupt flow / vblank
> > > > reporting is going to work. Could you explain it a bit more?
> > >
> > > We just need to handle vertical blanking in the VSP frame end handler.
> > > See the code below.
> > >
> > > static void rzg2l_du_vsp_complete(void *private, unsigned int status,
> > > u32 crc) {
> > > struct rzg2l_du_crtc *crtc = private;
> > >
> > > if (crtc->vblank_enable)
> > > drm_crtc_handle_vblank(&crtc->crtc);
> > >
> > > if (status & VSP1_DU_STATUS_COMPLETE)
> > > rzg2l_du_crtc_finish_page_flip(crtc);
> > >
> > > drm_crtc_add_crc_entry(&crtc->crtc, false, 0, &crc); }
> >
> > Then we're back to the same question :)
> >
> > Why can't you mask the frame end interrupt?
>
> We are masking interrupts.
>
> [ 70.639139] #######rzg2l_du_crtc_disable_vblank#######
> [ 70.650243] #########rzg2l_du_vsp_disable ############
> [ 70.652003] ########## vsp1_wpf_stop###
>
> Unmask is,
>
> [ 176.354520] #######rzg2l_du_crtc_enable_vblank#######
> [ 176.354922] #########rzg2l_du_vsp_atomic_flush ############
> [ 176.355198] ########## wpf_configure_stream###
Sorry, my question was why aren't you unmasking and masking them in the
enable/disable_vblank hooks of the CRTC.
Maxime
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
^ permalink raw reply [flat|nested] 39+ messages in thread
* RE: [PATCH v15 3/5] drm: renesas: Add RZ/G2L DU Support
2023-12-15 13:52 ` Biju Das
2023-12-15 14:18 ` Maxime Ripard
@ 2023-12-15 14:19 ` Biju Das
2023-12-15 14:23 ` Maxime Ripard
1 sibling, 1 reply; 39+ messages in thread
From: Biju Das @ 2023-12-15 14:19 UTC (permalink / raw)
To: Maxime Ripard
Cc: Fabrizio Castro, biju.das.au, Magnus Damm, Geert Uytterhoeven,
Thomas Zimmermann, Prabhakar Mahadev Lad, dri-devel,
linux-renesas-soc, Kieran Bingham, Laurent Pinchart,
Jacopo Mondi
Hi Maxime Ripard,
> -----Original Message-----
> From: Biju Das
> Sent: Friday, December 15, 2023 1:52 PM
> Subject: RE: [PATCH v15 3/5] drm: renesas: Add RZ/G2L DU Support
>
> Hi Maxime Ripard,
>
> > -----Original Message-----
> > From: Maxime Ripard <mripard@kernel.org>
> > Sent: Friday, December 15, 2023 12:58 PM
> > Subject: Re: [PATCH v15 3/5] drm: renesas: Add RZ/G2L DU Support
> >
> > On Fri, Dec 15, 2023 at 11:37:07AM +0000, Biju Das wrote:
> > > Hi Maxime Ripard,
> > >
> > > > -----Original Message-----
> > > > From: Maxime Ripard <mripard@kernel.org>
> > > > Sent: Friday, December 15, 2023 10:24 AM
> > > > To: Biju Das <biju.das.jz@bp.renesas.com>
> > > > Subject: Re: [PATCH v15 3/5] drm: renesas: Add RZ/G2L DU Support
> > > >
> > > > On Thu, Dec 14, 2023 at 03:24:17PM +0000, Biju Das wrote:
> > > > > Hi Maxime Ripard,
> > > > >
> > > > > Thanks for the feedback.
> > > > >
> > > > > > -----Original Message-----
> > > > > > From: Maxime Ripard <mripard@kernel.org>
> > > > > > Sent: Wednesday, December 13, 2023 3:47 PM
> > > > > > To: Biju Das <biju.das.jz@bp.renesas.com>
> > > > > > Subject: Re: [PATCH v15 3/5] drm: renesas: Add RZ/G2L DU
> > > > > > Support
> > > > > >
> > > > > > > + */
> > > > > > > + rzg2l_du_crtc_get(rcrtc);
> > > > > >
> > > > > > That's a bit suspicious. Have you looked at
> > > > > > drm_atomic_helper_commit_tail_rpm() ?
> > > > >
> > > > > Ok, I will drop this and start using
> > > > > drm_atomic_helper_commit_tail_rpm()
> > > > > instead of rzg2l_du_atomic_commit_tail().
> > > >
> > > > It was more of a suggestion, really. I'm not sure whether it works
> > > > for you, but it usually addresses similar issues in drivers.
> > >
> > > I confirm, it is working in my case, even after removing
> > > rzg2l_du_crtc_get() and using the helper function
> > drm_atomic_helper_commit_tail_rpm().
> > >
> > > >
> > > > > >
> > > > > > > +static int rzg2l_du_crtc_enable_vblank(struct drm_crtc *crtc)
> {
> > > > > > > + struct rzg2l_du_crtc *rcrtc = to_rzg2l_crtc(crtc);
> > > > > > > +
> > > > > > > + rcrtc->vblank_enable = true;
> > > > > > > +
> > > > > > > + return 0;
> > > > > > > +}
> > > > > > > +
> > > > > > > +static void rzg2l_du_crtc_disable_vblank(struct drm_crtc
> > > > > > > +*crtc)
> > {
> > > > > > > + struct rzg2l_du_crtc *rcrtc = to_rzg2l_crtc(crtc);
> > > > > > > +
> > > > > > > + rcrtc->vblank_enable = false; }
> > > > > >
> > > > > > You should enable / disable your interrupts here
> > > > >
> > > > > We don't have dedicated vblank IRQ for enabling/disabling vblank.
> > > > >
> > > > > vblank is handled by vspd.
> > > > >
> > > > > vspd is directly rendering images to display,
> > > > > rcar_du_crtc_finish_page_flip() and drm_crtc_handle_vblank()
> > > > > called in vspd's pageflip context.
> > > > >
> > > > > See rzg2l_du_vsp_complete()in rzg2l_du_vsp.c
> > > >
> > > > Sorry, I couldn't really get how the interrupt flow / vblank
> > > > reporting is going to work. Could you explain it a bit more?
> > >
> > > We just need to handle vertical blanking in the VSP frame end handler.
> > > See the code below.
> > >
> > > static void rzg2l_du_vsp_complete(void *private, unsigned int
> > > status,
> > > u32 crc) {
> > > struct rzg2l_du_crtc *crtc = private;
> > >
> > > if (crtc->vblank_enable)
> > > drm_crtc_handle_vblank(&crtc->crtc);
> > >
> > > if (status & VSP1_DU_STATUS_COMPLETE)
> > > rzg2l_du_crtc_finish_page_flip(crtc);
> > >
> > > drm_crtc_add_crc_entry(&crtc->crtc, false, 0, &crc); }
> >
> > Then we're back to the same question :)
> >
> > Why can't you mask the frame end interrupt?
>
> We are masking interrupts.
>
> [ 70.639139] #######rzg2l_du_crtc_disable_vblank#######
> [ 70.650243] #########rzg2l_du_vsp_disable ############
> [ 70.652003] ########## vsp1_wpf_stop###
>
> Unmask is,
>
> [ 176.354520] #######rzg2l_du_crtc_enable_vblank#######
> [ 176.354922] #########rzg2l_du_vsp_atomic_flush ############
> [ 176.355198] ########## wpf_configure_stream###
>
Shall I send V16 now as I am going for xmas vacation or
Do you prefer to wait?
Cheers,
Biju
^ permalink raw reply [flat|nested] 39+ messages in thread
* Re: [PATCH v15 3/5] drm: renesas: Add RZ/G2L DU Support
2023-12-15 14:19 ` Biju Das
@ 2023-12-15 14:23 ` Maxime Ripard
2023-12-15 14:42 ` Biju Das
0 siblings, 1 reply; 39+ messages in thread
From: Maxime Ripard @ 2023-12-15 14:23 UTC (permalink / raw)
To: Biju Das
Cc: Fabrizio Castro, biju.das.au, Magnus Damm, Geert Uytterhoeven,
Thomas Zimmermann, Prabhakar Mahadev Lad, dri-devel,
linux-renesas-soc, Kieran Bingham, Laurent Pinchart,
Jacopo Mondi
[-- Attachment #1: Type: text/plain, Size: 4610 bytes --]
On Fri, Dec 15, 2023 at 02:19:25PM +0000, Biju Das wrote:
> Hi Maxime Ripard,
>
> > -----Original Message-----
> > From: Biju Das
> > Sent: Friday, December 15, 2023 1:52 PM
> > Subject: RE: [PATCH v15 3/5] drm: renesas: Add RZ/G2L DU Support
> >
> > Hi Maxime Ripard,
> >
> > > -----Original Message-----
> > > From: Maxime Ripard <mripard@kernel.org>
> > > Sent: Friday, December 15, 2023 12:58 PM
> > > Subject: Re: [PATCH v15 3/5] drm: renesas: Add RZ/G2L DU Support
> > >
> > > On Fri, Dec 15, 2023 at 11:37:07AM +0000, Biju Das wrote:
> > > > Hi Maxime Ripard,
> > > >
> > > > > -----Original Message-----
> > > > > From: Maxime Ripard <mripard@kernel.org>
> > > > > Sent: Friday, December 15, 2023 10:24 AM
> > > > > To: Biju Das <biju.das.jz@bp.renesas.com>
> > > > > Subject: Re: [PATCH v15 3/5] drm: renesas: Add RZ/G2L DU Support
> > > > >
> > > > > On Thu, Dec 14, 2023 at 03:24:17PM +0000, Biju Das wrote:
> > > > > > Hi Maxime Ripard,
> > > > > >
> > > > > > Thanks for the feedback.
> > > > > >
> > > > > > > -----Original Message-----
> > > > > > > From: Maxime Ripard <mripard@kernel.org>
> > > > > > > Sent: Wednesday, December 13, 2023 3:47 PM
> > > > > > > To: Biju Das <biju.das.jz@bp.renesas.com>
> > > > > > > Subject: Re: [PATCH v15 3/5] drm: renesas: Add RZ/G2L DU
> > > > > > > Support
> > > > > > >
> > > > > > > > + */
> > > > > > > > + rzg2l_du_crtc_get(rcrtc);
> > > > > > >
> > > > > > > That's a bit suspicious. Have you looked at
> > > > > > > drm_atomic_helper_commit_tail_rpm() ?
> > > > > >
> > > > > > Ok, I will drop this and start using
> > > > > > drm_atomic_helper_commit_tail_rpm()
> > > > > > instead of rzg2l_du_atomic_commit_tail().
> > > > >
> > > > > It was more of a suggestion, really. I'm not sure whether it works
> > > > > for you, but it usually addresses similar issues in drivers.
> > > >
> > > > I confirm, it is working in my case, even after removing
> > > > rzg2l_du_crtc_get() and using the helper function
> > > drm_atomic_helper_commit_tail_rpm().
> > > >
> > > > >
> > > > > > >
> > > > > > > > +static int rzg2l_du_crtc_enable_vblank(struct drm_crtc *crtc)
> > {
> > > > > > > > + struct rzg2l_du_crtc *rcrtc = to_rzg2l_crtc(crtc);
> > > > > > > > +
> > > > > > > > + rcrtc->vblank_enable = true;
> > > > > > > > +
> > > > > > > > + return 0;
> > > > > > > > +}
> > > > > > > > +
> > > > > > > > +static void rzg2l_du_crtc_disable_vblank(struct drm_crtc
> > > > > > > > +*crtc)
> > > {
> > > > > > > > + struct rzg2l_du_crtc *rcrtc = to_rzg2l_crtc(crtc);
> > > > > > > > +
> > > > > > > > + rcrtc->vblank_enable = false; }
> > > > > > >
> > > > > > > You should enable / disable your interrupts here
> > > > > >
> > > > > > We don't have dedicated vblank IRQ for enabling/disabling vblank.
> > > > > >
> > > > > > vblank is handled by vspd.
> > > > > >
> > > > > > vspd is directly rendering images to display,
> > > > > > rcar_du_crtc_finish_page_flip() and drm_crtc_handle_vblank()
> > > > > > called in vspd's pageflip context.
> > > > > >
> > > > > > See rzg2l_du_vsp_complete()in rzg2l_du_vsp.c
> > > > >
> > > > > Sorry, I couldn't really get how the interrupt flow / vblank
> > > > > reporting is going to work. Could you explain it a bit more?
> > > >
> > > > We just need to handle vertical blanking in the VSP frame end handler.
> > > > See the code below.
> > > >
> > > > static void rzg2l_du_vsp_complete(void *private, unsigned int
> > > > status,
> > > > u32 crc) {
> > > > struct rzg2l_du_crtc *crtc = private;
> > > >
> > > > if (crtc->vblank_enable)
> > > > drm_crtc_handle_vblank(&crtc->crtc);
> > > >
> > > > if (status & VSP1_DU_STATUS_COMPLETE)
> > > > rzg2l_du_crtc_finish_page_flip(crtc);
> > > >
> > > > drm_crtc_add_crc_entry(&crtc->crtc, false, 0, &crc); }
> > >
> > > Then we're back to the same question :)
> > >
> > > Why can't you mask the frame end interrupt?
> >
> > We are masking interrupts.
> >
> > [ 70.639139] #######rzg2l_du_crtc_disable_vblank#######
> > [ 70.650243] #########rzg2l_du_vsp_disable ############
> > [ 70.652003] ########## vsp1_wpf_stop###
> >
> > Unmask is,
> >
> > [ 176.354520] #######rzg2l_du_crtc_enable_vblank#######
> > [ 176.354922] #########rzg2l_du_vsp_atomic_flush ############
> > [ 176.355198] ########## wpf_configure_stream###
> >
>
> Shall I send V16 now as I am going for xmas vacation or
> Do you prefer to wait?
Waiting is fine, most of us are going to be in holidays too so you won't
get any reviews either :)
Maxime
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
^ permalink raw reply [flat|nested] 39+ messages in thread
* Re: [PATCH v15 3/5] drm: renesas: Add RZ/G2L DU Support
2023-12-15 13:25 ` Biju Das
@ 2023-12-15 14:24 ` Maxime Ripard
2024-01-04 14:34 ` Biju Das
0 siblings, 1 reply; 39+ messages in thread
From: Maxime Ripard @ 2023-12-15 14:24 UTC (permalink / raw)
To: Biju Das
Cc: Fabrizio Castro, biju.das.au, Magnus Damm, Geert Uytterhoeven,
Thomas Zimmermann, Prabhakar Mahadev Lad, dri-devel,
linux-renesas-soc, Kieran Bingham, Laurent Pinchart,
Jacopo Mondi
[-- Attachment #1: Type: text/plain, Size: 1444 bytes --]
On Fri, Dec 15, 2023 at 01:25:48PM +0000, Biju Das wrote:
> Hi Maxime Ripard,
>
> > -----Original Message-----
> > From: Maxime Ripard <mripard@kernel.org>
> > Sent: Friday, December 15, 2023 10:24 AM
> > Subject: Re: [PATCH v15 3/5] drm: renesas: Add RZ/G2L DU Support
> >
> > On Thu, Dec 14, 2023 at 03:24:17PM +0000, Biju Das wrote:
> > > Hi Maxime Ripard,
> > >
> > > Thanks for the feedback.
> >
> > Thanks, that's super helpful. The architecture is thus similar to vc4
> >
> > Some general questions related to bugs we had at some point with vc4:
> >
> > * Where is the display list stored? In RAM or in a dedicated SRAM?
>
> [1] It is in DDR (RAM).
>
> >
> > * Are the pointer to the current display list latched?
> >
> > * Is the display list itself latched? If it's not, what happens when
> > the display list is changed while the frame is being generated?
>
> There is some protocol defined for SW side and HW side for updating display list
> See [1] 33.4.8.1 Operation flow of VSPD and DU.
>
> All the display list operations are manged here[2]
>
> [1] https://www.renesas.com/us/en/document/mah/rzg2l-group-rzg2lc-group-users-manual-hardware-0
>
> [2] https://elixir.bootlin.com/linux/v6.7-rc5/source/drivers/media/platform/renesas/vsp1/vsp1_dl.c#L863
I'm sorry, but I'm not going to read a 3500+ to try to figure it out.
Could you answer the questions above?
Maxime
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
^ permalink raw reply [flat|nested] 39+ messages in thread
* RE: [PATCH v15 3/5] drm: renesas: Add RZ/G2L DU Support
2023-12-15 14:23 ` Maxime Ripard
@ 2023-12-15 14:42 ` Biju Das
0 siblings, 0 replies; 39+ messages in thread
From: Biju Das @ 2023-12-15 14:42 UTC (permalink / raw)
To: Maxime Ripard
Cc: Fabrizio Castro, biju.das.au, Magnus Damm, Geert Uytterhoeven,
Thomas Zimmermann, Prabhakar Mahadev Lad, dri-devel,
linux-renesas-soc, Kieran Bingham, Laurent Pinchart,
Jacopo Mondi
Hi Maxime Ripard,
> -----Original Message-----
> From: Maxime Ripard <mripard@kernel.org>
> Sent: Friday, December 15, 2023 2:23 PM
> Subject: Re: [PATCH v15 3/5] drm: renesas: Add RZ/G2L DU Support
>
> On Fri, Dec 15, 2023 at 02:19:25PM +0000, Biju Das wrote:
> > Hi Maxime Ripard,
> >
> > > -----Original Message-----
> > > From: Biju Das
> > > Sent: Friday, December 15, 2023 1:52 PM
> > > Subject: RE: [PATCH v15 3/5] drm: renesas: Add RZ/G2L DU Support
> > >
> > > Hi Maxime Ripard,
> > >
> > > > -----Original Message-----
> > > > From: Maxime Ripard <mripard@kernel.org>
> > > > Sent: Friday, December 15, 2023 12:58 PM
> > > > Subject: Re: [PATCH v15 3/5] drm: renesas: Add RZ/G2L DU Support
> > > >
> > > > On Fri, Dec 15, 2023 at 11:37:07AM +0000, Biju Das wrote:
> > > > > Hi Maxime Ripard,
> > > > >
> > > > > > -----Original Message-----
> > > > > > From: Maxime Ripard <mripard@kernel.org>
> > > > > > Sent: Friday, December 15, 2023 10:24 AM
> > > > > > To: Biju Das <biju.das.jz@bp.renesas.com>
> > > > > > Subject: Re: [PATCH v15 3/5] drm: renesas: Add RZ/G2L DU
> > > > > > Support
> > > > > >
> > > > > > On Thu, Dec 14, 2023 at 03:24:17PM +0000, Biju Das wrote:
> > > > > > > Hi Maxime Ripard,
> > > > > > >
> > > > > > > Thanks for the feedback.
> > > > > > >
> > > > > > > > -----Original Message-----
> > > > > > > > From: Maxime Ripard <mripard@kernel.org>
> > > > > > > > Sent: Wednesday, December 13, 2023 3:47 PM
> > > > > > > > To: Biju Das <biju.das.jz@bp.renesas.com>
> > > > > > > > Subject: Re: [PATCH v15 3/5] drm: renesas: Add RZ/G2L DU
> > > > > > > > Support
> > > > > > > >
> > > > > > > > > + */
> > > > > > > > > + rzg2l_du_crtc_get(rcrtc);
> > > > > > > >
> > > > > > > > That's a bit suspicious. Have you looked at
> > > > > > > > drm_atomic_helper_commit_tail_rpm() ?
> > > > > > >
> > > > > > > Ok, I will drop this and start using
> > > > > > > drm_atomic_helper_commit_tail_rpm()
> > > > > > > instead of rzg2l_du_atomic_commit_tail().
> > > > > >
> > > > > > It was more of a suggestion, really. I'm not sure whether it
> > > > > > works for you, but it usually addresses similar issues in
> drivers.
> > > > >
> > > > > I confirm, it is working in my case, even after removing
> > > > > rzg2l_du_crtc_get() and using the helper function
> > > > drm_atomic_helper_commit_tail_rpm().
> > > > >
> > > > > >
> > > > > > > >
> > > > > > > > > +static int rzg2l_du_crtc_enable_vblank(struct drm_crtc
> > > > > > > > > +*crtc)
> > > {
> > > > > > > > > + struct rzg2l_du_crtc *rcrtc = to_rzg2l_crtc(crtc);
> > > > > > > > > +
> > > > > > > > > + rcrtc->vblank_enable = true;
> > > > > > > > > +
> > > > > > > > > + return 0;
> > > > > > > > > +}
> > > > > > > > > +
> > > > > > > > > +static void rzg2l_du_crtc_disable_vblank(struct
> > > > > > > > > +drm_crtc
> > > > > > > > > +*crtc)
> > > > {
> > > > > > > > > + struct rzg2l_du_crtc *rcrtc = to_rzg2l_crtc(crtc);
> > > > > > > > > +
> > > > > > > > > + rcrtc->vblank_enable = false; }
> > > > > > > >
> > > > > > > > You should enable / disable your interrupts here
> > > > > > >
> > > > > > > We don't have dedicated vblank IRQ for enabling/disabling
> vblank.
> > > > > > >
> > > > > > > vblank is handled by vspd.
> > > > > > >
> > > > > > > vspd is directly rendering images to display,
> > > > > > > rcar_du_crtc_finish_page_flip() and drm_crtc_handle_vblank()
> > > > > > > called in vspd's pageflip context.
> > > > > > >
> > > > > > > See rzg2l_du_vsp_complete()in rzg2l_du_vsp.c
> > > > > >
> > > > > > Sorry, I couldn't really get how the interrupt flow / vblank
> > > > > > reporting is going to work. Could you explain it a bit more?
> > > > >
> > > > > We just need to handle vertical blanking in the VSP frame end
> handler.
> > > > > See the code below.
> > > > >
> > > > > static void rzg2l_du_vsp_complete(void *private, unsigned int
> > > > > status,
> > > > > u32 crc) {
> > > > > struct rzg2l_du_crtc *crtc = private;
> > > > >
> > > > > if (crtc->vblank_enable)
> > > > > drm_crtc_handle_vblank(&crtc->crtc);
> > > > >
> > > > > if (status & VSP1_DU_STATUS_COMPLETE)
> > > > > rzg2l_du_crtc_finish_page_flip(crtc);
> > > > >
> > > > > drm_crtc_add_crc_entry(&crtc->crtc, false, 0, &crc); }
> > > >
> > > > Then we're back to the same question :)
> > > >
> > > > Why can't you mask the frame end interrupt?
> > >
> > > We are masking interrupts.
> > >
> > > [ 70.639139] #######rzg2l_du_crtc_disable_vblank#######
> > > [ 70.650243] #########rzg2l_du_vsp_disable ############
> > > [ 70.652003] ########## vsp1_wpf_stop###
> > >
> > > Unmask is,
> > >
> > > [ 176.354520] #######rzg2l_du_crtc_enable_vblank#######
> > > [ 176.354922] #########rzg2l_du_vsp_atomic_flush ############ [
> > > 176.355198] ########## wpf_configure_stream###
> > >
> >
> > Shall I send V16 now as I am going for xmas vacation or Do you prefer
> > to wait?
>
> Waiting is fine, most of us are going to be in holidays too so you won't
> get any reviews either :)
Agreed.
Cheers,
Biju
^ permalink raw reply [flat|nested] 39+ messages in thread
* RE: [PATCH v15 3/5] drm: renesas: Add RZ/G2L DU Support
2023-12-15 14:18 ` Maxime Ripard
@ 2023-12-15 14:55 ` Biju Das
2023-12-15 14:58 ` Biju Das
2024-01-04 14:17 ` Biju Das
0 siblings, 2 replies; 39+ messages in thread
From: Biju Das @ 2023-12-15 14:55 UTC (permalink / raw)
To: Maxime Ripard
Cc: Fabrizio Castro, biju.das.au, Magnus Damm, Geert Uytterhoeven,
Thomas Zimmermann, Prabhakar Mahadev Lad, dri-devel,
linux-renesas-soc, Kieran Bingham, Laurent Pinchart,
Jacopo Mondi
Hi Maxime Ripard,
> -----Original Message-----
> From: Maxime Ripard <mripard@kernel.org>
> Sent: Friday, December 15, 2023 2:18 PM
> Subject: Re: [PATCH v15 3/5] drm: renesas: Add RZ/G2L DU Support
>
> On Fri, Dec 15, 2023 at 01:52:28PM +0000, Biju Das wrote:
> > > > > > > > +static int rzg2l_du_crtc_enable_vblank(struct drm_crtc
> *crtc) {
> > > > > > > > + struct rzg2l_du_crtc *rcrtc = to_rzg2l_crtc(crtc);
> > > > > > > > +
> > > > > > > > + rcrtc->vblank_enable = true;
> > > > > > > > +
> > > > > > > > + return 0;
> > > > > > > > +}
> > > > > > > > +
> > > > > > > > +static void rzg2l_du_crtc_disable_vblank(struct drm_crtc
> > > > > > > > +*crtc)
> > > {
> > > > > > > > + struct rzg2l_du_crtc *rcrtc = to_rzg2l_crtc(crtc);
> > > > > > > > +
> > > > > > > > + rcrtc->vblank_enable = false; }
> > > > > > >
> > > > > > > You should enable / disable your interrupts here
> > > > > >
> > > > > > We don't have dedicated vblank IRQ for enabling/disabling
> vblank.
> > > > > >
> > > > > > vblank is handled by vspd.
> > > > > >
> > > > > > vspd is directly rendering images to display,
> > > > > > rcar_du_crtc_finish_page_flip() and drm_crtc_handle_vblank()
> > > > > > called in vspd's pageflip context.
> > > > > >
> > > > > > See rzg2l_du_vsp_complete()in rzg2l_du_vsp.c
> > > > >
> > > > > Sorry, I couldn't really get how the interrupt flow / vblank
> > > > > reporting is going to work. Could you explain it a bit more?
> > > >
> > > > We just need to handle vertical blanking in the VSP frame end
> handler.
> > > > See the code below.
> > > >
> > > > static void rzg2l_du_vsp_complete(void *private, unsigned int
> > > > status,
> > > > u32 crc) {
> > > > struct rzg2l_du_crtc *crtc = private;
> > > >
> > > > if (crtc->vblank_enable)
> > > > drm_crtc_handle_vblank(&crtc->crtc);
> > > >
> > > > if (status & VSP1_DU_STATUS_COMPLETE)
> > > > rzg2l_du_crtc_finish_page_flip(crtc);
> > > >
> > > > drm_crtc_add_crc_entry(&crtc->crtc, false, 0, &crc); }
> > >
> > > Then we're back to the same question :)
> > >
> > > Why can't you mask the frame end interrupt?
> >
> > We are masking interrupts.
> >
> > [ 70.639139] #######rzg2l_du_crtc_disable_vblank#######
> > [ 70.650243] #########rzg2l_du_vsp_disable ############
> > [ 70.652003] ########## vsp1_wpf_stop###
> >
> > Unmask is,
> >
> > [ 176.354520] #######rzg2l_du_crtc_enable_vblank#######
> > [ 176.354922] #########rzg2l_du_vsp_atomic_flush ############ [
> > 176.355198] ########## wpf_configure_stream###
>
> Sorry, my question was why aren't you unmasking and masking them in the
> enable/disable_vblank hooks of the CRTC.
I have n't tried that. Will try and provide feedback.
Currently the IRQ source belongs to VSPD in media subsystem.
So I need to export an API though vsp1_drm and test it.
Currently we disable IRQ in rzg2l_du_crtc_atomic_disable() context
And enable IRQ in rzg2l_du_vsp_atomic_flush().
Cheers,
Biju
^ permalink raw reply [flat|nested] 39+ messages in thread
* RE: [PATCH v15 3/5] drm: renesas: Add RZ/G2L DU Support
2023-12-15 14:55 ` Biju Das
@ 2023-12-15 14:58 ` Biju Das
2024-01-04 14:17 ` Biju Das
1 sibling, 0 replies; 39+ messages in thread
From: Biju Das @ 2023-12-15 14:58 UTC (permalink / raw)
To: Maxime Ripard
Cc: Fabrizio Castro, biju.das.au, Magnus Damm, Geert Uytterhoeven,
Thomas Zimmermann, Prabhakar Mahadev Lad, dri-devel,
linux-renesas-soc, Kieran Bingham, Laurent Pinchart,
Jacopo Mondi
> Subject: RE: [PATCH v15 3/5] drm: renesas: Add RZ/G2L DU Support
>
> Hi Maxime Ripard,
>
> > -----Original Message-----
> > From: Maxime Ripard <mripard@kernel.org>
> > Sent: Friday, December 15, 2023 2:18 PM
> > Subject: Re: [PATCH v15 3/5] drm: renesas: Add RZ/G2L DU Support
> >
> > On Fri, Dec 15, 2023 at 01:52:28PM +0000, Biju Das wrote:
> > > > > > > > > +static int rzg2l_du_crtc_enable_vblank(struct drm_crtc
> > *crtc) {
> > > > > > > > > + struct rzg2l_du_crtc *rcrtc = to_rzg2l_crtc(crtc);
> > > > > > > > > +
> > > > > > > > > + rcrtc->vblank_enable = true;
> > > > > > > > > +
> > > > > > > > > + return 0;
> > > > > > > > > +}
> > > > > > > > > +
> > > > > > > > > +static void rzg2l_du_crtc_disable_vblank(struct
> > > > > > > > > +drm_crtc
> > > > > > > > > +*crtc)
> > > > {
> > > > > > > > > + struct rzg2l_du_crtc *rcrtc = to_rzg2l_crtc(crtc);
> > > > > > > > > +
> > > > > > > > > + rcrtc->vblank_enable = false; }
> > > > > > > >
> > > > > > > > You should enable / disable your interrupts here
> > > > > > >
> > > > > > > We don't have dedicated vblank IRQ for enabling/disabling
> > vblank.
> > > > > > >
> > > > > > > vblank is handled by vspd.
> > > > > > >
> > > > > > > vspd is directly rendering images to display,
> > > > > > > rcar_du_crtc_finish_page_flip() and drm_crtc_handle_vblank()
> > > > > > > called in vspd's pageflip context.
> > > > > > >
> > > > > > > See rzg2l_du_vsp_complete()in rzg2l_du_vsp.c
> > > > > >
> > > > > > Sorry, I couldn't really get how the interrupt flow / vblank
> > > > > > reporting is going to work. Could you explain it a bit more?
> > > > >
> > > > > We just need to handle vertical blanking in the VSP frame end
> > handler.
> > > > > See the code below.
> > > > >
> > > > > static void rzg2l_du_vsp_complete(void *private, unsigned int
> > > > > status,
> > > > > u32 crc) {
> > > > > struct rzg2l_du_crtc *crtc = private;
> > > > >
> > > > > if (crtc->vblank_enable)
> > > > > drm_crtc_handle_vblank(&crtc->crtc);
> > > > >
> > > > > if (status & VSP1_DU_STATUS_COMPLETE)
> > > > > rzg2l_du_crtc_finish_page_flip(crtc);
> > > > >
> > > > > drm_crtc_add_crc_entry(&crtc->crtc, false, 0, &crc); }
> > > >
> > > > Then we're back to the same question :)
> > > >
> > > > Why can't you mask the frame end interrupt?
> > >
> > > We are masking interrupts.
> > >
> > > [ 70.639139] #######rzg2l_du_crtc_disable_vblank#######
> > > [ 70.650243] #########rzg2l_du_vsp_disable ############
> > > [ 70.652003] ########## vsp1_wpf_stop###
> > >
> > > Unmask is,
> > >
> > > [ 176.354520] #######rzg2l_du_crtc_enable_vblank#######
> > > [ 176.354922] #########rzg2l_du_vsp_atomic_flush ############ [
> > > 176.355198] ########## wpf_configure_stream###
> >
> > Sorry, my question was why aren't you unmasking and masking them in
> > the enable/disable_vblank hooks of the CRTC.
>
> I have n't tried that. Will try and provide feedback.
>
> Currently the IRQ source belongs to VSPD in media subsystem.
> So I need to export an API though vsp1_drm and test it.
>
>
> Currently we disable IRQ in rzg2l_du_crtc_atomic_disable() context
>
> And enable IRQ in rzg2l_du_vsp_atomic_flush().
Typo, it is rzg2l_du_crtc_atomic_flush().
Cheers,
Biju
^ permalink raw reply [flat|nested] 39+ messages in thread
* RE: [PATCH v15 3/5] drm: renesas: Add RZ/G2L DU Support
2023-12-15 14:55 ` Biju Das
2023-12-15 14:58 ` Biju Das
@ 2024-01-04 14:17 ` Biju Das
2024-01-10 19:38 ` Laurent Pinchart
1 sibling, 1 reply; 39+ messages in thread
From: Biju Das @ 2024-01-04 14:17 UTC (permalink / raw)
To: Maxime Ripard, Laurent Pinchart
Cc: Fabrizio Castro, biju.das.au, Magnus Damm, Geert Uytterhoeven,
Thomas Zimmermann, Prabhakar Mahadev Lad, dri-devel,
linux-renesas-soc, Kieran Bingham, Laurent Pinchart,
Jacopo Mondi, linux-media
Hi Maxime Ripard,
> -----Original Message-----
> From: Biju Das <biju.das.jz@bp.renesas.com>
> Sent: Friday, December 15, 2023 2:56 PM
> Subject: RE: [PATCH v15 3/5] drm: renesas: Add RZ/G2L DU Support
>
> > -----Original Message-----
> > From: Maxime Ripard <mripard@kernel.org>
> > Sent: Friday, December 15, 2023 2:18 PM
> > Subject: Re: [PATCH v15 3/5] drm: renesas: Add RZ/G2L DU Support
> >
> > On Fri, Dec 15, 2023 at 01:52:28PM +0000, Biju Das wrote:
> > > > > > > > > +static int rzg2l_du_crtc_enable_vblank(struct drm_crtc
> > *crtc) {
> > > > > > > > > + struct rzg2l_du_crtc *rcrtc = to_rzg2l_crtc(crtc);
> > > > > > > > > +
> > > > > > > > > + rcrtc->vblank_enable = true;
> > > > > > > > > +
> > > > > > > > > + return 0;
> > > > > > > > > +}
> > > > > > > > > +
> > > > > > > > > +static void rzg2l_du_crtc_disable_vblank(struct
> > > > > > > > > +drm_crtc
> > > > > > > > > +*crtc)
> > > > {
> > > > > > > > > + struct rzg2l_du_crtc *rcrtc = to_rzg2l_crtc(crtc);
> > > > > > > > > +
> > > > > > > > > + rcrtc->vblank_enable = false; }
> > > > > > > >
> > > > > > > > You should enable / disable your interrupts here
> > > > > > >
> > > > > > > We don't have dedicated vblank IRQ for enabling/disabling
> > vblank.
> > > > > > >
> > > > > > > vblank is handled by vspd.
> > > > > > >
> > > > > > > vspd is directly rendering images to display,
> > > > > > > rcar_du_crtc_finish_page_flip() and drm_crtc_handle_vblank()
> > > > > > > called in vspd's pageflip context.
> > > > > > >
> > > > > > > See rzg2l_du_vsp_complete()in rzg2l_du_vsp.c
> > > > > >
> > > > > > Sorry, I couldn't really get how the interrupt flow / vblank
> > > > > > reporting is going to work. Could you explain it a bit more?
> > > > >
> > > > > We just need to handle vertical blanking in the VSP frame end
> > handler.
> > > > > See the code below.
> > > > >
> > > > > static void rzg2l_du_vsp_complete(void *private, unsigned int
> > > > > status,
> > > > > u32 crc) {
> > > > > struct rzg2l_du_crtc *crtc = private;
> > > > >
> > > > > if (crtc->vblank_enable)
> > > > > drm_crtc_handle_vblank(&crtc->crtc);
> > > > >
> > > > > if (status & VSP1_DU_STATUS_COMPLETE)
> > > > > rzg2l_du_crtc_finish_page_flip(crtc);
> > > > >
> > > > > drm_crtc_add_crc_entry(&crtc->crtc, false, 0, &crc); }
> > > >
> > > > Then we're back to the same question :)
> > > >
> > > > Why can't you mask the frame end interrupt?
> > >
> > > We are masking interrupts.
> > >
> > > [ 70.639139] #######rzg2l_du_crtc_disable_vblank#######
> > > [ 70.650243] #########rzg2l_du_vsp_disable ############
> > > [ 70.652003] ########## vsp1_wpf_stop###
> > >
> > > Unmask is,
> > >
> > > [ 176.354520] #######rzg2l_du_crtc_enable_vblank#######
> > > [ 176.354922] #########rzg2l_du_vsp_atomic_flush ############ [
> > > 176.355198] ########## wpf_configure_stream###
> >
> > Sorry, my question was why aren't you unmasking and masking them in
> > the enable/disable_vblank hooks of the CRTC.
>
> I have n't tried that. Will try and provide feedback.
>
> Currently the IRQ source belongs to VSPD in media subsystem.
> So I need to export an API though vsp1_drm and test it.
>
+ linux-media
Laurent, are you ok with the below RZ/G2L specific patch[1] for enabling/disabling frame end interrupt in VSP driver?
Note:
I need to add a quirk for handling this only for RZ/G2L family as other SoCs have Vblank specific interrupt available in DU.
[1]
diff --git a/drivers/media/platform/renesas/vsp1/vsp1_drm.c b/drivers/media/platform/renesas/vsp1/vsp1_drm.c
index 9b087bd8df7d..39347c16bb27 100644
--- a/drivers/media/platform/renesas/vsp1/vsp1_drm.c
+++ b/drivers/media/platform/renesas/vsp1/vsp1_drm.c
@@ -936,6 +936,14 @@ void vsp1_du_unmap_sg(struct device *dev, struct sg_table *sgt)
}
EXPORT_SYMBOL_GPL(vsp1_du_unmap_sg);
+void vsp1_du_mask_frame_end_interrupt(struct device *dev, bool mask)
+{
+ struct vsp1_device *vsp1 = dev_get_drvdata(dev);
+
+ vsp1_write(vsp1, VI6_WPF_IRQ_ENB(0), mask ? 0 : VI6_WPF_IRQ_ENB_DFEE);
+}
+EXPORT_SYMBOL_GPL(vsp1_du_mask_frame_end_interrupt);
+
/* -----------------------------------------------------------------------------
* Initialization
*/
diff --git a/include/media/vsp1.h b/include/media/vsp1.h
index 48f4a5023d81..ccac48a6bdd2 100644
--- a/include/media/vsp1.h
+++ b/include/media/vsp1.h
@@ -117,4 +117,6 @@ void vsp1_du_atomic_flush(struct device *dev, unsigned int pipe_index,
int vsp1_du_map_sg(struct device *dev, struct sg_table *sgt);
void vsp1_du_unmap_sg(struct device *dev, struct sg_table *sgt);
+void vsp1_du_mask_frame_end_interrupt(struct device *dev, bool mask);
+
#endif /* __MEDIA_VSP1_H__ */
Cheers,
Biju
^ permalink raw reply related [flat|nested] 39+ messages in thread
* RE: [PATCH v15 3/5] drm: renesas: Add RZ/G2L DU Support
2023-12-15 14:24 ` Maxime Ripard
@ 2024-01-04 14:34 ` Biju Das
2024-01-10 16:14 ` Maxime Ripard
0 siblings, 1 reply; 39+ messages in thread
From: Biju Das @ 2024-01-04 14:34 UTC (permalink / raw)
To: Maxime Ripard
Cc: Fabrizio Castro, biju.das.au, Magnus Damm, Geert Uytterhoeven,
Thomas Zimmermann, Prabhakar Mahadev Lad, dri-devel,
linux-renesas-soc, Kieran Bingham, Laurent Pinchart,
Jacopo Mondi
Hi Maxime Ripard,
> -----Original Message-----
> From: Maxime Ripard <mripard@kernel.org>
> Sent: Friday, December 15, 2023 2:24 PM
> Subject: Re: [PATCH v15 3/5] drm: renesas: Add RZ/G2L DU Support
>
> On Fri, Dec 15, 2023 at 01:25:48PM +0000, Biju Das wrote:
> > Hi Maxime Ripard,
> >
> > > -----Original Message-----
> > > From: Maxime Ripard <mripard@kernel.org>
> > > Sent: Friday, December 15, 2023 10:24 AM
> > > Subject: Re: [PATCH v15 3/5] drm: renesas: Add RZ/G2L DU Support
> > >
> > > On Thu, Dec 14, 2023 at 03:24:17PM +0000, Biju Das wrote:
> > > > Hi Maxime Ripard,
> > > >
> > > > Thanks for the feedback.
> > >
> > > Thanks, that's super helpful. The architecture is thus similar to
> > > vc4
> > >
> > > Some general questions related to bugs we had at some point with vc4:
> > >
> > > * Where is the display list stored? In RAM or in a dedicated SRAM?
> >
> > [1] It is in DDR (RAM).
> >
> > >
> > > * Are the pointer to the current display list latched?
> > >
> > > * Is the display list itself latched? If it's not, what happens when
> > > the display list is changed while the frame is being generated?
> >
> > There is some protocol defined for SW side and HW side for updating
> > display list See [1] 33.4.8.1 Operation flow of VSPD and DU.
> >
> > All the display list operations are manged here[2]
> >
> > [1]
> > https://www.renesas.com/us/en/document/mah/rzg2l-group-rzg2lc-group-us
> > ers-manual-hardware-0
> >
> > [2]
> > https://elixir.bootlin.com/linux/v6.7-rc5/source/drivers/media/platfor
> > m/renesas/vsp1/vsp1_dl.c#L863
>
> I'm sorry, but I'm not going to read a 3500+ to try to figure it out.
> Could you answer the questions above?
The answer for your question is,
If a previous display list has been queued to the hardware but not
processed yet, the VSP can start processing it at any time. In that
case we can't replace the queued list by the new one, as we could
race with the hardware. We thus mark the update as pending, it will
be queued up to the hardware by the frame end interrupt handler.
Cheers,
Biju
^ permalink raw reply [flat|nested] 39+ messages in thread
* Re: [PATCH v15 3/5] drm: renesas: Add RZ/G2L DU Support
2024-01-04 14:34 ` Biju Das
@ 2024-01-10 16:14 ` Maxime Ripard
2024-01-10 17:58 ` Laurent Pinchart
0 siblings, 1 reply; 39+ messages in thread
From: Maxime Ripard @ 2024-01-10 16:14 UTC (permalink / raw)
To: Biju Das
Cc: Fabrizio Castro, biju.das.au, Magnus Damm, Geert Uytterhoeven,
Thomas Zimmermann, Prabhakar Mahadev Lad, dri-devel,
linux-renesas-soc, Kieran Bingham, Laurent Pinchart,
Jacopo Mondi
[-- Attachment #1: Type: text/plain, Size: 2503 bytes --]
On Thu, Jan 04, 2024 at 02:34:33PM +0000, Biju Das wrote:
> Hi Maxime Ripard,
>
> > -----Original Message-----
> > From: Maxime Ripard <mripard@kernel.org>
> > Sent: Friday, December 15, 2023 2:24 PM
> > Subject: Re: [PATCH v15 3/5] drm: renesas: Add RZ/G2L DU Support
> >
> > On Fri, Dec 15, 2023 at 01:25:48PM +0000, Biju Das wrote:
> > > Hi Maxime Ripard,
> > >
> > > > -----Original Message-----
> > > > From: Maxime Ripard <mripard@kernel.org>
> > > > Sent: Friday, December 15, 2023 10:24 AM
> > > > Subject: Re: [PATCH v15 3/5] drm: renesas: Add RZ/G2L DU Support
> > > >
> > > > On Thu, Dec 14, 2023 at 03:24:17PM +0000, Biju Das wrote:
> > > > > Hi Maxime Ripard,
> > > > >
> > > > > Thanks for the feedback.
> > > >
> > > > Thanks, that's super helpful. The architecture is thus similar to
> > > > vc4
> > > >
> > > > Some general questions related to bugs we had at some point with vc4:
> > > >
> > > > * Where is the display list stored? In RAM or in a dedicated SRAM?
> > >
> > > [1] It is in DDR (RAM).
> > >
> > > >
> > > > * Are the pointer to the current display list latched?
> > > >
> > > > * Is the display list itself latched? If it's not, what happens when
> > > > the display list is changed while the frame is being generated?
> > >
> > > There is some protocol defined for SW side and HW side for updating
> > > display list See [1] 33.4.8.1 Operation flow of VSPD and DU.
> > >
> > > All the display list operations are manged here[2]
> > >
> > > [1]
> > > https://www.renesas.com/us/en/document/mah/rzg2l-group-rzg2lc-group-us
> > > ers-manual-hardware-0
> > >
> > > [2]
> > > https://elixir.bootlin.com/linux/v6.7-rc5/source/drivers/media/platfor
> > > m/renesas/vsp1/vsp1_dl.c#L863
> >
> > I'm sorry, but I'm not going to read a 3500+ to try to figure it out.
> > Could you answer the questions above?
>
> The answer for your question is,
>
> If a previous display list has been queued to the hardware but not
> processed yet, the VSP can start processing it at any time. In that
> case we can't replace the queued list by the new one, as we could
> race with the hardware. We thus mark the update as pending, it will
> be queued up to the hardware by the frame end interrupt handler.
Ok, so you need to make sure that the list entries are allocated and
tied to the state. That way, you'll know for sure it'll get destroyed
only once the state isn't used anymore, so after the vblank.
Maxime
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
^ permalink raw reply [flat|nested] 39+ messages in thread
* Re: [PATCH v15 3/5] drm: renesas: Add RZ/G2L DU Support
2024-01-10 16:14 ` Maxime Ripard
@ 2024-01-10 17:58 ` Laurent Pinchart
0 siblings, 0 replies; 39+ messages in thread
From: Laurent Pinchart @ 2024-01-10 17:58 UTC (permalink / raw)
To: Maxime Ripard
Cc: biju.das.au, Magnus Damm, Geert Uytterhoeven, Thomas Zimmermann,
Prabhakar Mahadev Lad, dri-devel, linux-renesas-soc,
Jacopo Mondi, Kieran Bingham, Fabrizio Castro, Biju Das
Hi Maxime,
On Wed, Jan 10, 2024 at 05:14:41PM +0100, Maxime Ripard wrote:
> On Thu, Jan 04, 2024 at 02:34:33PM +0000, Biju Das wrote:
> > On Friday, December 15, 2023 2:24 PM, Maxime Ripard wrote:
> > > On Fri, Dec 15, 2023 at 01:25:48PM +0000, Biju Das wrote:
> > > > On Friday, December 15, 2023 10:24 AM, Maxime Ripard wrote:
> > > > > On Thu, Dec 14, 2023 at 03:24:17PM +0000, Biju Das wrote:
> > > > > > Hi Maxime Ripard,
> > > > > >
> > > > > > Thanks for the feedback.
> > > > >
> > > > > Thanks, that's super helpful. The architecture is thus similar to
> > > > > vc4
> > > > >
> > > > > Some general questions related to bugs we had at some point with vc4:
> > > > >
> > > > > * Where is the display list stored? In RAM or in a dedicated SRAM?
> > > >
> > > > [1] It is in DDR (RAM).
> > > >
> > > > >
> > > > > * Are the pointer to the current display list latched?
> > > > >
> > > > > * Is the display list itself latched? If it's not, what happens when
> > > > > the display list is changed while the frame is being generated?
> > > >
> > > > There is some protocol defined for SW side and HW side for updating
> > > > display list See [1] 33.4.8.1 Operation flow of VSPD and DU.
> > > >
> > > > All the display list operations are manged here[2]
> > > >
> > > > [1] https://www.renesas.com/us/en/document/mah/rzg2l-group-rzg2lc-group-users-manual-hardware-0
> > > >
> > > > [2] https://elixir.bootlin.com/linux/v6.7-rc5/source/drivers/media/platform/renesas/vsp1/vsp1_dl.c#L863
> > >
> > > I'm sorry, but I'm not going to read a 3500+ to try to figure it out.
> > > Could you answer the questions above?
> >
> > The answer for your question is,
> >
> > If a previous display list has been queued to the hardware but not
> > processed yet, the VSP can start processing it at any time. In that
> > case we can't replace the queued list by the new one, as we could
> > race with the hardware. We thus mark the update as pending, it will
> > be queued up to the hardware by the frame end interrupt handler.
>
> Ok, so you need to make sure that the list entries are allocated and
> tied to the state. That way, you'll know for sure it'll get destroyed
> only once the state isn't used anymore, so after the vblank.
Because the VSP started as a memory-to-memory processing IP without
being tied to the display, it got supported by a V4L2 (and MC) driver.
Later on, the R-Car Gen2 added a direct connection between the output of
*some* VSP instances and one input of the DU (display engine), using the
VSP as an extra "plane" from a KMS point of view. Using the VSP was
optional, as the DU had "normal" planes. R-Car Gen3 dropped support for
direct memory access in the DU, making usage of the VSP mandatory.
As using the VSP is mandatory for display operation on R-Car Gen3, we
ruled out forcing userspace to deal with a KMS *and* a V4L2 device
manually to get anything out on the screen. We also ruled out
redeveloping VSP support inside the DU driver, as that would have
duplicated (complex) code. Instead, the DU driver communicates with the
VSP driver within the kernel, completely transparently for userspace.
This in-kernel API is defined in include/media/vsp1.h, and consists of
the following operations that have been modelled on the KMS atomic API:
- One-time setup at driver initialization time:
int vsp1_du_init(struct device *dev);
- Configuration at CRTC enable/disable time:
int vsp1_du_setup_lif(struct device *dev, unsigned int pipe_index,
const struct vsp1_du_lif_config *cfg);
This includes configuration of the output width/height.
(LIF stands for "LCD InterFace" if I recall correctly, it's the block in
the VSP that connects to the DU.)
- Atomic updates
void vsp1_du_atomic_begin(struct device *dev, unsigned int pipe_index);
int vsp1_du_atomic_update(struct device *dev, unsigned int pipe_index,
unsigned int rpf,
const struct vsp1_du_atomic_config *cfg);
void vsp1_du_atomic_flush(struct device *dev, unsigned int pipe_index,
const struct vsp1_du_atomic_pipe_config *cfg);
These operations configure planes (the VSP has a blending engine with 2
to 5 inputs depending on the exact SoC) and writeback (the VSP being
historically just a memory-to-memory engine, it supports writing the
output to memory in addition to forwarding it to the DU).
The display lists are fully handled inside the VSP driver, the DU
doesn't need to manage them. You can ignore the implementation details
of the VSP itself.
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 39+ messages in thread
* Re: [PATCH v15 3/5] drm: renesas: Add RZ/G2L DU Support
2024-01-04 14:17 ` Biju Das
@ 2024-01-10 19:38 ` Laurent Pinchart
2024-01-11 9:31 ` Biju Das
0 siblings, 1 reply; 39+ messages in thread
From: Laurent Pinchart @ 2024-01-10 19:38 UTC (permalink / raw)
To: Biju Das
Cc: Fabrizio Castro, biju.das.au, Magnus Damm, Geert Uytterhoeven,
Thomas Zimmermann, Prabhakar Mahadev Lad, Maxime Ripard,
linux-renesas-soc, Kieran Bingham, dri-devel, Jacopo Mondi,
linux-media
Hi Biju,
On Thu, Jan 04, 2024 at 02:17:39PM +0000, Biju Das wrote:
> On Friday, December 15, 2023 2:56 PM, Biju Das wrote:
> > On Friday, December 15, 2023 2:18 PM, Maxime Ripard wrote:
> > > On Fri, Dec 15, 2023 at 01:52:28PM +0000, Biju Das wrote:
> > > > > > > > > > +static int rzg2l_du_crtc_enable_vblank(struct drm_crtc *crtc) {
> > > > > > > > > > + struct rzg2l_du_crtc *rcrtc = to_rzg2l_crtc(crtc);
> > > > > > > > > > +
> > > > > > > > > > + rcrtc->vblank_enable = true;
> > > > > > > > > > +
> > > > > > > > > > + return 0;
> > > > > > > > > > +}
> > > > > > > > > > +
> > > > > > > > > > +static void rzg2l_du_crtc_disable_vblank(struct drm_crtc *crtc)
> > > > > > > > > > +{
> > > > > > > > > > + struct rzg2l_du_crtc *rcrtc = to_rzg2l_crtc(crtc);
> > > > > > > > > > +
> > > > > > > > > > + rcrtc->vblank_enable = false; }
> > > > > > > > >
> > > > > > > > > You should enable / disable your interrupts here
> > > > > > > >
> > > > > > > > We don't have dedicated vblank IRQ for enabling/disabling vblank.
> > > > > > > >
> > > > > > > > vblank is handled by vspd.
> > > > > > > >
> > > > > > > > vspd is directly rendering images to display,
> > > > > > > > rcar_du_crtc_finish_page_flip() and drm_crtc_handle_vblank()
> > > > > > > > called in vspd's pageflip context.
> > > > > > > >
> > > > > > > > See rzg2l_du_vsp_complete()in rzg2l_du_vsp.c
> > > > > > >
> > > > > > > Sorry, I couldn't really get how the interrupt flow / vblank
> > > > > > > reporting is going to work. Could you explain it a bit more?
> > > > > >
> > > > > > We just need to handle vertical blanking in the VSP frame end handler.
> > > > > > See the code below.
> > > > > >
> > > > > > static void rzg2l_du_vsp_complete(void *private, unsigned int status,
> > > > > > u32 crc) {
> > > > > > struct rzg2l_du_crtc *crtc = private;
> > > > > >
> > > > > > if (crtc->vblank_enable)
> > > > > > drm_crtc_handle_vblank(&crtc->crtc);
> > > > > >
> > > > > > if (status & VSP1_DU_STATUS_COMPLETE)
> > > > > > rzg2l_du_crtc_finish_page_flip(crtc);
> > > > > >
> > > > > > drm_crtc_add_crc_entry(&crtc->crtc, false, 0, &crc); }
> > > > >
> > > > > Then we're back to the same question :)
> > > > >
> > > > > Why can't you mask the frame end interrupt?
> > > >
> > > > We are masking interrupts.
> > > >
> > > > [ 70.639139] #######rzg2l_du_crtc_disable_vblank#######
> > > > [ 70.650243] #########rzg2l_du_vsp_disable ############
> > > > [ 70.652003] ########## vsp1_wpf_stop###
> > > >
> > > > Unmask is,
> > > >
> > > > [ 176.354520] #######rzg2l_du_crtc_enable_vblank#######
> > > > [ 176.354922] #########rzg2l_du_vsp_atomic_flush ############
> > > > [ 176.355198] ########## wpf_configure_stream###
> > >
> > > Sorry, my question was why aren't you unmasking and masking them in
> > > the enable/disable_vblank hooks of the CRTC.
> >
> > I have n't tried that. Will try and provide feedback.
> >
> > Currently the IRQ source belongs to VSPD in media subsystem.
> > So I need to export an API though vsp1_drm and test it.
>
> + linux-media
>
> Laurent, are you ok with the below RZ/G2L specific patch[1] for
> enabling/disabling frame end interrupt in VSP driver?
> Note:
> I need to add a quirk for handling this only for RZ/G2L family as
> other SoCs have Vblank specific interrupt available in DU.
The DU driver on Gen3 handles vblank exactly as in your patch. What's
the problem with that ?
> [1]
>
> diff --git a/drivers/media/platform/renesas/vsp1/vsp1_drm.c b/drivers/media/platform/renesas/vsp1/vsp1_drm.c
> index 9b087bd8df7d..39347c16bb27 100644
> --- a/drivers/media/platform/renesas/vsp1/vsp1_drm.c
> +++ b/drivers/media/platform/renesas/vsp1/vsp1_drm.c
> @@ -936,6 +936,14 @@ void vsp1_du_unmap_sg(struct device *dev, struct sg_table *sgt)
> }
> EXPORT_SYMBOL_GPL(vsp1_du_unmap_sg);
>
> +void vsp1_du_mask_frame_end_interrupt(struct device *dev, bool mask)
> +{
> + struct vsp1_device *vsp1 = dev_get_drvdata(dev);
> +
> + vsp1_write(vsp1, VI6_WPF_IRQ_ENB(0), mask ? 0 : VI6_WPF_IRQ_ENB_DFEE);
That will break everything. As soon as you turn of vblank reporting, the
VSP will stop processing frames and the display will freeze.
> +}
> +EXPORT_SYMBOL_GPL(vsp1_du_mask_frame_end_interrupt);
> +
> /* -----------------------------------------------------------------------------
> * Initialization
> */
> diff --git a/include/media/vsp1.h b/include/media/vsp1.h
> index 48f4a5023d81..ccac48a6bdd2 100644
> --- a/include/media/vsp1.h
> +++ b/include/media/vsp1.h
> @@ -117,4 +117,6 @@ void vsp1_du_atomic_flush(struct device *dev, unsigned int pipe_index,
> int vsp1_du_map_sg(struct device *dev, struct sg_table *sgt);
> void vsp1_du_unmap_sg(struct device *dev, struct sg_table *sgt);
>
> +void vsp1_du_mask_frame_end_interrupt(struct device *dev, bool mask);
> +
> #endif /* __MEDIA_VSP1_H__ */
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 39+ messages in thread
* RE: [PATCH v15 3/5] drm: renesas: Add RZ/G2L DU Support
2024-01-10 19:38 ` Laurent Pinchart
@ 2024-01-11 9:31 ` Biju Das
0 siblings, 0 replies; 39+ messages in thread
From: Biju Das @ 2024-01-11 9:31 UTC (permalink / raw)
To: Laurent Pinchart
Cc: Fabrizio Castro, biju.das.au, Magnus Damm, Geert Uytterhoeven,
Thomas Zimmermann, Prabhakar Mahadev Lad, Maxime Ripard,
linux-renesas-soc, Kieran Bingham, dri-devel, Jacopo Mondi,
linux-media
Hi Laurent,
Thanks for the feedback.
> -----Original Message-----
> From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> Sent: Wednesday, January 10, 2024 7:39 PM
> Subject: Re: [PATCH v15 3/5] drm: renesas: Add RZ/G2L DU Support
>
> Hi Biju,
>
> On Thu, Jan 04, 2024 at 02:17:39PM +0000, Biju Das wrote:
> > On Friday, December 15, 2023 2:56 PM, Biju Das wrote:
> > > On Friday, December 15, 2023 2:18 PM, Maxime Ripard wrote:
> > > > On Fri, Dec 15, 2023 at 01:52:28PM +0000, Biju Das wrote:
> > > > > > > > > > > +static int rzg2l_du_crtc_enable_vblank(struct
> drm_crtc *crtc) {
> > > > > > > > > > > + struct rzg2l_du_crtc *rcrtc = to_rzg2l_crtc(crtc);
> > > > > > > > > > > +
> > > > > > > > > > > + rcrtc->vblank_enable = true;
> > > > > > > > > > > +
> > > > > > > > > > > + return 0;
> > > > > > > > > > > +}
> > > > > > > > > > > +
> > > > > > > > > > > +static void rzg2l_du_crtc_disable_vblank(struct
> > > > > > > > > > > +drm_crtc *crtc) {
> > > > > > > > > > > + struct rzg2l_du_crtc *rcrtc = to_rzg2l_crtc(crtc);
> > > > > > > > > > > +
> > > > > > > > > > > + rcrtc->vblank_enable = false; }
> > > > > > > > > >
> > > > > > > > > > You should enable / disable your interrupts here
> > > > > > > > >
> > > > > > > > > We don't have dedicated vblank IRQ for enabling/disabling
> vblank.
> > > > > > > > >
> > > > > > > > > vblank is handled by vspd.
> > > > > > > > >
> > > > > > > > > vspd is directly rendering images to display,
> > > > > > > > > rcar_du_crtc_finish_page_flip() and
> > > > > > > > > drm_crtc_handle_vblank() called in vspd's pageflip
> context.
> > > > > > > > >
> > > > > > > > > See rzg2l_du_vsp_complete()in rzg2l_du_vsp.c
> > > > > > > >
> > > > > > > > Sorry, I couldn't really get how the interrupt flow /
> > > > > > > > vblank reporting is going to work. Could you explain it a
> bit more?
> > > > > > >
> > > > > > > We just need to handle vertical blanking in the VSP frame end
> handler.
> > > > > > > See the code below.
> > > > > > >
> > > > > > > static void rzg2l_du_vsp_complete(void *private, unsigned
> > > > > > > int status,
> > > > > > > u32 crc) {
> > > > > > > struct rzg2l_du_crtc *crtc = private;
> > > > > > >
> > > > > > > if (crtc->vblank_enable)
> > > > > > > drm_crtc_handle_vblank(&crtc->crtc);
> > > > > > >
> > > > > > > if (status & VSP1_DU_STATUS_COMPLETE)
> > > > > > > rzg2l_du_crtc_finish_page_flip(crtc);
> > > > > > >
> > > > > > > drm_crtc_add_crc_entry(&crtc->crtc, false, 0, &crc); }
> > > > > >
> > > > > > Then we're back to the same question :)
> > > > > >
> > > > > > Why can't you mask the frame end interrupt?
> > > > >
> > > > > We are masking interrupts.
> > > > >
> > > > > [ 70.639139] #######rzg2l_du_crtc_disable_vblank#######
> > > > > [ 70.650243] #########rzg2l_du_vsp_disable ############
> > > > > [ 70.652003] ########## vsp1_wpf_stop###
> > > > >
> > > > > Unmask is,
> > > > >
> > > > > [ 176.354520] #######rzg2l_du_crtc_enable_vblank#######
> > > > > [ 176.354922] #########rzg2l_du_vsp_atomic_flush ############ [
> > > > > 176.355198] ########## wpf_configure_stream###
> > > >
> > > > Sorry, my question was why aren't you unmasking and masking them
> > > > in the enable/disable_vblank hooks of the CRTC.
> > >
> > > I have n't tried that. Will try and provide feedback.
> > >
> > > Currently the IRQ source belongs to VSPD in media subsystem.
> > > So I need to export an API though vsp1_drm and test it.
> >
> > + linux-media
> >
> > Laurent, are you ok with the below RZ/G2L specific patch[1] for
> > enabling/disabling frame end interrupt in VSP driver?
> > Note:
> > I need to add a quirk for handling this only for RZ/G2L family as
> > other SoCs have Vblank specific interrupt available in DU.
>
> The DU driver on Gen3 handles vblank exactly as in your patch. What's the
> problem with that ?
There is no issue. Maxime Ripard is checking whether is it possible to mask/unmask
Interrupt associated with vblank reporting during vblank{enable, disable}?
That is the reason I produced the below patch[1] for suggestions.
>
> > [1]
> >
> > diff --git a/drivers/media/platform/renesas/vsp1/vsp1_drm.c
> > b/drivers/media/platform/renesas/vsp1/vsp1_drm.c
> > index 9b087bd8df7d..39347c16bb27 100644
> > --- a/drivers/media/platform/renesas/vsp1/vsp1_drm.c
> > +++ b/drivers/media/platform/renesas/vsp1/vsp1_drm.c
> > @@ -936,6 +936,14 @@ void vsp1_du_unmap_sg(struct device *dev, struct
> > sg_table *sgt) } EXPORT_SYMBOL_GPL(vsp1_du_unmap_sg);
> >
> > +void vsp1_du_mask_frame_end_interrupt(struct device *dev, bool mask)
> > +{
> > + struct vsp1_device *vsp1 = dev_get_drvdata(dev);
> > +
> > + vsp1_write(vsp1, VI6_WPF_IRQ_ENB(0), mask ? 0 :
> > + VI6_WPF_IRQ_ENB_DFEE);
>
> That will break everything. As soon as you turn of vblank reporting, the
> VSP will stop processing frames and the display will freeze.
OK. I am not able to reproduce this issue on RZ/G2L with limited testing compared to
R-Car. As per your suggestion, I will drop this change. I hope it is ok for
everyone.
Cheers,
Biju
>
> > +}
> > +EXPORT_SYMBOL_GPL(vsp1_du_mask_frame_end_interrupt);
> > +
> > /* --------------------------------------------------------------------
> ---------
> > * Initialization
> > */
> > diff --git a/include/media/vsp1.h b/include/media/vsp1.h index
> > 48f4a5023d81..ccac48a6bdd2 100644
> > --- a/include/media/vsp1.h
> > +++ b/include/media/vsp1.h
> > @@ -117,4 +117,6 @@ void vsp1_du_atomic_flush(struct device *dev,
> > unsigned int pipe_index, int vsp1_du_map_sg(struct device *dev,
> > struct sg_table *sgt); void vsp1_du_unmap_sg(struct device *dev,
> > struct sg_table *sgt);
> >
> > +void vsp1_du_mask_frame_end_interrupt(struct device *dev, bool mask);
> > +
> > #endif /* __MEDIA_VSP1_H__ */
>
> --
> Regards,
>
> Laurent Pinchart
^ permalink raw reply [flat|nested] 39+ messages in thread
* Re: [PATCH v15 0/5] Add RZ/{G2L,G2LC} and RZ/V2L Display Unit support
2023-11-28 10:51 [PATCH v15 0/5] Add RZ/{G2L,G2LC} and RZ/V2L Display Unit support Biju Das
` (5 preceding siblings ...)
2023-12-11 12:10 ` [PATCH v15 0/5] Add RZ/{G2L, G2LC} and RZ/V2L Display Unit support Biju Das
@ 2024-02-21 16:24 ` Maxime Ripard
6 siblings, 0 replies; 39+ messages in thread
From: Maxime Ripard @ 2024-02-21 16:24 UTC (permalink / raw)
To: Maarten Lankhorst, Thomas Zimmermann, David Airlie,
Daniel Vetter, Philipp Zabel, Biju Das
Cc: Laurent Pinchart, Kieran Bingham, Jacopo Mondi,
Geert Uytterhoeven, Magnus Damm, dri-devel, linux-renesas-soc,
Fabrizio Castro, Prabhakar Mahadev Lad, Biju Das
On Tue, 28 Nov 2023 10:51:24 +0000, Biju Das wrote:
> This path series aims to add support for RZ/G2L DU DRM driver.
>
> RZ/G2L LCD controller composed of Frame compression Processor(FCPVD), Video
> signal processor (VSPD) and Display unit(DU). The output of LCDC is
> connected to Display parallel interface and MIPI link video interface.
>
> The output from DSI is connected to ADV7535.
>
> [...]
Applied to drm/drm-misc (drm-misc-next).
Thanks!
Maxime
^ permalink raw reply [flat|nested] 39+ messages in thread
end of thread, other threads:[~2024-02-21 16:24 UTC | newest]
Thread overview: 39+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-11-28 10:51 [PATCH v15 0/5] Add RZ/{G2L,G2LC} and RZ/V2L Display Unit support Biju Das
2023-11-28 10:51 ` [PATCH v15 1/5] dt-bindings: display: Document Renesas RZ/G2L DU bindings Biju Das
2023-11-28 10:51 ` [PATCH v15 2/5] dt-bindings: display: renesas, rzg2l-du: Document RZ/V2L " Biju Das
2023-11-28 10:51 ` [PATCH v15 3/5] drm: renesas: Add RZ/G2L DU Support Biju Das
2023-12-13 15:47 ` Maxime Ripard
2023-12-13 15:48 ` Maxime Ripard
2023-12-13 15:50 ` Laurent Pinchart
2023-12-13 16:11 ` Geert Uytterhoeven
2023-12-13 16:46 ` Biju Das
2023-12-14 15:24 ` Biju Das
2023-12-14 18:35 ` Biju Das
2023-12-14 20:50 ` Biju Das
2023-12-15 7:47 ` Biju Das
2023-12-15 9:24 ` Maxime Ripard
2023-12-15 11:19 ` Biju Das
2023-12-15 9:22 ` Maxime Ripard
2023-12-15 10:23 ` Maxime Ripard
2023-12-15 11:37 ` Biju Das
2023-12-15 12:58 ` Maxime Ripard
2023-12-15 13:52 ` Biju Das
2023-12-15 14:18 ` Maxime Ripard
2023-12-15 14:55 ` Biju Das
2023-12-15 14:58 ` Biju Das
2024-01-04 14:17 ` Biju Das
2024-01-10 19:38 ` Laurent Pinchart
2024-01-11 9:31 ` Biju Das
2023-12-15 14:19 ` Biju Das
2023-12-15 14:23 ` Maxime Ripard
2023-12-15 14:42 ` Biju Das
2023-12-15 13:25 ` Biju Das
2023-12-15 14:24 ` Maxime Ripard
2024-01-04 14:34 ` Biju Das
2024-01-10 16:14 ` Maxime Ripard
2024-01-10 17:58 ` Laurent Pinchart
2023-11-28 10:51 ` [PATCH v15 4/5] MAINTAINERS: Update entries for Renesas DRM drivers Biju Das
2023-11-28 11:05 ` Geert Uytterhoeven
2023-11-28 10:51 ` [PATCH v15 5/5] MAINTAINERS: Create entry for Renesas RZ " Biju Das
2023-12-11 12:10 ` [PATCH v15 0/5] Add RZ/{G2L, G2LC} and RZ/V2L Display Unit support Biju Das
2024-02-21 16:24 ` [PATCH v15 0/5] Add RZ/{G2L,G2LC} " Maxime Ripard
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).