DC Patches Jun 24, 2026
cover DC Patches Jun 24, 2026
This DC patchset brings improvements in multiple areas. In summary, we have:
* Fixes on DCN4, encoder, debugfs output, and others
* Enhanced KUnit coverage
* Code cleanup
Alex Hung (12):
drm/amd/display: Extract backlight helpers for KUnit tests drm/amd/display: Add more KUnit tests for amdgpu_dm_colorop drm/amd/display: Simplify boolean checks drm/amd/display: Simplify DMUB notify registration drm/amd/display: Fix KUnit test crash after global alpha change drm/amd/display: Add KUnit test for amdgpu_dm_wb drm/amd/display: Add KUnit tests for amdgpu_dm_replay drm/amd/display: Add KUnit tests for amdgpu_dm_psr drm/amd/display: Add KUnit tests for amdgpu_dm_pp_smu drm/amd/display: Add KUnit tests for mst_types drm/amd/display: Extract shared KUnit test helpers drm/amd/amdgpu: Fix stack frame size warnings in KUnit tests
Andrew Lichmanov (1):
drm/amd/display: Disable mem gating for DCHVM on DCHVM init
Austin Zheng (1):
drm/amd/display: Revert "Add Debug Option To Enable Per-DPM De-rate
Usage"
Bhawanpreet Lakha (1):
drm/amd/display: Add kunit tests for amdgpu_dm_plane
Bhuvanachandra Pinninti (2):
drm/amd/display: Cleaned up headers
drm/amd/display: Add block sequence support for bandwidth programming
operations
Charlene Liu (1):
drm/amd/display: remove dead code related to forcevrr
Harry Wentland (4):
drm/amd/display: fix malformed link_settings debugfs output drm/amd/display: clamp DMUB AUX reply length to payload buffer drm/amd/display: guard against overflow in HDCP message dump drm/amd/display: hold a vblank ref while writeback is pending
James Lin (1):
drm/amd/display: scale plane global alpha to 12 bits on DCN 4.2
Leo Chen (1):
drm/amd/display: revert "Enable HUBP/DPP power gate for DCN42"
Peichen Huang (1):
drm/amd/display: correct encoder minimal creation
Relja Vojvodic (1):
drm/amd/display: Update link bw
Taimur Hassan (1):
drm/amd/display: Promote DC to 3.2.388
Wenjing Liu (1):
drm/amd/display: Replace repeated no-native-i2c checks with
force_i2c_over_aux field
.../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 64 +- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 2 + .../display/amdgpu_dm/amdgpu_dm_backlight.c | 84 +- .../display/amdgpu_dm/amdgpu_dm_backlight.h | 8 + .../amd/display/amdgpu_dm/amdgpu_dm_colorop.c | 1 + .../display/amdgpu_dm/amdgpu_dm_connector.c | 2 +- .../amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 20 +- .../amd/display/amdgpu_dm/amdgpu_dm_dmub.c | 32 +- .../drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c | 53 +- .../display/amdgpu_dm/amdgpu_dm_mst_types.c | 19 +- .../display/amdgpu_dm/amdgpu_dm_mst_types.h | 7 + .../amd/display/amdgpu_dm/amdgpu_dm_plane.c | 127 +- .../amd/display/amdgpu_dm/amdgpu_dm_plane.h | 51 + .../amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c | 52 +- .../amd/display/amdgpu_dm/amdgpu_dm_pp_smu.h | 23 + .../drm/amd/display/amdgpu_dm/amdgpu_dm_psr.c | 51 +- .../drm/amd/display/amdgpu_dm/amdgpu_dm_psr.h | 5 + .../amd/display/amdgpu_dm/amdgpu_dm_replay.c | 3 + .../drm/amd/display/amdgpu_dm/amdgpu_dm_wb.c | 1 + .../amd/display/amdgpu_dm/tests/.kunitconfig | 3 + .../drm/amd/display/amdgpu_dm/tests/Makefile | 3 + .../tests/amdgpu_dm_backlight_test.c | 140 +- .../amdgpu_dm/tests/amdgpu_dm_colorop_test.c | 140 +- .../tests/amdgpu_dm_connector_test.c | 64 +- .../amdgpu_dm/tests/amdgpu_dm_crtc_test.c | 15 +- .../amdgpu_dm/tests/amdgpu_dm_helpers_test.c | 19 +- .../amdgpu_dm/tests/amdgpu_dm_irq_test.c | 37 +- .../amdgpu_dm/tests/amdgpu_dm_ism_test.c | 39 +- .../amdgpu_dm/tests/amdgpu_dm_kunit_helpers.c | 142 ++ .../tests/amdgpu_dm_kunit_test_helpers.h | 32 + .../tests/amdgpu_dm_mst_types_test.c | 643 ++++++- .../amdgpu_dm/tests/amdgpu_dm_plane_test.c | 1228 +++++++++++++ .../amdgpu_dm/tests/amdgpu_dm_pp_smu_test.c | 1535 ++++++++++++++++- .../amdgpu_dm/tests/amdgpu_dm_psr_test.c | 518 +++++- .../amdgpu_dm/tests/amdgpu_dm_replay_test.c | 432 ++++- .../display/amdgpu_dm/tests/amdgpu_dm_test.c | 72 +- .../amdgpu_dm/tests/amdgpu_dm_wb_test.c | 56 + .../dc/clk_mgr/dcn401/dcn401_clk_mgr.c | 57 +- .../dc/clk_mgr/dcn401/dcn401_clk_mgr.h | 9 + drivers/gpu/drm/amd/display/dc/core/dc.c | 4 +- .../drm/amd/display/dc/core/dc_hw_sequencer.c | 154 ++ drivers/gpu/drm/amd/display/dc/dc.h | 9 +- drivers/gpu/drm/amd/display/dc/dce/dce_aux.c | 9 +- .../amd/display/dc/dce110/dce110_compressor.c | 2 - .../display/dc/dce110/dce110_mem_input_v.c | 2 - .../amd/display/dc/dce112/dce112_compressor.c | 8 +- .../dc/dio/dcn31/dcn31_dio_link_encoder.c | 4 + .../dc/dio/dcn31/dcn31_dio_link_encoder.h | 2 + .../dc/gpio/dce80/hw_translate_dce80.c | 5 +- .../display/dc/hubbub/dcn35/dcn35_hubbub.c | 2 +- .../amd/display/dc/hwss/dcn401/dcn401_hwseq.c | 97 +- .../amd/display/dc/hwss/dcn401/dcn401_hwseq.h | 10 + .../amd/display/dc/hwss/dcn401/dcn401_init.c | 2 + .../drm/amd/display/dc/hwss/hw_sequencer.h | 82 + .../gpu/drm/amd/display/dc/inc/hw/clk_mgr.h | 8 + .../gpu/drm/amd/display/dc/inc/link_service.h | 1 + .../drm/amd/display/dc/link/link_factory.c | 7 +- .../amd/display/dc/link/protocols/link_ddc.c | 20 +- .../amd/display/dc/link/protocols/link_ddc.h | 2 + .../dc/link/protocols/link_dp_capability.c | 8 +- .../dc/link/protocols/link_dp_panel_replay.c | 7 +- .../link/protocols/link_edp_panel_control.c | 13 +- .../dc/resource/dcn31/dcn31_resource.c | 4 +- .../dc/resource/dcn314/dcn314_resource.c | 4 +- .../dc/resource/dcn315/dcn315_resource.c | 4 +- .../dc/resource/dcn316/dcn316_resource.c | 4 +- .../dc/resource/dcn35/dcn35_resource.c | 4 +- .../dc/resource/dcn351/dcn351_resource.c | 4 +- .../dc/resource/dcn36/dcn36_resource.c | 4 +- .../dc/resource/dcn42/dcn42_resource.c | 8 +- .../dc/resource/dcn42b/dcn42b_resource.c | 4 +- .../dcn401/dcn401_soc_and_ip_translator.c | 16 - .../drm/amd/display/modules/hdcp/hdcp_log.c | 30 +- .../gpu/drm/amd/display/modules/power/power.c | 7 +- .../drm/amd/display/modules/power/power_abm.c | 14 +- 75 files changed, 5875 insertions(+), 479 deletions(-) create mode 100644 drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_kunit_helpers.c create mode 100644 drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_kunit_test_helpers.h create mode 100644 drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_plane_test.c
Signature · 1 line
2.53.0
PATCH 2/28 drm/amd/display: Replace repeated no-native-i2c checks with force_i2c_over_aux field
From: Wenjing Liu <[email protected]>
[Why]
The compound condition checking dp_connector_no_native_i2c and no_ddc_pin was duplicated across many files, obscuring intent at every call site.
[How]
Add bool force_i2c_over_aux to struct dc_link, initialized once during link creation. Add link_get_ddc_aux_inst() helper to select the correct aux instance. Wire into link_service via construct_link_service_ddc(). Replace all duplicated condition checks and aux instance selection blocks with the new field and helper. No functional change.
--- drivers/gpu/drm/amd/display/dc/dc.h | 4 ++++ drivers/gpu/drm/amd/display/dc/dce/dce_aux.c | 8 ++++---- .../amd/display/dc/hwss/dcn401/dcn401_hwseq.c | 2 +- .../gpu/drm/amd/display/dc/inc/link_service.h | 1 + .../drm/amd/display/dc/link/link_factory.c | 7 +++++-- .../amd/display/dc/link/protocols/link_ddc.c | 20 ++++++++++++++++--- .../amd/display/dc/link/protocols/link_ddc.h | 2 ++ .../dc/link/protocols/link_dp_capability.c | 2 +- .../dc/link/protocols/link_dp_panel_replay.c | 7 ++----- .../link/protocols/link_edp_panel_control.c | 13 +++--------- .../gpu/drm/amd/display/modules/power/power.c | 7 +------ .../drm/amd/display/modules/power/power_abm.c | 14 ++----------- 12 files changed, 43 insertions(+), 44 deletions(-)
drivers/gpu/drm/amd/display/dc/dc.h +4 -0
@@ -1845,6 +1845,10 @@ struct dc_scratch_space {* of ddc_pin to know which aux instance is associated with link. */ bool no_ddc_pin; +/** When set, forces all native I2C communication on this DP connector +* to use the I2C-over-AUX protocol instead of native I2C signaling. +*/ +bool force_to_use_aux;enum gpio_ddc_line aux_hw_inst;enum gpio_ddc_line ddc_hw_inst;
drivers/gpu/drm/amd/display/dc/dce/dce_aux.c +4 -4
@@ -529,7 +529,7 @@ static uint32_t dce_aux_configure_timeout(struct ddc_service *ddc,uint32_t prev_timeout_val =0 ;struct ddc *ddc_pin = ddc->ddc_pin; -if (ddc->ctx->dc->config.dp_connector_no_native_i2c && ddc->link->no_ddc_pin) +if (ddc->link->force_to_use_aux)return dce_aux_configure_timeout_without_ddc_pin (ddc, timeout_in_us);struct dce_aux *aux_engine = ddc->ctx->dc->res_pool->engines[ddc_pin->pin_data->en];
@@ -652,7 +652,7 @@ int dce_aux_transfer_raw(struct ddc_service *ddc, struct aux_payload *payload, enum aux_return_code_type *operation_result) { -if (ddc->ctx->dc->config.dp_connector_no_native_i2c && ddc->link->no_ddc_pin) { +if (ddc->link->force_to_use_aux) {/* Check whether aux to be processed via dmub or dcn directly */ if (ddc->ctx->dc->debug.enable_dmub_aux_for_legacy_ddc) {return dce_aux_transfer_dmub_raw (ddc, payload, operation_result);
@@ -795,7 +795,7 @@ int dce_aux_transfer_dmub_raw(struct ddc_service *ddc,release_engine (aux_engine); } -if (ddc->ctx->dc->config.dp_connector_no_native_i2c && ddc->link->no_ddc_pin) { +if (ddc->link->force_to_use_aux) {struct dce_aux *aux_engine = ddc->ctx->dc->res_pool->engines[ddc->link->aux_hw_inst];if (!acquire_aux_engine_without_ddc_pin (aux_engine, ddc_pin)) {
@@ -893,7 +893,7 @@ bool dce_aux_transfer_with_retries(struct ddc_service *ddc, aux110 =FROM_AUX_ENGINE (aux_engine); } -if (ddc->ctx->dc->config.dp_connector_no_native_i2c && ddc->link->no_ddc_pin) { +if (ddc->link->force_to_use_aux) { aux_engine = ddc->ctx->dc->res_pool->engines[ddc->link->aux_hw_inst]; aux110 =FROM_AUX_ENGINE (aux_engine); }
drivers/gpu/drm/amd/display/dc/hwss/dcn401/dcn401_hwseq.c +1 -1
@@ -321,7 +321,7 @@ void dcn401_init_hw(struct dc *dc) user_level = link->panel_cntl->stored_backlight_registers.USER_LEVEL; } -if (link->ctx->dc->config.dp_connector_no_native_i2c && link->no_ddc_pin) { +if (link->force_to_use_aux) {struct graphics_object_i2c_info i2c_info;struct ddc *ddc_pin;struct gpio_ddc_hw_info hw_info;
drivers/gpu/drm/amd/display/dc/inc/link_service.h +1 -0
@@ -193,6 +193,7 @@ struct link_service { struct aux_payload *payload);bool (*is_in_aux_transaction_mode)(struct ddc_service *ddc);uint32_t (*get_aux_defer_delay)(struct ddc_service *ddc); +uint8_t (*get_ddc_aux_inst)(const struct dc_link *link);/*************************** DP Capability ****************************/
drivers/gpu/drm/amd/display/dc/link/link_factory.c +5 -2
@@ -143,6 +143,7 @@ static void construct_link_service_ddc(struct link_service *link_srv) link_aux_transfer_with_retries_no_mutex; link_srv->is_in_aux_transaction_mode = link_is_in_aux_transaction_mode; link_srv->get_aux_defer_delay = link_get_aux_defer_delay; + link_srv->get_ddc_aux_inst = link_get_ddc_aux_inst; }/* link dp capability implements dp specific link capability retrieval sequence.
@@ -441,7 +442,7 @@ static enum channel_id get_ddc_line(struct dc_link *link) channel =CHANNEL_ID_UNKNOWN ; -if (link->ctx->dc->config.dp_connector_no_native_i2c && link->no_ddc_pin) { +if (link->force_to_use_aux) { channel = link->aux_hw_inst +1 ; }else { ddc =get_ddc_pin (link->ddc);
@@ -576,6 +577,8 @@ static bool construct_phy(struct dc_link *link, link->is_internal_display = (disp_connect_caps_info.INTERNAL_DISPLAY !=0 );DC_LOG_DC ("BIOS object table - is_internal_display: %d" , link->is_internal_display); link->no_ddc_pin = disp_connect_caps_info.NO_DDC_PIN !=0 ; + link->force_to_use_aux = link->dc->config.dp_connector_no_native_i2c + && link->no_ddc_pin; }if (link->link_id.type !=OBJECT_TYPE_CONNECTOR ) {
@@ -598,7 +601,7 @@ static bool construct_phy(struct dc_link *link, goto ddc_create_fail; } -if (link->ctx->dc->config.dp_connector_no_native_i2c && link->no_ddc_pin) { +if (link->force_to_use_aux) { link->ddc_hw_inst = link->aux_hw_inst; }else {/* Embedded display connectors such as LVDS may not have DDC. */
drivers/gpu/drm/amd/display/dc/link/protocols/link_ddc.c +17 -3
@@ -120,8 +120,7 @@ static void ddc_service_construct( ddc_service->link = init_data->link; ddc_service->ctx = init_data->ctx; -if (ddc_service->link && ddc_service->ctx->dc->config.dp_connector_no_native_i2c && - ddc_service->link->no_ddc_pin) { +if (ddc_service->link && ddc_service->link->force_to_use_aux) {// Obtain aux instance info from i2c_info without GPIO DDC pin info if (dcb->funcs->get_connector_aux_info (dcb, init_data->id, &i2c_info) ==BP_RESULT_OK ) ddc_service->link->aux_hw_inst = (uint8_t )i2c_info.i2c_line;
@@ -252,6 +251,21 @@ static uint32_t defer_delay_converter_wa(#define DP_TRANSLATOR_DELAY 5 +/** +* link_get_ddc_aux_inst - Return the AUX/DDC hardware instance for a link. +* @link: the link to query +* +* Return: aux_hw_inst when I2C is forced over AUX, otherwise the DDC pin +* channel index. +*/ +uint8_t link_get_ddc_aux_inst (const struct dc_link *link) +{ +if (link->force_to_use_aux) +return link->aux_hw_inst; +ASSERT (link->ddc->ddc_pin->hw_info.ddc_channel <=0xFF ); +return (uint8_t )link->ddc->ddc_pin->hw_info.ddc_channel; +} +uint32_t link_get_aux_defer_delay (struct ddc_service *ddc) {uint32_t defer_delay =0 ;
@@ -526,7 +540,7 @@ bool try_to_configure_aux_timeout(struct ddc_service *ddc,if (ddc->link->ep_type !=DISPLAY_ENDPOINT_PHY )return true; -if (ddc->ctx->dc->config.dp_connector_no_native_i2c && ddc->link->no_ddc_pin) { +if (ddc->link->force_to_use_aux) {if (ddc->ctx->dc->res_pool->engines[ddc->link->aux_hw_inst]->funcs->configure_timeout) { ddc->ctx->dc->res_pool->engines[ddc->link->aux_hw_inst]->funcs->configure_timeout (ddc, timeout); result = true;
drivers/gpu/drm/amd/display/dc/link/protocols/link_ddc.h +2 -0
@@ -46,6 +46,8 @@ void set_ddc_transaction_type(struct ddc_service *ddc, enum ddc_transaction_type type); +uint8_t link_get_ddc_aux_inst (const struct dc_link *link); +uint32_t link_get_aux_defer_delay (struct ddc_service *ddc);bool link_is_in_aux_transaction_mode (struct ddc_service *ddc);
drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_capability.c +1 -1
@@ -2583,7 +2583,7 @@ bool dp_is_sink_present(struct dc_link *link)/* We can't perform the step below for ASICs with no Native * I2C signaling support on DP connectors, so skip it. */ -if (link->ctx->dc->config.dp_connector_no_native_i2c && link->no_ddc_pin) +if (link->force_to_use_aux)return present; ddc =get_ddc_pin (link->ddc);
drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_panel_replay.c +2 -5
@@ -25,6 +25,7 @@#include "link_dp_panel_replay.h" #include "link_edp_panel_control.h" +#include "link_ddc.h" #include "link_dpcd.h" #include "dm_helpers.h" #include "dc/dc_dmub_srv.h"
@@ -119,11 +120,7 @@ static bool dp_setup_panel_replay(struct dc_link *link, const struct dc_stream_sif (!dp_pr_get_panel_inst (dc, link, &panel_inst))return false; -if (dc->config.dp_connector_no_native_i2c && link->no_ddc_pin) { - replay_context.aux_inst = (enum channel_id ) link->aux_hw_inst; - }else { - replay_context.aux_inst = link->ddc->ddc_pin->hw_info.ddc_channel; - } + replay_context.aux_inst = (enum channel_id )link_get_ddc_aux_inst (link); replay_context.digbe_inst = link->link_enc->transmitter; replay_context.digfe_inst = link->link_enc->preferred_engine;
drivers/gpu/drm/amd/display/dc/link/protocols/link_edp_panel_control.c +3 -10
@@ -29,6 +29,7 @@*/ #include "link_edp_panel_control.h" +#include "link_ddc.h" #include "link_dpcd.h" #include "link_dp_capability.h" #include "dm_helpers.h"
@@ -788,11 +789,7 @@ bool edp_setup_psr(struct dc_link *link, } } -if (dc->config.dp_connector_no_native_i2c && link->no_ddc_pin) { - psr_context->channel = (enum channel_id )link->aux_hw_inst; - }else { - psr_context->channel = link->ddc->ddc_pin->hw_info.ddc_channel; - } + psr_context->channel =link_get_ddc_aux_inst (link); psr_context->transmitterId = link->link_enc->transmitter; psr_context->engineId = link->link_enc->preferred_engine;
@@ -1025,11 +1022,7 @@ bool edp_setup_freesync_replay(struct dc_link *link, const struct dc_stream_statif (!dp_pr_get_panel_inst (dc, link, &panel_inst))return false; -if (dc->config.dp_connector_no_native_i2c && link->no_ddc_pin) { - replay_context.aux_inst = (enum channel_id ) link->aux_hw_inst; - }else { - replay_context.aux_inst = link->ddc->ddc_pin->hw_info.ddc_channel; - } + replay_context.aux_inst =link_get_ddc_aux_inst (link); replay_context.digbe_inst = link->link_enc->transmitter; replay_context.digfe_inst = link->link_enc->preferred_engine;
drivers/gpu/drm/amd/display/modules/power/power.c +1 -6
@@ -483,12 +483,7 @@ bool mod_power_notify_mode_change(struct mod_power *mod_power, link =dc_stream_get_link (stream);if (link !=NULL &&dc_get_edp_link_panel_inst (dc, link, &panel_inst)) { -if (link->ctx->dc->config.dp_connector_no_native_i2c && link->no_ddc_pin) { - aux_inst = (uint8_t )link->aux_hw_inst; - }else { -ASSERT (link->ddc->ddc_pin->hw_info.ddc_channel <=0xFF ); - aux_inst = (uint8_t )link->ddc->ddc_pin->hw_info.ddc_channel; - } + aux_inst = link->dc->link_srv->get_ddc_aux_inst (link);mod_power_update_backlight_on_mode_change (core_power, link, panel_inst, aux_inst, is_hdr);
drivers/gpu/drm/amd/display/modules/power/power_abm.c +2 -12
@@ -849,12 +849,7 @@ bool mod_power_set_backlight_nits(struct mod_power *mod_power, core_power =MOD_POWER_TO_CORE (mod_power); link =dc_stream_get_link (stream); -if (link->ctx->dc->config.dp_connector_no_native_i2c && link->no_ddc_pin) { - aux_inst = (uint8_t )link->aux_hw_inst; - }else { -ASSERT (link->ddc->ddc_pin->hw_info.ddc_channel <=0xFF ); - aux_inst = (uint8_t )link->ddc->ddc_pin->hw_info.ddc_channel; - } + aux_inst = link->dc->link_srv->get_ddc_aux_inst (link);if (!dc_get_edp_link_panel_inst (core_power->dc, stream->link, &panel_inst))return false;
@@ -941,12 +936,7 @@ bool mod_power_set_backlight_percent(struct mod_power *mod_power, core_power =MOD_POWER_TO_CORE (mod_power); link =dc_stream_get_link (stream); -if (link->ctx->dc->config.dp_connector_no_native_i2c && link->no_ddc_pin) { - aux_inst = (uint8_t )link->aux_hw_inst; - }else { -ASSERT (link->ddc->ddc_pin->hw_info.ddc_channel <=0xFF ); - aux_inst = (uint8_t )link->ddc->ddc_pin->hw_info.ddc_channel; - } + aux_inst = link->dc->link_srv->get_ddc_aux_inst (link);if (!dc_get_edp_link_panel_inst (core_power->dc, stream->link, &panel_inst))return false;
Signature · 1 line
2.53.0
PATCH 3/28 drm/amd/display: Extract backlight helpers for KUnit tests
In reply to George ZhangFrom: Alex Hung <[email protected]>
[WHAT]
Extract shared backlight device index lookup and property setup into testable helpers. The duplicated bd-to-index scan in update_status/get_brightness is replaced by amdgpu_dm_backlight_get_device_index(), and the inline backlight_properties calculation is replaced by amdgpu_dm_backlight_fill_props().
Add KUnit coverage for both new helpers. Keep the runtime power_supply_is_system_supplied() call at the caller so the helpers remain pure and deterministic under test.
--- .../display/amdgpu_dm/amdgpu_dm_backlight.c | 84 +++++++----- .../display/amdgpu_dm/amdgpu_dm_backlight.h | 8 ++ .../tests/amdgpu_dm_backlight_test.c | 123 ++++++++++++++++++ 3 files changed, 184 insertions(+), 31 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_backlight.c +53 -31
@@ -236,6 +236,21 @@ static struct dc_stream_state *dm_find_stream_with_link(return NULL ; } +STATIC_IFN_KUNIT +int amdgpu_dm_backlight_get_device_index(struct amdgpu_display_manager *dm, +struct backlight_device *bd) +{ +int i; + +for (i =0 ; i < dm->num_of_edps; i++) { +if (bd == dm->backlight_dev[i]) +return i; + } + +return 0 ; +} +EXPORT_IF_KUNIT (amdgpu_dm_backlight_get_device_index); +void amdgpu_dm_backlight_set_level (struct amdgpu_display_manager *dm,int bl_idx,u32 user_brightness)
@@ -335,14 +350,8 @@ void amdgpu_dm_backlight_set_level(struct amdgpu_display_manager *dm,static int amdgpu_dm_backlight_update_status (struct backlight_device *bd) {struct amdgpu_display_manager *dm =bl_get_data (bd); -int i; +int i =amdgpu_dm_backlight_get_device_index (dm, bd); -for (i =0 ; i < dm->num_of_edps; i++) { -if (bd == dm->backlight_dev[i]) -break ; - } -if (i >=AMDGPU_DM_MAX_NUM_EDP ) - i =0 ;amdgpu_dm_backlight_set_level (dm, i, bd->props.brightness);return 0 ;
@@ -377,14 +386,8 @@ static u32 amdgpu_dm_backlight_get_level(struct amdgpu_display_manager *dm,static int amdgpu_dm_backlight_get_brightness (struct backlight_device *bd) {struct amdgpu_display_manager *dm =bl_get_data (bd); -int i; +int i =amdgpu_dm_backlight_get_device_index (dm, bd); -for (i =0 ; i < dm->num_of_edps; i++) { -if (bd == dm->backlight_dev[i]) -break ; - } -if (i >=AMDGPU_DM_MAX_NUM_EDP ) - i =0 ;return amdgpu_dm_backlight_get_level (dm, i); }
@@ -394,6 +397,35 @@ static const struct backlight_ops amdgpu_dm_backlight_ops = { .update_status = amdgpu_dm_backlight_update_status, }; +STATIC_IFN_KUNIT +void amdgpu_dm_backlight_fill_props(const struct amdgpu_dm_backlight_caps *caps, +bool is_system_supplied, +bool custom_curve_enabled, +struct backlight_properties *props) +{ +unsigned int min, max; + +if (get_brightness_range (caps, &min, &max)) { +if (is_system_supplied) + props->brightness =DIV_ROUND_CLOSEST ((max - min) * caps->ac_level, +100 ); +else + props->brightness =DIV_ROUND_CLOSEST ((max - min) * caps->dc_level, +100 ); + props->max_brightness = max - min; + }else { + props->brightness =MAX_BACKLIGHT_LEVEL ; + props->max_brightness =MAX_BACKLIGHT_LEVEL ; + } + +if (caps && caps->data_points && custom_curve_enabled) + props->scale =BACKLIGHT_SCALE_NON_LINEAR ; +else + props->scale =BACKLIGHT_SCALE_LINEAR ; + props->type =BACKLIGHT_RAW ; +} +EXPORT_IF_KUNIT (amdgpu_dm_backlight_fill_props); +void amdgpu_dm_register_backlight_device (struct amdgpu_dm_connector *aconnector) {
@@ -402,7 +434,6 @@ amdgpu_dm_register_backlight_device(struct amdgpu_dm_connector *aconnector)struct backlight_properties props = {0 };struct amdgpu_dm_backlight_caps *caps;char bl_name[16 ]; -int min, max;int real_brightness;int init_brightness;
@@ -417,26 +448,17 @@ amdgpu_dm_register_backlight_device(struct amdgpu_dm_connector *aconnector) } caps = &dm->backlight_caps[aconnector->bl_idx]; -if (get_brightness_range (caps, &min, &max)) { -if (power_supply_is_system_supplied () >0 ) - props.brightness =DIV_ROUND_CLOSEST ((max - min) * caps->ac_level,100 ); -else - props.brightness =DIV_ROUND_CLOSEST ((max - min) * caps->dc_level,100 ); -/* min is zero, so max needs to be adjusted */ - props.max_brightness = max - min; -drm_dbg (drm,"Backlight caps: min: %d, max: %d, ac %d, dc %d\n" , min, max, - caps->ac_level, caps->dc_level); - }else - props.brightness = props.max_brightness =MAX_BACKLIGHT_LEVEL ; +amdgpu_dm_backlight_fill_props (caps,power_supply_is_system_supplied () >0 , + !(amdgpu_dc_debug_mask & +DC_DISABLE_CUSTOM_BRIGHTNESS_CURVE ), + &props); +drm_dbg (drm,"Backlight caps: max_brightness: %d, ac %d, dc %d\n" , + props.max_brightness, caps->ac_level, caps->dc_level); init_brightness = props.brightness; -if (caps->data_points && !(amdgpu_dc_debug_mask &DC_DISABLE_CUSTOM_BRIGHTNESS_CURVE )) { +if (props.scale ==BACKLIGHT_SCALE_NON_LINEAR )drm_info (drm,"Using custom brightness curve\n" ); - props.scale =BACKLIGHT_SCALE_NON_LINEAR ; - }else - props.scale =BACKLIGHT_SCALE_LINEAR ; - props.type =BACKLIGHT_RAW ;snprintf (bl_name,sizeof (bl_name),"amdgpu_bl%d" , drm->primary->index + aconnector->bl_idx);
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_backlight.h +8 -0
@@ -26,6 +26,8 @@struct amdgpu_display_manager ;struct amdgpu_dm_connector ; +struct backlight_device ; +struct backlight_properties ;struct drm_connector ;struct attribute_group ;
@@ -56,6 +58,12 @@ u32 convert_brightness_from_user(const struct amdgpu_dm_backlight_caps *caps, uint32_t brightness);u32 convert_brightness_to_user (const struct amdgpu_dm_backlight_caps *caps,uint32_t brightness); +int amdgpu_dm_backlight_get_device_index (struct amdgpu_display_manager *dm, +struct backlight_device *bd); +void amdgpu_dm_backlight_fill_props (const struct amdgpu_dm_backlight_caps *caps, +bool is_system_supplied, +bool custom_curve_enabled, +struct backlight_properties *props);uint amdgpu_dm_get_dc_debug_mask (void );void amdgpu_dm_set_dc_debug_mask (uint val);int amdgpu_dm_get_abm_level_param (void );
drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_backlight_test.c +123 -0
159 lines not on this page · raw message
Signature · 1 line
2.53.0
PATCH 4/28 drm/amd/display: Add more KUnit tests for amdgpu_dm_colorop
In reply to George ZhangFrom: Alex Hung <[email protected]>
[WHAT]
Add KUnit coverage for amdgpu_dm_initialize_default_pipeline() using an amdgpu_device-backed DRM mock so drm_to_adev() and the DC color capability checks are exercised.
--- .../amd/display/amdgpu_dm/amdgpu_dm_colorop.c | 1 + .../amdgpu_dm/tests/amdgpu_dm_colorop_test.c | 147 ++++++++++++++++-- 2 files changed, 133 insertions(+), 15 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_colorop.c +1 -0
@@ -224,3 +224,4 @@ int amdgpu_dm_initialize_default_pipeline(struct drm_plane *plane, struct drm_prreturn amdgpu_dm_build_default_pipeline (dev, plane, hw_3d_lut, list); } +EXPORT_IF_KUNIT (amdgpu_dm_initialize_default_pipeline);
drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_colorop_test.c +132 -15
178 lines not on this page · raw message
Signature · 1 line
2.53.0
PATCH 5/28 drm/amd/display: Add kunit tests for amdgpu_dm_plane
In reply to George ZhangFrom: Bhawanpreet Lakha <[email protected]>
Add kunit tests for some functions in amdgpu_dm_plane.
--- .../amd/display/amdgpu_dm/amdgpu_dm_plane.c | 115 +- .../amd/display/amdgpu_dm/amdgpu_dm_plane.h | 51 + .../drm/amd/display/amdgpu_dm/tests/Makefile | 2 + .../amdgpu_dm/tests/amdgpu_dm_plane_test.c | 1204 +++++++++++++++++ 4 files changed, 1325 insertions(+), 47 deletions(-) create mode 100644 drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_plane_test.c
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c +68 -47
@@ -37,6 +37,7 @@#include "amdgpu_display.h" #include "amdgpu_dm_trace.h" #include "amdgpu_dm_plane.h" +#include "amdgpu_dm_kunit_helpers.h" #include "amdgpu_dm_colorop.h" #include "gc/gc_11_0_0_offset.h" #include "gc/gc_11_0_0_sh_mask.h"
@@ -97,6 +98,7 @@ const struct drm_format_info *amdgpu_dm_plane_get_format_info(u32 pixel_format, {return amdgpu_lookup_format_info (pixel_format, modifier); } +EXPORT_IF_KUNIT (amdgpu_dm_plane_get_format_info); void amdgpu_dm_plane_fill_blending_from_plane_state(const struct drm_plane_state *plane_state, bool *per_pixel_alpha, bool *pre_multiplied_alpha,
@@ -139,8 +141,10 @@ void amdgpu_dm_plane_fill_blending_from_plane_state(const struct drm_plane_state *global_alpha_value = plane_state->alpha >>8 ; } } +EXPORT_IF_KUNIT (amdgpu_dm_plane_fill_blending_from_plane_state); -static void amdgpu_dm_plane_add_modifier (uint64_t **mods,uint64_t *size,uint64_t *cap,uint64_t mod) +STATIC_IFN_KUNIT void amdgpu_dm_plane_add_modifier(uint64_t **mods, uint64_t *size, +uint64_t *cap,uint64_t mod) {if (!*mods)return ;
@@ -164,27 +168,29 @@ static void amdgpu_dm_plane_add_modifier(uint64_t **mods, uint64_t *size, uint64 (*mods)[*size] = mod; *size +=1 ; } +EXPORT_IF_KUNIT (amdgpu_dm_plane_add_modifier); -static bool amdgpu_dm_plane_modifier_has_dcc (uint64_t modifier) +STATIC_IFN_KUNIT bool amdgpu_dm_plane_modifier_has_dcc(uint64_t modifier) {return IS_AMD_FMT_MOD (modifier) &&AMD_FMT_MOD_GET (DCC , modifier); } +EXPORT_IF_KUNIT (amdgpu_dm_plane_modifier_has_dcc); -static unsigned int amdgpu_dm_plane_modifier_gfx9_swizzle_mode (uint64_t modifier) +STATIC_IFN_KUNIT unsigned int amdgpu_dm_plane_modifier_gfx9_swizzle_mode(uint64_t modifier) {if (modifier ==DRM_FORMAT_MOD_LINEAR )return 0 ;return AMD_FMT_MOD_GET (TILE , modifier); } +EXPORT_IF_KUNIT (amdgpu_dm_plane_modifier_gfx9_swizzle_mode); -static void amdgpu_dm_plane_fill_gfx8_tiling_info_from_flags (struct dc_tiling_info *tiling_info, -uint64_t tiling_flags) +STATIC_IFN_KUNIT void amdgpu_dm_plane_fill_gfx8_tiling_info_from_flags(struct dc_tiling_info *tiling_info, +uint64_t tiling_flags) {/* Fill GFX8 params */ if (AMDGPU_TILING_GET (tiling_flags,ARRAY_MODE ) ==DC_ARRAY_2D_TILED_THIN1 ) {unsigned int bankw, bankh, mtaspect, tile_split, num_banks; - bankw =AMDGPU_TILING_GET (tiling_flags,BANK_WIDTH ); bankh =AMDGPU_TILING_GET (tiling_flags,BANK_HEIGHT ); mtaspect =AMDGPU_TILING_GET (tiling_flags,MACRO_TILE_ASPECT );
@@ -210,9 +216,10 @@ static void amdgpu_dm_plane_fill_gfx8_tiling_info_from_flags(struct dc_tiling_in tiling_info->gfx8.pipe_config =AMDGPU_TILING_GET (tiling_flags,PIPE_CONFIG ); } +EXPORT_IF_KUNIT (amdgpu_dm_plane_fill_gfx8_tiling_info_from_flags); -static void amdgpu_dm_plane_fill_gfx9_tiling_info_from_device (const struct amdgpu_device *adev, -struct dc_tiling_info *tiling_info) +STATIC_IFN_KUNIT void amdgpu_dm_plane_fill_gfx9_tiling_info_from_device(const struct amdgpu_device *adev, +struct dc_tiling_info *tiling_info) {/* Fill GFX9 params */ tiling_info->gfx9.num_pipes =
@@ -231,10 +238,11 @@ static void amdgpu_dm_plane_fill_gfx9_tiling_info_from_device(const struct amdgpif (amdgpu_ip_version (adev,GC_HWIP ,0 ) >=IP_VERSION (10 ,3 ,0 )) tiling_info->gfx9.num_pkrs = adev->gfx.config.gb_addr_config_fields.num_pkrs; } +EXPORT_IF_KUNIT (amdgpu_dm_plane_fill_gfx9_tiling_info_from_device); -static void amdgpu_dm_plane_fill_gfx9_tiling_info_from_modifier (const struct amdgpu_device *adev, -struct dc_tiling_info *tiling_info, -uint64_t modifier) +STATIC_IFN_KUNIT void amdgpu_dm_plane_fill_gfx9_tiling_info_from_modifier(const struct amdgpu_device *adev, +struct dc_tiling_info *tiling_info, +uint64_t modifier) {unsigned int mod_bank_xor_bits =AMD_FMT_MOD_GET (BANK_XOR_BITS , modifier);unsigned int mod_pipe_xor_bits =AMD_FMT_MOD_GET (PIPE_XOR_BITS , modifier);
@@ -259,14 +267,15 @@ static void amdgpu_dm_plane_fill_gfx9_tiling_info_from_modifier(const struct amd/* for DCC we know it isn't rb aligned, so rb_per_se doesn't matter. */ } } - -static int amdgpu_dm_plane_validate_dcc (struct amdgpu_device *adev, -const enum surface_pixel_format format, -const enum dc_rotation_angle rotation, -const struct dc_tiling_info *tiling_info, -const struct dc_plane_dcc_param *dcc, -const struct dc_plane_address *address, -const struct plane_size *plane_size) +EXPORT_IF_KUNIT (amdgpu_dm_plane_fill_gfx9_tiling_info_from_modifier); + +STATIC_IFN_KUNIT int amdgpu_dm_plane_validate_dcc(struct amdgpu_device *adev, +const enum surface_pixel_format format, +const enum dc_rotation_angle rotation, +const struct dc_tiling_info *tiling_info, +const struct dc_plane_dcc_param *dcc, +const struct dc_plane_address *address, +const struct plane_size *plane_size) {struct dc *dc = adev->dm.dc;struct dc_dcc_surface_param input;
@@ -307,15 +316,16 @@ static int amdgpu_dm_plane_validate_dcc(struct amdgpu_device *adev,return 0 ; } - -static int amdgpu_dm_plane_fill_gfx9_plane_attributes_from_modifiers (struct amdgpu_device *adev, -const struct amdgpu_framebuffer *afb, -const enum surface_pixel_format format, -const enum dc_rotation_angle rotation, -const struct plane_size *plane_size, -struct dc_tiling_info *tiling_info, -struct dc_plane_dcc_param *dcc, -struct dc_plane_address *address) +EXPORT_IF_KUNIT (amdgpu_dm_plane_validate_dcc); + +STATIC_IFN_KUNIT int amdgpu_dm_plane_fill_gfx9_plane_attributes_from_modifiers(struct amdgpu_device *adev, +const struct amdgpu_framebuffer *afb, +const enum surface_pixel_format format, +const enum dc_rotation_angle rotation, +const struct plane_size *plane_size, +struct dc_tiling_info *tiling_info, +struct dc_plane_dcc_param *dcc, +struct dc_plane_address *address) {const uint64_t modifier = afb->base.modifier;int ret =0 ;
@@ -358,15 +368,16 @@ static int amdgpu_dm_plane_fill_gfx9_plane_attributes_from_modifiers(struct amdgreturn ret; } - -static int amdgpu_dm_plane_fill_gfx12_plane_attributes_from_modifiers (struct amdgpu_device *adev, -const struct amdgpu_framebuffer *afb, -const enum surface_pixel_format format, -const enum dc_rotation_angle rotation, -const struct plane_size *plane_size, -struct dc_tiling_info *tiling_info, -struct dc_plane_dcc_param *dcc, -struct dc_plane_address *address) +EXPORT_IF_KUNIT (amdgpu_dm_plane_fill_gfx9_plane_attributes_from_modifiers); + +STATIC_IFN_KUNIT int amdgpu_dm_plane_fill_gfx12_plane_attributes_from_modifiers(struct amdgpu_device *adev, +const struct amdgpu_framebuffer *afb, +const enum surface_pixel_format format, +const enum dc_rotation_angle rotation, +const struct plane_size *plane_size, +struct dc_tiling_info *tiling_info, +struct dc_plane_dcc_param *dcc, +struct dc_plane_address *address) {const uint64_t modifier = afb->base.modifier;int ret =0 ;
@@ -398,6 +409,7 @@ static int amdgpu_dm_plane_fill_gfx12_plane_attributes_from_modifiers(struct amdreturn ret; } +EXPORT_IF_KUNIT (amdgpu_dm_plane_fill_gfx12_plane_attributes_from_modifiers); static void amdgpu_dm_plane_add_gfx10_1_modifiers(const struct amdgpu_device *adev, uint64_t **mods,
@@ -724,7 +736,7 @@ static void amdgpu_dm_plane_add_gfx12_modifiers(struct amdgpu_device *adev, } -static int amdgpu_dm_plane_get_plane_modifiers (struct amdgpu_device *adev,unsigned int plane_type,uint64_t **mods) +STATIC_IFN_KUNIT int amdgpu_dm_plane_get_plane_modifiers(struct amdgpu_device *adev, unsigned int plane_type, uint64_t **mods) {uint64_t size =0 , capacity =128 ; *mods =NULL ;
@@ -777,10 +789,11 @@ static int amdgpu_dm_plane_get_plane_modifiers(struct amdgpu_device *adev, unsigreturn 0 ; } +EXPORT_IF_KUNIT (amdgpu_dm_plane_get_plane_modifiers); -static int amdgpu_dm_plane_get_plane_formats (const struct drm_plane *plane, -const struct dc_plane_cap *plane_cap, -uint32_t *formats,int max_formats) +STATIC_IFN_KUNIT int amdgpu_dm_plane_get_plane_formats(const struct drm_plane *plane, +const struct dc_plane_cap *plane_cap, +uint32_t *formats,int max_formats) {int i, num_formats =0 ;
@@ -836,6 +849,7 @@ static int amdgpu_dm_plane_get_plane_formats(const struct drm_plane *plane,return num_formats; } +EXPORT_IF_KUNIT (amdgpu_dm_plane_get_plane_formats); int amdgpu_dm_plane_fill_plane_buffer_attributes(struct amdgpu_device *adev, const struct amdgpu_framebuffer *afb,
@@ -922,6 +936,7 @@ int amdgpu_dm_plane_fill_plane_buffer_attributes(struct amdgpu_device *adev,return 0 ; } +EXPORT_IF_KUNIT (amdgpu_dm_plane_fill_plane_buffer_attributes);static int amdgpu_dm_plane_helper_prepare_fb (struct drm_plane *plane,struct drm_plane_state *new_state)
@@ -1042,9 +1057,9 @@ static void amdgpu_dm_plane_helper_cleanup_fb(struct drm_plane *plane,amdgpu_bo_unref (&rbo); } -static void amdgpu_dm_plane_get_min_max_dc_plane_scaling (struct drm_device *dev, -struct drm_framebuffer *fb, -int *min_downscale,int *max_upscale) +STATIC_IFN_KUNIT void amdgpu_dm_plane_get_min_max_dc_plane_scaling(struct drm_device *dev, +struct drm_framebuffer *fb, +int *min_downscale,int *max_upscale) {struct amdgpu_device *adev =drm_to_adev (dev);struct dc *dc = adev->dm.dc;
@@ -1088,6 +1103,7 @@ static void amdgpu_dm_plane_get_min_max_dc_plane_scaling(struct drm_device *dev,if (*min_downscale ==1 ) *min_downscale =1000 ; } +EXPORT_IF_KUNIT (amdgpu_dm_plane_get_min_max_dc_plane_scaling);int amdgpu_dm_plane_helper_check_state (struct drm_plane_state *state,struct drm_crtc_state *new_crtc_state)
@@ -1142,6 +1158,7 @@ int amdgpu_dm_plane_helper_check_state(struct drm_plane_state *state,return drm_atomic_helper_check_plane_state ( state, new_crtc_state, min_scale, max_scale, true, true); } +EXPORT_IF_KUNIT (amdgpu_dm_plane_helper_check_state); int amdgpu_dm_plane_fill_dc_scaling_info(struct amdgpu_device *adev, const struct drm_plane_state *state,
@@ -1225,6 +1242,7 @@ int amdgpu_dm_plane_fill_dc_scaling_info(struct amdgpu_device *adev,return 0 ; } +EXPORT_IF_KUNIT (amdgpu_dm_plane_fill_dc_scaling_info);static int amdgpu_dm_plane_atomic_check (struct drm_plane *plane,struct drm_atomic_state *state)
@@ -1343,6 +1361,7 @@ int amdgpu_dm_plane_get_cursor_position(struct drm_plane *plane, struct drm_crtcreturn 0 ; } +EXPORT_IF_KUNIT (amdgpu_dm_plane_get_cursor_position);void amdgpu_dm_plane_handle_cursor_update (struct drm_plane *plane,struct drm_plane_state *old_plane_state)
@@ -1546,9 +1565,9 @@ static struct drm_plane_state *amdgpu_dm_plane_drm_plane_duplicate_state(structreturn &dm_plane_state->base; } -static bool amdgpu_dm_plane_format_mod_supported (struct drm_plane *plane, -uint32_t format, -uint64_t modifier) +STATIC_IFN_KUNIT bool amdgpu_dm_plane_format_mod_supported(struct drm_plane *plane, +uint32_t format, +uint64_t modifier) {struct amdgpu_device *adev =drm_to_adev (plane->dev);const struct drm_format_info *info =drm_format_info (format);
@@ -1607,6 +1626,7 @@ static bool amdgpu_dm_plane_format_mod_supported(struct drm_plane *plane,return true; } +EXPORT_IF_KUNIT (amdgpu_dm_plane_format_mod_supported);static void amdgpu_dm_plane_drm_plane_destroy_state (struct drm_plane *plane,struct drm_plane_state *state)
@@ -1982,4 +2002,5 @@ bool amdgpu_dm_plane_is_video_format(uint32_t format)return false; } +EXPORT_IF_KUNIT (amdgpu_dm_plane_is_video_format);
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.h +51 -0
61 lines not on this page · raw message
drivers/gpu/drm/amd/display/amdgpu_dm/tests/Makefile +2 -0
@@ -24,6 +24,7 @@ obj-$(CONFIG_DRM_AMD_DC_KUNIT_TEST) += amdgpu_dm_replay_test.o obj-$(CONFIG_DRM_AMD_DC_KUNIT_TEST) += amdgpu_dm_ism_test.o obj-$(CONFIG_DRM_AMD_DC_KUNIT_TEST) += amdgpu_dm_irq_test.o obj-$(CONFIG_DRM_AMD_DC_KUNIT_TEST) += amdgpu_dm_wb_test.o +obj-$(CONFIG_DRM_AMD_DC_KUNIT_TEST) += amdgpu_dm_plane_test.o obj-$(CONFIG_DRM_AMD_DC_KUNIT_TEST) += amdgpu_dm_mst_types_test.o obj-$(CONFIG_DRM_AMD_DC_KUNIT_TEST) += amdgpu_dm_pp_smu_test.o obj-$(CONFIG_DRM_AMD_DC_KUNIT_TEST) += amdgpu_dm_test.o
@@ -31,3 +32,4 @@ obj-$(CONFIG_DRM_AMD_DC_KUNIT_TEST) += amdgpu_dm_crtc_test.o obj-$(CONFIG_DRM_AMD_DC_KUNIT_TEST) += amdgpu_dm_services_test.o obj-$(CONFIG_DRM_AMD_DC_KUNIT_TEST) += amdgpu_dm_helpers_test.o obj-$(CONFIG_DRM_AMD_DC_KUNIT_TEST) += amdgpu_dm_quirks_test.o +obj-$(CONFIG_DRM_AMD_DC_KUNIT_TEST) += amdgpu_dm_plane_test.o
drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_plane_test.c new file +1204 -0
1,204 lines not on this page · raw message
Signature · 1 line
2.53.0
PATCH 6/28 drm/amd/display: Simplify boolean checks
In reply to George ZhangFrom: Alex Hung <[email protected]>
[WHAT]
Use direct boolean in connector and IRQ code paths. This removes redundant comparisons around MST state, IRQ validation, handler removal, and DMUB notification offload without changing behavior.
--- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_connector.c | 2 +- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_connector.c +1 -1
@@ -466,7 +466,7 @@ void amdgpu_dm_update_connector_after_detect(struct drm_device *dev = connector->dev;/* MST handled by drm_mst framework */ -if (aconnector->mst_mgr.mst_state == true) +if (aconnector->mst_mgr.mst_state)return ; sink = aconnector->dc_link->local_sink;
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c +4 -4
@@ -188,7 +188,7 @@ static struct list_head *remove_irq_handler(struct amdgpu_device *adev,DM_IRQ_TABLE_UNLOCK (adev, irq_table_flags); -if (handler_removed == false) { +if (!handler_removed) {/* Not necessarily an error - caller may not * know the context. */
@@ -326,7 +326,7 @@ void *amdgpu_dm_irq_register_interrupt(struct amdgpu_device *adev,unsigned long irq_table_flags;enum dc_irq_source irq_source; -if (false ==validate_irq_registration_params (int_params, ih)) +if (!validate_irq_registration_params (int_params, ih))return DAL_INVALID_IRQ_HANDLER_IDX ; handler_data =kzalloc (sizeof (*handler_data),GFP_KERNEL );
@@ -392,7 +392,7 @@ void amdgpu_dm_irq_unregister_interrupt(struct amdgpu_device *adev,struct dc_interrupt_params int_params;int i; -if (false ==validate_irq_unregistration_params (irq_source, ih)) +if (!validate_irq_unregistration_params (irq_source, ih))return ;memset (&int_params,0 ,sizeof (int_params));
@@ -2188,7 +2188,7 @@ static void dm_dmub_outbox1_low_irq(void *interrupt_params) dmub_notification_type_str(notify.type));continue ; } -if (dm->dmub_thread_offload[notify.type] == true) { +if (dm->dmub_thread_offload[notify.type]) { dmub_hpd_wrk =kzalloc (sizeof (*dmub_hpd_wrk),GFP_ATOMIC );if (!dmub_hpd_wrk) {drm_err (adev_to_drm (adev),"Failed to allocate dmub_hpd_wrk" );
Signature · 1 line
2.53.0
PATCH 7/28 drm/amd/display: Simplify DMUB notify registration
In reply to George ZhangFrom: Alex Hung <[email protected]>
[WHAT]
Use an early guard for invalid DMUB notify callback registration inputs. This keeps the same accepted and rejected cases while removing the redundant else block.
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_dmub.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_dmub.c +4 -4
@@ -124,12 +124,12 @@ bool dm_register_dmub_notify_callback(struct amdgpu_device *adev, dmub_notify_interrupt_callback_t callback, bool dmub_int_thread_offload) { -if (callback !=NULL && type <ARRAY_SIZE (adev->dm.dmub_thread_offload)) { - adev->dm.dmub_callback[type] = callback; - adev->dm.dmub_thread_offload[type] = dmub_int_thread_offload; - }else +if (!callback || type >=ARRAY_SIZE (adev->dm.dmub_thread_offload))return false; + adev->dm.dmub_callback[type] = callback; + adev->dm.dmub_thread_offload[type] = dmub_int_thread_offload; +return true; }EXPORT_IF_KUNIT (dm_register_dmub_notify_callback);
Signature · 1 line
2.53.0
PATCH 8/28 drm/amd/display: scale plane global alpha to 12 bits on DCN 4.2
In reply to George ZhangFrom: James Lin <[email protected]>
[why]
On DCN 4.2 the global alpha is reported using 12 bits (MPCC_GLOBAL_ALPHA spans bits [0:11]), whereas other ASICs such as DCN 3.1.4 use an 8-bit field (MPCC_GLOBAL_ALPHA spans bits [16:23]). The DRM plane alpha property is 16-bit and amdgpu_dm unconditionally scaled it down by >> 8, which only matches the 8-bit hardware field. On DCN 4.2 this fed a value that was 4 bits too small into the 12-bit field, so the hardware applied the wrong global alpha and the resulting blended output did not match the expected hw * alpha value.
[how]
Detect DCN 4.2 via amdgpu_ip_version(adev, DCE_HWIP, 0) and scale the 16-bit plane alpha by >> 4 to fill the 12-bit MPCC_GLOBAL_ALPHA field. All other ASICs keep the existing >> 8 behavior for their 8-bit field.
--- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c +11 -1
@@ -137,8 +137,18 @@ void amdgpu_dm_plane_fill_blending_from_plane_state(const struct drm_plane_state }if (plane_state->alpha <0xffff ) { +struct amdgpu_device *adev =drm_to_adev (plane_state->plane->dev); *global_alpha = true; - *global_alpha_value = plane_state->alpha >>8 ; +/* +* DCN 4.2 uses a 12-bit MPCC_GLOBAL_ALPHA field, while +* other ASICs use an 8-bit field. The DRM plane alpha is +* 16-bit, so scale it down to the width the hardware expects. +*/ +if (amdgpu_ip_version (adev,DCE_HWIP ,0 ) ==IP_VERSION (4 ,2 ,0 )) + *global_alpha_value = plane_state->alpha >>4 ; +else + *global_alpha_value = plane_state->alpha >>8 ; + } }EXPORT_IF_KUNIT (amdgpu_dm_plane_fill_blending_from_plane_state);
Signature · 1 line
2.53.0
PATCH 9/28 drm/amd/display: Fix KUnit test crash after global alpha change
In reply to George ZhangFrom: Alex Hung <[email protected]>
[WHY]amdgpu_dm_plane_fill_blending_from_plane_state added drm_to_adev() but dm_test_fill_blending_global_alpha did not initialize plane_state->plane, causing a NULL pointer dereference.
[HOW]
Add an amdgpu_device and drm_plane so the plane->dev dereference is valid in the test.
--- .../drm/amd/display/amdgpu_dm/tests/amdgpu_dm_plane_test.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_plane_test.c +7 -0
@@ -184,12 +184,19 @@ static void dm_test_fill_blending_coverage_alpha_format(struct kunit *test)*/ static void dm_test_fill_blending_global_alpha (struct kunit *test) { +struct amdgpu_device *adev; +struct drm_plane plane = {0 };struct drm_plane_state state = {0 };bool per_pixel_alpha;bool pre_multiplied_alpha;bool global_alpha;int global_alpha_value; + adev =kunit_kzalloc (test,sizeof (*adev),GFP_KERNEL ); +KUNIT_ASSERT_NOT_NULL (test, adev); + + plane.dev = &adev->ddev; + state.plane = &plane; state.pixel_blend_mode =DRM_MODE_BLEND_PIXEL_NONE ; state.alpha =0x8000 ;
Signature · 1 line
2.53.0
PATCH 10/28 drm/amd/display: correct encoder minimal creation
In reply to George ZhangFrom: Peichen Huang <[email protected]>
[WHY]
shift and mask are not correctly initilized in create_minimal functions.
[HOW]
Correct initialize necessary variables.
--- .../gpu/drm/amd/display/dc/dio/dcn31/dcn31_dio_link_encoder.c | 4 ++++ .../gpu/drm/amd/display/dc/dio/dcn31/dcn31_dio_link_encoder.h | 2 ++ .../gpu/drm/amd/display/dc/resource/dcn31/dcn31_resource.c | 4 +++- .../gpu/drm/amd/display/dc/resource/dcn314/dcn314_resource.c | 4 +++- .../gpu/drm/amd/display/dc/resource/dcn315/dcn315_resource.c | 4 +++- .../gpu/drm/amd/display/dc/resource/dcn316/dcn316_resource.c | 4 +++- .../gpu/drm/amd/display/dc/resource/dcn35/dcn35_resource.c | 4 +++- .../gpu/drm/amd/display/dc/resource/dcn351/dcn351_resource.c | 4 +++- .../gpu/drm/amd/display/dc/resource/dcn36/dcn36_resource.c | 4 +++- .../gpu/drm/amd/display/dc/resource/dcn42/dcn42_resource.c | 4 +++- .../gpu/drm/amd/display/dc/resource/dcn42b/dcn42b_resource.c | 4 +++- 11 files changed, 33 insertions(+), 9 deletions(-)
drivers/gpu/drm/amd/display/dc/dio/dcn31/dcn31_dio_link_encoder.c +4 -0
@@ -516,6 +516,8 @@ void dcn31_link_encoder_construct_minimal(struct dc_context *ctx, const struct encoder_feature_support *enc_features, const struct dcn10_link_enc_registers *link_regs, + const struct dcn10_link_enc_shift *link_shift, + const struct dcn10_link_enc_mask *link_mask, enum engine_id eng_id) { struct dcn10_link_encoder *enc10 = &enc20->enc10;
@@ -529,6 +531,8 @@ void dcn31_link_encoder_construct_minimal( enc10->base.features = *enc_features; enc10->base.transmitter =TRANSMITTER_UNKNOWN ; enc10->link_regs = link_regs; + enc10->link_shift = link_shift; + enc10->link_mask = link_mask; enc10->base.output_signals = SIGNAL_TYPE_DISPLAY_PORT |
drivers/gpu/drm/amd/display/dc/dio/dcn31/dcn31_dio_link_encoder.h +2 -0
@@ -246,6 +246,8 @@ void dcn31_link_encoder_construct_minimal(struct dc_context *ctx, const struct encoder_feature_support *enc_features, const struct dcn10_link_enc_registers *link_regs, + const struct dcn10_link_enc_shift *link_shift, + const struct dcn10_link_enc_mask *link_mask, enum engine_id eng_id); void dcn31_link_encoder_set_dio_phy_mux(
drivers/gpu/drm/amd/display/dc/resource/dcn31/dcn31_resource.c +3 -1
@@ -1191,7 +1191,7 @@ static struct link_encoder *dcn31_link_enc_create_minimal( {struct dcn20_link_encoder *enc20; -if (((unsigned int )eng_id -ENGINE_ID_DIGA ) > ctx->dc->res_pool->res_cap->num_dig_link_enc) +if (((unsigned int )eng_id -ENGINE_ID_DIGA ) >= ctx->dc->res_pool->res_cap->num_dig_link_enc)return NULL ; enc20 =kzalloc (sizeof (struct dcn20_link_encoder ),GFP_KERNEL );
@@ -1203,6 +1203,8 @@ static struct link_encoder *dcn31_link_enc_create_minimal( ctx, &link_enc_feature, &link_enc_regs[eng_id -ENGINE_ID_DIGA ], + &le_shift, + &le_mask, eng_id);return &enc20->enc10.base;
drivers/gpu/drm/amd/display/dc/resource/dcn314/dcn314_resource.c +3 -1
@@ -1248,7 +1248,7 @@ static struct link_encoder *dcn31_link_enc_create_minimal( {struct dcn20_link_encoder *enc20; -if (((unsigned int )eng_id -ENGINE_ID_DIGA ) > ctx->dc->res_pool->res_cap->num_dig_link_enc) +if (((unsigned int )eng_id -ENGINE_ID_DIGA ) >= ctx->dc->res_pool->res_cap->num_dig_link_enc)return NULL ; enc20 =kzalloc (sizeof (struct dcn20_link_encoder ),GFP_KERNEL );
@@ -1260,6 +1260,8 @@ static struct link_encoder *dcn31_link_enc_create_minimal( ctx, &link_enc_feature, &link_enc_regs[eng_id -ENGINE_ID_DIGA ], + &le_shift, + &le_mask, eng_id);return &enc20->enc10.base;
drivers/gpu/drm/amd/display/dc/resource/dcn315/dcn315_resource.c +3 -1
@@ -1190,7 +1190,7 @@ static struct link_encoder *dcn31_link_enc_create_minimal( {struct dcn20_link_encoder *enc20; -if (((unsigned int )eng_id -ENGINE_ID_DIGA ) > ctx->dc->res_pool->res_cap->num_dig_link_enc) +if (((unsigned int )eng_id -ENGINE_ID_DIGA ) >= ctx->dc->res_pool->res_cap->num_dig_link_enc)return NULL ; enc20 =kzalloc (sizeof (struct dcn20_link_encoder ),GFP_KERNEL );
@@ -1202,6 +1202,8 @@ static struct link_encoder *dcn31_link_enc_create_minimal( ctx, &link_enc_feature, &link_enc_regs[eng_id -ENGINE_ID_DIGA ], + &le_shift, + &le_mask, eng_id);return &enc20->enc10.base;
drivers/gpu/drm/amd/display/dc/resource/dcn316/dcn316_resource.c +3 -1
@@ -1183,7 +1183,7 @@ static struct link_encoder *dcn31_link_enc_create_minimal( {struct dcn20_link_encoder *enc20; -if (((unsigned int )eng_id -ENGINE_ID_DIGA ) > ctx->dc->res_pool->res_cap->num_dig_link_enc) +if (((unsigned int )eng_id -ENGINE_ID_DIGA ) >= ctx->dc->res_pool->res_cap->num_dig_link_enc)return NULL ; enc20 =kzalloc (sizeof (struct dcn20_link_encoder ),GFP_KERNEL );
@@ -1195,6 +1195,8 @@ static struct link_encoder *dcn31_link_enc_create_minimal( ctx, &link_enc_feature, &link_enc_regs[eng_id -ENGINE_ID_DIGA ], + &le_shift, + &le_mask, eng_id);return &enc20->enc10.base;
drivers/gpu/drm/amd/display/dc/resource/dcn35/dcn35_resource.c +3 -1
@@ -1189,7 +1189,7 @@ static struct link_encoder *dcn31_link_enc_create_minimal( {struct dcn20_link_encoder *enc20; -if (((unsigned int )eng_id -ENGINE_ID_DIGA ) > ctx->dc->res_pool->res_cap->num_dig_link_enc) +if (((unsigned int )eng_id -ENGINE_ID_DIGA ) >= ctx->dc->res_pool->res_cap->num_dig_link_enc)return NULL ; enc20 =kzalloc (sizeof (struct dcn20_link_encoder ),GFP_KERNEL );
@@ -1201,6 +1201,8 @@ static struct link_encoder *dcn31_link_enc_create_minimal( ctx, &link_enc_feature, &link_enc_regs[eng_id -ENGINE_ID_DIGA ], + &le_shift, + &le_mask, eng_id);return &enc20->enc10.base;
drivers/gpu/drm/amd/display/dc/resource/dcn351/dcn351_resource.c +3 -1
@@ -1169,7 +1169,7 @@ static struct link_encoder *dcn31_link_enc_create_minimal( {struct dcn20_link_encoder *enc20; -if (((unsigned int )eng_id -ENGINE_ID_DIGA ) > ctx->dc->res_pool->res_cap->num_dig_link_enc) +if (((unsigned int )eng_id -ENGINE_ID_DIGA ) >= ctx->dc->res_pool->res_cap->num_dig_link_enc)return NULL ; enc20 =kzalloc (sizeof (struct dcn20_link_encoder ),GFP_KERNEL );
@@ -1181,6 +1181,8 @@ static struct link_encoder *dcn31_link_enc_create_minimal( ctx, &link_enc_feature, &link_enc_regs[eng_id -ENGINE_ID_DIGA ], + &le_shift, + &le_mask, eng_id);return &enc20->enc10.base;
drivers/gpu/drm/amd/display/dc/resource/dcn36/dcn36_resource.c +3 -1
@@ -1176,7 +1176,7 @@ static struct link_encoder *dcn31_link_enc_create_minimal( {struct dcn20_link_encoder *enc20; -if (((unsigned int )eng_id -ENGINE_ID_DIGA ) > ctx->dc->res_pool->res_cap->num_dig_link_enc) +if (((unsigned int )eng_id -ENGINE_ID_DIGA ) >= ctx->dc->res_pool->res_cap->num_dig_link_enc)return NULL ; enc20 =kzalloc (sizeof (struct dcn20_link_encoder ),GFP_KERNEL );
@@ -1188,6 +1188,8 @@ static struct link_encoder *dcn31_link_enc_create_minimal( ctx, &link_enc_feature, &link_enc_regs[eng_id -ENGINE_ID_DIGA ], + &le_shift, + &le_mask, eng_id);return &enc20->enc10.base;
drivers/gpu/drm/amd/display/dc/resource/dcn42/dcn42_resource.c +3 -1
@@ -1882,7 +1882,7 @@ static struct link_encoder *dcn42_link_enc_create_minimal( {struct dcn20_link_encoder *enc20; -if ((unsigned int )(eng_id -ENGINE_ID_DIGA ) > ctx->dc->res_pool->res_cap->num_dig_link_enc) +if ((unsigned int )(eng_id -ENGINE_ID_DIGA ) >= ctx->dc->res_pool->res_cap->num_dig_link_enc)return NULL ; enc20 =kzalloc (sizeof (struct dcn20_link_encoder ),GFP_KERNEL );
@@ -1894,6 +1894,8 @@ static struct link_encoder *dcn42_link_enc_create_minimal( ctx, &link_enc_feature, &link_enc_regs[eng_id -ENGINE_ID_DIGA ], + &le_shift, + &le_mask, eng_id);return &enc20->enc10.base;
drivers/gpu/drm/amd/display/dc/resource/dcn42b/dcn42b_resource.c +3 -1
@@ -1824,7 +1824,7 @@ static struct link_encoder *dcn42b_link_enc_create_minimal( {struct dcn20_link_encoder *enc20; -if ((unsigned int )(eng_id -ENGINE_ID_DIGA ) > ctx->dc->res_pool->res_cap->num_dig_link_enc) +if ((unsigned int )(eng_id -ENGINE_ID_DIGA ) >= ctx->dc->res_pool->res_cap->num_dig_link_enc)return NULL ; enc20 =kzalloc (sizeof (struct dcn20_link_encoder ),GFP_KERNEL );
@@ -1836,6 +1836,8 @@ static struct link_encoder *dcn42b_link_enc_create_minimal( ctx, &link_enc_feature, &link_enc_regs[eng_id -ENGINE_ID_DIGA ], + &le_shift, + &le_mask, eng_id);return &enc20->enc10.base;
Signature · 1 line
2.53.0
PATCH 11/28 drm/amd/display: fix malformed link_settings debugfs output
In reply to George ZhangFrom: Harry Wentland <[email protected]>
[Why]dp_link_settings_read() passed strlen() of each format string as the size argument to snprintf() and then advanced rd_buf_ptr by that same fixed amount. The format-string length has no relation to the formatted output length, so snprintf() truncated each field at a NUL it wrote inside the buffer while the pointer was advanced past it. The result is a buffer peppered with embedded NUL bytes and fields that are silently cut short, so the data read back from the debugfs node does not reflect the actual link settings.
[How]
Use scnprintf() with the real remaining buffer size (rd_buf_size - (rd_buf_ptr - rd_buf)) and advance rd_buf_ptr by its return value, which is the number of characters actually written. This both bounds each write to the space left in rd_buf and keeps the output a single, properly terminated string. The now-unused str_len local is removed.
--- .../amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 20 ++++++++----------- 1 file changed, 8 insertions(+), 12 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c +8 -12
@@ -196,7 +196,6 @@ static ssize_t dp_link_settings_read(struct file *f, char __user *buf,char *rd_buf_ptr =NULL ;const uint32_t rd_buf_size =100 ;uint32_t result =0 ; -uint8_t str_len =0 ;int r;if (*pos &3 || size &3 )
@@ -208,29 +207,26 @@ static ssize_t dp_link_settings_read(struct file *f, char __user *buf, rd_buf_ptr = rd_buf; - str_len =strlen ("Current: %d 0x%x %d " ); -snprintf (rd_buf_ptr, str_len,"Current: %d 0x%x %d " , + rd_buf_ptr +=scnprintf (rd_buf_ptr, rd_buf_size - (rd_buf_ptr - rd_buf), +"Current: %d 0x%x %d " , link->cur_link_settings.lane_count, link->cur_link_settings.link_rate, link->cur_link_settings.link_spread); - rd_buf_ptr += str_len; - str_len =strlen ("Verified: %d 0x%x %d " ); -snprintf (rd_buf_ptr, str_len,"Verified: %d 0x%x %d " , + rd_buf_ptr +=scnprintf (rd_buf_ptr, rd_buf_size - (rd_buf_ptr - rd_buf), +"Verified: %d 0x%x %d " , link->verified_link_cap.lane_count, link->verified_link_cap.link_rate, link->verified_link_cap.link_spread); - rd_buf_ptr += str_len; - str_len =strlen ("Reported: %d 0x%x %d " ); -snprintf (rd_buf_ptr, str_len,"Reported: %d 0x%x %d " , + rd_buf_ptr +=scnprintf (rd_buf_ptr, rd_buf_size - (rd_buf_ptr - rd_buf), +"Reported: %d 0x%x %d " , link->reported_link_cap.lane_count, link->reported_link_cap.link_rate, link->reported_link_cap.link_spread); - rd_buf_ptr += str_len; - str_len =strlen ("Preferred: %d 0x%x %d " ); -snprintf (rd_buf_ptr, str_len,"Preferred: %d 0x%x %d\n" , + rd_buf_ptr +=scnprintf (rd_buf_ptr, rd_buf_size - (rd_buf_ptr - rd_buf), +"Preferred: %d 0x%x %d\n" , link->preferred_link_setting.lane_count, link->preferred_link_setting.link_rate, link->preferred_link_setting.link_spread);
Signature · 1 line
2.53.0
PATCH 12/28 drm/amd/display: Cleaned up headers
In reply to George ZhangFrom: Bhuvanachandra Pinninti <[email protected]>
[why & how]
The register spec headers are duplicated in the external asic_reg path and maintaining a local copy is unnecessary.
--- drivers/gpu/drm/amd/display/dc/dce/dce_aux.c | 1 + drivers/gpu/drm/amd/display/dc/dce110/dce110_compressor.c | 2 -- .../gpu/drm/amd/display/dc/dce110/dce110_mem_input_v.c | 2 -- drivers/gpu/drm/amd/display/dc/dce112/dce112_compressor.c | 8 ++++++-- .../drm/amd/display/dc/gpio/dce80/hw_translate_dce80.c | 5 ++++- 5 files changed, 11 insertions(+), 7 deletions(-)
drivers/gpu/drm/amd/display/dc/dce/dce_aux.c +1 -0
@@ -26,6 +26,7 @@#include "dm_services.h" #include "core_types.h" #include "dce_aux.h" +#include "dce/dce_11_0_d.h" #include "dce/dce_11_0_sh_mask.h" #include "dm_event_log.h" #include "dm_helpers.h"
drivers/gpu/drm/amd/display/dc/dce110/dce110_compressor.c +0 -2
@@ -27,8 +27,6 @@#include "dce/dce_11_0_d.h" #include "dce/dce_11_0_sh_mask.h" -#include "gmc/gmc_8_2_sh_mask.h" -#include "gmc/gmc_8_2_d.h" #include "include/logger_interface.h"
drivers/gpu/drm/amd/display/dc/dce110/dce110_mem_input_v.c +0 -2
@@ -27,8 +27,6 @@#include "dce/dce_11_0_d.h" #include "dce/dce_11_0_sh_mask.h" /* TODO: this needs to be looked at, used by Stella's workaround*/ -#include "gmc/gmc_8_2_d.h" -#include "gmc/gmc_8_2_sh_mask.h" #include "include/logger_interface.h" #include "inc/dce_calcs.h"
drivers/gpu/drm/amd/display/dc/dce112/dce112_compressor.c +6 -2
@@ -27,8 +27,12 @@#include "dce/dce_11_2_d.h" #include "dce/dce_11_2_sh_mask.h" -#include "gmc/gmc_8_1_sh_mask.h" -#include "gmc/gmc_8_1_d.h" + +#ifndef mmGMCON_LPT_TARGET +#define mmGMCON_LPT_TARGET 0x0D53 +#define GMCON_LPT_TARGET__STCTRL_LPT_TARGET__SHIFT 0x00000000 +#define GMCON_LPT_TARGET__STCTRL_LPT_TARGET_MASK 0xffffffffL +#endif #include "include/logger_interface.h"
drivers/gpu/drm/amd/display/dc/gpio/dce80/hw_translate_dce80.c +4 -1
@@ -35,7 +35,10 @@#include "dce/dce_8_0_d.h" #include "dce/dce_8_0_sh_mask.h" -#include "smu/smu_7_0_1_d.h" + +#ifndef mmGPIOPAD_A +#define mmGPIOPAD_A 0x0183 +#endif /* * @brief
Signature · 1 line
2.53.0
PATCH 14/28 drm/amd/display: clamp DMUB AUX reply length to payload buffer
In reply to George ZhangFrom: Harry Wentland <[email protected]>
[Why]amdgpu_dm_process_dmub_aux_transfer_sync() copies p_notify->aux_reply.length bytes into payload->data without clamping. payload->data is typically a 16-byte DPCD scratch buffer, while aux_reply.length is echoed from the sink via the DMUB ring. While this is clamped by DMUB it's prudent to ensure we validate this in the driver as well.
[How]
Clamp the copy to sizeof(aux_reply.data), the scratch buffer the reply was read into, and use that for both the memcpy and the return value. For regular transfers additionally clamp to payload->length to cover callers whose destination buffer is smaller than 16 bytes. The write-status-update retry path (dce_aux_transfer_with_retries) deliberately zeroes payload->length while still expecting the partial-write status byte, so that bound is skipped in that case to avoid dropping the reply. Also guard against a NULL payload->data.
--- .../amd/display/amdgpu_dm/amdgpu_dm_dmub.c | 24 +++++++++++++++---- 1 file changed, 19 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_dmub.c +19 -5
@@ -798,12 +798,26 @@ int amdgpu_dm_process_dmub_aux_transfer_sync( payload->reply[0 ] = (adev->dm.dmub_notify->aux_reply.command >>4 ) &0xF ;/*write req may receive a byte indicating partially written number as well*/ -if (p_notify->aux_reply.length) -memcpy (payload->data, p_notify->aux_reply.data, - p_notify->aux_reply.length); +if (p_notify->aux_reply.length && payload->data) { +/* Bound the reply to the scratch buffer it was read into. */ + ret =min ((uint32_t )p_notify->aux_reply.length, + (uint32_t )sizeof (p_notify->aux_reply.data)); + +/* +* During a write-status-update retry the caller zeroes +* payload->length while still expecting the partial-write +* status byte in payload->data (see dce_aux_transfer_with_retries), +* so only clamp to payload->length for regular transfers. +*/ +if (!payload->write_status_update) + ret =min (ret, payload->length); + +memcpy (payload->data, p_notify->aux_reply.data, ret); + }else { +/* success */ + ret = p_notify->aux_reply.length; + } -/* success */ - ret = p_notify->aux_reply.length; *operation_result = p_notify->result; out:reinit_completion (&adev->dm.dmub_aux_transfer_done);
Signature · 1 line
2.53.0
PATCH 15/28 drm/amd/display: guard against overflow in HDCP message dump
In reply to George ZhangFrom: Harry Wentland <[email protected]>
[Why]mod_hdcp_dump_binary_message() computed target_size (a uint32_t) as roughly byte_size * msg_size and gated the whole write on buf_size >= target_size. A large msg_size can overflow target_size, wrapping it to a small value that passes the check while the loop still writes byte_size * msg_size bytes into buf. All current callers pass small constants so this is not reachable today, but the unchecked arithmetic should be hardened.
[How]
Drop the overflow-prone target_size precomputation and instead bounds-check the output position on every iteration, stopping once the next entry would not leave room for the trailing terminator. This cannot overflow and, for oversized messages, dumps as much as fits rather than printing nothing.
--- .../drm/amd/display/modules/hdcp/hdcp_log.c | 30 +++++++++++-------- 1 file changed, 18 insertions(+), 12 deletions(-)
drivers/gpu/drm/amd/display/modules/hdcp/hdcp_log.c +18 -12
@@ -33,22 +33,28 @@ void mod_hdcp_dump_binary_message(uint8_t *msg, uint32_t msg_size, byte_size =3 , newline_size =1 , terminator_size =1 ; -uint32_t line_count = msg_size / bytes_per_line, - trailing_bytes = msg_size % bytes_per_line; -uint32_t target_size = (byte_size * bytes_per_line + newline_size) * line_count + - byte_size * trailing_bytes + newline_size + terminator_size;uint32_t buf_pos =0 ;uint32_t i =0 ; -if (buf_size >= target_size) { -for (i =0 ; i < msg_size; i++) { -if (i % bytes_per_line ==0 ) - buf[buf_pos++] ='\n' ; -sprintf ((char *)&buf[buf_pos],"%02X " , msg[i]); - buf_pos += byte_size; - } - buf[buf_pos++] ='\0' ; +/* Need room for at least the terminator. */ +if (buf_size < terminator_size) +return ; + +for (i =0 ; i < msg_size; i++) { +uint32_t needed = byte_size + terminator_size; + +if (i % bytes_per_line ==0 ) + needed += newline_size; + +if (buf_pos + needed > buf_size) +break ; + +if (i % bytes_per_line ==0 ) + buf[buf_pos++] ='\n' ; +sprintf ((char *)&buf[buf_pos],"%02X " , msg[i]); + buf_pos += byte_size; } + buf[buf_pos++] ='\0' ; }void mod_hdcp_log_ddc_trace (struct mod_hdcp *hdcp)
Signature · 1 line
2.53.0
PATCH 17/28 drm/amd/display: Add KUnit test for amdgpu_dm_wb
In reply to George ZhangFrom: Alex Hung <[email protected]>
[WHAT]
Add KUnit test with DRM mock for amdgpu_dm_wb_connector_init().
--- .../drm/amd/display/amdgpu_dm/amdgpu_dm_wb.c | 1 + .../amdgpu_dm/tests/amdgpu_dm_wb_test.c | 70 +++++++++++++++++++ 2 files changed, 71 insertions(+)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_wb.c +1 -0
@@ -216,3 +216,4 @@ int amdgpu_dm_wb_connector_init(struct amdgpu_display_manager *dm,return 0 ; } +EXPORT_IF_KUNIT (amdgpu_dm_wb_connector_init);
drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_wb_test.c +70 -0
94 lines not on this page · raw message
Signature · 1 line
2.53.0
PATCH 18/28 drm/amd/display: Add KUnit tests for amdgpu_dm_replay
In reply to George ZhangFrom: Alex Hung <[email protected]>
[WHAT]
Add KUnit coverage for amdgpu_dm_set_replay_caps(), amdgpu_dm_link_setup_replay(), and amdgpu_dm_replay_set_event() including happy-path tests that exercise the configuration logic, coasting vtotal calculations, and early-return when replay events are already in the desired state.
--- .../amd/display/amdgpu_dm/amdgpu_dm_replay.c | 3 + .../amdgpu_dm/tests/amdgpu_dm_replay_test.c | 437 +++++++++++++++++- 2 files changed, 436 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_replay.c +3 -0
@@ -128,6 +128,7 @@ bool amdgpu_dm_set_replay_caps(struct dc_link *link, struct amdgpu_dm_connectorreturn true; } +EXPORT_IF_KUNIT (amdgpu_dm_set_replay_caps);/* * amdgpu_dm_link_setup_replay() - config replay settings
@@ -166,6 +167,7 @@ bool amdgpu_dm_link_setup_replay(struct dc_stream_state *stream, static_coasting_vtotal);return true; } +EXPORT_IF_KUNIT (amdgpu_dm_link_setup_replay);/* * amdgpu_dm_replay_set_event() - set or clear replay event for a stream
@@ -205,3 +207,4 @@ bool amdgpu_dm_replay_set_event(struct amdgpu_display_manager *dm,return mod_power_set_replay_event (dm->power_module, stream, set_event, event, wait_for_disable); } +EXPORT_IF_KUNIT (amdgpu_dm_replay_set_event);
drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_replay_test.c +433 -4
478 lines not on this page · raw message
Signature · 1 line
2.53.0
PATCH 19/28 drm/amd/display: Add KUnit tests for amdgpu_dm_psr
In reply to George ZhangFrom: Alex Hung <[email protected]>
[WHAT]
Add Kunit tests for functions:
- link_supports_psrsu()
- amdgpu_dm_psr_fill_caps()
- amdgpu_dm_set_psr_caps()
- amdgpu_dm_psr_is_active_allowed()
- amdgpu_dm_psr_set_event()
--- .../drm/amd/display/amdgpu_dm/amdgpu_dm_psr.c | 51 +- .../drm/amd/display/amdgpu_dm/amdgpu_dm_psr.h | 5 + .../amdgpu_dm/tests/amdgpu_dm_psr_test.c | 538 ++++++++++++++++++ 3 files changed, 592 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_psr.c +49 -2
@@ -32,8 +32,8 @@#include "modules/power/power_helpers.h" #include "amdgpu_dm_kunit_helpers.h" - -static bool link_supports_psrsu (struct dc_link *link) +STATIC_IFN_KUNIT +bool link_supports_psrsu(struct dc_link *link) {struct dc *dc = link->ctx->dc;
@@ -60,6 +60,7 @@ static bool link_supports_psrsu(struct dc_link *link)/* Temporarily disable PSR-SU to avoid glitches */ return false; } +EXPORT_IF_KUNIT (link_supports_psrsu);STATIC_IFN_KUNIT void amdgpu_dm_psr_fill_caps(struct dc_link *link, struct psr_caps *caps)
@@ -134,6 +135,7 @@ bool amdgpu_dm_set_psr_caps(struct dc_link *link, struct amdgpu_dm_connector *acamdgpu_dm_psr_fill_caps (link, &aconnector->psr_caps);return true; } +EXPORT_IF_KUNIT (amdgpu_dm_set_psr_caps);/* * amdgpu_dm_psr_is_active_allowed() - check if psr is allowed on any stream
@@ -157,6 +159,7 @@ bool amdgpu_dm_psr_is_active_allowed(struct amdgpu_display_manager *dm) }return false; } +EXPORT_IF_KUNIT (amdgpu_dm_psr_is_active_allowed);/* * amdgpu_dm_psr_set_event() - set or clear PSR event for stream
@@ -190,3 +193,47 @@ bool amdgpu_dm_psr_set_event(struct amdgpu_display_manager *dm, struct dc_stream set_event, event, wait_for_disable); }EXPORT_IF_KUNIT (amdgpu_dm_psr_set_event); + +#if IS_ENABLED (CONFIG_DRM_AMD_DC_KUNIT_TEST ) +/** +* amdgpu_dm_psr_get_dc_feature_mask() - Get DC feature mask for KUnit tests. +* +* Return: Current value of amdgpu_dc_feature_mask. +*/ +unsigned int amdgpu_dm_psr_get_dc_feature_mask (void ) +{ +return amdgpu_dc_feature_mask; +} +EXPORT_IF_KUNIT (amdgpu_dm_psr_get_dc_feature_mask); + +/** +* amdgpu_dm_psr_set_dc_feature_mask() - Set DC feature mask for KUnit tests. +* @feature_mask: DC feature mask to set while testing amdgpu_dm_psr_fill_caps(). +*/ +void amdgpu_dm_psr_set_dc_feature_mask (unsigned int feature_mask) +{ + amdgpu_dc_feature_mask = feature_mask; +} +EXPORT_IF_KUNIT (amdgpu_dm_psr_set_dc_feature_mask); + +/** +* amdgpu_dm_psr_get_dc_debug_mask() - Get DC debug mask for KUnit tests. +* +* Return: Current value of amdgpu_dc_debug_mask. +*/ +unsigned int amdgpu_dm_psr_get_dc_debug_mask (void ) +{ +return amdgpu_dc_debug_mask; +} +EXPORT_IF_KUNIT (amdgpu_dm_psr_get_dc_debug_mask); + +/** +* amdgpu_dm_psr_set_dc_debug_mask() - Set DC debug mask for KUnit tests. +* @debug_mask: DC debug mask to set while testing link_supports_psrsu(). +*/ +void amdgpu_dm_psr_set_dc_debug_mask (unsigned int debug_mask) +{ + amdgpu_dc_debug_mask = debug_mask; +} +EXPORT_IF_KUNIT (amdgpu_dm_psr_set_dc_debug_mask); +#endif
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_psr.h +5 -0
@@ -43,7 +43,12 @@ bool amdgpu_dm_psr_set_event(struct amdgpu_display_manager *dm, bool wait_for_disable);#if IS_ENABLED (CONFIG_DRM_AMD_DC_KUNIT_TEST ) +bool link_supports_psrsu (struct dc_link *link);void amdgpu_dm_psr_fill_caps (struct dc_link *link,struct psr_caps *caps); +unsigned int amdgpu_dm_psr_get_dc_feature_mask (void ); +void amdgpu_dm_psr_set_dc_feature_mask (unsigned int feature_mask); +unsigned int amdgpu_dm_psr_get_dc_debug_mask (void ); +void amdgpu_dm_psr_set_dc_debug_mask (unsigned int debug_mask);#endif #endif /* AMDGPU_DM_AMDGPU_DM_PSR_H_ */
drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_psr_test.c +538 -0
575 lines not on this page · raw message
Signature · 1 line
2.53.0
PATCH 20/28 drm/amd/display: Add KUnit tests for amdgpu_dm_pp_smu
In reply to George ZhangFrom: Alex Hung <[email protected]>
Add comprehensive KUnit test coverage for amdgpu_dm_pp_smu.c including:
- Utility functions: dc_to_pp_clock_type, pp_to_dc_clock_levels, build_pm_display_cfg, get_default_clock_levels, build_wm_clock_ranges_soc15, cap_clock_levels_to_validation
- DPM-backed functions: dm_pp_get_clock_levels_by_type, dm_pp_notify_wm_clock_changes, dm_pp_apply_clock_for_voltage_request, dm_pp_get_static_clocks
- Raven pass-throughs: pp_rv_set_wm_ranges, pp_rv_set_pme_wa_enable, pp_rv_set_active_display_count, pp_rv_set_min_deep_sleep_dcfclk, pp_rv_set_hard_min_dcefclk_by_freq, pp_rv_set_hard_min_fclk_by_freq
- Navi functions: pp_nv_set_wm_ranges, pp_nv_get_maximum_sustainable_clocks, pp_nv_get_uclk_dpm_states, pp_nv_get_dpm_clock_table
- Renoir: pp_rn_get_dpm_clock_table
- dm_pp_get_funcs ASIC family selection
--- .../amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c | 52 +- .../amd/display/amdgpu_dm/amdgpu_dm_pp_smu.h | 23 + .../amdgpu_dm/tests/amdgpu_dm_pp_smu_test.c | 1535 ++++++++++++++++- 3 files changed, 1592 insertions(+), 18 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c +36 -16
@@ -337,6 +337,7 @@ bool dm_pp_get_clock_levels_by_type(return true; } +EXPORT_IF_KUNIT (dm_pp_get_clock_levels_by_type); bool dm_pp_get_clock_levels_by_type_with_latency( const struct dc_context *ctx,
@@ -357,6 +358,7 @@ bool dm_pp_get_clock_levels_by_type_with_latency(return true; } +EXPORT_IF_KUNIT (dm_pp_get_clock_levels_by_type_with_latency); bool dm_pp_get_clock_levels_by_type_with_voltage( const struct dc_context *ctx,
@@ -377,6 +379,7 @@ bool dm_pp_get_clock_levels_by_type_with_voltage(return true; } +EXPORT_IF_KUNIT (dm_pp_get_clock_levels_by_type_with_voltage); bool dm_pp_notify_wm_clock_changes( const struct dc_context *ctx,
@@ -396,6 +399,7 @@ bool dm_pp_notify_wm_clock_changes(return false; } +EXPORT_IF_KUNIT (dm_pp_notify_wm_clock_changes); bool dm_pp_apply_clock_for_voltage_request( const struct dc_context *ctx,
@@ -464,7 +468,7 @@ STATIC_IFN_KUNIT void build_wm_clock_ranges_soc15( }EXPORT_IF_KUNIT (build_wm_clock_ranges_soc15); -static void pp_rv_set_wm_ranges (struct pp_smu *pp, +STATIC_IFN_KUNIT void pp_rv_set_wm_ranges(struct pp_smu *pp,struct pp_smu_wm_range_sets *ranges) {const struct dc_context *ctx = pp->dm;
@@ -476,48 +480,54 @@ static void pp_rv_set_wm_ranges(struct pp_smu *pp,amdgpu_dpm_set_watermarks_for_clocks_ranges (adev, &wm_with_clock_ranges); } +EXPORT_IF_KUNIT (pp_rv_set_wm_ranges); -static void pp_rv_set_pme_wa_enable (struct pp_smu *pp) +STATIC_IFN_KUNIT void pp_rv_set_pme_wa_enable(struct pp_smu *pp) {const struct dc_context *ctx = pp->dm;struct amdgpu_device *adev = ctx->driver_context;amdgpu_dpm_notify_smu_enable_pwe (adev); } +EXPORT_IF_KUNIT (pp_rv_set_pme_wa_enable); -static void pp_rv_set_active_display_count (struct pp_smu *pp,int count) +STATIC_IFN_KUNIT void pp_rv_set_active_display_count(struct pp_smu *pp, int count) {const struct dc_context *ctx = pp->dm;struct amdgpu_device *adev = ctx->driver_context;amdgpu_dpm_set_active_display_count (adev, count); } +EXPORT_IF_KUNIT (pp_rv_set_active_display_count); -static void pp_rv_set_min_deep_sleep_dcfclk (struct pp_smu *pp,int clock) +STATIC_IFN_KUNIT void pp_rv_set_min_deep_sleep_dcfclk(struct pp_smu *pp, int clock) {const struct dc_context *ctx = pp->dm;struct amdgpu_device *adev = ctx->driver_context;amdgpu_dpm_set_min_deep_sleep_dcefclk (adev, clock); } +EXPORT_IF_KUNIT (pp_rv_set_min_deep_sleep_dcfclk); -static void pp_rv_set_hard_min_dcefclk_by_freq (struct pp_smu *pp,int clock) +STATIC_IFN_KUNIT void pp_rv_set_hard_min_dcefclk_by_freq(struct pp_smu *pp, int clock) {const struct dc_context *ctx = pp->dm;struct amdgpu_device *adev = ctx->driver_context;amdgpu_dpm_set_hard_min_dcefclk_by_freq (adev, clock); } +EXPORT_IF_KUNIT (pp_rv_set_hard_min_dcefclk_by_freq); -static void pp_rv_set_hard_min_fclk_by_freq (struct pp_smu *pp,int mhz) +STATIC_IFN_KUNIT void pp_rv_set_hard_min_fclk_by_freq(struct pp_smu *pp, int mhz) {const struct dc_context *ctx = pp->dm;struct amdgpu_device *adev = ctx->driver_context;amdgpu_dpm_set_hard_min_fclk_by_freq (adev, mhz); } +EXPORT_IF_KUNIT (pp_rv_set_hard_min_fclk_by_freq); -static enum pp_smu_status pp_nv_set_wm_ranges (struct pp_smu *pp, +STATIC_IFN_KUNIT enum pp_smu_status pp_nv_set_wm_ranges(struct pp_smu *pp,struct pp_smu_wm_range_sets *ranges) {const struct dc_context *ctx = pp->dm;
@@ -527,8 +537,9 @@ static enum pp_smu_status pp_nv_set_wm_ranges(struct pp_smu *pp,return PP_SMU_RESULT_OK ; } +EXPORT_IF_KUNIT (pp_nv_set_wm_ranges); -static enum pp_smu_status pp_nv_set_display_count (struct pp_smu *pp,int count) +STATIC_IFN_KUNIT enum pp_smu_status pp_nv_set_display_count(struct pp_smu *pp, int count) {const struct dc_context *ctx = pp->dm;struct amdgpu_device *adev = ctx->driver_context;
@@ -543,8 +554,9 @@ static enum pp_smu_status pp_nv_set_display_count(struct pp_smu *pp, int count)return PP_SMU_RESULT_OK ; } +EXPORT_IF_KUNIT (pp_nv_set_display_count); -static enum pp_smu_status +STATIC_IFN_KUNIT enum pp_smu_statuspp_nv_set_min_deep_sleep_dcfclk (struct pp_smu *pp,int mhz) {const struct dc_context *ctx = pp->dm;
@@ -560,8 +572,9 @@ pp_nv_set_min_deep_sleep_dcfclk(struct pp_smu *pp, int mhz)return PP_SMU_RESULT_OK ; } +EXPORT_IF_KUNIT (pp_nv_set_min_deep_sleep_dcfclk); -static enum pp_smu_status pp_nv_set_hard_min_dcefclk_by_freq ( +STATIC_IFN_KUNIT enum pp_smu_status pp_nv_set_hard_min_dcefclk_by_freq(struct pp_smu *pp,int mhz) {const struct dc_context *ctx = pp->dm;
@@ -583,8 +596,9 @@ static enum pp_smu_status pp_nv_set_hard_min_dcefclk_by_freq(return PP_SMU_RESULT_OK ; } +EXPORT_IF_KUNIT (pp_nv_set_hard_min_dcefclk_by_freq); -static enum pp_smu_status +STATIC_IFN_KUNIT enum pp_smu_statuspp_nv_set_hard_min_uclk_by_freq (struct pp_smu *pp,int mhz) {const struct dc_context *ctx = pp->dm;
@@ -606,8 +620,9 @@ pp_nv_set_hard_min_uclk_by_freq(struct pp_smu *pp, int mhz)return PP_SMU_RESULT_OK ; } +EXPORT_IF_KUNIT (pp_nv_set_hard_min_uclk_by_freq); -static enum pp_smu_status pp_nv_set_pstate_handshake_support ( +STATIC_IFN_KUNIT enum pp_smu_status pp_nv_set_pstate_handshake_support(struct pp_smu *pp,bool pstate_handshake_supported) {const struct dc_context *ctx = pp->dm;
@@ -619,6 +634,7 @@ static enum pp_smu_status pp_nv_set_pstate_handshake_support(return PP_SMU_RESULT_OK ; } +EXPORT_IF_KUNIT (pp_nv_set_pstate_handshake_support); STATIC_IFN_KUNIT bool pp_smu_nv_clock_id_to_pp(enum pp_smu_nv_clock_id clock_id,enum amd_pp_clock_type *clock_type)
@@ -641,7 +657,7 @@ STATIC_IFN_KUNIT bool pp_smu_nv_clock_id_to_pp(enum pp_smu_nv_clock_id clock_id, }EXPORT_IF_KUNIT (pp_smu_nv_clock_id_to_pp); -static enum pp_smu_status pp_nv_set_voltage_by_freq (struct pp_smu *pp, +STATIC_IFN_KUNIT enum pp_smu_status pp_nv_set_voltage_by_freq(struct pp_smu *pp,enum pp_smu_nv_clock_id clock_id,int mhz) {const struct dc_context *ctx = pp->dm;
@@ -665,8 +681,9 @@ static enum pp_smu_status pp_nv_set_voltage_by_freq(struct pp_smu *pp,return PP_SMU_RESULT_OK ; } +EXPORT_IF_KUNIT (pp_nv_set_voltage_by_freq); -static enum pp_smu_status pp_nv_get_maximum_sustainable_clocks ( +STATIC_IFN_KUNIT enum pp_smu_status pp_nv_get_maximum_sustainable_clocks(struct pp_smu *pp,struct pp_smu_nv_clock_table *max_clocks) {const struct dc_context *ctx = pp->dm;
@@ -682,8 +699,9 @@ static enum pp_smu_status pp_nv_get_maximum_sustainable_clocks(return PP_SMU_RESULT_OK ; } +EXPORT_IF_KUNIT (pp_nv_get_maximum_sustainable_clocks); -static enum pp_smu_status pp_nv_get_uclk_dpm_states (struct pp_smu *pp, +STATIC_IFN_KUNIT enum pp_smu_status pp_nv_get_uclk_dpm_states(struct pp_smu *pp,unsigned int *clock_values_in_khz,unsigned int *num_states) {const struct dc_context *ctx = pp->dm;
@@ -700,8 +718,9 @@ static enum pp_smu_status pp_nv_get_uclk_dpm_states(struct pp_smu *pp,return PP_SMU_RESULT_OK ; } +EXPORT_IF_KUNIT (pp_nv_get_uclk_dpm_states); -static enum pp_smu_status pp_rn_get_dpm_clock_table ( +STATIC_IFN_KUNIT enum pp_smu_status pp_rn_get_dpm_clock_table(struct pp_smu *pp,struct dpm_clocks *clock_table) {const struct dc_context *ctx = pp->dm;
@@ -716,6 +735,7 @@ static enum pp_smu_status pp_rn_get_dpm_clock_table(return PP_SMU_RESULT_OK ; } +EXPORT_IF_KUNIT (pp_rn_get_dpm_clock_table); void dm_pp_get_funcs( struct dc_context *ctx,
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.h +23 -0
@@ -33,6 +33,29 @@ void cap_clock_levels_to_validation(struct dm_pp_clock_levels *dc_clks, const struct amd_pp_simple_clock_info *validation_clks);bool pp_smu_nv_clock_id_to_pp (enum pp_smu_nv_clock_id clock_id,enum amd_pp_clock_type *clock_type); +void pp_rv_set_wm_ranges (struct pp_smu *pp,struct pp_smu_wm_range_sets *ranges); +void pp_rv_set_pme_wa_enable (struct pp_smu *pp); +void pp_rv_set_active_display_count (struct pp_smu *pp,int count); +void pp_rv_set_min_deep_sleep_dcfclk (struct pp_smu *pp,int clock); +void pp_rv_set_hard_min_dcefclk_by_freq (struct pp_smu *pp,int clock); +void pp_rv_set_hard_min_fclk_by_freq (struct pp_smu *pp,int mhz); +enum pp_smu_status pp_nv_set_wm_ranges (struct pp_smu *pp, +struct pp_smu_wm_range_sets *ranges); +enum pp_smu_status pp_nv_set_display_count (struct pp_smu *pp,int count); +enum pp_smu_status pp_nv_set_min_deep_sleep_dcfclk (struct pp_smu *pp,int mhz); +enum pp_smu_status pp_nv_set_hard_min_dcefclk_by_freq (struct pp_smu *pp,int mhz); +enum pp_smu_status pp_nv_set_hard_min_uclk_by_freq (struct pp_smu *pp,int mhz); +enum pp_smu_status pp_nv_set_pstate_handshake_support (struct pp_smu *pp, +bool pstate_handshake_supported); +enum pp_smu_status pp_nv_set_voltage_by_freq (struct pp_smu *pp, +enum pp_smu_nv_clock_id clock_id,int mhz); +enum pp_smu_status pp_nv_get_maximum_sustainable_clocks (struct pp_smu *pp, +struct pp_smu_nv_clock_table *max_clocks); +enum pp_smu_status pp_nv_get_uclk_dpm_states (struct pp_smu *pp, +unsigned int *clock_values_in_khz, +unsigned int *num_states); +enum pp_smu_status pp_rn_get_dpm_clock_table (struct pp_smu *pp, +struct dpm_clocks *clock_table);#endif #endif /* __AMDGPU_DM_PP_SMU_H__ */
drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_pp_smu_test.c +1533 -2
1,580 lines not on this page · raw message
Signature · 1 line
2.53.0
PATCH 21/28 drm/amd/display: Add KUnit tests for mst_types
In reply to George ZhangFrom: Alex Hung <[email protected]>
Add KUnit coverage for the following MST functions:
- dm_dp_aux_transfer(): native read/write, partial write, error result remapping, and HPD disconnect quirk via fake DC link service
- dm_dp_aux_transfer_result(): error code translation
- dm_dp_aux_fill_payload_flags(): request flag decoding
- dm_mst_msg_ready_mask(): ESI mask selection
- dm_mst_select_esi_dpcd(): DPCD address/length selection
- dm_mst_atomic_best_encoder(): encoder selection by CRTC ID
- dm_dp_mst_detect(): unregistered connector early return
- dm_dp_mst_atomic_check(): no-old-CRTC early return
- dm_dp_create_fake_mst_encoders(): encoder init and CRTC mask
- dm_handle_mst_sideband_msg_ready_event(): idle no-ready-bits
- retrieve_branch_specific_data(): branch OUI parsing
- retrieve_downstream_port_device(): downstream port present
- needs_dsc_aux_workaround(): DSC workaround matching
- dm_mst_get_pbn_divider(): null link guard
- amdgpu_dm_mst_reset_mst_connector_setting(): field reset
- dm_dp_mst_is_port_support_mode(): FP-off fallback
--- .../display/amdgpu_dm/amdgpu_dm_mst_types.c | 19 +- .../display/amdgpu_dm/amdgpu_dm_mst_types.h | 7 + .../tests/amdgpu_dm_mst_types_test.c | 572 ++++++++++++++++++ 3 files changed, 592 insertions(+), 6 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c +13 -6
@@ -99,8 +99,8 @@ EXPORT_IF_KUNIT(dm_dp_aux_fill_payload_flags);/* * This function handles both native AUX and I2C-Over-AUX transactions. */ -static ssize_t dm_dp_aux_transfer (struct drm_dp_aux *aux, -struct drm_dp_aux_msg *msg) +STATIC_IFN_KUNIT ssize_t dm_dp_aux_transfer(struct drm_dp_aux *aux, +struct drm_dp_aux_msg *msg) {ssize_t result =0 ;struct aux_payload payload;
@@ -167,6 +167,7 @@ static ssize_t dm_dp_aux_transfer(struct drm_dp_aux *aux,return result; } +EXPORT_IF_KUNIT (dm_dp_aux_transfer);static void dm_dp_mst_connector_destroy (struct drm_connector *connector)
@@ -518,7 +519,7 @@ static int dm_dp_mst_get_modes(struct drm_connector *connector)return ret; } -static struct drm_encoder * +STATIC_IFN_KUNIT struct drm_encoder *dm_mst_atomic_best_encoder (struct drm_connector *connector,struct drm_atomic_state *state) {
@@ -529,8 +530,9 @@ dm_mst_atomic_best_encoder(struct drm_connector *connector,return &adev->dm.mst_encoders[acrtc->crtc_id].base; } +EXPORT_IF_KUNIT (dm_mst_atomic_best_encoder); -static int +STATIC_IFN_KUNIT intdm_dp_mst_detect (struct drm_connector *connector,struct drm_modeset_acquire_ctx *ctx,bool force) {
@@ -600,9 +602,10 @@ dm_dp_mst_detect(struct drm_connector *connector,return connection_status; } +EXPORT_IF_KUNIT (dm_dp_mst_detect); -static int dm_dp_mst_atomic_check (struct drm_connector *connector, -struct drm_atomic_state *state) +STATIC_IFN_KUNIT int dm_dp_mst_atomic_check(struct drm_connector *connector, +struct drm_atomic_state *state) {struct amdgpu_dm_connector *aconnector =to_amdgpu_dm_connector (connector);struct drm_dp_mst_topology_mgr *mst_mgr = &aconnector->mst_root->mst_mgr;
@@ -610,6 +613,7 @@ static int dm_dp_mst_atomic_check(struct drm_connector *connector,return drm_dp_atomic_release_time_slots (state, mst_mgr, mst_port); } +EXPORT_IF_KUNIT (dm_dp_mst_atomic_check);static const struct drm_connector_helper_funcs dm_dp_mst_connector_helper_funcs = { .get_modes = dm_dp_mst_get_modes,
@@ -650,6 +654,7 @@ dm_dp_create_fake_mst_encoders(struct amdgpu_device *adev)drm_encoder_helper_add (encoder, &amdgpu_dm_encoder_helper_funcs); } } +EXPORT_IF_KUNIT (dm_dp_create_fake_mst_encoders);static struct drm_connector * dm_dp_add_mst_connector(struct drm_dp_mst_topology_mgr *mgr,
@@ -855,6 +860,7 @@ void dm_handle_mst_sideband_msg_ready_event(if (process_count == max_process_count)DRM_DEBUG_DRIVER ("Loop exceeded max iterations\n" ); } +EXPORT_IF_KUNIT (dm_handle_mst_sideband_msg_ready_event);static void dm_handle_mst_down_rep_msg_ready (struct drm_dp_mst_topology_mgr *mgr) {
@@ -2108,3 +2114,4 @@ enum dc_status dm_dp_mst_is_port_support_mode(#endif return DC_OK ; } +EXPORT_IF_KUNIT (dm_dp_mst_is_port_support_mode);
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.h +7 -0
@@ -108,8 +108,15 @@ bool retrieve_branch_specific_data(struct amdgpu_dm_connector *aconnector);ssize_t dm_dp_aux_transfer_result (ssize_t result,enum aux_return_code_type operation_result);void dm_dp_aux_fill_payload_flags (u8 request,struct aux_payload *payload); +ssize_t dm_dp_aux_transfer (struct drm_dp_aux *aux,struct drm_dp_aux_msg *msg);u8 dm_mst_msg_ready_mask (enum mst_msg_ready_type msg_rdy_type);void dm_mst_select_esi_dpcd (u8 dpcd_rev,int *dpcd_addr,u8 *dpcd_bytes_to_read); +struct drm_encoder *dm_mst_atomic_best_encoder (struct drm_connector *connector, +struct drm_atomic_state *state); +int dm_dp_mst_atomic_check (struct drm_connector *connector, +struct drm_atomic_state *state); +int dm_dp_mst_detect (struct drm_connector *connector, +struct drm_modeset_acquire_ctx *ctx,bool force);#endif #endif
drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_mst_types_test.c +572 -0
631 lines not on this page · raw message
Signature · 1 line
2.53.0
PATCH 22/28 drm/amd/display: hold a vblank ref while writeback is pending
In reply to George ZhangFrom: Harry Wentland <[email protected]>
Writeback completion is detected in dm_crtc_high_irq(), the CRTC vblank IRQ handler. The arm path (dm_set_writeback) never took a vblank reference, so the interrupt was only enabled incidentally (by a pageflip on the same commit, fbcon, or a previous vblank's off-delay window).
A writeback-only commit right after a fresh drm_crtc_vblank_on() (e.g. a writeback connector detached and re-attached) therefore has no vblank
reference: the IRQ never fires, wb_pending is never cleared and the out fence times out. This is reproducible with IGT kms_writeback and was seen via kms_colorop on writeback-capable hardware. The relevant IGT branch is at
https://gitlab.freedesktop.org/hwentland/igt-gpu-tools/-/tree/yuv-fm-colorop
Take a vblank reference when arming the writeback and release it once completion is signalled. The get is done before arming wb_pending so the completion IRQ cannot drop the reference before it is taken. Factor the shared completion bookkeeping into amdgpu_dm_crtc_complete_writeback() and also call it from the teardown path, so a writeback torn down while still pending signals its out fence and releases the reference instead of leaking both.
--- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 64 ++++++++++++++++++- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 2 + .../drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c | 45 ++++++------- 3 files changed, 82 insertions(+), 29 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +62 -2
@@ -4494,10 +4494,55 @@ static void amdgpu_dm_crtc_copy_transient_flags(struct drm_crtc_state *crtc_stat stream_state->mode_changed =drm_atomic_crtc_needs_modeset (crtc_state); } +/** +* amdgpu_dm_crtc_complete_writeback - finish a pending writeback job +* @acrtc: the CRTC whose pending writeback should be completed +* +* Clears the pending state, signals the writeback out fence and releases the +* vblank reference taken in dm_set_writeback() while the writeback was armed. +* The pending flag is tested and cleared under the writeback job lock, so this +* is safe to call concurrently from the completion vblank IRQ +* (dm_crtc_high_irq()) and from the writeback teardown path +* (dm_clear_writeback()); only the caller that observes the pending job +* performs the completion. +* +* Return: true if a pending writeback job was completed by this call. +*/ +bool amdgpu_dm_crtc_complete_writeback (struct amdgpu_crtc *acrtc) +{ +unsigned long flags; +bool pending; + +if (!acrtc->wb_conn) +return false; + +spin_lock_irqsave (&acrtc->wb_conn->job_lock, flags); + pending = acrtc->wb_pending; + acrtc->wb_pending = false; +spin_unlock_irqrestore (&acrtc->wb_conn->job_lock, flags); + +if (!pending) +return false; + +drm_writeback_signal_completion (acrtc->wb_conn,0 ); +drm_crtc_vblank_put (&acrtc->base); + +return true; +} +static void dm_clear_writeback (struct amdgpu_display_manager *dm, +struct amdgpu_crtc *acrtc,struct dm_crtc_state *crtc_state) {dc_stream_remove_writeback (dm->dc, crtc_state->stream,0 ); + +/* +* If the writeback is still pending when it is torn down (its +* completion vblank IRQ never fired), signal the out fence so a +* waiting client does not stall and release the vblank reference +* taken in dm_set_writeback(). +*/ +amdgpu_dm_crtc_complete_writeback (acrtc); }/**
@@ -4650,7 +4695,7 @@ static void amdgpu_dm_commit_streams(struct drm_atomic_state *state, dm_old_crtc_state =to_dm_crtc_state (old_crtc_state); -dm_clear_writeback (dm, dm_old_crtc_state); +dm_clear_writeback (dm, acrtc, dm_old_crtc_state); acrtc->wb_enabled = false; }
@@ -4924,9 +4969,24 @@ static void dm_set_writeback(struct amdgpu_display_manager *dm,dc_stream_add_writeback (dm->dc, crtc_state->stream, wb_info); - acrtc->wb_pending = true; acrtc->wb_conn = wb_conn;drm_writeback_queue_job (wb_conn, new_con_state); + +/* +* Writeback completion is detected in the CRTC vblank IRQ +* (dm_crtc_high_irq()). Take a vblank reference so the vblank interrupt +* stays enabled while the writeback is pending; otherwise a +* writeback-only commit right after drm_crtc_vblank_on() (e.g. +* re-enabling a CRTC that was disabled) has no other vblank reference, +* the IRQ never fires and the out fence times out. The matching put +* happens once completion is signalled in dm_crtc_high_irq(), or when +* the writeback is torn down in dm_clear_writeback(). +* +* Arm wb_pending only after the reference is held so the completion IRQ +* cannot run its matching vblank_put before this get. +*/ +WARN_ON (drm_crtc_vblank_get (&acrtc->base)); + acrtc->wb_pending = true; }static void amdgpu_dm_update_hdcp (struct drm_atomic_state *state)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h +2 -0
@@ -1120,6 +1120,8 @@ void dm_free_gpu_mem(struct amdgpu_device *adev,bool amdgpu_dm_is_headless (struct amdgpu_device *adev); +bool amdgpu_dm_crtc_complete_writeback (struct amdgpu_crtc *acrtc); +void retrieve_dmi_info (struct amdgpu_display_manager *dm);void amdgpu_dm_emulated_link_detect (struct dc_link *link);
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c +18 -27
57 lines not on this page · raw message
Signature · 1 line
2.53.0
PATCH 23/28 drm/amd/display: Extract shared KUnit test helpers
In reply to George ZhangFrom: Alex Hung <[email protected]>
Extract common allocation and setup patterns from KUnit test files into a dedicated helpers module to reduce duplication.
Add tests/amdgpu_dm_kunit_helpers.c with shared helpers:
- dm_kunit_alloc_adev: allocate amdgpu_device via DRM mock
- dm_kunit_alloc_link: allocate zeroed dc_link
- dm_kunit_alloc_link_with_ctx: allocate dc_link with dc_context
- dm_kunit_alloc_dm: allocate display_manager with DC state
- dm_kunit_alloc_stream: allocate dc_stream_state with link
- dm_kunit_add_stream_to_state: wire stream into dc_state
- dm_kunit_alloc_connector: allocate connector wired to device
Update 10 test files to use the shared helpers, removing duplicated local alloc_test_adev, alloc_test_link, alloc_test_dm, alloc_test_stream, and add_test_stream functions.
Add missing MODULE_DESCRIPTION() macro to suppress modpost warning:
WARNING: modpost: missing MODULE_DESCRIPTION() in amdgpu_dm_kunit_helpers.o
--- .../drm/amd/display/amdgpu_dm/tests/Makefile | 1 + .../tests/amdgpu_dm_backlight_test.c | 21 +-- .../amdgpu_dm/tests/amdgpu_dm_colorop_test.c | 13 +- .../amdgpu_dm/tests/amdgpu_dm_crtc_test.c | 15 +- .../amdgpu_dm/tests/amdgpu_dm_helpers_test.c | 19 +-- .../amdgpu_dm/tests/amdgpu_dm_irq_test.c | 37 +---- .../amdgpu_dm/tests/amdgpu_dm_ism_test.c | 39 ++--- .../amdgpu_dm/tests/amdgpu_dm_kunit_helpers.c | 142 ++++++++++++++++++ .../tests/amdgpu_dm_kunit_test_helpers.h | 32 ++++ .../tests/amdgpu_dm_mst_types_test.c | 13 +- .../amdgpu_dm/tests/amdgpu_dm_psr_test.c | 126 ++++------------ .../amdgpu_dm/tests/amdgpu_dm_replay_test.c | 19 +-- .../amdgpu_dm/tests/amdgpu_dm_wb_test.c | 18 +-- 13 files changed, 252 insertions(+), 243 deletions(-) create mode 100644 drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_kunit_helpers.c create mode 100644 drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_kunit_test_helpers.h
drivers/gpu/drm/amd/display/amdgpu_dm/tests/Makefile +1 -0
@@ -11,6 +11,7 @@ ccflags-y += -I$(src)/../../../amdgpu ccflags-y += -I$(src)/../../../amdkfd ccflags-y += -I$(src)/../../../include +obj-$(CONFIG_DRM_AMD_DC_KUNIT_TEST) += amdgpu_dm_kunit_helpers.o obj-$(CONFIG_DRM_AMD_DC_KUNIT_TEST) += amdgpu_dm_crc_test.o obj-$(CONFIG_DRM_AMD_DC_KUNIT_TEST) += amdgpu_dm_hdcp_test.o obj-$(CONFIG_DRM_AMD_DC_KUNIT_TEST) += amdgpu_dm_audio_test.o
drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_backlight_test.c +6 -15
@@ -13,6 +13,7 @@#include "amdgpu_mode.h" #include "amdgpu_dm.h" #include "amdgpu_dm_backlight.h" +#include "amdgpu_dm_kunit_test_helpers.h" #include "amd_shared.h" #include "dc/inc/hw/panel_cntl.h"
@@ -22,16 +23,6 @@ struct dm_backlight_connector_fixture {struct dc_link *link; }; -static struct amdgpu_display_manager *alloc_test_dm (struct kunit *test) -{ -struct amdgpu_display_manager *dm; - - dm =kunit_kzalloc (test,sizeof (*dm),GFP_KERNEL ); -KUNIT_ASSERT_NOT_NULL (test, dm); - -return dm; -} -static void setup_test_connector (struct kunit *test,struct dm_backlight_connector_fixture *fixture,int bl_idx,enum signal_type signal)
@@ -57,7 +48,7 @@ static void setup_test_connector(struct kunit *test,*/ static void dm_test_backlight_device_index_matches_second (struct kunit *test) { -struct amdgpu_display_manager *dm =alloc_test_dm (test); +struct amdgpu_display_manager *dm =dm_kunit_alloc_dm (test);struct backlight_device *bd0;struct backlight_device *bd1;
@@ -79,7 +70,7 @@ static void dm_test_backlight_device_index_matches_second(struct kunit *test)*/ static void dm_test_backlight_device_index_missing_fallback (struct kunit *test) { -struct amdgpu_display_manager *dm =alloc_test_dm (test); +struct amdgpu_display_manager *dm =dm_kunit_alloc_dm (test);struct backlight_device *known_bd;struct backlight_device *unknown_bd;
@@ -102,7 +93,7 @@ static void dm_test_backlight_device_index_missing_fallback(struct kunit *test)*/ static void dm_test_backlight_caps_valid_short_circuit (struct kunit *test) { -struct amdgpu_display_manager *dm =alloc_test_dm (test); +struct amdgpu_display_manager *dm =dm_kunit_alloc_dm (test);struct amdgpu_dm_backlight_caps *caps = &dm->backlight_caps[0 ]; caps->caps_valid = true;
@@ -125,7 +116,7 @@ static void dm_test_backlight_caps_valid_short_circuit(struct kunit *test)*/ static void dm_test_backlight_caps_aux_support_noop (struct kunit *test) { -struct amdgpu_display_manager *dm =alloc_test_dm (test); +struct amdgpu_display_manager *dm =dm_kunit_alloc_dm (test);struct amdgpu_dm_backlight_caps *caps = &dm->backlight_caps[0 ]; caps->caps_valid = false;
@@ -146,7 +137,7 @@ static void dm_test_backlight_caps_aux_support_noop(struct kunit *test)*/ static void dm_test_backlight_caps_non_aux_sets_defaults (struct kunit *test) { -struct amdgpu_display_manager *dm =alloc_test_dm (test); +struct amdgpu_display_manager *dm =dm_kunit_alloc_dm (test);struct amdgpu_dm_backlight_caps *caps = &dm->backlight_caps[0 ]; caps->caps_valid = false;
drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_colorop_test.c +3 -10
@@ -12,6 +12,7 @@#include "dc.h" #include "amdgpu.h" #include "amdgpu_dm_colorop.h" +#include "amdgpu_dm_kunit_test_helpers.h" /* Tests for amdgpu_dm_supported_degam_tfs */
@@ -222,19 +223,11 @@ static void dm_test_initialize_default_pipeline_caps(struct kunit *test,struct amdgpu_device *adev;struct drm_device *drm;struct drm_plane *plane; -struct device *dev;struct dc *dc;int ret; - dev =drm_kunit_helper_alloc_device (test); -KUNIT_ASSERT_NOT_ERR_OR_NULL (test, dev); - - drm =__drm_kunit_helper_alloc_drm_device (test, dev, -sizeof (*adev), - offsetof(struct amdgpu_device , ddev), -DRIVER_MODESET ); -KUNIT_ASSERT_NOT_ERR_OR_NULL (test, drm); - adev =drm_to_adev (drm); + adev =dm_kunit_alloc_adev (test); + drm = &adev->ddev; dc =kunit_kzalloc (test,sizeof (*dc),GFP_KERNEL );KUNIT_ASSERT_NOT_ERR_OR_NULL (test, dc);
drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_crtc_test.c +3 -12
@@ -15,6 +15,7 @@#include "amdgpu_mode.h" #include "amdgpu_dm.h" #include "amdgpu_dm_crtc.h" +#include "amdgpu_dm_kunit_test_helpers.h" #include "amdgpu_dm_irq_params.h" /* Tests for amdgpu_dm_crtc_modeset_required() */
@@ -435,23 +436,13 @@ static void dm_test_crtc_set_vupdate_irq_no_otg(struct kunit *test) {struct amdgpu_crtc *acrtc;struct amdgpu_device *adev; -struct drm_device *drm; -struct device *dev; - dev =drm_kunit_helper_alloc_device (test); -KUNIT_ASSERT_NOT_ERR_OR_NULL (test, dev); - - drm =__drm_kunit_helper_alloc_drm_device (test, dev, -sizeof (*adev), - offsetof(struct amdgpu_device , ddev), -DRIVER_MODESET ); -KUNIT_ASSERT_NOT_ERR_OR_NULL (test, drm); - adev =drm_to_adev (drm); + adev =dm_kunit_alloc_adev (test); acrtc =kunit_kzalloc (test,sizeof (*acrtc),GFP_KERNEL );KUNIT_ASSERT_NOT_ERR_OR_NULL (test, acrtc); - acrtc->base.dev = drm; + acrtc->base.dev = &adev->ddev; acrtc->otg_inst =-1 ;KUNIT_EXPECT_EQ (test,amdgpu_dm_crtc_set_vupdate_irq (&acrtc->base, true),0 );
drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_helpers_test.c +4 -15
@@ -16,6 +16,7 @@#include "dm_helpers.h" #include "ddc_service_types.h" #include "amdgpu_dm_helpers.h" +#include "amdgpu_dm_kunit_test_helpers.h" /* Tests for edid_extract_panel_id() */
@@ -552,26 +553,14 @@ static void dm_test_mst_start_top_mgr_boot(struct kunit *test) {struct amdgpu_dm_connector *aconnector;struct amdgpu_device *adev; -struct drm_device *drm; -struct device *dev;struct dc_link *link; - dev =drm_kunit_helper_alloc_device (test); -KUNIT_ASSERT_NOT_ERR_OR_NULL (test, dev); + adev =dm_kunit_alloc_adev (test); - drm =__drm_kunit_helper_alloc_drm_device (test, dev, -sizeof (*adev), - offsetof(struct amdgpu_device , ddev), -DRIVER_MODESET ); -KUNIT_ASSERT_NOT_ERR_OR_NULL (test, drm); - adev =drm_to_adev (drm); + link =dm_kunit_alloc_link (test); - aconnector =kunit_kzalloc (test,sizeof (*aconnector),GFP_KERNEL ); -KUNIT_ASSERT_NOT_NULL (test, aconnector); - aconnector->base.dev = drm; + aconnector =dm_kunit_alloc_connector (test, adev,NULL ); - link =kunit_kzalloc (test,sizeof (*link),GFP_KERNEL ); -KUNIT_ASSERT_NOT_NULL (test, link); link->priv = aconnector;KUNIT_EXPECT_TRUE (test,dm_helpers_dp_mst_start_top_mgr (NULL , link, true));
drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_irq_test.c +6 -31
@@ -13,6 +13,7 @@#include "amdgpu_mode.h" #include "amdgpu_dm.h" #include "amdgpu_dm_irq.h" +#include "amdgpu_dm_kunit_test_helpers.h" #include "dmub/dmub_srv.h" static void dm_test_irq_handler (void *arg)
@@ -778,17 +779,9 @@ static void dm_test_get_crtc_by_otg_inst_returns_match(struct kunit *test)struct amdgpu_crtc *acrtc_a, *acrtc_b;struct amdgpu_device *adev;struct drm_device *drm; -struct device *dev; - dev =drm_kunit_helper_alloc_device (test); -KUNIT_ASSERT_NOT_ERR_OR_NULL (test, dev); - - drm =__drm_kunit_helper_alloc_drm_device (test, dev, -sizeof (*adev), - offsetof(struct amdgpu_device , ddev), -DRIVER_MODESET ); -KUNIT_ASSERT_NOT_ERR_OR_NULL (test, drm); - adev =drm_to_adev (drm); + adev =dm_kunit_alloc_adev (test); + drm = &adev->ddev; acrtc_a =kunit_kzalloc (test,sizeof (*acrtc_a),GFP_KERNEL );KUNIT_ASSERT_NOT_ERR_OR_NULL (test, acrtc_a);
@@ -819,17 +812,9 @@ static void dm_test_get_crtc_by_otg_inst_returns_null(struct kunit *test)struct amdgpu_crtc *acrtc;struct amdgpu_device *adev;struct drm_device *drm; -struct device *dev; - - dev =drm_kunit_helper_alloc_device (test); -KUNIT_ASSERT_NOT_ERR_OR_NULL (test, dev); - drm =__drm_kunit_helper_alloc_drm_device (test, dev, -sizeof (*adev), - offsetof(struct amdgpu_device , ddev), -DRIVER_MODESET ); -KUNIT_ASSERT_NOT_ERR_OR_NULL (test, drm); - adev =drm_to_adev (drm); + adev =dm_kunit_alloc_adev (test); + drm = &adev->ddev; acrtc =kunit_kzalloc (test,sizeof (*acrtc),GFP_KERNEL );KUNIT_ASSERT_NOT_ERR_OR_NULL (test, acrtc);
@@ -851,18 +836,8 @@ static void dm_test_get_crtc_by_otg_inst_returns_null(struct kunit *test)static void dm_test_get_crtc_by_otg_inst_empty_list (struct kunit *test) {struct amdgpu_device *adev; -struct drm_device *drm; -struct device *dev; - - dev =drm_kunit_helper_alloc_device (test); -KUNIT_ASSERT_NOT_ERR_OR_NULL (test, dev); - drm =__drm_kunit_helper_alloc_drm_device (test, dev, -sizeof (*adev), - offsetof(struct amdgpu_device , ddev), -DRIVER_MODESET ); -KUNIT_ASSERT_NOT_ERR_OR_NULL (test, drm); - adev =drm_to_adev (drm); + adev =dm_kunit_alloc_adev (test);KUNIT_EXPECT_NULL (test,amdgpu_dm_get_crtc_by_otg_inst (adev,0 )); }
drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_ism_test.c +13 -26
@@ -9,20 +9,7 @@#include "dc.h" #include "amdgpu_dm_ism.h" - -/* -* Helper: allocate and zero-initialise a dc_stream_state for timing tests. -* Only the timing sub-struct is accessed by the functions under test. -*/ -static struct dc_stream_state *alloc_test_stream (struct kunit *test) -{ -struct dc_stream_state *stream; - - stream =kunit_kzalloc (test,sizeof (*stream),GFP_KERNEL ); -KUNIT_ASSERT_NOT_NULL (test, stream); - -return stream; -} +#include "amdgpu_dm_kunit_test_helpers.h" /* * Helper: allocate and zero-initialise an ISM instance.
@@ -275,7 +262,7 @@ static void dm_test_ism_sso_delay_null_stream(struct kunit *test)static void dm_test_ism_sso_delay_zero_frames (struct kunit *test) {struct amdgpu_dm_ism *ism =alloc_test_ism (test); -struct dc_stream_state *stream =alloc_test_stream (test); +struct dc_stream_state *stream =dm_kunit_alloc_stream (test,NULL ); stream->timing.v_total =1125 ; stream->timing.h_total =2200 ;
@@ -288,7 +275,7 @@ static void dm_test_ism_sso_delay_zero_frames(struct kunit *test)static void dm_test_ism_sso_delay_1080p60_3frames (struct kunit *test) {struct amdgpu_dm_ism *ism =alloc_test_ism (test); -struct dc_stream_state *stream =alloc_test_stream (test); +struct dc_stream_state *stream =dm_kunit_alloc_stream (test,NULL );uint64_t expected_one_frame_ns, expected;/*
@@ -311,7 +298,7 @@ static void dm_test_ism_sso_delay_1080p60_3frames(struct kunit *test)static void dm_test_ism_sso_delay_4k60_1frame (struct kunit *test) {struct amdgpu_dm_ism *ism =alloc_test_ism (test); -struct dc_stream_state *stream =alloc_test_stream (test); +struct dc_stream_state *stream =dm_kunit_alloc_stream (test,NULL );uint64_t expected_one_frame_ns;/*
@@ -347,7 +334,7 @@ static void dm_test_ism_idle_delay_null_stream(struct kunit *test)static void dm_test_ism_idle_delay_zero_filter_frames (struct kunit *test) {struct amdgpu_dm_ism *ism =alloc_test_ism (test); -struct dc_stream_state *stream =alloc_test_stream (test); +struct dc_stream_state *stream =dm_kunit_alloc_stream (test,NULL ); stream->timing.v_total =1125 ; stream->timing.h_total =2200 ;
@@ -361,7 +348,7 @@ static void dm_test_ism_idle_delay_zero_filter_frames(struct kunit *test)static void dm_test_ism_idle_delay_zero_entry_count (struct kunit *test) {struct amdgpu_dm_ism *ism =alloc_test_ism (test); -struct dc_stream_state *stream =alloc_test_stream (test); +struct dc_stream_state *stream =dm_kunit_alloc_stream (test,NULL ); stream->timing.v_total =1125 ; stream->timing.h_total =2200 ;
@@ -376,7 +363,7 @@ static void dm_test_ism_idle_delay_zero_entry_count(struct kunit *test)static void dm_test_ism_idle_delay_zero_delay_frames (struct kunit *test) {struct amdgpu_dm_ism *ism =alloc_test_ism (test); -struct dc_stream_state *stream =alloc_test_stream (test); +struct dc_stream_state *stream =dm_kunit_alloc_stream (test,NULL ); stream->timing.v_total =1125 ; stream->timing.h_total =2200 ;
@@ -392,7 +379,7 @@ static void dm_test_ism_idle_delay_zero_delay_frames(struct kunit *test)static void dm_test_ism_idle_delay_no_short_idles (struct kunit *test) {struct amdgpu_dm_ism *ism =alloc_test_ism (test); -struct dc_stream_state *stream =alloc_test_stream (test); +struct dc_stream_state *stream =dm_kunit_alloc_stream (test,NULL );uint64_t one_frame_ns;/*
@@ -426,7 +413,7 @@ static void dm_test_ism_idle_delay_no_short_idles(struct kunit *test)static void dm_test_ism_idle_delay_enough_short_idles (struct kunit *test) {struct amdgpu_dm_ism *ism =alloc_test_ism (test); -struct dc_stream_state *stream =alloc_test_stream (test); +struct dc_stream_state *stream =dm_kunit_alloc_stream (test,NULL );uint64_t one_frame_ns, expected;/*
@@ -461,7 +448,7 @@ static void dm_test_ism_idle_delay_enough_short_idles(struct kunit *test)static void dm_test_ism_idle_delay_wraps_around_buffer (struct kunit *test) {struct amdgpu_dm_ism *ism =alloc_test_ism (test); -struct dc_stream_state *stream =alloc_test_stream (test); +struct dc_stream_state *stream =dm_kunit_alloc_stream (test,NULL );uint64_t one_frame_ns, expected;/*
@@ -497,7 +484,7 @@ static void dm_test_ism_idle_delay_wraps_around_buffer(struct kunit *test)static void dm_test_ism_idle_delay_old_history_cutoff (struct kunit *test) {struct amdgpu_dm_ism *ism =alloc_test_ism (test); -struct dc_stream_state *stream =alloc_test_stream (test); +struct dc_stream_state *stream =dm_kunit_alloc_stream (test,NULL );uint64_t one_frame_ns;/*
@@ -545,7 +532,7 @@ static void dm_test_ism_idle_delay_old_history_cutoff(struct kunit *test)static void dm_test_ism_idle_delay_mixed_durations (struct kunit *test) {struct amdgpu_dm_ism *ism =alloc_test_ism (test); -struct dc_stream_state *stream =alloc_test_stream (test); +struct dc_stream_state *stream =dm_kunit_alloc_stream (test,NULL );uint64_t one_frame_ns;/*
@@ -586,7 +573,7 @@ static void dm_test_ism_idle_delay_mixed_durations(struct kunit *test)static void dm_test_ism_idle_delay_entry_count_exceeds_history_size (struct kunit *test) {struct amdgpu_dm_ism *ism =alloc_test_ism (test); -struct dc_stream_state *stream =alloc_test_stream (test); +struct dc_stream_state *stream =dm_kunit_alloc_stream (test,NULL );uint64_t one_frame_ns, expected;/*
drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_kunit_helpers.c new file +142 -0
142 lines not on this page · raw message
drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_kunit_test_helpers.h new file +32 -0
@@ -0,0 +1,32 @@ +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ +/* +* KUnit test helpers for amdgpu_dm tests. +* +* Copyright 2026 Advanced Micro Devices, Inc. +*/ + +#ifndef AMDGPU_DM_KUNIT_TEST_HELPERS_H +#define AMDGPU_DM_KUNIT_TEST_HELPERS_H + +#include <kunit/test.h> + +struct amdgpu_device ; +struct amdgpu_display_manager ; +struct amdgpu_dm_connector ; +struct dc_link ; +struct dc_state ; +struct dc_stream_state ; + +struct amdgpu_device *dm_kunit_alloc_adev (struct kunit *test); +struct dc_link *dm_kunit_alloc_link (struct kunit *test); +struct dc_link *dm_kunit_alloc_link_with_ctx (struct kunit *test); +struct amdgpu_display_manager *dm_kunit_alloc_dm (struct kunit *test); +struct dc_stream_state *dm_kunit_alloc_stream (struct kunit *test, +struct dc_link *link); +void dm_kunit_add_stream_to_state (struct kunit *test,struct dc_state *state, +unsigned int index,struct dc_link *link); +struct amdgpu_dm_connector *dm_kunit_alloc_connector (struct kunit *test, +struct amdgpu_device *adev, +struct dc_link *link); + +#endif /* AMDGPU_DM_KUNIT_TEST_HELPERS_H */
drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_mst_types_test.c +3 -10
@@ -20,6 +20,7 @@#include "amdgpu_mode.h" #include "amdgpu_dm.h" #include "amdgpu_dm_mst_types.h" +#include "amdgpu_dm_kunit_test_helpers.h" #include "inc/link_service.h" /*
@@ -914,18 +915,10 @@ static void dm_mst_test_create_fake_mst_encoders(struct kunit *test) {struct amdgpu_device *adev;struct drm_device *drm; -struct device *dev;int i; - dev =drm_kunit_helper_alloc_device (test); -KUNIT_ASSERT_NOT_ERR_OR_NULL (test, dev); - - drm =__drm_kunit_helper_alloc_drm_device (test, dev, -sizeof (*adev), - offsetof(struct amdgpu_device , ddev), -DRIVER_MODESET |DRIVER_ATOMIC ); -KUNIT_ASSERT_NOT_ERR_OR_NULL (test, drm); - adev =drm_to_adev (drm); + adev =dm_kunit_alloc_adev (test); + drm = &adev->ddev; adev->dm.display_indexes_num =3 ; adev->mode_info.num_crtc =3 ;
drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_psr_test.c +32 -94
282 lines not on this page · raw message
drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_replay_test.c +5 -14
@@ -12,6 +12,7 @@#include "amdgpu_mode.h" #include "amdgpu_dm.h" #include "amdgpu_dm_replay.h" +#include "amdgpu_dm_kunit_test_helpers.h" #include "modules/power/power_helpers.h" #include "dmub/dmub_srv.h"
@@ -35,8 +36,9 @@ static struct replay_test_ctx *alloc_replay_ctx(struct kunit *test) ctx =kunit_kzalloc (test,sizeof (*ctx),GFP_KERNEL );KUNIT_ASSERT_NOT_NULL (test, ctx); - ctx->link =kunit_kzalloc (test,sizeof (*ctx->link),GFP_KERNEL ); -KUNIT_ASSERT_NOT_NULL (test, ctx->link); + ctx->link =dm_kunit_alloc_link_with_ctx (test); + ctx->dc_ctx = ctx->link->ctx; + ctx->dc = ctx->dc_ctx->dc; ctx->aconnector =kunit_kzalloc (test,sizeof (*ctx->aconnector),GFP_KERNEL );KUNIT_ASSERT_NOT_NULL (test, ctx->aconnector);
@@ -44,21 +46,10 @@ static struct replay_test_ctx *alloc_replay_ctx(struct kunit *test) ctx->dm_state =kunit_kzalloc (test,sizeof (*ctx->dm_state),GFP_KERNEL );KUNIT_ASSERT_NOT_NULL (test, ctx->dm_state); - ctx->dc =kunit_kzalloc (test,sizeof (*ctx->dc),GFP_KERNEL ); -KUNIT_ASSERT_NOT_NULL (test, ctx->dc); - - ctx->dc_ctx =kunit_kzalloc (test,sizeof (*ctx->dc_ctx),GFP_KERNEL ); -KUNIT_ASSERT_NOT_NULL (test, ctx->dc_ctx); - - ctx->stream =kunit_kzalloc (test,sizeof (*ctx->stream),GFP_KERNEL ); -KUNIT_ASSERT_NOT_NULL (test, ctx->stream); + ctx->stream =dm_kunit_alloc_stream (test, ctx->link);/* Wire connector state so to_dm_connector_state() works */ ctx->aconnector->base.state = &ctx->dm_state->base; - ctx->link->ctx = ctx->dc_ctx; - ctx->dc_ctx->dc = ctx->dc; - ctx->dc->ctx = ctx->dc_ctx; - ctx->stream->link = ctx->link;return ctx; }
drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_wb_test.c +2 -16
@@ -20,6 +20,7 @@#include "amdgpu.h" #include "amdgpu_dm.h" #include "amdgpu_dm_wb.h" +#include "amdgpu_dm_kunit_test_helpers.h" /* Helper functions */
@@ -71,22 +72,7 @@ static struct drm_connector_state *alloc_test_conn_state(struct kunit *test,return conn_state; } -static struct amdgpu_device *alloc_test_adev (struct kunit *test) -{ -struct drm_device *drm; -struct device *dev; - - dev =drm_kunit_helper_alloc_device (test); -KUNIT_ASSERT_NOT_ERR_OR_NULL (test, dev); - drm =__drm_kunit_helper_alloc_drm_device (test, dev, -sizeof (struct amdgpu_device ), - offsetof(struct amdgpu_device , ddev), -DRIVER_MODESET |DRIVER_ATOMIC ); -KUNIT_ASSERT_NOT_ERR_OR_NULL (test, drm); - -return drm_to_adev (drm); -}/* Tests for amdgpu_dm_wb_encoder_atomic_check */
@@ -350,7 +336,7 @@ static void dm_test_wb_connector_init_success(struct kunit *test)struct dc *dc;int ret; - adev =alloc_test_adev (test); + adev =dm_kunit_alloc_adev (test); adev->mode_info.num_crtc =1 ; dm = &adev->dm; dm->adev = adev;
Signature · 1 line
2.53.0
PATCH 24/28 drm/amd/display: remove dead code related to forcevrr
In reply to George ZhangFrom: Charlene Liu <[email protected]>
[why]
remove the forcevrr related which are not used any more.
--- drivers/gpu/drm/amd/display/dc/dc.h | 1 - 1 file changed, 1 deletion(-)
drivers/gpu/drm/amd/display/dc/dc.h +0 -1
@@ -1149,7 +1149,6 @@ struct dc_debug_options {bool validate_dml_output;bool enable_dmcub_surface_flip;bool usbc_combo_phy_reset_wa; -bool force_vrr;bool force_fva;int max_frl_rate;unsigned int force_frl_rate;
Signature · 1 line
2.53.0
PATCH 25/28 drm/amd/display: Disable mem gating for DCHVM on DCHVM init
In reply to George ZhangFrom: Andrew Lichmanov <[email protected]>
[Why] Hang occurs with global gating enabled if req=1
--- drivers/gpu/drm/amd/display/dc/hubbub/dcn35/dcn35_hubbub.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/hubbub/dcn35/dcn35_hubbub.c +1 -1
@@ -571,7 +571,7 @@ void dcn35_dchvm_init(struct hubbub *hubbub)if (riommu_active) {// Disable gating and memory power requests -REG_UPDATE (DCHVM_MEM_CTRL ,HVM_GPUVMRET_PWR_REQ_DIS ,1 ); +REG_UPDATE_2 (DCHVM_MEM_CTRL ,HVM_GPUVMRET_PWR_REQ_DIS ,1 ,HVM_GPUVMRET_FORCE_REQ ,0 ); REG_UPDATE_4(DCHVM_CLK_CTRL, HVM_DISPCLK_R_GATE_DIS, 1, HVM_DISPCLK_G_GATE_DIS, 1,
Signature · 1 line
2.53.0
PATCH 26/28 drm/amd/display: revert "Enable HUBP/DPP power gate for DCN42"
In reply to George ZhangFrom: Leo Chen <[email protected]>
[why]
Disabling HUBP/DPP Driver PG as it's causing corruption issues. This reverts commit a07a9b8295758e5c2b14684bb90738ac20e77406.
--- .../gpu/drm/amd/display/dc/resource/dcn42/dcn42_resource.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/display/dc/resource/dcn42/dcn42_resource.c +2 -2
@@ -729,8 +729,8 @@ static const struct dc_debug_options debug_defaults_drv = { .clock_trace = true, .disable_pplib_clock_request = false, .ignore_pg = false, - .disable_dpp_power_gate = false, - .disable_hubp_power_gate = false, + .disable_dpp_power_gate = true, + .disable_hubp_power_gate = true, .disable_optc_power_gate = true, .disable_dsc_power_gate = false, .disable_dio_power_gate = true,
Signature · 1 line
2.53.0
PATCH 27/28 drm/amd/amdgpu: Fix stack frame size warnings in KUnit tests
In reply to George ZhangFrom: Alex Hung <[email protected]>
[WHAT]
Replace stack-allocated large structs with kunit_kzalloc() in KUnit test functions that exceed the kernel 1280-byte stack frame limit. Also add CONFIG_FRAME_WARN=1024 to .kunitconfig to enforce the limit.
Affected structs and files:
- struct dc_link in amdgpu_dm_connector_test.c and amdgpu_dm_mst_types_test.c
- struct drm_plane, drm_plane_state, drm_framebuffer in amdgpu_dm_plane_test.c
- struct drm_connector_state, drm_atomic_state in amdgpu_dm_mst_types_test.c
- struct dm_connector_state in amdgpu_dm_test.c
--- .../amd/display/amdgpu_dm/tests/.kunitconfig | 3 + .../tests/amdgpu_dm_connector_test.c | 64 +++++++---- .../tests/amdgpu_dm_mst_types_test.c | 104 ++++++++++-------- .../amdgpu_dm/tests/amdgpu_dm_plane_test.c | 99 ++++++++++------- .../display/amdgpu_dm/tests/amdgpu_dm_test.c | 72 +++++++----- 5 files changed, 208 insertions(+), 134 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/tests/.kunitconfig +3 -0
@@ -15,6 +15,9 @@ CONFIG_I2C=y CONFIG_POWER_SUPPLY=y CONFIG_CRC16=y +# Limit stack size to 1280 +CONFIG_FRAME_WARN=1280 + # Treat warnings as errors CONFIG_WERROR=y
drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_connector_test.c +40 -24
120 lines not on this page · raw message
drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_mst_types_test.c +61 -43
174 lines not on this page · raw message
drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_plane_test.c +58 -41
178 lines not on this page · raw message
drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_test.c +46 -26
105 lines not on this page · raw message
Signature · 1 line
2.53.0