DC Patches April 29, 2024
cover DC Patches April 29, 2024
This DC patchset brings improvements in multiple areas. In summary, we highlight:
- Disable seamless boot on 128b/132b encoding
- Change ASSR disable sequence to avoid corruption
- Fix few IPS problems
- Enable Replay for DCN315
- Fix few ODM problems
- Fix FEC_READY write timing
- Fix few FPO problems
- Adjust DML21 gpuvm_enable assignment
- Fix divide by 0 error in VM environment
- Fix few DCN35 problems
- Fix flickering on DCN321
- Fix mst resume problem
- Fix multi-disp FAMS problem
- Refactor Replay
- Update some of the dcn303 parameters
- Enable legacy fast update for dcn301
- Add VCO parameter for DCN31 FPU
- Have cursor and surface updates together
- Fix problems reported by Coverity
---
Alex Hung (9):
drm/amd/display: Check index msg_id before read or write drm/amd/display: Check pipe offset before setting vblank drm/amd/display: Skip finding free audio for unknown engine_id drm/amd/display: Do not return negative stream id for array drm/amd/display: ASSERT when failing to find index by plane/stream id drm/amd/display: Remove redundant include file drm/amd/display: Fix uninitialized variables in DM drm/amd/display: Fix uninitialized variables in DC drm/amd/display: Fix uninitialized variables in DC
Alvin Lee (3):
drm/amd/display: Only program P-State force if pipe config changed drm/amd/display: Assign linear_pitch_alignment even for VM drm/amd/display: For FPO + Vactive check that all pipes support VA
Aric Cyr (1):
drm/amd/display: 3.2.283
Daniel Miess (1):
drm/amd/display: Enable RCO for PHYSYMCLK in DCN35
Dennis Chan (1):
drm/amd/display: Refactor for Replay Link off frame count
Harry Wentland (2):
drm/amd/display: Do cursor programming with rest of pipe drm/amd/display: Always use legacy way of setting cursor on DCE
Hersen Wu (2):
drm/amd/display: Add NULL pointer check for kzalloc drm/amd/display: Fix overlapping copy within dml_core_mode_programming
Ilya Bakoulin (1):
drm/amd/display: Fix FEC_READY write on DP LT
Iswara Nagulendran (1):
drm/amd/display: Restrict multi-disp support for in-game FAMS
Joan Lee (1):
drm/amd/display: Enable Replay for DCN315
Leo Ma (1):
drm/amd/display: Fix DC mode screen flickering on DCN321
Nevenko Stupar (1):
drm/amd/display: gpuvm handling in DML21
Nicholas Kazlauskas (2):
drm/amd/display: Add trigger FIFO resync path for DCN35 drm/amd/display: Notify idle link detection through shared state
Revalla Hari Krishna (1):
drm/amd/display: Refactor HUBBUB into component folder
Rodrigo Siqueira (10):
drm/amd/display: Improve registers write drm/amd/display: Add missing SMU version drm/amd/display: Adjust codestyle for dcn31 and hdcp_msg drm/amd/display: Add VCO speed parameter for DCN31 FPU drm/amd/display: Adjust functions prefix for some of the dcn301 fpu
functions
drm/amd/display: Enable legacy fast update for dcn301 drm/amd/display: Update some of the dcn303 parameters drm/amd/display: Remove legacy code in DC drm/amd/display: Add log_color_state callback to multiple DCNs drm/amd/display: Handle the case which quad_part is equal 0
Roman Li (2):
drm/amd/display: Re-enable IPS2 for static screen drm/amd/display: Add periodic detection for IPS
Sung Joon Kim (1):
drm/amd/display: Disable seamless boot on 128b/132b encoding
Swapnil Patel (1):
drm/amd/display: Change ASSR disable sequence
Wayne Lin (2):
drm/amd/display: Remove unnecessary files drm/amd/display: Defer handling mst up request in resume
Webb Chen (1):
drm/amd/display: Revert "dc: Keep VBios pixel rate div setting util
next mode set"
Wenjing Liu (2):
drm/amd/display: take ODM slice count into account when deciding DSC
slice
drm/amd/display: use even ODM slice width for two pixels per container
drivers/gpu/drm/amd/display/Makefile | 1 +
.../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 105 ++++++++++++++++--
.../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 9 ++
.../amd/display/amdgpu_dm/amdgpu_dm_crtc.c | 59 +++++++++-
.../amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 4 +-
.../amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 5 +-
.../amd/display/amdgpu_dm/amdgpu_dm_plane.c | 4 +-
.../amd/display/amdgpu_dm/amdgpu_dm_plane.h | 3 +
.../drm/amd/display/amdgpu_dm/amdgpu_dm_psr.c | 28 +++++
.../drm/amd/display/amdgpu_dm/amdgpu_dm_psr.h | 1 +
drivers/gpu/drm/amd/display/dc/Makefile | 2 +-
.../drm/amd/display/dc/bios/command_table.c | 2 +-
.../drm/amd/display/dc/bios/command_table2.c | 2 +-
.../display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c | 8 ++
.../display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c | 23 +++-
drivers/gpu/drm/amd/display/dc/core/dc.c | 13 ++-
.../gpu/drm/amd/display/dc/core/dc_resource.c | 24 +++-
.../gpu/drm/amd/display/dc/core/dc_stream.c | 14 +--
.../drm/amd/display/dc/core/dc_vm_helper.c | 1 +
drivers/gpu/drm/amd/display/dc/dc.h | 11 +-
drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 30 +++++
drivers/gpu/drm/amd/display/dc/dc_dmub_srv.h | 10 ++
drivers/gpu/drm/amd/display/dc/dc_stream.h | 12 ++
drivers/gpu/drm/amd/display/dc/dc_types.h | 2 +-
.../dc/dce110/dce110_timing_generator.c | 18 +++
.../dc/dce110/dce110_timing_generator.h | 2 +
.../dc/dce110/dce110_timing_generator_v.c | 3 +-
.../dc/dce120/dce120_timing_generator.c | 1 +
.../display/dc/dce80/dce80_timing_generator.c | 1 +
drivers/gpu/drm/amd/display/dc/dcn10/Makefile | 2 +-
.../dc/dcn10/dcn10_hw_sequencer_debug.c | 2 +-
drivers/gpu/drm/amd/display/dc/dcn20/Makefile | 2 +-
.../gpu/drm/amd/display/dc/dcn201/Makefile | 3 +-
drivers/gpu/drm/amd/display/dc/dcn21/Makefile | 2 +-
drivers/gpu/drm/amd/display/dc/dcn30/Makefile | 3 +-
.../gpu/drm/amd/display/dc/dcn30/dcn30_mpc.c | 2 +-
.../gpu/drm/amd/display/dc/dcn301/Makefile | 2 +-
drivers/gpu/drm/amd/display/dc/dcn31/Makefile | 2 +-
.../drm/amd/display/dc/dcn314/dcn314_dccg.c | 12 +-
drivers/gpu/drm/amd/display/dc/dcn32/Makefile | 2 +-
.../gpu/drm/amd/display/dc/dcn32/dcn32_dccg.c | 12 +-
.../dc/dcn32/dcn32_dio_stream_encoder.c | 40 ++++++-
.../display/dc/dcn32/dcn32_resource_helpers.c | 6 +-
drivers/gpu/drm/amd/display/dc/dcn35/Makefile | 2 +-
.../gpu/drm/amd/display/dc/dcn35/dcn35_dccg.c | 63 +++--------
.../dc/dcn35/dcn35_dio_stream_encoder.c | 36 +++++-
drivers/gpu/drm/amd/display/dc/dm_pp_smu.h | 3 +-
.../drm/amd/display/dc/dml/dcn20/dcn20_fpu.c | 4 +-
.../drm/amd/display/dc/dml/dcn30/dcn30_fpu.c | 2 +-
.../amd/display/dc/dml/dcn301/dcn301_fpu.c | 4 +-
.../amd/display/dc/dml/dcn301/dcn301_fpu.h | 7 +-
.../drm/amd/display/dc/dml/dcn31/dcn31_fpu.c | 22 +---
.../drm/amd/display/dc/dml/dcn32/dcn32_fpu.c | 22 +++-
.../drm/amd/display/dc/dml/dcn32/dcn32_fpu.h | 2 +-
.../dc/dml/dcn32/display_mode_vba_util_32.c | 4 +-
.../amd/display/dc/dml2/display_mode_core.c | 4 +-
.../dc/dml2/dml21/dml21_translation_helper.c | 2 +-
.../display/dc/dml2/dml2_dc_resource_mgmt.c | 8 +-
.../display/dc/dml2/dml2_translation_helper.c | 6 +-
.../drm/amd/display/dc/dml2/dml2_wrapper.h | 1 +
.../amd/display/dc/dpp/dcn10/CMakeLists.txt | 6 -
.../amd/display/dc/dpp/dcn10/dcn10_dpp_cm.c | 5 +-
.../amd/display/dc/dpp/dcn20/CMakeLists.txt | 5 -
.../amd/display/dc/dpp/dcn20/dcn20_dpp_cm.c | 2 +-
.../amd/display/dc/dpp/dcn201/CMakeLists.txt | 4 -
.../amd/display/dc/dpp/dcn30/CMakeLists.txt | 5 -
.../amd/display/dc/dpp/dcn30/dcn30_dpp_cm.c | 2 +-
.../amd/display/dc/dpp/dcn32/CMakeLists.txt | 4 -
.../amd/display/dc/dpp/dcn35/CMakeLists.txt | 4 -
drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c | 30 +++--
.../drm/amd/display/dc/gpio/gpio_service.c | 6 +-
.../gpu/drm/amd/display/dc/hdcp/hdcp_msg.c | 2 +-
.../gpu/drm/amd/display/dc/hubbub/Makefile | 100 +++++++++++++++++
.../dc/{ => hubbub}/dcn10/dcn10_hubbub.c | 2 +-
.../dc/{ => hubbub}/dcn10/dcn10_hubbub.h | 0
.../dc/{ => hubbub}/dcn20/dcn20_hubbub.c | 0
.../dc/{ => hubbub}/dcn20/dcn20_hubbub.h | 2 +-
.../dc/{ => hubbub}/dcn201/dcn201_hubbub.c | 0
.../dc/{ => hubbub}/dcn201/dcn201_hubbub.h | 0
.../dc/{ => hubbub}/dcn21/dcn21_hubbub.c | 0
.../dc/{ => hubbub}/dcn21/dcn21_hubbub.h | 0
.../dc/{ => hubbub}/dcn30/dcn30_hubbub.c | 0
.../dc/{ => hubbub}/dcn30/dcn30_hubbub.h | 0
.../dc/{ => hubbub}/dcn301/dcn301_hubbub.c | 0
.../dc/{ => hubbub}/dcn301/dcn301_hubbub.h | 0
.../dc/{ => hubbub}/dcn31/dcn31_hubbub.c | 0
.../dc/{ => hubbub}/dcn31/dcn31_hubbub.h | 0
.../dc/{ => hubbub}/dcn32/dcn32_hubbub.c | 0
.../dc/{ => hubbub}/dcn32/dcn32_hubbub.h | 0
.../dc/{ => hubbub}/dcn35/dcn35_hubbub.c | 0
.../dc/{ => hubbub}/dcn35/dcn35_hubbub.h | 0
drivers/gpu/drm/amd/display/dc/hwss/Makefile | 6 -
.../amd/display/dc/hwss/dce110/dce110_hwseq.c | 28 +----
.../amd/display/dc/hwss/dcn10/dcn10_hwseq.c | 6 +-
.../amd/display/dc/hwss/dcn20/dcn20_hwseq.c | 42 ++++---
.../amd/display/dc/hwss/dcn201/dcn201_hwseq.c | 7 +-
.../amd/display/dc/hwss/dcn21/dcn21_hwseq.c | 2 +-
.../amd/display/dc/hwss/dcn21/dcn21_init.c | 1 +
.../amd/display/dc/hwss/dcn30/dcn30_hwseq.h | 2 +-
.../amd/display/dc/hwss/dcn30/dcn30_init.c | 1 +
.../amd/display/dc/hwss/dcn301/dcn301_init.c | 4 +-
.../amd/display/dc/hwss/dcn31/dcn31_hwseq.c | 2 +-
.../amd/display/dc/hwss/dcn31/dcn31_init.c | 1 +
.../amd/display/dc/hwss/dcn314/dcn314_hwseq.c | 29 +----
.../amd/display/dc/hwss/dcn314/dcn314_hwseq.h | 4 -
.../amd/display/dc/hwss/dcn314/dcn314_init.c | 2 +-
.../amd/display/dc/hwss/dcn32/dcn32_hwseq.c | 68 +++++-------
.../amd/display/dc/hwss/dcn32/dcn32_hwseq.h | 4 -
.../amd/display/dc/hwss/dcn32/dcn32_init.c | 1 -
.../amd/display/dc/hwss/dcn35/dcn35_hwseq.c | 34 +++++-
.../amd/display/dc/hwss/dcn35/dcn35_hwseq.h | 2 +
.../amd/display/dc/hwss/dcn35/dcn35_init.c | 4 +-
.../amd/display/dc/hwss/dcn351/dcn351_init.c | 2 +-
.../display/dc/hwss/hw_sequencer_private.h | 7 +-
.../gpu/drm/amd/display/dc/inc/core_types.h | 7 --
drivers/gpu/drm/amd/display/dc/inc/hw/dccg.h | 5 -
drivers/gpu/drm/amd/display/dc/inc/hw/optc.h | 4 +-
.../amd/display/dc/inc/hw/stream_encoder.h | 1 -
.../amd/display/dc/inc/hw/timing_generator.h | 1 +
.../dc/irq/dce110/irq_service_dce110.c | 8 +-
.../drm/amd/display/dc/link/link_detection.c | 4 +-
.../gpu/drm/amd/display/dc/link/link_dpms.c | 11 +-
.../dc/link/protocols/link_dp_capability.c | 16 +--
.../dc/link/protocols/link_dp_irq_handler.c | 10 +-
.../display/dc/link/protocols/link_dp_phy.c | 14 +--
.../dc/link/protocols/link_dp_training.c | 2 +-
.../link/protocols/link_edp_panel_control.c | 4 +-
.../amd/display/dc/link/protocols/link_hpd.c | 2 +-
.../amd/display/dc/optc/dcn10/dcn10_optc.c | 46 ++++----
.../amd/display/dc/optc/dcn20/dcn20_optc.c | 10 +-
.../amd/display/dc/optc/dcn20/dcn20_optc.h | 1 -
.../amd/display/dc/optc/dcn201/dcn201_optc.c | 7 +-
.../amd/display/dc/optc/dcn201/dcn201_optc.h | 3 -
.../amd/display/dc/optc/dcn30/dcn30_optc.c | 3 +-
.../amd/display/dc/optc/dcn301/dcn301_optc.c | 1 +
.../amd/display/dc/optc/dcn31/dcn31_optc.c | 1 +
.../amd/display/dc/optc/dcn314/dcn314_optc.c | 3 +-
.../amd/display/dc/optc/dcn32/dcn32_optc.c | 3 +-
.../amd/display/dc/optc/dcn35/dcn35_optc.c | 1 +
.../amd/display/dc/optc/dcn401/dcn401_optc.c | 15 ++-
drivers/gpu/drm/amd/display/dc/os_types.h | 2 -
.../display/dc/resource/dce80/CMakeLists.txt | 4 -
.../dc/resource/dcn20/dcn20_resource.c | 2 +-
.../dc/resource/dcn30/dcn30_resource.c | 5 +-
.../dc/resource/dcn301/dcn301_resource.c | 20 +++-
.../dc/resource/dcn303/dcn303_resource.c | 13 ++-
.../dc/resource/dcn31/dcn31_resource.c | 5 +
.../dc/resource/dcn314/dcn314_resource.c | 5 +
.../dc/resource/dcn315/dcn315_resource.c | 14 +++
.../dc/resource/dcn316/dcn316_resource.c | 2 +
.../dc/resource/dcn32/dcn32_resource.c | 5 +
.../dc/resource/dcn321/dcn321_resource.c | 2 +
.../dc/resource/dcn35/dcn35_resource.c | 2 +
.../dc/resource/dcn351/dcn351_resource.c | 2 +
drivers/gpu/drm/amd/display/dmub/dmub_srv.h | 1 +
.../gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 15 ++-
.../gpu/drm/amd/display/dmub/src/dmub_srv.c | 2 +
.../gpu/drm/amd/display/include/dal_types.h | 1 -
.../drm/amd/display/modules/hdcp/hdcp_ddc.c | 8 ++
.../amd/display/modules/power/power_helpers.c | 8 +-
160 files changed, 952 insertions(+), 469 deletions(-)
delete mode 100644 drivers/gpu/drm/amd/display/dc/dpp/dcn10/CMakeLists.txt
delete mode 100644 drivers/gpu/drm/amd/display/dc/dpp/dcn20/CMakeLists.txt
delete mode 100644 drivers/gpu/drm/amd/display/dc/dpp/dcn201/CMakeLists.txt
delete mode 100644 drivers/gpu/drm/amd/display/dc/dpp/dcn30/CMakeLists.txt
delete mode 100644 drivers/gpu/drm/amd/display/dc/dpp/dcn32/CMakeLists.txt
delete mode 100644 drivers/gpu/drm/amd/display/dc/dpp/dcn35/CMakeLists.txt
create mode 100644 drivers/gpu/drm/amd/display/dc/hubbub/Makefile
rename drivers/gpu/drm/amd/display/dc/{ => hubbub}/dcn10/dcn10_hubbub.c (99%)
rename drivers/gpu/drm/amd/display/dc/{ => hubbub}/dcn10/dcn10_hubbub.h (100%)
rename drivers/gpu/drm/amd/display/dc/{ => hubbub}/dcn20/dcn20_hubbub.c (100%)
rename drivers/gpu/drm/amd/display/dc/{ => hubbub}/dcn20/dcn20_hubbub.h (99%)
rename drivers/gpu/drm/amd/display/dc/{ => hubbub}/dcn201/dcn201_hubbub.c (100%)
rename drivers/gpu/drm/amd/display/dc/{ => hubbub}/dcn201/dcn201_hubbub.h (100%)
rename drivers/gpu/drm/amd/display/dc/{ => hubbub}/dcn21/dcn21_hubbub.c (100%)
rename drivers/gpu/drm/amd/display/dc/{ => hubbub}/dcn21/dcn21_hubbub.h (100%)
rename drivers/gpu/drm/amd/display/dc/{ => hubbub}/dcn30/dcn30_hubbub.c (100%)
rename drivers/gpu/drm/amd/display/dc/{ => hubbub}/dcn30/dcn30_hubbub.h (100%)
rename drivers/gpu/drm/amd/display/dc/{ => hubbub}/dcn301/dcn301_hubbub.c (100%)
rename drivers/gpu/drm/amd/display/dc/{ => hubbub}/dcn301/dcn301_hubbub.h (100%)
rename drivers/gpu/drm/amd/display/dc/{ => hubbub}/dcn31/dcn31_hubbub.c (100%)
rename drivers/gpu/drm/amd/display/dc/{ => hubbub}/dcn31/dcn31_hubbub.h (100%)
rename drivers/gpu/drm/amd/display/dc/{ => hubbub}/dcn32/dcn32_hubbub.c (100%)
rename drivers/gpu/drm/amd/display/dc/{ => hubbub}/dcn32/dcn32_hubbub.h (100%)
rename drivers/gpu/drm/amd/display/dc/{ => hubbub}/dcn35/dcn35_hubbub.c (100%)
rename drivers/gpu/drm/amd/display/dc/{ => hubbub}/dcn35/dcn35_hubbub.h (100%)
delete mode 100644 drivers/gpu/drm/amd/display/dc/resource/dce80/CMakeLists.txtSignature · 1 line
2.37.3
PATCH 1/46 drm/amd/display: Do cursor programming with rest of pipe
From: Harry Wentland <[email protected]>
Cursors are always programmed independently of updates on other planes. When atomic commits program cursor and surface updates together the cursor update might be locked out by the surface update and not take effect.
To combat this program cursor and surface updates together via dc_update_planes_and_stream to ensure they can be applied atomically.
When cursor updates come on their own use the old method to program the cursor as dc_update_planes_and_stream isn't handling this case correctly (yet), leading to a flickering screen.
--- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 79 ++++++++++++++++++- .../amd/display/amdgpu_dm/amdgpu_dm_plane.c | 4 +- .../amd/display/amdgpu_dm/amdgpu_dm_plane.h | 3 + drivers/gpu/drm/amd/display/dc/core/dc.c | 5 ++ .../gpu/drm/amd/display/dc/core/dc_stream.c | 14 ++-- drivers/gpu/drm/amd/display/dc/dc_stream.h | 12 +++ 6 files changed, 105 insertions(+), 12 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +77 -2
@@ -8365,6 +8365,77 @@ static inline uint32_t get_mem_type(struct drm_framebuffer *fb)return abo->tbo.resource ? abo->tbo.resource->mem_type :0 ; } +static void amdgpu_dm_update_cursor (struct drm_plane *plane, +struct drm_plane_state *old_plane_state, +struct dc_stream_update *update) +{ +struct amdgpu_device *adev =drm_to_adev (plane->dev); +struct amdgpu_framebuffer *afb =to_amdgpu_framebuffer (plane->state->fb); +struct drm_crtc *crtc = afb ? plane->state->crtc : old_plane_state->crtc; +struct dm_crtc_state *crtc_state = crtc ?to_dm_crtc_state (crtc->state) :NULL ; +struct amdgpu_crtc *amdgpu_crtc =to_amdgpu_crtc (crtc); +uint64_t address = afb ? afb->address :0 ; +struct dc_cursor_position position = {0 }; +struct dc_cursor_attributes attributes; +int ret; + +if (!plane->state->fb && !old_plane_state->fb) +return ; + +drm_dbg_atomic (plane->dev,"crtc_id=%d with size %d to %d\n" , + amdgpu_crtc->crtc_id, plane->state->crtc_w, + plane->state->crtc_h); + + ret =amdgpu_dm_plane_get_cursor_position (plane, crtc, &position); +if (ret) +return ; + +if (!position.enable) { +/* turn off cursor */ +if (crtc_state && crtc_state->stream) { +dc_stream_set_cursor_position (crtc_state->stream, + &position); + update->cursor_position = &crtc_state->stream->cursor_position; + } +return ; + } + + amdgpu_crtc->cursor_width = plane->state->crtc_w; + amdgpu_crtc->cursor_height = plane->state->crtc_h; + +memset (&attributes,0 ,sizeof (attributes)); + attributes.address.high_part =upper_32_bits (address); + attributes.address.low_part =lower_32_bits (address); + attributes.width = plane->state->crtc_w; + attributes.height = plane->state->crtc_h; + attributes.color_format =CURSOR_MODE_COLOR_PRE_MULTIPLIED_ALPHA ; + attributes.rotation_angle =0 ; + attributes.attribute_flags.value =0 ; + +/* Enable cursor degamma ROM on DCN3+ for implicit sRGB degamma in DRM +* legacy gamma setup. +*/ +if (crtc_state->cm_is_degamma_srgb && + adev->dm.dc->caps.color.dpp.gamma_corr) + attributes.attribute_flags.bits.ENABLE_CURSOR_DEGAMMA =1 ; + + attributes.pitch = afb->base.pitches[0 ] / afb->base.format->cpp[0 ]; + +if (crtc_state->stream) { +if (!dc_stream_set_cursor_attributes (crtc_state->stream, + &attributes)) +DRM_ERROR ("DC failed to set cursor attributes\n" ); + + update->cursor_attributes = &crtc_state->stream->cursor_attributes; + +if (!dc_stream_set_cursor_position (crtc_state->stream, + &position)) +DRM_ERROR ("DC failed to set cursor position\n" ); + + update->cursor_position = &crtc_state->stream->cursor_position; + } +} + static void amdgpu_dm_commit_planes(struct drm_atomic_state *state, struct drm_device *dev, struct amdgpu_display_manager *dm,
@@ -8388,6 +8459,7 @@ static void amdgpu_dm_commit_planes(struct drm_atomic_state *state,bool cursor_update = false;bool pflip_present = false;bool dirty_rects_changed = false; +bool updated_planes_and_streams = false;struct {struct dc_surface_update surface_updates[MAX_SURFACES ];struct dc_plane_info plane_infos[MAX_SURFACES ];
@@ -8424,8 +8496,10 @@ static void amdgpu_dm_commit_planes(struct drm_atomic_state *state,/* Cursor plane is handled after stream updates */ if (plane->type ==DRM_PLANE_TYPE_CURSOR ) {if ((fb && crtc == pcrtc) || - (old_plane_state->fb && old_plane_state->crtc == pcrtc)) + (old_plane_state->fb && old_plane_state->crtc == pcrtc)) { cursor_update = true; +amdgpu_dm_update_cursor (plane, old_plane_state, &bundle->stream_update); + }continue ; }
@@ -8698,6 +8772,7 @@ static void amdgpu_dm_commit_planes(struct drm_atomic_state *state, acrtc_state->stream, &bundle->stream_update, bundle->surface_updates); + updated_planes_and_streams = true;/** * Enable or disable the interrupts on the backend.
@@ -8775,7 +8850,7 @@ static void amdgpu_dm_commit_planes(struct drm_atomic_state *state,* This avoids redundant programming in the case where we're going * to be disabling a single plane - those pipes are being disabled. */ -if (acrtc_state->active_planes) +if (acrtc_state->active_planes && !updated_planes_and_streams)amdgpu_dm_commit_cursors (state); cleanup:
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c +2 -2
@@ -1197,8 +1197,8 @@ static int amdgpu_dm_plane_atomic_async_check(struct drm_plane *plane,return 0 ; } -static int amdgpu_dm_plane_get_cursor_position (struct drm_plane *plane,struct drm_crtc *crtc, -struct dc_cursor_position *position) +int amdgpu_dm_plane_get_cursor_position (struct drm_plane *plane,struct drm_crtc *crtc, +struct dc_cursor_position *position) {struct amdgpu_crtc *amdgpu_crtc =to_amdgpu_crtc (crtc);int x, y;
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.h +3 -0
@@ -29,6 +29,9 @@#include "dc.h" +int amdgpu_dm_plane_get_cursor_position (struct drm_plane *plane,struct drm_crtc *crtc, +struct dc_cursor_position *position); +void amdgpu_dm_plane_handle_cursor_update (struct drm_plane *plane,struct drm_plane_state *old_plane_state);
drivers/gpu/drm/amd/display/dc/core/dc.c +5 -0
@@ -3340,6 +3340,11 @@ static void commit_planes_do_stream_update(struct dc *dc, } } +if (stream_update->cursor_attributes) +program_cursor_attributes (dc, stream); + +if (stream_update->cursor_position) +program_cursor_position (dc, stream);/* Full fe update*/ if (update_type ==UPDATE_TYPE_FAST )
drivers/gpu/drm/amd/display/dc/core/dc_stream.c +6 -8
@@ -219,10 +219,9 @@ struct dc_stream_status *dc_stream_get_status(return dc_state_get_stream_status (dc->current_state, stream); } -static void program_cursor_attributes ( +void program_cursor_attributes (struct dc *dc, -struct dc_stream_state *stream, -const struct dc_cursor_attributes *attributes) +struct dc_stream_state *stream) {int i;struct resource_context *res_ctx;
@@ -318,7 +317,7 @@ bool dc_stream_program_cursor_attributes( reset_idle_optimizations = true; } -program_cursor_attributes (dc, stream, attributes); +program_cursor_attributes (dc, stream);/* re-enable idle optimizations if necessary */ if (reset_idle_optimizations && !dc->debug.disable_dmub_reallow_idle)
@@ -330,10 +329,9 @@ bool dc_stream_program_cursor_attributes(return false; } -static void program_cursor_position ( +void program_cursor_position (struct dc *dc, -struct dc_stream_state *stream, -const struct dc_cursor_position *position) +struct dc_stream_state *stream) {int i;struct resource_context *res_ctx;
@@ -410,7 +408,7 @@ bool dc_stream_program_cursor_position( reset_idle_optimizations = true; } -program_cursor_position (dc, stream, position); +program_cursor_position (dc, stream);/* re-enable idle optimizations if necessary */ if (reset_idle_optimizations && !dc->debug.disable_dmub_reallow_idle)dc_allow_idle_optimizations (dc, true);
drivers/gpu/drm/amd/display/dc/dc_stream.h +12 -0
@@ -341,6 +341,9 @@ struct dc_stream_update {struct test_pattern *pending_test_pattern;struct dc_crtc_timing_adjust *crtc_timing_adjust; + +struct dc_cursor_attributes *cursor_attributes; +struct dc_cursor_position *cursor_position; }; bool dc_is_stream_unchanged(
@@ -480,6 +483,15 @@ struct dc_stream_status *dc_stream_get_status(* Cursor interfaces - To manages the cursor within a stream ******************************************************************************/ /* TODO: Deprecated once we switch to dc_set_cursor_position */ + +void program_cursor_attributes ( +struct dc *dc, +struct dc_stream_state *stream); + +void program_cursor_position ( +struct dc *dc, +struct dc_stream_state *stream); +bool dc_stream_set_cursor_attributes (struct dc_stream_state *stream,const struct dc_cursor_attributes *attributes);
Signature · 1 line
2.37.3
PATCH 2/46 drm/amd/display: Always use legacy way of setting cursor on DCE
In reply to Wayne LinFrom: Harry Wentland <[email protected]>
Some IGT tests fail with the new atomic cursor updates when running on older DCE-based ASICs. To work around these issues keep calling the amdgpu_dm_commit_cursors for each cursor update on DCE, even if those cursor updates coincide with other plane updates.
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +4 -2
@@ -8498,7 +8498,8 @@ static void amdgpu_dm_commit_planes(struct drm_atomic_state *state,if ((fb && crtc == pcrtc) || (old_plane_state->fb && old_plane_state->crtc == pcrtc)) { cursor_update = true; -amdgpu_dm_update_cursor (plane, old_plane_state, &bundle->stream_update); +if (amdgpu_ip_version (dm->adev,DCE_HWIP ,0 ) !=0 ) +amdgpu_dm_update_cursor (plane, old_plane_state, &bundle->stream_update); }continue ;
@@ -8850,7 +8851,8 @@ static void amdgpu_dm_commit_planes(struct drm_atomic_state *state,* This avoids redundant programming in the case where we're going * to be disabling a single plane - those pipes are being disabled. */ -if (acrtc_state->active_planes && !updated_planes_and_streams) +if (acrtc_state->active_planes && + (!updated_planes_and_streams ||amdgpu_ip_version (dm->adev,DCE_HWIP ,0 ) ==0 ))amdgpu_dm_commit_cursors (state); cleanup:
Signature · 1 line
2.37.3
PATCH 3/46 drm/amd/display: Add NULL pointer check for kzalloc
In reply to Wayne LinFrom: Hersen Wu <[email protected]>
[Why & How]
Check return pointer of kzalloc before using it.
--- .../gpu/drm/amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c | 8 ++++++++ .../gpu/drm/amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c | 8 ++++++++ .../drm/amd/display/dc/resource/dcn30/dcn30_resource.c | 3 +++ .../drm/amd/display/dc/resource/dcn31/dcn31_resource.c | 5 +++++ .../drm/amd/display/dc/resource/dcn314/dcn314_resource.c | 5 +++++ .../drm/amd/display/dc/resource/dcn315/dcn315_resource.c | 2 ++ .../drm/amd/display/dc/resource/dcn316/dcn316_resource.c | 2 ++ .../drm/amd/display/dc/resource/dcn32/dcn32_resource.c | 5 +++++ .../drm/amd/display/dc/resource/dcn321/dcn321_resource.c | 2 ++ .../drm/amd/display/dc/resource/dcn35/dcn35_resource.c | 2 ++ .../drm/amd/display/dc/resource/dcn351/dcn351_resource.c | 2 ++ 11 files changed, 44 insertions(+)
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c +8 -0
@@ -560,11 +560,19 @@ void dcn3_clk_mgr_construct(dce_clock_read_ss_info (clk_mgr); clk_mgr->base.bw_params =kzalloc (sizeof (*clk_mgr->base.bw_params),GFP_KERNEL ); +if (!clk_mgr->base.bw_params) { +BREAK_TO_DEBUGGER (); +return ; + }/* need physical address of table to give to PMFW */ clk_mgr->wm_range_table =dm_helpers_allocate_gpu_mem (clk_mgr->base.ctx,DC_MEM_ALLOC_TYPE_GART ,sizeof (WatermarksExternal_t), &clk_mgr->wm_range_table_addr); +if (!clk_mgr->wm_range_table) { +BREAK_TO_DEBUGGER (); +return ; + } }void dcn3_clk_mgr_destroy (struct clk_mgr_internal *clk_mgr)
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c +8 -0
@@ -1199,11 +1199,19 @@ void dcn32_clk_mgr_construct( clk_mgr->smu_present = false; clk_mgr->base.bw_params =kzalloc (sizeof (*clk_mgr->base.bw_params),GFP_KERNEL ); +if (!clk_mgr->base.bw_params) { +BREAK_TO_DEBUGGER (); +return ; + }/* need physical address of table to give to PMFW */ clk_mgr->wm_range_table =dm_helpers_allocate_gpu_mem (clk_mgr->base.ctx,DC_MEM_ALLOC_TYPE_GART ,sizeof (WatermarksExternal_t), &clk_mgr->wm_range_table_addr); +if (!clk_mgr->wm_range_table) { +BREAK_TO_DEBUGGER (); +return ; + } }void dcn32_clk_mgr_destroy (struct clk_mgr_internal *clk_mgr)
drivers/gpu/drm/amd/display/dc/resource/dcn30/dcn30_resource.c +3 -0
@@ -2050,6 +2050,9 @@ bool dcn30_validate_bandwidth(struct dc *dc,BW_VAL_TRACE_COUNT (); +if (!pipes) + goto validate_fail; +DC_FP_START (); out =dcn30_internal_validate_bw (dc, context, pipes, &pipe_cnt, &vlevel, fast_validate, true);DC_FP_END ();
drivers/gpu/drm/amd/display/dc/resource/dcn31/dcn31_resource.c +5 -0
@@ -1310,6 +1310,8 @@ static struct hpo_dp_link_encoder *dcn31_hpo_dp_link_encoder_create(/* allocate HPO link encoder */ hpo_dp_enc31 =kzalloc (sizeof (struct dcn31_hpo_dp_link_encoder ),GFP_KERNEL ); +if (!hpo_dp_enc31) +return NULL ;/* out of memory */ hpo_dp_link_encoder31_construct(hpo_dp_enc31, ctx, inst, &hpo_dp_link_enc_regs[inst],
@@ -1766,6 +1768,9 @@ bool dcn31_validate_bandwidth(struct dc *dc,BW_VAL_TRACE_COUNT (); +if (!pipes) + goto validate_fail; +DC_FP_START (); out =dcn30_internal_validate_bw (dc, context, pipes, &pipe_cnt, &vlevel, fast_validate, true);DC_FP_END ();
drivers/gpu/drm/amd/display/dc/resource/dcn314/dcn314_resource.c +5 -0
@@ -1367,6 +1367,8 @@ static struct hpo_dp_link_encoder *dcn31_hpo_dp_link_encoder_create(/* allocate HPO link encoder */ hpo_dp_enc31 =kzalloc (sizeof (struct dcn31_hpo_dp_link_encoder ),GFP_KERNEL ); +if (!hpo_dp_enc31) +return NULL ;/* out of memory */ hpo_dp_link_encoder31_construct(hpo_dp_enc31, ctx, inst, &hpo_dp_link_enc_regs[inst],
@@ -1727,6 +1729,9 @@ bool dcn314_validate_bandwidth(struct dc *dc,BW_VAL_TRACE_COUNT (); +if (!pipes) + goto validate_fail; +if (filter_modes_for_single_channel_workaround (dc, context)) goto validate_fail;
drivers/gpu/drm/amd/display/dc/resource/dcn315/dcn315_resource.c +2 -0
@@ -1309,6 +1309,8 @@ static struct hpo_dp_link_encoder *dcn31_hpo_dp_link_encoder_create(/* allocate HPO link encoder */ hpo_dp_enc31 =kzalloc (sizeof (struct dcn31_hpo_dp_link_encoder ),GFP_KERNEL ); +if (!hpo_dp_enc31) +return NULL ;/* out of memory */ hpo_dp_link_encoder31_construct(hpo_dp_enc31, ctx, inst, &hpo_dp_link_enc_regs[inst],
drivers/gpu/drm/amd/display/dc/resource/dcn316/dcn316_resource.c +2 -0
@@ -1305,6 +1305,8 @@ static struct hpo_dp_link_encoder *dcn31_hpo_dp_link_encoder_create(/* allocate HPO link encoder */ hpo_dp_enc31 =kzalloc (sizeof (struct dcn31_hpo_dp_link_encoder ),GFP_KERNEL ); +if (!hpo_dp_enc31) +return NULL ;/* out of memory */ hpo_dp_link_encoder31_construct(hpo_dp_enc31, ctx, inst, &hpo_dp_link_enc_regs[inst],
drivers/gpu/drm/amd/display/dc/resource/dcn32/dcn32_resource.c +5 -0
@@ -1305,6 +1305,8 @@ static struct hpo_dp_link_encoder *dcn32_hpo_dp_link_encoder_create(/* allocate HPO link encoder */ hpo_dp_enc31 =kzalloc (sizeof (struct dcn31_hpo_dp_link_encoder ),GFP_KERNEL ); +if (!hpo_dp_enc31) +return NULL ;/* out of memory */ #undef REG_STRUCT#define REG_STRUCT hpo_dp_link_enc_regs
@@ -1752,6 +1754,9 @@ static bool dml1_validate(struct dc *dc, struct dc_state *context, bool fast_valBW_VAL_TRACE_COUNT (); +if (!pipes) + goto validate_fail; +DC_FP_START (); out =dcn32_internal_validate_bw (dc, context, pipes, &pipe_cnt, &vlevel, fast_validate);DC_FP_END ();
drivers/gpu/drm/amd/display/dc/resource/dcn321/dcn321_resource.c +2 -0
@@ -1288,6 +1288,8 @@ static struct hpo_dp_link_encoder *dcn321_hpo_dp_link_encoder_create(/* allocate HPO link encoder */ hpo_dp_enc31 =kzalloc (sizeof (struct dcn31_hpo_dp_link_encoder ),GFP_KERNEL ); +if (!hpo_dp_enc31) +return NULL ;/* out of memory */ #undef REG_STRUCT#define REG_STRUCT hpo_dp_link_enc_regs
drivers/gpu/drm/amd/display/dc/resource/dcn35/dcn35_resource.c +2 -0
@@ -1368,6 +1368,8 @@ static struct hpo_dp_link_encoder *dcn31_hpo_dp_link_encoder_create(/* allocate HPO link encoder */ hpo_dp_enc31 =kzalloc (sizeof (struct dcn31_hpo_dp_link_encoder ),GFP_KERNEL ); +if (!hpo_dp_enc31) +return NULL ;/* out of memory */ #undef REG_STRUCT#define REG_STRUCT hpo_dp_link_enc_regs
drivers/gpu/drm/amd/display/dc/resource/dcn351/dcn351_resource.c +2 -0
@@ -1348,6 +1348,8 @@ static struct hpo_dp_link_encoder *dcn31_hpo_dp_link_encoder_create(/* allocate HPO link encoder */ hpo_dp_enc31 =kzalloc (sizeof (struct dcn31_hpo_dp_link_encoder ),GFP_KERNEL ); +if (!hpo_dp_enc31) +return NULL ;/* out of memory */ #undef REG_STRUCT#define REG_STRUCT hpo_dp_link_enc_regs
Signature · 1 line
2.37.3
PATCH 4/46 drm/amd/display: Check index msg_id before read or write
In reply to Wayne LinFrom: Alex Hung <[email protected]>
[WHAT]msg_id is used as an array index and it cannot be a negative value, and therefore cannot be equal to MOD_HDCP_MESSAGE_ID_INVALID (-1).
[HOW]
Check whether msg_id is valid before reading and setting.
This fixes 4 OVERRUN issues reported by Coverity.
--- drivers/gpu/drm/amd/display/modules/hdcp/hdcp_ddc.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/gpu/drm/amd/display/modules/hdcp/hdcp_ddc.c +8 -0
@@ -156,6 +156,10 @@ static enum mod_hdcp_status read(struct mod_hdcp *hdcp,uint32_t cur_size =0 ;uint32_t data_offset =0 ; +if (msg_id ==MOD_HDCP_MESSAGE_ID_INVALID ) { +return MOD_HDCP_STATUS_DDC_FAILURE ; + } +if (is_dp_hdcp (hdcp)) {while (buf_len >0 ) { cur_size =MIN (buf_len,HDCP_MAX_AUX_TRANSACTION_SIZE );
@@ -215,6 +219,10 @@ static enum mod_hdcp_status write(struct mod_hdcp *hdcp,uint32_t cur_size =0 ;uint32_t data_offset =0 ; +if (msg_id ==MOD_HDCP_MESSAGE_ID_INVALID ) { +return MOD_HDCP_STATUS_DDC_FAILURE ; + } +if (is_dp_hdcp (hdcp)) {while (buf_len >0 ) { cur_size =MIN (buf_len,HDCP_MAX_AUX_TRANSACTION_SIZE );
Signature · 1 line
2.37.3
PATCH 5/46 drm/amd/display: Check pipe offset before setting vblank
In reply to Wayne LinFrom: Alex Hung <[email protected]>
pipe_ctx has a size of MAX_PIPES so checking its index before accessing the array.
This fixes an OVERRUN issue reported by Coverity.
--- .../drm/amd/display/dc/irq/dce110/irq_service_dce110.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/display/dc/irq/dce110/irq_service_dce110.c +6 -2
@@ -211,8 +211,12 @@ bool dce110_vblank_set(struct irq_service *irq_service, info->ext_id);uint8_t pipe_offset = dal_irq_src -IRQ_TYPE_VBLANK ; -struct timing_generator *tg = - dc->current_state->res_ctx.pipe_ctx[pipe_offset].stream_res.tg; +struct timing_generator *tg; + +if (pipe_offset >=MAX_PIPES ) +return false; + + tg = dc->current_state->res_ctx.pipe_ctx[pipe_offset].stream_res.tg;if (enable) {if (!tg || !tg->funcs->arm_vert_intr (tg,2 )) {
Signature · 1 line
2.37.3
PATCH 6/46 drm/amd/display: Skip finding free audio for unknown engine_id
In reply to Wayne LinFrom: Alex Hung <[email protected]>
[WHY]ENGINE_ID_UNKNOWN = -1 and can not be used as an array index. Plus, it also means it is uninitialized and does not need free audio.
[HOW]
Skip and return NULL.
This fixes 2 OVERRUN issues reported by Coverity.
--- drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/amd/display/dc/core/dc_resource.c +3 -0
@@ -3230,6 +3230,9 @@ static struct audio *find_first_free_audio( {int i, available_audio_count; +if (id ==ENGINE_ID_UNKNOWN ) +return NULL ; + available_audio_count = pool->audio_count;for (i =0 ; i < available_audio_count; i++) {
Signature · 1 line
2.37.3
PATCH 7/46 drm/amd/display: Fix overlapping copy within dml_core_mode_programming
In reply to Wayne LinFrom: Hersen Wu <[email protected]>
[WHY]&mode_lib->mp.Watermark and &locals->Watermark are the same address. memcpy may lead to unexpected behavior.
[HOW]
memmove should be used.
--- drivers/gpu/drm/amd/display/dc/dml2/display_mode_core.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/dml2/display_mode_core.c +3 -1
@@ -9460,8 +9460,10 @@ void dml_core_mode_programming(struct display_mode_lib_st *mode_lib, const struc/* Copy the calculated watermarks to mp.Watermark as the getter functions are * implemented by the DML team to copy the calculated values from the mp.Watermark interface. +* &mode_lib->mp.Watermark and &locals->Watermark are the same address, memcpy may lead to +* unexpected behavior. memmove should be used. */ -memcpy (&mode_lib->mp.Watermark, CalculateWatermarks_params->Watermark,sizeof (struct Watermarks )); +memmove (&mode_lib->mp.Watermark, CalculateWatermarks_params->Watermark,sizeof (struct Watermarks ));for (k =0 ; k < mode_lib->ms.num_active_planes; ++k) {if (mode_lib->ms.cache_display_cfg.writeback.WritebackEnable[k] == true) {
Signature · 1 line
2.37.3
PATCH 8/46 drm/amd/display: Do not return negative stream id for array
In reply to Wayne LinFrom: Alex Hung <[email protected]>
[WHY]resource_stream_to_stream_idx returns an array index and it return -1 when not found; however, -1 is not a valid array index number.
[HOW]
When this happens, call ASSERT(), and return a zero instead.
This fixes an OVERRUN and an NEGATIVE_RETURNS issues reported by Coverity.
--- drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/gpu/drm/amd/display/dc/core/dc_resource.c +7 -0
@@ -2282,6 +2282,13 @@ static int resource_stream_to_stream_idx(struct dc_state *state, stream_idx = i;break ; } + +/* never return negative array index */ +if (stream_idx ==-1 ) { +ASSERT (0 ); +return 0 ; + } +return stream_idx; }
Signature · 1 line
2.37.3
PATCH 9/46 drm/amd/display: ASSERT when failing to find index by plane/stream id
In reply to Wayne LinFrom: Alex Hung <[email protected]>
[WHY]find_disp_cfg_idx_by_plane_id and find_disp_cfg_idx_by_stream_id returns an array index and they return -1 when not found; however, -1 is not a valid index number.
[HOW]
When this happens, call ASSERT(), and return a positive number (which is fewer than callers' array size) instead.
This fixes 4 OVERRUN and 2 NEGATIVE_RETURNS issues reported by Coverity.
--- drivers/gpu/drm/amd/display/dc/dml2/dml2_dc_resource_mgmt.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/display/dc/dml2/dml2_dc_resource_mgmt.c +4 -2
@@ -88,7 +88,8 @@ static int find_disp_cfg_idx_by_plane_id(struct dml2_dml_to_dc_pipe_mapping *mapreturn i; } -return -1 ; +ASSERT (false); +return __DML2_WRAPPER_MAX_STREAMS_PLANES__; }static int find_disp_cfg_idx_by_stream_id (struct dml2_dml_to_dc_pipe_mapping *mapping,unsigned int stream_id)
@@ -100,7 +101,8 @@ static int find_disp_cfg_idx_by_stream_id(struct dml2_dml_to_dc_pipe_mapping *mareturn i; } -return -1 ; +ASSERT (false); +return __DML2_WRAPPER_MAX_STREAMS_PLANES__; }// The master pipe of a stream is defined as the top pipe in odm slice 0
Signature · 1 line
2.37.3
PATCH 10/46 drm/amd/display: Remove unnecessary files
In reply to Wayne Lin[Why & How]
We accidentally upstream unnecessary files. Remove them.
--- drivers/gpu/drm/amd/display/dc/dpp/dcn10/CMakeLists.txt | 6 ------ drivers/gpu/drm/amd/display/dc/dpp/dcn20/CMakeLists.txt | 5 ----- drivers/gpu/drm/amd/display/dc/dpp/dcn201/CMakeLists.txt | 4 ---- drivers/gpu/drm/amd/display/dc/dpp/dcn30/CMakeLists.txt | 5 ----- drivers/gpu/drm/amd/display/dc/dpp/dcn32/CMakeLists.txt | 4 ---- drivers/gpu/drm/amd/display/dc/dpp/dcn35/CMakeLists.txt | 4 ---- .../gpu/drm/amd/display/dc/resource/dce80/CMakeLists.txt | 4 ---- 7 files changed, 32 deletions(-) delete mode 100644 drivers/gpu/drm/amd/display/dc/dpp/dcn10/CMakeLists.txt delete mode 100644 drivers/gpu/drm/amd/display/dc/dpp/dcn20/CMakeLists.txt delete mode 100644 drivers/gpu/drm/amd/display/dc/dpp/dcn201/CMakeLists.txt delete mode 100644 drivers/gpu/drm/amd/display/dc/dpp/dcn30/CMakeLists.txt delete mode 100644 drivers/gpu/drm/amd/display/dc/dpp/dcn32/CMakeLists.txt delete mode 100644 drivers/gpu/drm/amd/display/dc/dpp/dcn35/CMakeLists.txt delete mode 100644 drivers/gpu/drm/amd/display/dc/resource/dce80/CMakeLists.txt
drivers/gpu/drm/amd/display/dc/dpp/dcn10/CMakeLists.txt deleted +0 -6
@@ -1,6 +0,0 @@ -dal3_subdirectory_sources( - dcn10_dpp.c - dcn10_dpp_cm.c - dcn10_dpp_dscl.c - dcn10_dpp.h -)
drivers/gpu/drm/amd/display/dc/dpp/dcn20/CMakeLists.txt deleted +0 -5
@@ -1,5 +0,0 @@ -dal3_subdirectory_sources( - dcn20_dpp.c - dcn20_dpp_cm.c - dcn20_dpp.h -)
drivers/gpu/drm/amd/display/dc/dpp/dcn201/CMakeLists.txt deleted +0 -4
@@ -1,4 +0,0 @@ -dal3_subdirectory_sources( - dcn201_dpp.c - dcn201_dpp.h -)
drivers/gpu/drm/amd/display/dc/dpp/dcn30/CMakeLists.txt deleted +0 -5
@@ -1,5 +0,0 @@ -dal3_subdirectory_sources( - dcn30_dpp.c - dcn30_dpp_cm.c - dcn30_dpp.h -)
drivers/gpu/drm/amd/display/dc/dpp/dcn32/CMakeLists.txt deleted +0 -4
@@ -1,4 +0,0 @@ -dal3_subdirectory_sources( - dcn32_dpp.c - dcn32_dpp.h -)
drivers/gpu/drm/amd/display/dc/dpp/dcn35/CMakeLists.txt deleted +0 -4
@@ -1,4 +0,0 @@ -dal3_subdirectory_sources( - dcn35_dpp.c - dcn35_dpp.h -)
drivers/gpu/drm/amd/display/dc/resource/dce80/CMakeLists.txt deleted +0 -4
@@ -1,4 +0,0 @@ -dal3_subdirectory_sources( - dce80_resource.c - dce80_resource.h - )
Signature · 1 line
2.37.3
PATCH 11/46 drm/amd/display: Improve registers write
In reply to Wayne LinFrom: Rodrigo Siqueira <[email protected]>
Add REG_SEQ_SUBMIT and REG_SEQ_WAIT_DONE to optimize the burst write for the regama lut.
--- drivers/gpu/drm/amd/display/dc/dpp/dcn10/dcn10_dpp_cm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/dpp/dcn10/dcn10_dpp_cm.c +2 -1
@@ -410,9 +410,10 @@ void dpp1_cm_program_regamma_lut(struct dpp *dpp_base,REG_SET (CM_RGAM_LUT_DATA ,0 ,CM_RGAM_LUT_DATA , rgb[i].delta_red_reg);REG_SET (CM_RGAM_LUT_DATA ,0 ,CM_RGAM_LUT_DATA , rgb[i].delta_green_reg);REG_SET (CM_RGAM_LUT_DATA ,0 ,CM_RGAM_LUT_DATA , rgb[i].delta_blue_reg); - } +REG_SEQ_SUBMIT (); +REG_SEQ_WAIT_DONE (); } void dpp1_cm_configure_regamma_lut(
Signature · 1 line
2.37.3
PATCH 12/46 drm/amd/display: Add missing SMU version
In reply to Wayne LinFrom: Rodrigo Siqueira <[email protected]>
This commit add PP_SMU_VER_VG to the pp_smu_ver list.
--- drivers/gpu/drm/amd/display/dc/dm_pp_smu.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/dm_pp_smu.h +2 -1
@@ -40,8 +40,9 @@ enum pp_smu_ver {PP_SMU_UNSUPPORTED ,PP_SMU_VER_RV ,PP_SMU_VER_NV , -PP_SMU_VER_RN , +PP_SMU_VER_RN , +PP_SMU_VER_VG , PP_SMU_VER_MAX };
Signature · 1 line
2.37.3
PATCH 13/46 drm/amd/display: Adjust codestyle for dcn31 and hdcp_msg
In reply to Wayne LinFrom: Rodrigo Siqueira <[email protected]>
This commit just update the code style in two if conditions and in an static array.
--- drivers/gpu/drm/amd/display/dc/dml/dcn31/dcn31_fpu.c | 8 ++++---- drivers/gpu/drm/amd/display/dc/hdcp/hdcp_msg.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/display/dc/dml/dcn31/dcn31_fpu.c +4 -4
@@ -645,9 +645,9 @@ void dcn31_update_bw_bounding_box(struct dc *dc, struct clk_bw_params *bw_params dcn3_1_soc.clock_limits[closest_clk_lvl].phyclk_d18_mhz; s[i].phyclk_mhz = dcn3_1_soc.clock_limits[closest_clk_lvl].phyclk_mhz; } -if (clk_table->num_entries) { + +if (clk_table->num_entries) dcn3_1_soc.num_states = clk_table->num_entries; - }memcpy (dcn3_1_soc.clock_limits, s,sizeof (dcn3_1_soc.clock_limits));
@@ -797,9 +797,9 @@ void dcn316_update_bw_bounding_box(struct dc *dc, struct clk_bw_params *bw_param dcn3_16_soc.clock_limits[closest_clk_lvl].phyclk_d18_mhz; s[i].phyclk_mhz = dcn3_16_soc.clock_limits[closest_clk_lvl].phyclk_mhz; } -if (clk_table->num_entries) { + +if (clk_table->num_entries) dcn3_16_soc.num_states = clk_table->num_entries; - }memcpy (dcn3_16_soc.clock_limits, s,sizeof (dcn3_16_soc.clock_limits));
drivers/gpu/drm/amd/display/dc/hdcp/hdcp_msg.c +1 -1
@@ -70,7 +70,7 @@ static const bool hdcp_cmd_is_read[HDCP_MESSAGE_ID_MAX] = { [HDCP_MESSAGE_ID_WRITE_REPEATER_AUTH_STREAM_MANAGE] = false, [HDCP_MESSAGE_ID_READ_REPEATER_AUTH_STREAM_READY] = true, [HDCP_MESSAGE_ID_READ_RXSTATUS] = true, - [HDCP_MESSAGE_ID_WRITE_CONTENT_STREAM_TYPE ] = false + [HDCP_MESSAGE_ID_WRITE_CONTENT_STREAM_TYPE] = false, };static const uint8_t hdcp_i2c_offsets[HDCP_MESSAGE_ID_MAX ] = {
Signature · 1 line
2.37.3
PATCH 14/46 drm/amd/display: Add VCO speed parameter for DCN31 FPU
In reply to Wayne LinFrom: Rodrigo Siqueira <[email protected]>
Add VCO speed parameters in the bounding box array.
--- drivers/gpu/drm/amd/display/dc/dml/dcn31/dcn31_fpu.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/amd/display/dc/dml/dcn31/dcn31_fpu.c +2 -0
@@ -291,6 +291,7 @@ static struct _vcs_dpi_soc_bounding_box_st dcn3_15_soc = { .do_urgent_latency_adjustment = false, .urgent_latency_adjustment_fabric_clock_component_us = 0, .urgent_latency_adjustment_fabric_clock_reference_mhz = 0, + .dispclk_dppclk_vco_speed_mhz = 2400.0, .num_chans = 4, .dummy_pstate_latency_us = 10.0 };
@@ -438,6 +439,7 @@ static struct _vcs_dpi_soc_bounding_box_st dcn3_16_soc = { .do_urgent_latency_adjustment = false, .urgent_latency_adjustment_fabric_clock_component_us = 0, .urgent_latency_adjustment_fabric_clock_reference_mhz = 0, + .dispclk_dppclk_vco_speed_mhz = 2500.0, }; void dcn31_zero_pipe_dcc_fraction(display_e2e_pipe_params_st *pipes,
Signature · 1 line
2.37.3
PATCH 15/46 drm/amd/display: Adjust functions prefix for some of the dcn301 fpu functions
In reply to Wayne LinFrom: Rodrigo Siqueira <[email protected]>
Add dcn301_fpu prefix to some of the FPU function with the required adjustments.
--- .../amd/display/dc/dml/dcn301/dcn301_fpu.c | 4 ++-- .../amd/display/dc/dml/dcn301/dcn301_fpu.h | 7 +++---- .../dc/resource/dcn301/dcn301_resource.c | 19 +++++++++++++------ 3 files changed, 18 insertions(+), 12 deletions(-)
drivers/gpu/drm/amd/display/dc/dml/dcn301/dcn301_fpu.c +2 -2
@@ -320,7 +320,7 @@ static void calculate_wm_set_for_vlevel(int vlevel, } -void dcn301_update_bw_bounding_box (struct dc *dc,struct clk_bw_params *bw_params) +void dcn301_fpu_update_bw_bounding_box (struct dc *dc,struct clk_bw_params *bw_params) {struct _vcs_dpi_voltage_scaling_st *s = dc->scratch.update_bw_bounding_box.clock_limits;struct dcn301_resource_pool *pool =TO_DCN301_RES_POOL (dc->res_pool);
@@ -409,7 +409,7 @@ void dcn301_fpu_init_soc_bounding_box(struct bp_soc_bb_info bb_info) dcn3_01_soc.sr_exit_time_us = bb_info.dram_sr_exit_latency_100ns *10 ; } -void dcn301_calculate_wm_and_dlg_fp(struct dc *dc, +void dcn301_fpu_calculate_wm_and_dlg(struct dc *dc, struct dc_state *context, display_e2e_pipe_params_st *pipes, int pipe_cnt,
drivers/gpu/drm/amd/display/dc/dml/dcn301/dcn301_fpu.h +3 -4
@@ -26,15 +26,14 @@#ifndef __DCN301_FPU_H__#define __DCN301_FPU_H__ -void dcn301_update_bw_bounding_box (struct dc *dc,struct clk_bw_params *bw_params); +void dcn301_fpu_init_soc_bounding_box (struct bp_soc_bb_info bb_info); +void dcn301_fpu_update_bw_bounding_box (struct dc *dc,struct clk_bw_params *bw_params);void dcn301_fpu_set_wm_ranges (int i,struct pp_smu_wm_range_sets *ranges,struct _vcs_dpi_soc_bounding_box_st *loaded_bb); -void dcn301_fpu_init_soc_bounding_box (struct bp_soc_bb_info bb_info); - -void dcn301_calculate_wm_and_dlg_fp(struct dc *dc, +void dcn301_fpu_calculate_wm_and_dlg(struct dc *dc, struct dc_state *context, display_e2e_pipe_params_st *pipes, int pipe_cnt,
drivers/gpu/drm/amd/display/dc/resource/dcn301/dcn301_resource.c +13 -6
@@ -1363,14 +1363,21 @@ static void set_wm_ranges( pp_smu->nv_funcs.set_wm_ranges (&pp_smu->nv_funcs.pp_smu, &ranges); } -static void dcn301_calculate_wm_and_dlg ( -struct dc *dc,struct dc_state *context, -display_e2e_pipe_params_st *pipes, -int pipe_cnt, -int vlevel) +static void dcn301_update_bw_bounding_box (struct dc *dc,struct clk_bw_params *bw_params) {DC_FP_START (); -dcn301_calculate_wm_and_dlg_fp (dc, context, pipes, pipe_cnt, vlevel); +dcn301_fpu_update_bw_bounding_box (dc, bw_params); +DC_FP_END (); +} + +static void dcn301_calculate_wm_and_dlg (struct dc *dc, +struct dc_state *context, +display_e2e_pipe_params_st *pipes, +int pipe_cnt, +int vlevel_req) +{ +DC_FP_START (); +dcn301_fpu_calculate_wm_and_dlg (dc, context, pipes, pipe_cnt, vlevel_req);DC_FP_END (); }
Signature · 1 line
2.37.3