DC Patches July 09, 2026
Subsystems (5)
cover DC Patches July 09, 2026
This DC patchset brings improvements in multiple areas. In summary, we have:
* Fixes on EDID 8K parsing, cursor mode, backlight, OLED/VABC, and HDR to SDR
* Improvements on DCN42 clocking, det allocation, and power gating
* Greatly enhanced KUnit coverage across amdgpu_dm
* Code cleanup
Alex Hung (32):
drm/amd/display: Fix KUnit backlight tests for CACP drm/amd/display: Add KUnit tests for ism drm/amd/display: Test EDID and ACPI/VBIOS readers drm/amd/display: Test DPCD AUX and Synaptics helpers drm/amd/display: Test MST start/stop and panel settings drm/amd/display: Test I2C, stubs and MST early returns drm/amd/display: Test MCCS FreeSync VCP helpers drm/amd/display: Test MST payload and DSC enable helpers drm/amd/display: Test irq funcs/suspend/workqueue drm/amd/display: Test irq state setters and work drm/amd/display: Test HPD init/fini
drm/amd/display: Test HPD interrupt handling drm/amd/display: Test dmub HPD callbacks and handlers drm/amd/display: Test high-IRQ and handler registration drm/amd/display: Test top-level IRQ handler and vmin/vmax worker drm/amd/display: Test format info and blending drm/amd/display: Test GFX9/GFX10 plane modifiers drm/amd/display: Test GFX11/GFX12 plane modifiers drm/amd/display: Test plane scaling info paths drm/amd/display: Test plane buffer attributes drm/amd/display: Test GFX9 DCC plane attributes drm/amd/display: Test GFX12 DCC plane attributes drm/amd/display: Test DCC and cursor edge cases drm/amd/display: Test helper_check_state rejects drm/amd/display: Test plane atomic check and hooks drm/amd/display: Add KUnit test for wb jobs drm/amd/display: Test MST coverage gaps drm/amd/display: Test backlight level programming path drm/amd/display: Test backlight level readback path drm/amd/display: Test backlight device registration drm/amd/display: Test panel power savings sysfs drm/amd/display: Test backlight ABM property attach
Austin Zheng (1):
drm/amd/display: Add Debug Option To Enable Per-DPM De-rate Usage
Bhawanpreet Lakha (9):
drm/amd/display: Add more tests for HDCP
drm/amd/display: More Kunit tests for audio drm/amd/display: Add color space and timing tests for connector drm/amd/display: Add subconnector property tests for connector drm/amd/display: Add FBC init tests for connector drm/amd/display: Add MST link detection tests for connector drm/amd/display: Add crtc matching and panel type tests for connector drm/amd/display: Add CACP caps tests for connector drm/amd/display: Add stream property tests for connector
Bhuvanachandra Pinninti (1):
drm/amd/display: Fix dc_stream_remove_writeback dropping wrong
writeback entries.
Charlene Liu (6):
drm/amd/display: add null pointer access check drm/amd/display: ensure dtbclk clk_src selected before
hdmistream_clk_en
drm/amd/display: limit reuse dsc capable bootup timing drm/amd/display: enable hdmistreamclk_rcg by default for dcn42 drm/amd/display: add DST_Y_DELTA_DRQ_LIMIT reg macro for later use drm/amd/display: add DST_Y_DELTA_DRQ_LIMIT hw programming
Chenyu Chen (3):
drm/amd/display: Enable CACP on Linux drm/amd/display: Fix dead-code panel type detection from DID drm/amd/display: Add KUnit tests for CACP on Linux
Dillon Varone (1):
drm/amd/display: Generalize DMUB memory flushes from host
Dmytro Laktyushkin (4):
drm/amd/display: update memclk clock table read for dcn42 drm/amd/display: remove unused dcn42 socbb values drm/amd/display: fix dcn42 det allocation order drm/amd/display: fix dcn42b det allocation order
Dominik Kaszewski (2):
drm/amd/display: Remove sink usage from DPMS
drm/amd/display: Fix indenting of dpms on
Fangzhi Zuo (3):
drm/amd/display: Fix 8K Mode Not Parsed by EDID drm/amd/display: Allocate DCN32/1 dmub memory to GTT drm/amd/display: Skip Update HDCP Config In Transition State
Gabe Teeger (3):
drm/amd/display: Enable PSR and Replay on DCN4 variant [Part 2] drm/amd/display: Enable IPS support for DCN4 Variant drm/amd/display: Enable zstate support and fix seamless boot
Iswara Nagulendran (1):
drm/amd/display: Fix VABC Init and OLED Support
James Lin (4):
drm/amd/display: program dither on all OPP heads under ODM combine drm/amd/display: Add MALL status readback support for DCN 4.0.1 drm/amd/display: Re-evaluate cursor mode on plane position/size change drm/amd/display: don't re-evaluate cursor mode on cursor plane
movement
Karthi Kandasamy (1):
drm/amd/display: Fix DMSS not triggering for HDR to SDR transition
Leo Chen (1):
drm/amd/display: Enable HUBP/DPP Driver PG for DCN42
Mario Limonciello (1):
drm/amd/display: Fix backlight max_brightness to match exported range
Matthew Stewart (3):
drm/amd/display: Fix DCN42B null registers & register masks drm/amd/display: Add passive dongle handling in force_to_use_aux case drm/amd/display: Add DCN42B VID_CRC_CONTROL and HBLANK_CONTROL
registers
Nicholas Kazlauskas (1):
drm/amd/display: Exit LS for ISHARP before coefficient write
Srinivasan Shanmugam (1):
drm/amd/display: Check dc_link before applying DSC policy
Taimur Hassan (1):
drm/amd/display: Promote DC to 3.2.389
Tom Chung (1):
drm/amd/display: Tear down dangling pipe on boot to fix s0i3
.../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 33 + .../amd/display/amdgpu_dm/amdgpu_dm_audio.c | 36 +- .../amd/display/amdgpu_dm/amdgpu_dm_audio.h | 2 + .../display/amdgpu_dm/amdgpu_dm_backlight.c | 64 +- .../display/amdgpu_dm/amdgpu_dm_backlight.h | 15 + .../display/amdgpu_dm/amdgpu_dm_connector.c | 80 +- .../display/amdgpu_dm/amdgpu_dm_connector.h | 15 + .../amd/display/amdgpu_dm/amdgpu_dm_dmub.c | 16 +- .../amd/display/amdgpu_dm/amdgpu_dm_hdcp.c | 76 +- .../amd/display/amdgpu_dm/amdgpu_dm_hdcp.h | 5 + .../amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 90 +- .../amd/display/amdgpu_dm/amdgpu_dm_helpers.h | 41 + .../drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c | 84 +- .../drm/amd/display/amdgpu_dm/amdgpu_dm_irq.h | 57 + .../drm/amd/display/amdgpu_dm/amdgpu_dm_ism.c | 4 + .../display/amdgpu_dm/amdgpu_dm_mst_types.c | 4 +- .../display/amdgpu_dm/amdgpu_dm_mst_types.h | 1 + .../amd/display/amdgpu_dm/amdgpu_dm_plane.c | 25 +- .../amd/display/amdgpu_dm/amdgpu_dm_plane.h | 9 + .../drm/amd/display/amdgpu_dm/amdgpu_dm_wb.c | 6 +- .../drm/amd/display/amdgpu_dm/amdgpu_dm_wb.h | 4 + .../amdgpu_dm/tests/amdgpu_dm_audio_test.c | 118 + .../tests/amdgpu_dm_backlight_test.c | 734 +++- .../tests/amdgpu_dm_connector_test.c | 1655 +++++++ .../amdgpu_dm/tests/amdgpu_dm_hdcp_test.c | 240 + .../amdgpu_dm/tests/amdgpu_dm_helpers_test.c | 3867 +++++++++++++++-- .../amdgpu_dm/tests/amdgpu_dm_irq_test.c | 3201 +++++++++++++- .../amdgpu_dm/tests/amdgpu_dm_ism_test.c | 353 ++ .../tests/amdgpu_dm_mst_types_test.c | 371 +- .../amdgpu_dm/tests/amdgpu_dm_plane_test.c | 2070 ++++++++- .../amdgpu_dm/tests/amdgpu_dm_wb_test.c | 44 + .../display/dc/clk_mgr/dcn42/dcn42_clk_mgr.c | 16 +- drivers/gpu/drm/amd/display/dc/core/dc.c | 169 +- .../gpu/drm/amd/display/dc/core/dc_stream.c | 21 +- drivers/gpu/drm/amd/display/dc/dc.h | 7 +- drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 4 +- drivers/gpu/drm/amd/display/dc/dc_types.h | 8 + .../amd/display/dc/dccg/dcn35/dcn35_dccg.c | 9 +- .../amd/display/dc/dccg/dcn35/dcn35_dccg.h | 5 +- .../amd/display/dc/dccg/dcn42/dcn42_dccg.c | 2 +- drivers/gpu/drm/amd/display/dc/dce/Makefile | 4 +- drivers/gpu/drm/amd/display/dc/dce/dmub_abm.c | 73 +- .../drm/amd/display/dc/dce/dmub_abm_cacp.c | 213 + .../drm/amd/display/dc/dce/dmub_abm_cacp.h | 20 + .../gpu/drm/amd/display/dc/dce/dmub_abm_lcd.c | 4 +- .../display/dc/dio/dcn10/dcn10_link_encoder.c | 10 +- .../dml21/inc/bounding_boxes/dcn42_soc_bb.h | 6 - .../display/dc/dpp/dcn401/dcn401_dpp_dscl.c | 25 +- .../display/dc/hubbub/dcn401/dcn401_hubbub.c | 3 +- .../display/dc/hubbub/dcn401/dcn401_hubbub.h | 4 +- .../amd/display/dc/hubp/dcn20/dcn20_hubp.h | 3 +- .../amd/display/dc/hubp/dcn42/dcn42_hubp.c | 51 +- .../amd/display/dc/hubp/dcn42/dcn42_hubp.h | 5 + .../amd/display/dc/hwss/dce110/dce110_hwseq.c | 12 +- .../amd/display/dc/hwss/dcn21/dcn21_hwseq.c | 40 +- .../amd/display/dc/hwss/dcn21/dcn21_hwseq.h | 2 + .../amd/display/dc/hwss/dcn31/dcn31_hwseq.c | 70 +- .../amd/display/dc/hwss/dcn35/dcn35_hwseq.c | 15 +- .../amd/display/dc/hwss/dcn401/dcn401_hwseq.c | 23 +- .../amd/display/dc/hwss/dcn42/dcn42_hwseq.c | 2 + drivers/gpu/drm/amd/display/dc/inc/hw/abm.h | 3 + .../drm/amd/display/dc/link/link_detection.c | 25 +- .../gpu/drm/amd/display/dc/link/link_dpms.c | 192 +- .../link/protocols/link_edp_panel_control.c | 13 +- .../dc/resource/dcn401/dcn401_resource.h | 3 +- .../dc/resource/dcn42/dcn42_resource.c | 7 +- .../dc/resource/dcn42/dcn42_resource.h | 1 + .../dc/resource/dcn42b/dcn42b_resource.c | 53 +- .../dc/resource/dcn42b/dcn42b_resource.h | 159 +- .../dcn401/dcn401_soc_and_ip_translator.c | 16 + drivers/gpu/drm/amd/display/dmub/dmub_srv.h | 9 +- .../gpu/drm/amd/display/dmub/src/dmub_srv.c | 55 +- .../drm/amd/display/modules/inc/mod_power.h | 11 + .../drm/amd/display/modules/power/power_abm.c | 136 +- .../amd/display/modules/power/power_helpers.h | 10 + .../drm/amd/display/modules/power/power_psr.c | 7 + .../amd/display/modules/power/power_replay.c | 7 + 77 files changed, 13975 insertions(+), 878 deletions(-) create mode 100644 drivers/gpu/drm/amd/display/dc/dce/dmub_abm_cacp.c create mode 100644 drivers/gpu/drm/amd/display/dc/dce/dmub_abm_cacp.h
--
2.55.0
PATCH 1/80 drm/amd/display: Fix KUnit backlight tests for CACP
From: Alex Hung <[email protected]>
[WHY]
A change was added in amdgpu_dm_should_create_sysfs() to check link->panel_type instead of caps->aux_support, and removed the OLED exclusion from the ABM property attach path in amdgpu_dm_setup_backlight_device().
This broke three KUnit tests:
- dm_test_should_create_sysfs_no_backlight_index and dm_test_should_create_sysfs_pwm_backlight returned false because kzalloc zeroes panel_type but PANEL_TYPE_LCD is 1.
- dm_test_setup_backlight_device_oled_success crashed with a NULL pointer dereference in drm_object_attach_property since abm_level_property was NULL.
[WHY]
Set panel_type to PANEL_TYPE_LCD in the two sysfs tests and skip the ABM property attach path in the OLED setup test by setting amdgpu_dm_abm_level to 0.
--- .../amd/display/amdgpu_dm/tests/amdgpu_dm_backlight_test.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_backlight_test.c +6 -1
@@ -1026,6 +1026,7 @@ static void dm_test_should_create_sysfs_no_backlight_index(struct kunit *test)amdgpu_dm_set_abm_level_param (-1 );setup_test_connector (test, &fixture,-1 ,SIGNAL_TYPE_EDP ); fixture.aconnector->base.connector_type = DRM_MODE_CONNECTOR_eDP; + fixture.link->panel_type =PANEL_TYPE_LCD ;KUNIT_EXPECT_TRUE (test,amdgpu_dm_should_create_sysfs (fixture.aconnector));
@@ -1063,6 +1064,7 @@ static void dm_test_should_create_sysfs_pwm_backlight(struct kunit *test)amdgpu_dm_set_abm_level_param (-1 );setup_test_connector (test, &fixture,0 ,SIGNAL_TYPE_EDP ); fixture.aconnector->base.connector_type = DRM_MODE_CONNECTOR_eDP; + fixture.link->panel_type =PANEL_TYPE_LCD ; fixture.adev->dm.backlight_caps[0 ].aux_support = false;KUNIT_EXPECT_TRUE (test,amdgpu_dm_should_create_sysfs (fixture.aconnector));
@@ -1147,11 +1149,13 @@ static void dm_test_setup_backlight_device_oled_success(struct kunit *test)struct dm_backlight_connector_fixture fixture = {};struct amdgpu_display_manager *dm;int saved_backlight =amdgpu_dm_get_backlight_param (); +int saved_abm_level =amdgpu_dm_get_abm_level_param ();amdgpu_dm_set_backlight_param (-1 ); +/* Skip ABM property attach (requires full DRM object setup) */ +amdgpu_dm_set_abm_level_param (0 );setup_test_connector (test, &fixture,-1 ,SIGNAL_TYPE_EDP ); fixture.link->type = dc_connection_single; -/* OLED panel avoids the ABM property attach path */ fixture.link->dpcd_sink_ext_caps.bits.oled =1 ; dm = &fixture.adev->dm; dm->adev = fixture.adev;
@@ -1166,6 +1170,7 @@ static void dm_test_setup_backlight_device_oled_success(struct kunit *test)KUNIT_EXPECT_TRUE (test, dm->backlight_caps[0 ].aux_support);amdgpu_dm_set_backlight_param (saved_backlight); +amdgpu_dm_set_abm_level_param (saved_abm_level); }static struct kunit_case dm_backlight_test_cases[] = {
--
2.55.0
PATCH 2/80 drm/amd/display: Generalize DMUB memory flushes from host
In reply to George ZhangFrom: Dillon Varone <[email protected]>
[WHY&HOW]
Add DMUB service context to aid in platform abstraction when flushing memory from the host.
--- .../amd/display/amdgpu_dm/amdgpu_dm_dmub.c | 5 +- drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 4 +- .../gpu/drm/amd/display/dc/dce/dmub_abm_lcd.c | 4 +- drivers/gpu/drm/amd/display/dmub/dmub_srv.h | 9 ++- .../gpu/drm/amd/display/dmub/src/dmub_srv.c | 55 +++++++++++-------- 5 files changed, 46 insertions(+), 31 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_dmub.c +2 -3
@@ -147,7 +147,7 @@ int dm_dmub_hw_init(struct amdgpu_device *adev)struct dmub_srv_hw_params hw_params;enum dmub_status status;const unsigned char *fw_inst_const, *fw_bss_data; -u32 i, fw_inst_const_size, fw_bss_data_size; +u32 fw_inst_const_size, fw_bss_data_size;bool has_hw_support;if (!dmub_srv)
@@ -243,8 +243,7 @@ int dm_dmub_hw_init(struct amdgpu_device *adev)if (dmcu) hw_params.psp_version = dmcu->psp_version; -for (i =0 ; i < fb_info->num_fb; ++i) - hw_params.fb[i] = &fb_info->fb[i]; + hw_params.fb_info = fb_info;/* Enable usb4 dpia in the FW APU */ if (dc->caps.is_apu &&
drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c +3 -1
@@ -1908,6 +1908,8 @@ static void dc_dmub_srv_ib_based_fams2_update_config(struct dc *dc, config->global.features.bits.enable = enable && context->bw_ctx.bw.dcn.fams2_global_config.features.bits.enable; config->global.features.bits.enable_ppt_check = dc->debug.fams2_config.bits.enable_ppt_check; +dmub_srv_flush_buffer_mem (dc->ctx->dmub_srv->dmub, &dc->ctx->dmub_srv->dmub->ib_mem_gart); +dm_execute_dmub_cmd_list (dc->ctx,1 , &cmd,DM_DMUB_WAIT_TYPE_WAIT ); }
@@ -2073,7 +2075,7 @@ bool dc_dmub_srv_ips_query_residency_info(const struct dc_context *ctx, uint8_tunion dmub_rb_cmd cmd;uint32_t bytes =sizeof (struct dmub_ips_residency_info ); -dmub_flush_buffer_mem (&ctx->dmub_srv->dmub->scratch_mem_fb); +dmub_srv_flush_buffer_mem (ctx->dmub_srv->dmub, &ctx->dmub_srv->dmub->scratch_mem_fb);memset (&cmd,0 ,sizeof (cmd)); cmd.ips_query_residency_info.header.type =DMUB_CMD__IPS ;
drivers/gpu/drm/amd/display/dc/dce/dmub_abm_lcd.c +2 -2
@@ -166,7 +166,7 @@ void dmub_abm_init_config(struct abm *abm,uint8_t panel_mask =0x01 << inst;// TODO: Optimize by only reading back final 4 bytes -dmub_flush_buffer_mem (&dc->dmub_srv->dmub->scratch_mem_fb); +dmub_srv_flush_buffer_mem (dc->dmub_srv->dmub, &dc->dmub_srv->dmub->scratch_mem_fb);// Copy iramtable into cw7 memcpy (dc->dmub_srv->dmub->scratch_mem_fb.cpu_addr, (void *)src, bytes);
@@ -227,7 +227,7 @@ bool dmub_abm_save_restore(unsigned int bytes =sizeof (struct abm_save_restore );// TODO: Optimize by only reading back final 4 bytes -dmub_flush_buffer_mem (&dc->dmub_srv->dmub->scratch_mem_fb); +dmub_srv_flush_buffer_mem (dc->dmub_srv->dmub, &dc->dmub_srv->dmub->scratch_mem_fb);// Copy iramtable into cw7 memcpy (dc->dmub_srv->dmub->scratch_mem_fb.cpu_addr, (void *)pData, bytes);
drivers/gpu/drm/amd/display/dmub/dmub_srv.h +6 -3
@@ -329,7 +329,7 @@ struct dmub_soc_fb_info {* @load_inst_const: true if DMUB should load inst const fw */ struct dmub_srv_hw_params { -struct dmub_fb *fb[DMUB_WINDOW_TOTAL ]; +struct dmub_srv_fb_info *fb_info;struct dmub_soc_fb_info soc_fb_info;uint32_t psp_version;bool load_inst_const;
@@ -592,9 +592,11 @@ struct dmub_srv {void *user_ctx;uint32_t fw_version;bool is_virtual; +bool no_ext_reg_access;struct dmub_fb scratch_mem_fb;struct dmub_fb ib_mem_gart;struct dmub_fb cursor_offload_fb; +const struct dmub_srv_fb_info *fb_info;volatile struct dmub_shared_state_feature_block *shared_state;volatile struct dmub_cursor_offload_v1 *cursor_offload_v1;volatile const struct dmub_fw_state *fw_state;
@@ -954,14 +956,15 @@ enum dmub_status dmub_srv_get_gpint_dataout(struct dmub_srv *dmub, uint32_t *dataout);/** -* dmub_flush_buffer_mem() - Read back entire frame buffer region. +* dmub_srv_flush_buffer_mem() - Read back entire frame buffer region. * This ensures that the write from x86 has been flushed and will not * hang the DMCUB. +* @dmub: the dmub service * @fb: frame buffer to flush * * Can be called after software initialization. */ -void dmub_flush_buffer_mem (const struct dmub_fb *fb); +void dmub_srv_flush_buffer_mem (struct dmub_srv *dmub,const struct dmub_fb *fb);/** * dmub_srv_get_fw_boot_status() - Returns the DMUB boot status bits.
drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c +33 -22
120 lines not on this page · raw message
--
2.55.0
PATCH 3/80 drm/amd/display: Enable CACP on Linux
In reply to George ZhangFrom: Chenyu Chen <[email protected]>
[Why]
Enable OLED panels to save more power on the Linux platform by enabling CACP support on Linux.
[How]
Update abm_feature_support() to return ABM_CACP_SUPPORT for OLED panels. Enable ABM property for all eDP panels including OLED to support CACP via set_abm_level.
--- .../display/amdgpu_dm/amdgpu_dm_backlight.c | 23 +- .../display/amdgpu_dm/amdgpu_dm_connector.c | 53 ++++- drivers/gpu/drm/amd/display/dc/dc.h | 1 + drivers/gpu/drm/amd/display/dc/dc_types.h | 8 + drivers/gpu/drm/amd/display/dc/dce/Makefile | 4 +- drivers/gpu/drm/amd/display/dc/dce/dmub_abm.c | 73 +++++- .../drm/amd/display/dc/dce/dmub_abm_cacp.c | 213 ++++++++++++++++++ .../drm/amd/display/dc/dce/dmub_abm_cacp.h | 20 ++ .../amd/display/dc/hwss/dcn21/dcn21_hwseq.c | 40 +++- .../amd/display/dc/hwss/dcn21/dcn21_hwseq.h | 2 + .../amd/display/dc/hwss/dcn31/dcn31_hwseq.c | 8 + drivers/gpu/drm/amd/display/dc/inc/hw/abm.h | 3 + .../drm/amd/display/modules/inc/mod_power.h | 11 + .../drm/amd/display/modules/power/power_abm.c | 126 +++++++++++ .../amd/display/modules/power/power_helpers.h | 10 + 15 files changed, 566 insertions(+), 29 deletions(-) create mode 100644 drivers/gpu/drm/amd/display/dc/dce/dmub_abm_cacp.c create mode 100644 drivers/gpu/drm/amd/display/dc/dce/dmub_abm_cacp.h
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_backlight.c +9 -14
@@ -559,7 +559,6 @@ EXPORT_IF_KUNIT(amdgpu_dm_update_connector_ext_caps);void amdgpu_dm_setup_backlight_device (struct amdgpu_display_manager *dm,struct amdgpu_dm_connector *aconnector) { -struct amdgpu_dm_backlight_caps *caps;struct dc_link *link = aconnector->dc_link;int bl_idx = dm->num_of_edps;
@@ -579,10 +578,12 @@ void amdgpu_dm_setup_backlight_device(struct amdgpu_display_manager *dm, dm->num_of_edps++;amdgpu_dm_update_connector_ext_caps (aconnector); - caps = &dm->backlight_caps[aconnector->bl_idx]; -/* Only offer ABM property when non-OLED and user didn't turn off by module parameter */ -if (caps->ext_caps && !caps->ext_caps->bits.oled && amdgpu_dm_abm_level <0 ) +/* Offer ABM property when user didn't turn off by module parameter. +* OLED panels are included to support CACP (Content Adaptive +* Contrast and Power) feature via set_abm_level. +*/ +if (amdgpu_dm_abm_level <0 )drm_object_attach_property (&aconnector->base.base, dm->adev->mode_info.abm_level_property,ABM_SYSFS_CONTROL );
@@ -666,22 +667,16 @@ const struct attribute_group amdgpu_group = {bool amdgpu_dm_should_create_sysfs (struct amdgpu_dm_connector *amdgpu_dm_connector) { +struct dc_link *link = amdgpu_dm_connector->dc_link; +if (amdgpu_dm_abm_level >=0 )return false;if (amdgpu_dm_connector->base.connector_type != DRM_MODE_CONNECTOR_eDP)return false; -/* check for OLED panels */ -if (amdgpu_dm_connector->bl_idx >=0 ) { -struct drm_device *drm = amdgpu_dm_connector->base.dev; -struct amdgpu_display_manager *dm = &drm_to_adev (drm)->dm; -struct amdgpu_dm_backlight_caps *caps; - - caps = &dm->backlight_caps[amdgpu_dm_connector->bl_idx]; -if (caps->aux_support) -return false; - } +if (link->panel_type !=PANEL_TYPE_LCD && !link->panel_config.cacp.cacp_supported) +return false;return true; }
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_connector.c +42 -11
103 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/dc.h +1 -0
@@ -632,6 +632,7 @@ enum visual_confirm {VISUAL_CONFIRM_SMARTMUX_DGPU =10 ,VISUAL_CONFIRM_REPLAY =12 ,VISUAL_CONFIRM_SUBVP =14 , +VISUAL_CONFIRM_ABM =15 ,VISUAL_CONFIRM_MCLK_SWITCH =16 ,VISUAL_CONFIRM_FAMS2 =19 , VISUAL_CONFIRM_HW_CURSOR = 20,
drivers/gpu/drm/amd/display/dc/dc_types.h +8 -0
@@ -1347,6 +1347,14 @@ struct dc_panel_config {struct ilr {bool optimize_edp_link_rate;/* eDP ILR */ } ilr; +/* CACP*/ +struct cacp { +unsigned int cacp_supported; +unsigned int cacp_control_mode; +unsigned int strscl_valid; +unsigned int strscl_sdr[4 ]; +unsigned int strscl_hdr[4 ]; + } cacp;/* Adaptive VariBright*/ struct adaptive_vb {bool disable_adaptive_vb;
drivers/gpu/drm/amd/display/dc/dce/Makefile +2 -2
@@ -23,14 +23,14 @@ # Makefile for common 'dce' logic # HW object file under this folder follow similar pattern for HW programming # - register offset and/or shift + mask stored in the dec_hw struct -# - register programming through common macros that look up register +# - register programming through common macros that look up register # offset/shift/mask stored in dce_hw struct DCE = dce_audio.o dce_stream_encoder.o dce_link_encoder.o \ dce_mem_input.o dce_clock_source.o dce_scl_filters.o dce_transform.o \ dce_opp.o dce_dmcu.o dce_abm.o dce_ipp.o dce_aux.o \ dce_i2c.o dce_i2c_hw.o dce_i2c_sw.o dmub_psr.o dmub_abm.o dmub_abm_lcd.o dce_panel_cntl.o \ -dmub_hw_lock_mgr.o dmub_outbox.o dmub_replay.o +dmub_hw_lock_mgr.o dmub_outbox.o dmub_replay.o dmub_abm_cacp.o AMD_DAL_DCE = $(addprefix $(AMDDALPATH)/dc/dce/,$(DCE))
drivers/gpu/drm/amd/display/dc/dce/dmub_abm.c +72 -1
151 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/dce/dmub_abm_cacp.c new file +213 -0
213 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/dce/dmub_abm_cacp.h new file +20 -0
@@ -0,0 +1,20 @@ +/* Copyright (C) 2022 Advanced Micro Devices, Inc. All rights reserved. */ + +#include "dmub_cmd.h" + +#ifndef __DMUB_ABM_CACP_H__ +#define __DMUB_ABM_CACP_H__ + +void dmub_cacp_init (struct abm *abm,const char *src,unsigned int bytes,unsigned int panel_inst); +bool dmub_cacp_set_level (struct abm *abm,unsigned int cacp_level,unsigned char panel_mask); +bool dmub_cacp_set_pipe (struct abm *abm,unsigned int otg_inst,unsigned int pipe_option, +unsigned int panel_inst,unsigned int pwrseq_inst); +bool dmub_cacp_set_event (struct abm *abm,unsigned int full_screen,unsigned int trans_info,unsigned int hdr_mode, +unsigned int scaling_enable,unsigned int panel_inst); +bool dmub_cacp_set_pause (struct abm *abm,bool pause,unsigned int panel_inst,unsigned int otg_inst); +bool dmub_cacp_set_backlight_level (struct abm *abm,unsigned int backlight_pwm_u16_16,unsigned int frame_ramp, +unsigned int panel_inst); +void dmub_cacp_enable_fractional_pwm (struct abm *abm,uint8_t panel_mask); +bool dmub_cacp_get_histogram (struct dc_context *dc,unsigned int panel_inst,unsigned int *histogram, +enum dmub_abm_histogram_type histogram_type,unsigned int size); +#endif
drivers/gpu/drm/amd/display/dc/hwss/dcn21/dcn21_hwseq.c +39 -1
@@ -136,6 +136,26 @@ void dcn21_PLAT_58856_wa(struct dc_state *context, struct pipe_ctx *pipe_ctx) pipe_ctx->stream->dpms_off = true; } +bool dcn21_dmub_cacp_set_pipe (struct abm *abm,uint32_t otg_inst, +uint32_t option,uint32_t panel_inst,uint32_t pwrseq_inst) +{ +union dmub_rb_cmd cmd; +struct dc_context *dc = abm->ctx; + +memset (&cmd,0 ,sizeof (cmd)); + cmd.cacp_set_pipe.header.type =DMUB_CMD__CACP ; + cmd.cacp_set_pipe.header.sub_type =DMUB_CMD__CACP_SET_PIPE ; + cmd.cacp_set_pipe.cacp_set_pipe_data.otg_inst = (uint8_t )otg_inst; + cmd.cacp_set_pipe.cacp_set_pipe_data.pwrseq_inst = (uint8_t )pwrseq_inst; + cmd.cacp_set_pipe.cacp_set_pipe_data.set_pipe_option = (uint8_t )option; + cmd.cacp_set_pipe.cacp_set_pipe_data.panel_inst = (uint8_t )panel_inst; + cmd.cacp_set_pipe.header.payload_bytes =sizeof (struct dmub_cmd_cacp_set_pipe_data ); + +dc_wake_and_execute_dmub_cmd (dc, &cmd,DM_DMUB_WAIT_TYPE_WAIT ); + +return true; +} +bool dcn21_dmub_abm_set_pipe (struct abm *abm,uint32_t otg_inst,uint32_t option,uint32_t panel_inst,uint32_t pwrseq_inst) {
@@ -181,10 +201,12 @@ void dcn21_set_abm_immediate_disable(struct pipe_ctx *pipe_ctx)uint32_t otg_inst = pipe_ctx->stream_res.tg->inst;struct panel_cntl *panel_cntl = pipe_ctx->stream->link->panel_cntl;struct dmcu *dmcu = pipe_ctx->stream->ctx->dc->res_pool->dmcu; +struct dc_link *link = pipe_ctx->stream->link;// make a short term w/a for an issue that backlight ramping unexpectedly paused in the middle, // will decouple backlight from ABM and redefine DMUB interface, then this w/a could be removed -if (pipe_ctx->stream->abm_level ==0 || pipe_ctx->stream->abm_level ==ABM_LEVEL_IMMEDIATE_DISABLE ) { +if ((pipe_ctx->stream->abm_level ==0 || pipe_ctx->stream->abm_level ==ABM_LEVEL_IMMEDIATE_DISABLE ) + && (link && !link->panel_config.cacp.cacp_supported)) {return ; }
@@ -197,6 +219,9 @@ void dcn21_set_abm_immediate_disable(struct pipe_ctx *pipe_ctx)if (abm->funcs && abm->funcs->set_pipe_ex) { abm->funcs->set_pipe_ex (abm, otg_inst,SET_ABM_PIPE_IMMEDIATELY_DISABLE , panel_cntl->inst, panel_cntl->pwrseq_inst); + }else if (link && link->panel_config.cacp.cacp_supported) { +dcn21_dmub_cacp_set_pipe (abm, otg_inst,SET_CACP_PIPE_IMMEDIATELY_DISABLE , + panel_cntl->inst, panel_cntl->pwrseq_inst); }else { dcn21_dmub_abm_set_pipe(abm, otg_inst,
@@ -214,6 +239,7 @@ void dcn21_set_pipe(struct pipe_ctx *pipe_ctx)struct timing_generator *tg = pipe_ctx->stream_res.tg;struct panel_cntl *panel_cntl = pipe_ctx->stream->link->panel_cntl;struct dmcu *dmcu = pipe_ctx->stream->ctx->dc->res_pool->dmcu; +struct dc_link *link = pipe_ctx->stream->link;uint32_t otg_inst;if (!abm || !tg || !panel_cntl)
@@ -233,6 +259,11 @@ void dcn21_set_pipe(struct pipe_ctx *pipe_ctx) panel_cntl->inst, panel_cntl->pwrseq_inst); }else { + +if (link && link->panel_config.cacp.cacp_supported) +dcn21_dmub_cacp_set_pipe (abm, otg_inst,SET_CACP_PIPE_NORMAL , + panel_cntl->inst, panel_cntl->pwrseq_inst); +else dcn21_dmub_abm_set_pipe(abm, otg_inst, SET_ABM_PIPE_NORMAL, panel_cntl->inst,
@@ -250,6 +281,7 @@ bool dcn21_set_backlight_level(struct pipe_ctx *pipe_ctx,uint32_t otg_inst;uint32_t backlight_pwm_u16_16 = backlight_level_params->backlight_pwm_u16_16;uint32_t frame_ramp = backlight_level_params->frame_ramp; +struct dc_link *link = pipe_ctx->stream->link;if (!abm || !tg || !panel_cntl)return false;
@@ -268,6 +300,12 @@ bool dcn21_set_backlight_level(struct pipe_ctx *pipe_ctx, panel_cntl->inst, panel_cntl->pwrseq_inst); }else { +if (link && link->panel_config.cacp.cacp_supported) +dcn21_dmub_cacp_set_pipe (abm, otg_inst, +SET_CACP_PIPE_NORMAL , + panel_cntl->inst, + panel_cntl->pwrseq_inst); +else dcn21_dmub_abm_set_pipe(abm, otg_inst, SET_ABM_PIPE_NORMAL,
drivers/gpu/drm/amd/display/dc/hwss/dcn21/dcn21_hwseq.h +2 -0
@@ -47,6 +47,8 @@ void dcn21_optimize_pwr_state(void dcn21_PLAT_58856_wa (struct dc_state *context,struct pipe_ctx *pipe_ctx); +bool dcn21_dmub_cacp_set_pipe (struct abm *abm,uint32_t otg_inst, +uint32_t option,uint32_t panel_inst,uint32_t pwrseq_inst);bool dcn21_dmub_abm_set_pipe (struct abm *abm,uint32_t otg_inst,uint32_t option,uint32_t panel_inst,uint32_t pwrseq_inst);void dcn21_set_pipe (struct pipe_ctx *pipe_ctx);
drivers/gpu/drm/amd/display/dc/hwss/dcn31/dcn31_hwseq.c +8 -0
@@ -54,6 +54,7 @@#include "dce/dce_i2c_hw.h" #include "dce/dmub_abm_lcd.h" #include "dio/dcn10/dcn10_dio.h" +#include "dce/dmub_abm_cacp.h" #define DC_LOGGER_INIT (logger)
@@ -726,12 +727,19 @@ bool dcn31_set_backlight_level(struct pipe_ctx *pipe_ctx,struct timing_generator *tg = pipe_ctx->stream_res.tg;struct panel_cntl *panel_cntl = pipe_ctx->stream->link->panel_cntl;uint32_t otg_inst; +struct dc_link *link = pipe_ctx->stream->link;if (!abm || !tg || !panel_cntl)return false; otg_inst = tg->inst; +if (link && link->panel_config.cacp.cacp_supported) +dcn21_dmub_cacp_set_pipe (abm, otg_inst, +SET_CACP_PIPE_NORMAL , + panel_cntl->inst, + panel_cntl->pwrseq_inst); +else dcn21_dmub_abm_set_pipe(abm, otg_inst, SET_ABM_PIPE_NORMAL,
drivers/gpu/drm/amd/display/dc/inc/hw/abm.h +3 -0
@@ -66,6 +66,9 @@ struct abm_funcs {unsigned int option, unsigned int panel_inst, unsigned int pwrseq_inst); +bool (*set_abm_event)(struct abm *abm,unsigned int full_screen,unsigned int trans_info, +unsigned int hdr_mode,unsigned int scaling_enable,unsigned int scaling_strength_map, + unsigned int panel_inst); };#endif
drivers/gpu/drm/amd/display/modules/inc/mod_power.h +11 -0
@@ -328,6 +328,17 @@ bool mod_power_is_abm_active(struct mod_power *mod_power,const struct dc_link *link, unsigned int inst); +bool mod_power_is_abm_supported (struct mod_power *mod_power, +unsigned int inst); + +bool mod_power_abm_set_event (struct mod_power *mod_power, +unsigned int full_screen,unsigned int trans_info, +unsigned int hdr_mode,unsigned int scaling_enable, +unsigned int scaling_strength_map,unsigned int inst); + +bool mod_power_abm_set_strength (struct mod_power *mod_power, +unsigned int strength, +unsigned int inst); bool mod_power_set_psr_event(struct mod_power *mod_power, struct dc_stream_state *stream, bool set_event,
drivers/gpu/drm/amd/display/modules/power/power_abm.c +126 -0
138 lines not on this page · raw message
drivers/gpu/drm/amd/display/modules/power/power_helpers.h +10 -0
@@ -146,6 +146,16 @@ bool dmub_init_abm_config(struct resource_pool *res_pool,struct dmcu_iram_parameters params, unsigned int inst); +bool dmub_is_abm_supported (struct resource_pool *res_pool, +unsigned int inst); +bool dmub_set_abm_event (struct resource_pool *res_pool, +unsigned int full_screen,unsigned int trans_info, +unsigned int hdr_mode,unsigned int scaling_enable, +unsigned int scaling_strength_map,unsigned int inst); +bool dmub_set_abm_strength (struct resource_pool *res_pool, +unsigned int strength, +unsigned int inst); +void init_replay_config (struct dc_link *link,struct replay_config *pr_config); void set_replay_coasting_vtotal(struct dc_link *link, enum replay_coasting_vtotal_type type,
--
2.55.0
PATCH 4/80 drm/amd/display: Enable PSR and Replay on DCN4 variant [Part 2]
In reply to George ZhangFrom: Gabe Teeger <[email protected]>
[Why]
Enable PSR and Panel Replay on a DCN4 variant for display power savings.
[How]
Enable PSR and Replay in the DCN4 variant panel config defaults.
--- .../gpu/drm/amd/display/dc/resource/dcn42b/dcn42b_resource.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/display/dc/resource/dcn42b/dcn42b_resource.c +2 -2
@@ -1016,9 +1016,9 @@ static struct hubp *dcn42b_hubp_create( }static const struct dc_panel_config dcn42b_panel_config_defaults = { .psr = { - .disable_psr = true, + .disable_psr = false, .disallow_psrsu = true, - .disallow_replay = true, + .disallow_replay = false, }, .ilr = { .optimize_edp_link_rate = true,
--
2.55.0
PATCH 5/80 drm/amd/display: Enable IPS support for DCN4 Variant
In reply to George ZhangFrom: Gabe Teeger <[email protected]>
[Why]
DCN4 variant had IPS completely disabled via ips_support = false and dc->config.disable_ips = DMUB_IPS_DISABLE_ALL. Enabling IPS for D3 allows DMUB to manage idle power savings when the display subsystem is inactive, reducing platform power without affecting active display operation.
[How]
In DCN4 variant resource construct:
- Set dc->caps.ips_support = true
- Remove dc->config.disable_ips = DMUB_IPS_DISABLE_ALL override This enables DMUB to dynamically manage IPS entry/exit during D3 power state transitions. Also enable zstate by default.
--- .../gpu/drm/amd/display/dc/resource/dcn42b/dcn42b_resource.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/display/dc/resource/dcn42b/dcn42b_resource.c +2 -3
@@ -1988,11 +1988,10 @@ static bool dcn42b_resource_construct( dc->caps.dmcub_support = true; dc->caps.is_apu = true; dc->caps.seamless_odm = true; - dc->caps.zstate_support = false; - dc->caps.ips_support = false; + dc->caps.zstate_support = true; + dc->caps.ips_support = true; dc->caps.max_v_total = (1 <<15 ) -1 ; dc->caps.vtotal_limited_by_fp2 = true; - dc->config.disable_ips =DMUB_IPS_DISABLE_ALL ;/* Color pipeline capabilities */ dc->caps.color.dpp.dcn_arch =1 ;
--
2.55.0
PATCH 6/80 drm/amd/display: Fix DCN42B null registers & register masks
In reply to George ZhangFrom: Matthew Stewart <[email protected]>
[why]
DCN42B is missing some register masks, which are causing errors in dmesg.
[how]
Make DCN42B reuse the DCN42 register lists, and add the missing defines manually.
--- .../dc/resource/dcn42b/dcn42b_resource.c | 20 ++- .../dc/resource/dcn42b/dcn42b_resource.h | 116 +----------------- 2 files changed, 20 insertions(+), 116 deletions(-)
drivers/gpu/drm/amd/display/dc/resource/dcn42b/dcn42b_resource.c +19 -1
@@ -22,6 +22,7 @@#include "dcn35/dcn35_resource.h" #include "dcn321/dcn321_resource.h" #include "dcn401/dcn401_resource.h" +#include "dcn42/dcn42_resource.h" #include "dcn42/dcn42_resource_fpu.h" #include "dcn10/dcn10_ipp.h"
@@ -116,6 +117,23 @@#define regAPG9_APG_DBG_GEN_CONTROL 0x38ae#define regAPG9_APG_DBG_GEN_CONTROL_BASE_IDX 2 +#define regHUBP0_HUBPREQ_DEBUG_DB 0x05f8 +#define regHUBP0_HUBPREQ_DEBUG_DB_BASE_IDX 2 +#define regHUBP0_HUBPREQ_DEBUG 0x05f9 +#define regHUBP0_HUBPREQ_DEBUG_BASE_IDX 2 +#define regHUBP1_HUBPREQ_DEBUG_DB 0x06d4 +#define regHUBP1_HUBPREQ_DEBUG_DB_BASE_IDX 2 +#define regHUBP1_HUBPREQ_DEBUG 0x06d5 +#define regHUBP1_HUBPREQ_DEBUG_BASE_IDX 2 +#define regHUBP2_HUBPREQ_DEBUG_DB 0x07b0 +#define regHUBP2_HUBPREQ_DEBUG_DB_BASE_IDX 2 +#define regHUBP2_HUBPREQ_DEBUG 0x07b1 +#define regHUBP2_HUBPREQ_DEBUG_BASE_IDX 2 +#define regHUBP3_HUBPREQ_DEBUG_DB 0x088c +#define regHUBP3_HUBPREQ_DEBUG_DB_BASE_IDX 2 +#define regHUBP3_HUBPREQ_DEBUG 0x088d +#define regHUBP3_HUBPREQ_DEBUG_BASE_IDX 2 +enum dcn401_clk_src_array_id {DCN401_CLK_SRC_PLL0 ,DCN401_CLK_SRC_PLL1 ,
@@ -461,7 +479,7 @@ static const struct dcn_optc_mask optc_mask = { OPTC_COMMON_MASK_SH_LIST_DCN42B(_MASK)};#define hubp_regs_init (id) \ - HUBP_REG_LIST_DCN42B_RI(id) + HUBP_REG_LIST_DCN42_RI(id)static struct dcn_hubp2_registers hubp_regs[4 ];
drivers/gpu/drm/amd/display/dc/resource/dcn42b/dcn42b_resource.h +1 -115
134 lines not on this page · raw message
--
2.55.0
PATCH 7/80 drm/amd/display: Enable zstate support and fix seamless boot
In reply to George ZhangFrom: Gabe Teeger <[email protected]>
[Why & How]
Port seamless boot fix from DCN42 to DCN42B and enable zstate support for DCN42B.
--- .../drm/amd/display/dc/resource/dcn42b/dcn42b_resource.c | 8 ++++---- .../drm/amd/display/dc/resource/dcn42b/dcn42b_resource.h | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/display/dc/resource/dcn42b/dcn42b_resource.c +4 -4
@@ -253,10 +253,10 @@ static struct bios_registers bios_regs;static struct dce110_clk_src_regs clk_src_regs[5 ];static const struct dce110_clk_src_shift cs_shift = { -CS_COMMON_MASK_SH_LIST_DCN3_2 (__SHIFT) +CS_COMMON_MASK_SH_LIST_DCN4_0_1 (__SHIFT) };static const struct dce110_clk_src_mask cs_mask = { -CS_COMMON_MASK_SH_LIST_DCN3_2 (_MASK) +CS_COMMON_MASK_SH_LIST_DCN4_0_1 (_MASK) };#define abm_regs_init (id) \ ABM_DCN42B_REG_LIST_RI(id)
@@ -801,7 +801,7 @@ static const struct dc_debug_options debug_defaults_drv = { } }, .seamless_boot_odm_combine = DML_FAIL_SOURCE_PIXEL_FORMAT, - .enable_z9_disable_interface = false, /* Allow support for the PMFW interface for disable Z9*/ + .enable_z9_disable_interface = true, /* Allow support for the PMFW interface for disable Z9*/ .minimum_z8_residency_time = 1, /* Always allow when other conditions are met */ .support_eDP1_5 = true, .use_max_lb = true,
@@ -823,7 +823,7 @@ static const struct dc_debug_options debug_defaults_drv = { .disable_timeout = true, .min_disp_clk_khz = 50000, .static_screen_wait_frames = 2, - .disable_z10 = true, + .disable_z10 = false, .ignore_pg = true, .disable_stutter_for_wm_program = true, .min_deep_sleep_dcfclk_khz = 8000,
drivers/gpu/drm/amd/display/dc/resource/dcn42b/dcn42b_resource.h +2 -1
@@ -518,7 +518,8 @@SRII_ARR_2 (MODULO ,DP_DTO ,2 , index), \SRII_ARR_2 (PIXEL_RATE_CNTL ,OTG ,0 , index), \SRII_ARR_2 (PIXEL_RATE_CNTL ,OTG ,1 , index), \ -SRII_ARR_2 (PIXEL_RATE_CNTL ,OTG ,2 , index) +SRII_ARR_2 (PIXEL_RATE_CNTL ,OTG ,2 , index), \ +SR_ARR (OTG_PIXEL_RATE_DIV , index) /* ABM */#define ABM_DCN42B_REG_LIST_RI (id) \
--
2.55.0
PATCH 8/80 drm/amd/display: Add passive dongle handling in force_to_use_aux case
In reply to George ZhangFrom: Matthew Stewart <[email protected]>
[why]
Need special handling for passive HDMI dongles with I2C over AUX.
--- .../drm/amd/display/dc/link/link_detection.c | 25 ++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/link/link_detection.c +24 -1
@@ -497,6 +497,12 @@ static void query_hdcp_capability(enum signal_type signal, struct dc_link *link) msg22.data = link->hdcp_caps.rx_caps.raw; msg22.length =sizeof (link->hdcp_caps.rx_caps.raw); msg22.msg_id =HDCP_MESSAGE_ID_RX_CAPS ; +if (link->force_to_use_aux && (signal ==SIGNAL_TYPE_HDMI_TYPE_A )) { +// case with passive dongle with i2c over aux + msg22.data = &link->hdcp_caps.rx_caps.fields.version; + msg22.length =sizeof (link->hdcp_caps.rx_caps.fields.version); + msg22.msg_id =HDCP_MESSAGE_ID_HDCP2VERSION ; + } }else { msg22.data = &link->hdcp_caps.rx_caps.fields.version; msg22.length =sizeof (link->hdcp_caps.rx_caps.fields.version);
@@ -597,7 +603,24 @@ static bool detect_dp(struct dc_link *link,if (sink_caps->transaction_type ==DDC_TRANSACTION_TYPE_I2C_OVER_AUX ) { sink_caps->signal =SIGNAL_TYPE_DISPLAY_PORT ;if (!detect_dp_sink_caps (link)) { -return false; +if (link->force_to_use_aux) { + sink_caps->signal =dp_passive_dongle_detection (link->ddc, sink_caps, audio_support); + link->dpcd_caps.dongle_type = sink_caps->dongle_type; + link->dpcd_caps.is_dongle_type_one = sink_caps->is_dongle_type_one; + link->dpcd_caps.dpcd_rev.raw =0 ; +/* Type 1 dongles do not work with I2C over Aux and also some of +* Type 2 dongles do not support I2C over Aux well, so for these +* cases when native Aux transactons fails and I2C over Aux fails +* report that nothing is connected, as we can't tell is it bad +* DP sink or bad passive dongle. +*/ +if (sink_caps->dongle_type ==DISPLAY_DONGLE_NONE ) +return false; +else +return true; + }else { +return false; + } }if (is_dp_branch_device (link))
--
2.55.0
PATCH 9/80 drm/amd/display: Check dc_link before applying DSC policy
In reply to George ZhangFrom: Srinivasan Shanmugam <[email protected]>
apply_dsc_policy_for_stream() decides whether Display Stream Compression (DSC) should be enabled for a display stream based on display capabilities, link bandwidth and user overrides.
Smatch reports that apply_dsc_policy_for_stream() dereferences aconnector->dc_link before checking whether it is NULL.
Add an early NULL check for aconnector->dc_link before the first dereference and remove the later redundant NULL check in the HDMI_FRL path.
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_connector.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_connector.c +4 -1
@@ -1238,6 +1238,9 @@ static void apply_dsc_policy_for_stream(struct amdgpu_dm_connector *aconnector, drm_connector->display_info.max_dsc_bpp;struct dc_dsc_config_options dsc_options = {0 }; +if (!aconnector->dc_link) +return ; +dc_dsc_get_default_config_option (dc, &dsc_options); dsc_options.max_target_bpp_limit_override_x16 = max_dsc_target_bpp_limit_override *16 ;
@@ -1299,7 +1302,7 @@ static void apply_dsc_policy_for_stream(struct amdgpu_dm_connector *aconnector, (dsc_caps->is_frl == 1) ? "HDMI FRL RX" : "DP-HDMI PCON"); } } - }else if (aconnector->dc_link && sink->sink_signal ==SIGNAL_TYPE_HDMI_FRL ) { + }else if (sink->sink_signal ==SIGNAL_TYPE_HDMI_FRL ) { frl_verified_link_cap =dc_link_get_frl_link_cap (stream->link); timing_bw_in_kbps =dc_bandwidth_in_kbps_from_timing (&stream->timing,DC_LINK_ENCODING_HDMI_FRL ); link_bandwidth_kbps =dc_link_frl_bandwidth_kbps (stream->link, frl_verified_link_cap->frl_link_rate);
--
2.55.0
PATCH 10/80 drm/amd/display: program dither on all OPP heads under ODM combine
In reply to George ZhangFrom: James Lin <[email protected]>
[why]
The IGT test kms_plane_alpha_blend@coverage-vs-premult-vs-constant failed on DCN with ODM 2:1 combine enabled. The test compares the CRC of a coverage-blended plane against a premultiplied-blended plane and expects them to be identical. With ODM combine the whole-frame CRC mismatched (left segment matched, right segment differed).
Root cause: dc_stream_set_dither_option() iterated the pipe_ctx array and broke out at the first pipe matching the stream (the OTG master / OPP instance 0), then programmed bit-depth reduction (dither) on that single OPP only. Under ODM combine there is more than one OPP head, so the secondary ODM segment (OPP instance 1) was never reprogrammed. When CRC capture requested dither off, only the left OPP got updated while the right OPP kept its previous dither setting, producing a different CRC for the right segment and thus a whole-frame CRC mismatch.
[how]
Use resource_get_otg_master_for_stream() and resource_get_opp_heads_for_otg_master() to retrieve every OPP head of the stream, then loop over all of them and call transform_set_pixel_storage_depth() and opp_program_bit_depth_reduction() on each. This keeps all OPP heads in sync under ODM combine, so dither is applied (or cleared) identically across every segment and the CRCs match.
--- drivers/gpu/drm/amd/display/dc/core/dc.c | 53 +++++++++++++++--------- 1 file changed, 34 insertions(+), 19 deletions(-)
drivers/gpu/drm/amd/display/dc/core/dc.c +34 -19
@@ -769,22 +769,23 @@ void dc_stream_set_dither_option(struct dc_stream_state *stream, {struct bit_depth_reduction_params params;struct dc_link *link = stream->link; -struct pipe_ctx *pipes =NULL ; +struct resource_context *res_ctx = &link->dc->current_state->res_ctx; +struct pipe_ctx *otg_master; +struct pipe_ctx *opp_heads[MAX_PIPES ]; +int opp_cnt;int i; -for (i =0 ; i <MAX_PIPES ; i++) { -if (link->dc->current_state->res_ctx.pipe_ctx[i].stream == - stream) { - pipes = &link->dc->current_state->res_ctx.pipe_ctx[i]; -break ; - } - } - -if (!pipes) + otg_master =resource_get_otg_master_for_stream (res_ctx, stream); +if (!otg_master)return ;if (option >DITHER_OPTION_MAX )return ; + opp_cnt =resource_get_opp_heads_for_otg_master (otg_master, res_ctx, opp_heads); + +if (opp_cnt ==0 ) +return ; +dc_exit_ips_for_hw_access (stream->ctx->dc); stream->dither_option = option;
@@ -793,16 +794,30 @@ void dc_stream_set_dither_option(struct dc_stream_state *stream,resource_build_bit_depth_reduction_params (stream, ¶ms); stream->bit_depth_params = params; -if (pipes->plane_res.xfm && - pipes->plane_res.xfm->funcs->transform_set_pixel_storage_depth) { - pipes->plane_res.xfm->funcs->transform_set_pixel_storage_depth ( - pipes->plane_res.xfm, - pipes->plane_res.scl_data.lb_params.depth, - &stream->bit_depth_params); - } +/* +* Program bit-depth reduction (dither) on every OPP head of the +* stream. Under ODM combine there is more than one OPP head and they +* must all be kept in sync, otherwise (e.g. when CRC capture requests +* dither off) a secondary ODM segment can keep dither enabled and +* produce a different CRC than the primary segment. +*/ +for (i =0 ; i < opp_cnt; i++) { +struct pipe_ctx *opp_head = opp_heads[i]; - pipes->stream_res.opp->funcs-> -opp_program_bit_depth_reduction (pipes->stream_res.opp, ¶ms); +if (opp_head->plane_res.xfm && + opp_head->plane_res.xfm->funcs->transform_set_pixel_storage_depth) { + opp_head->plane_res.xfm->funcs->transform_set_pixel_storage_depth ( + opp_head->plane_res.xfm, + opp_head->plane_res.scl_data.lb_params.depth, + &stream->bit_depth_params); + } + +if (opp_head->stream_res.opp && + opp_head->stream_res.opp->funcs->opp_program_bit_depth_reduction) { + opp_head->stream_res.opp->funcs->opp_program_bit_depth_reduction ( + opp_head->stream_res.opp, ¶ms); + } + } }bool dc_stream_set_gamut_remap (struct dc *dc,const struct dc_stream_state *stream)
--
2.55.0
PATCH 11/80 drm/amd/display: Remove sink usage from DPMS
In reply to George ZhangFrom: Dominik Kaszewski <[email protected]>
[Why]stream->sink is optional and can be null, so should always be checked before dereference. Additionally, most of its usage in DPMS sequences is for stream->sink->link, which can be replaced with stream->link, as the two should always be the same.
[How]
* Replace stream->sink->link in DPMS on/off
* Add assert to USB4 BW allocation where sink is required
* Avoid inconsistencies in resource access, e.g. don't repeat stream->link after it was already saved to a local variable
* Pull out effective VPG calculation to helper getter
* Formatting fixes
--- .../gpu/drm/amd/display/dc/link/link_dpms.c | 178 +++++++++--------- 1 file changed, 90 insertions(+), 88 deletions(-)
drivers/gpu/drm/amd/display/dc/link/link_dpms.c +90 -88
@@ -2296,6 +2296,8 @@ static enum dc_status enable_link(static bool allocate_usb4_bandwidth_for_stream (struct dc_stream_state *stream,int stream_bw) { +ASSERT (stream->sink); +struct dc_link *link = stream->sink->link;int req_bw = stream_bw;
@@ -2342,6 +2344,8 @@ static bool allocate_usb4_bandwidth_for_stream(struct dc_stream_state *stream, istatic bool allocate_usb4_bandwidth (struct dc_stream_state *stream) { +ASSERT (stream->sink); +bool ret; int bw = dc_bandwidth_in_kbps_from_timing(&stream->timing,
@@ -2361,38 +2365,43 @@ static bool deallocate_usb4_bandwidth(struct dc_stream_state *stream)return ret; } +static struct vpg *get_vpg (struct pipe_ctx *pipe_ctx) +{ +if (dc_is_hdmi_frl_signal (pipe_ctx->stream->signal)) +return pipe_ctx->stream_res.hpo_frl_stream_enc->vpg; +else if (dp_is_128b_132b_signal (pipe_ctx)) +return pipe_ctx->stream_res.hpo_dp_stream_enc->vpg; +else +return pipe_ctx->stream_res.stream_enc->vpg; +} +void link_set_dpms_off (struct pipe_ctx *pipe_ctx) { -struct dc *dc = pipe_ctx->stream->ctx->dc; +DC_LOGGER_INIT (pipe_ctx->stream->ctx->logger);struct dc_stream_state *stream = pipe_ctx->stream; -struct dc_link *link = stream->sink->link; -struct vpg *vpg = pipe_ctx->stream_res.stream_enc->vpg; +struct dc *dc = stream->ctx->dc; +struct dc_link *link = stream->link; +struct vpg *vpg =get_vpg (pipe_ctx);enum dp_panel_mode panel_mode_dp =dp_get_panel_mode (link); -DC_LOGGER_INIT (pipe_ctx->stream->ctx->logger); -ASSERT (is_master_pipe_for_link (link, pipe_ctx)); -if (dp_is_128b_132b_signal (pipe_ctx)) - vpg = pipe_ctx->stream_res.hpo_dp_stream_enc->vpg; -if (dc_is_hdmi_frl_signal (pipe_ctx->stream->signal)) - vpg = pipe_ctx->stream_res.hpo_frl_stream_enc->vpg; -if (dc_is_virtual_signal (pipe_ctx->stream->signal)) +if (dc_is_virtual_signal (stream->signal))return ; -if (pipe_ctx->stream->sink) { -if (pipe_ctx->stream->sink->sink_signal !=SIGNAL_TYPE_VIRTUAL && - pipe_ctx->stream->sink->sink_signal !=SIGNAL_TYPE_NONE ) { +if (stream->sink) { +if (stream->sink->sink_signal !=SIGNAL_TYPE_VIRTUAL && + stream->sink->sink_signal !=SIGNAL_TYPE_NONE ) {DC_LOG_DC ("%s pipe_ctx dispname=%s signal=%x link=%d sink_count=%d\n" , __func__, - pipe_ctx->stream->sink->edid_caps.display_name, - pipe_ctx->stream->signal, link->link_index, link->sink_count); + stream->sink->edid_caps.display_name, + stream->signal, link->link_index, link->sink_count); } }link_wait_for_unlocked (link); -if (!pipe_ctx->stream->sink->edid_caps.panel_patch.skip_avmute) { -if (dc_is_hdmi_signal (pipe_ctx->stream->signal)) +if (stream->sink && !stream->sink->edid_caps.panel_patch.skip_avmute) { +if (dc_is_hdmi_signal (stream->signal))set_avmute (pipe_ctx, true); }
@@ -2402,15 +2411,15 @@ void link_set_dpms_off(struct pipe_ctx *pipe_ctx) dc->hwss.blank_stream (pipe_ctx);if (pipe_ctx->link_config.dp_tunnel_settings.should_use_dp_bw_allocation) -deallocate_usb4_bandwidth (pipe_ctx->stream); +deallocate_usb4_bandwidth (stream); -if (pipe_ctx->stream->signal ==SIGNAL_TYPE_DISPLAY_PORT_MST ) +if (stream->signal ==SIGNAL_TYPE_DISPLAY_PORT_MST )deallocate_mst_payload (pipe_ctx); -else if (dc_is_dp_sst_signal (pipe_ctx->stream->signal) && +else if (dc_is_dp_sst_signal (stream->signal) &&dp_is_128b_132b_signal (pipe_ctx))update_sst_payload (pipe_ctx, false); -if (dc_is_hdmi_signal (pipe_ctx->stream->signal)) { +if (dc_is_hdmi_signal (stream->signal)) {struct ext_hdmi_settings settings = {0 };enum engine_id eng_id = pipe_ctx->stream_res.stream_enc->id;
@@ -2433,7 +2442,7 @@ void link_set_dpms_off(struct pipe_ctx *pipe_ctx) } } -if (pipe_ctx->stream->signal ==SIGNAL_TYPE_DISPLAY_PORT && +if (stream->signal ==SIGNAL_TYPE_DISPLAY_PORT && !dp_is_128b_132b_signal (pipe_ctx)) {/* In DP1.x SST mode, our encoder will go to TPS1
@@ -2443,18 +2452,18 @@ void link_set_dpms_off(struct pipe_ctx *pipe_ctx)* state machine. * In DP2 or MST mode, our encoder will stay video active */ -disable_link (pipe_ctx->stream->link, &pipe_ctx->link_res, pipe_ctx->stream->signal); +disable_link (link, &pipe_ctx->link_res, stream->signal); dc->hwss.disable_stream (pipe_ctx); }else { dc->hwss.disable_stream (pipe_ctx); -disable_link (pipe_ctx->stream->link, &pipe_ctx->link_res, pipe_ctx->stream->signal); +disable_link (link, &pipe_ctx->link_res, stream->signal); }edp_set_panel_assr (link, pipe_ctx, &panel_mode_dp, false); -if (pipe_ctx->stream->timing.flags.DSC) { -if (dc_is_dp_signal (pipe_ctx->stream->signal)) +if (stream->timing.flags.DSC) { +if (dc_is_dp_signal (stream->signal))link_set_dsc_enable (pipe_ctx, false); -else if (dc_is_hdmi_frl_signal (pipe_ctx->stream->signal)) +else if (dc_is_hdmi_frl_signal (stream->signal))link_set_dsc_on_stream (pipe_ctx, false); }if (dp_is_128b_132b_signal (pipe_ctx)) {
@@ -2468,7 +2477,7 @@ void link_set_dpms_off(struct pipe_ctx *pipe_ctx)/* for psp not exist case */ if (link->connector_signal ==SIGNAL_TYPE_EDP && dc->debug.psp_disabled_wa) {/* reset internal save state to default since eDP is off */ -enum dp_panel_mode panel_mode =dp_get_panel_mode (pipe_ctx->stream->link); +enum dp_panel_mode panel_mode =dp_get_panel_mode (link);/* since current psp not loaded, we need to reset it to default */ link->panel_mode = panel_mode; }
@@ -2478,62 +2487,57 @@ void link_set_dpms_on(struct dc_state *state, struct pipe_ctx *pipe_ctx) { - struct dc *dc = pipe_ctx->stream->ctx->dc; + DC_LOGGER_INIT(pipe_ctx->stream->ctx->logger);struct dc_stream_state *stream = pipe_ctx->stream; -struct dc_link *link = stream->sink->link; +struct dc *dc = stream->ctx->dc; +struct dc_link *link = stream->link;enum dc_status status;struct link_encoder *link_enc = pipe_ctx->link_res.dio_link_enc;enum otg_out_mux_dest otg_out_dest =OUT_MUX_DIO ; -struct vpg *vpg = pipe_ctx->stream_res.stream_enc->vpg; +struct vpg *vpg =get_vpg (pipe_ctx);const struct link_hwss *link_hwss =get_link_hwss (link, &pipe_ctx->link_res);bool apply_edp_fast_boot_optimization = - pipe_ctx->stream->apply_edp_fast_boot_optimization; - -DC_LOGGER_INIT (pipe_ctx->stream->ctx->logger); + stream->apply_edp_fast_boot_optimization;ASSERT (is_master_pipe_for_link (link, pipe_ctx)); -if (dp_is_128b_132b_signal (pipe_ctx)) - vpg = pipe_ctx->stream_res.hpo_dp_stream_enc->vpg; -if (dc_is_hdmi_frl_signal (pipe_ctx->stream->signal)) - vpg = pipe_ctx->stream_res.hpo_frl_stream_enc->vpg; -if (dc_is_virtual_signal (pipe_ctx->stream->signal)) +if (dc_is_virtual_signal (stream->signal))return ; -if (pipe_ctx->stream->sink) { -if (pipe_ctx->stream->sink->sink_signal !=SIGNAL_TYPE_VIRTUAL && - pipe_ctx->stream->sink->sink_signal !=SIGNAL_TYPE_NONE ) { +if (stream->sink) { +if (stream->sink->sink_signal !=SIGNAL_TYPE_VIRTUAL && + stream->sink->sink_signal !=SIGNAL_TYPE_NONE ) {DC_LOG_DC ("%s pipe_ctx dispname=%s signal=%x link=%d sink_count=%d\n" , __func__, - pipe_ctx->stream->sink->edid_caps.display_name, - pipe_ctx->stream->signal, + stream->sink->edid_caps.display_name, + stream->signal, link->link_index, link->sink_count); } } -link_wait_for_unlocked (stream->link); +link_wait_for_unlocked (link);if (!dc->config.unify_link_enc_assignment) link_enc =link_enc_cfg_get_link_enc (link);ASSERT (link_enc); -if (!dc_is_virtual_signal (pipe_ctx->stream->signal) - && !dc_is_hdmi_frl_signal (pipe_ctx->stream->signal) +if (!dc_is_virtual_signal (stream->signal) + && !dc_is_hdmi_frl_signal (stream->signal) && !dp_is_128b_132b_signal (pipe_ctx)) {if (link_enc) link_enc->funcs->setup ( link_enc, - pipe_ctx->stream->signal); + stream->signal); } - pipe_ctx->stream->link->link_state_valid = true; + link->link_state_valid = true; -if (dc_is_hdmi_frl_signal (pipe_ctx->stream->signal)) -hdmi_frl_decide_link_settings (stream, &stream->link->frl_link_settings, &pipe_ctx->dsc_padding_params); +if (dc_is_hdmi_frl_signal (stream->signal)) +hdmi_frl_decide_link_settings (stream, &link->frl_link_settings, &pipe_ctx->dsc_padding_params);if (pipe_ctx->stream_res.tg->funcs->set_out_mux) {if (dp_is_128b_132b_signal (pipe_ctx)) otg_out_dest =OUT_MUX_HPO_DP ; -else if (dc_is_hdmi_frl_signal (pipe_ctx->stream->signal)) +else if (dc_is_hdmi_frl_signal (stream->signal)) otg_out_dest =OUT_MUX_HPO_FRL ;else otg_out_dest =OUT_MUX_DIO ;
@@ -2542,7 +2546,7 @@ void link_set_dpms_on( link_hwss->setup_stream_attribute (pipe_ctx); - pipe_ctx->stream->apply_edp_fast_boot_optimization = false; + stream->apply_edp_fast_boot_optimization = false;// Enable VPG before building infoframe if (vpg && vpg->funcs->vpg_poweron)
@@ -2551,15 +2555,15 @@ void link_set_dpms_on(resource_build_info_frame (pipe_ctx); dc->hwss.update_info_frame (pipe_ctx); -if (dc_is_dp_signal (pipe_ctx->stream->signal)) +if (dc_is_dp_signal (stream->signal))dp_trace_source_sequence (link,DPCD_SOURCE_SEQ_AFTER_UPDATE_INFO_FRAME );/* Do not touch link on seamless boot optimization. */ -if (pipe_ctx->stream->apply_seamless_boot_optimization) { - pipe_ctx->stream->dpms_off = false; +if (stream->apply_seamless_boot_optimization) { + stream->dpms_off = false;/* Still enable stream features & audio on seamless boot for DP external displays */ -if (pipe_ctx->stream->signal ==SIGNAL_TYPE_DISPLAY_PORT ) { +if (stream->signal ==SIGNAL_TYPE_DISPLAY_PORT ) {enable_stream_features (pipe_ctx); dc->hwss.enable_audio_stream (pipe_ctx); }
@@ -2569,11 +2573,11 @@ void link_set_dpms_on( }/* eDP lit up by bios already, no need to enable again. */ -if (pipe_ctx->stream->signal ==SIGNAL_TYPE_EDP && +if (stream->signal ==SIGNAL_TYPE_EDP && apply_edp_fast_boot_optimization && - !pipe_ctx->stream->timing.flags.DSC && + !stream->timing.flags.DSC && !pipe_ctx->next_odm_pipe) { - pipe_ctx->stream->dpms_off = false; + stream->dpms_off = false;update_psp_stream_config (pipe_ctx, false);if (link->is_dds) {
@@ -2586,7 +2590,7 @@ void link_set_dpms_on(return ; } -if (pipe_ctx->stream->dpms_off) +if (stream->dpms_off)return ;/* For Dp tunneling link, a pending HPD means that we have a race condition between processing
@@ -2604,9 +2608,9 @@ void link_set_dpms_on(* will be automatically set at a later time when the video is enabled * (DP_VID_STREAM_EN = 1). */ -if (pipe_ctx->stream->timing.flags.DSC) { -if (dc_is_dp_signal (pipe_ctx->stream->signal) || -dc_is_virtual_signal (pipe_ctx->stream->signal)) +if (stream->timing.flags.DSC) { +if (dc_is_dp_signal (stream->signal) || +dc_is_virtual_signal (stream->signal))link_set_dsc_enable (pipe_ctx, true); }
@@ -2617,7 +2621,7 @@ void link_set_dpms_on(if (status !=DC_OK ) {DC_LOG_WARNING ("enabling link %u failed: %d\n" , - pipe_ctx->stream->link->link_index, + link->link_index, status);/* Abort stream enable *unless* the failure was due to
@@ -2627,19 +2631,18 @@ void link_set_dpms_on(*/ if ((status !=DC_FAIL_DP_LINK_TRAINING && status !=DC_FAIL_HDMI_FRL_LINK_TRAINING ) || - pipe_ctx->stream->signal ==SIGNAL_TYPE_DISPLAY_PORT_MST ) { -if (false == stream->link->link_status.link_active) -disable_link (stream->link, &pipe_ctx->link_res, - pipe_ctx->stream->signal); + stream->signal ==SIGNAL_TYPE_DISPLAY_PORT_MST ) { +if (false == link->link_status.link_active) +disable_link (link, &pipe_ctx->link_res, + stream->signal);BREAK_TO_DEBUGGER ();return ; } } -if (pipe_ctx->stream->timing.flags.DSC && -dc_is_hdmi_frl_signal (pipe_ctx->stream->signal)) -//TODO: bring HDMI FRL in line with DP -link_set_dsc_on_stream (pipe_ctx, true); +if (stream->timing.flags.DSC &&dc_is_hdmi_frl_signal (stream->signal)) +//TODO: bring HDMI FRL in line with DP +link_set_dsc_on_stream (pipe_ctx, true);/* turn off otg test pattern if enable */ if (pipe_ctx->stream_res.tg->funcs->set_test_pattern)
@@ -2651,37 +2654,37 @@ void link_set_dpms_on(* as a workaround for the incorrect value being applied * from transmitter control. */ -if (!(dc_is_virtual_signal (pipe_ctx->stream->signal) || -dc_is_hdmi_frl_signal (pipe_ctx->stream->signal) || +if (!(dc_is_virtual_signal (stream->signal) || +dc_is_hdmi_frl_signal (stream->signal) ||dp_is_128b_132b_signal (pipe_ctx))) {if (link_enc) link_enc->funcs->setup ( link_enc, - pipe_ctx->stream->signal); + stream->signal); } dc->hwss.enable_stream (pipe_ctx);/* Set DPS PPS SDP (AKA "info frames") */ -if (pipe_ctx->stream->timing.flags.DSC) { -if (dc_is_dp_signal (pipe_ctx->stream->signal) || -dc_is_virtual_signal (pipe_ctx->stream->signal)) { +if (stream->timing.flags.DSC) { +if (dc_is_dp_signal (stream->signal) || +dc_is_virtual_signal (stream->signal)) {dp_set_dsc_on_rx (pipe_ctx, true);link_set_dsc_pps_packet (pipe_ctx, true, true); } } -if (dc_is_dp_signal (pipe_ctx->stream->signal)) +if (dc_is_dp_signal (stream->signal))dp_set_hblank_reduction_on_rx (pipe_ctx);if (pipe_ctx->link_config.dp_tunnel_settings.should_use_dp_bw_allocation) -allocate_usb4_bandwidth (pipe_ctx->stream); +allocate_usb4_bandwidth (stream); -if (pipe_ctx->stream->signal ==SIGNAL_TYPE_DISPLAY_PORT_MST ) +if (stream->signal ==SIGNAL_TYPE_DISPLAY_PORT_MST )allocate_mst_payload (pipe_ctx); -else if (dc_is_dp_sst_signal (pipe_ctx->stream->signal) && +else if (dc_is_dp_sst_signal (stream->signal) &&dp_is_128b_132b_signal (pipe_ctx))update_sst_payload (pipe_ctx, true);
@@ -2690,23 +2693,22 @@ void link_set_dpms_on(* training and stream unblank resolves the corruption issue. * This is workaround. */ -if (pipe_ctx->stream->signal ==SIGNAL_TYPE_EDP && +if (stream->signal ==SIGNAL_TYPE_EDP && link->is_display_mux_present)msleep (20 ); dc->hwss.unblank_stream (pipe_ctx, - &pipe_ctx->stream->link->cur_link_settings); + &link->cur_link_settings);if (stream->sink_patches.delay_ignore_msa >0 )msleep (stream->sink_patches.delay_ignore_msa); -if (dc_is_dp_signal (pipe_ctx->stream->signal)) +if (dc_is_dp_signal (stream->signal))enable_stream_features (pipe_ctx);update_psp_stream_config (pipe_ctx, false); dc->hwss.enable_audio_stream (pipe_ctx); -if (dc_is_hdmi_signal (pipe_ctx->stream->signal)) { +if (dc_is_hdmi_signal (stream->signal))set_avmute (pipe_ctx, false); - } }
--
2.55.0
PATCH 12/80 drm/amd/display: Fix dead-code panel type detection from DID
In reply to George ZhangFrom: Chenyu Chen <[email protected]>
[Why]
In amdgpu_dm_set_panel_type() the DID fallback branch tested and wrote link->panel_type, while the rest of the function tracked the result in the local variable panel_type. The final assignment unconditionally overwrites link->panel_type from panel_type, so the value derived from DID was always discarded, making the DID branch dead code.
[How]
Use the local panel_type variable in the DID fallback branch so that the DID result participates in the source priority (VSDB -> DPCD -> DID -> vendor luminance heuristic -> LCD default) and is preserved by the final assignment.
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_connector.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_connector.c +3 -3
@@ -420,11 +420,11 @@ static void amdgpu_dm_set_panel_type(struct amdgpu_dm_connector *aconnector) }/* If VSDB and DPCD didn't determine panel type, check DID */ -if (link->panel_type ==PANEL_TYPE_NONE ) { +if (panel_type ==PANEL_TYPE_NONE ) {if (display_info->panel_type ==DRM_MODE_PANEL_TYPE_LCD ) - link->panel_type =PANEL_TYPE_LCD ; + panel_type =PANEL_TYPE_LCD ;else if (display_info->panel_type ==DRM_MODE_PANEL_TYPE_OLED ) - link->panel_type =PANEL_TYPE_OLED ; + panel_type =PANEL_TYPE_OLED ; }if (panel_type ==PANEL_TYPE_NONE ) {
--
2.55.0
PATCH 13/80 drm/amd/display: Add KUnit tests for CACP on Linux
In reply to George ZhangFrom: Chenyu Chen <[email protected]>
[Why]
The CACP enablement on Linux added panel-type detection and CACP capability logic that was not covered by KUnit tests.
[How]
Export amdgpu_dm_set_panel_type() and amdgpu_dm_update_cacp_caps() for KUnit via STATIC_IFN_KUNIT/EXPORT_IF_KUNIT and add unit tests covering:
- amdgpu_dm_update_cacp_caps(): IP version gating (including the 3.1.6 exclusion), eDP/LVDS signal handling, non-eDP signals, and OLED vs LCD panel types.
- amdgpu_dm_set_panel_type(): VSDB OLED/MINILED, DPCD oled/miniled bits, the DID path (OLED and LCD), the vendor luminance heuristic, and the LCD default.
Update the should_create_sysfs backlight tests to reflect the new OLED/CACP behavior (OLED with/without CACP and LCD eDP panels).
--- .../display/amdgpu_dm/amdgpu_dm_connector.c | 6 +- .../display/amdgpu_dm/amdgpu_dm_connector.h | 2 + .../tests/amdgpu_dm_backlight_test.c | 43 ++- .../tests/amdgpu_dm_connector_test.c | 351 ++++++++++++++++++ 4 files changed, 392 insertions(+), 10 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_connector.c +4 -2
@@ -392,7 +392,7 @@ amdgpu_dm_find_first_crtc_matching_connector(struct drm_atomic_state *state,return NULL ; } -static void amdgpu_dm_set_panel_type (struct amdgpu_dm_connector *aconnector) +STATIC_IFN_KUNIT void amdgpu_dm_set_panel_type(struct amdgpu_dm_connector *aconnector) {struct drm_connector *connector = &aconnector->base;struct drm_display_info *display_info = &connector->display_info;
@@ -459,8 +459,9 @@ static void amdgpu_dm_set_panel_type(struct amdgpu_dm_connector *aconnector)drm_dbg_kms (aconnector->base.dev,"Panel type: %d\n" , link->panel_type); } +EXPORT_IF_KUNIT (amdgpu_dm_set_panel_type); -static void amdgpu_dm_update_cacp_caps (struct amdgpu_dm_connector *aconnector) +STATIC_IFN_KUNIT void amdgpu_dm_update_cacp_caps(struct amdgpu_dm_connector *aconnector) {struct amdgpu_device *adev =drm_to_adev (aconnector->base.dev);struct dc_link *link = aconnector->dc_link;
@@ -485,6 +486,7 @@ static void amdgpu_dm_update_cacp_caps(struct amdgpu_dm_connector *aconnector)drm_dbg_kms (aconnector->base.dev,"cacp_supported: %d\n" , link->panel_config.cacp.cacp_supported); } +EXPORT_IF_KUNIT (amdgpu_dm_update_cacp_caps); DEFINE_FREE(sink_release, struct dc_sink *, if (_T) dc_sink_release(_T))
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_connector.h +2 -0
@@ -158,5 +158,7 @@ enum dc_aspect_ratio get_aspect_ratio(const struct drm_display_mode *mode_in);void decide_crtc_timing_for_drm_display_mode (struct drm_display_mode *drm_mode,const struct drm_display_mode *native_mode,bool scale_enabled); +void amdgpu_dm_set_panel_type (struct amdgpu_dm_connector *aconnector); +void amdgpu_dm_update_cacp_caps (struct amdgpu_dm_connector *aconnector);#endif #endif /* __AMDGPU_DM_CONNECTOR_H__ */
drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_backlight_test.c +35 -8
77 lines not on this page · raw message
drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_connector_test.c +351 -0
363 lines not on this page · raw message
--
2.55.0
PATCH 14/80 drm/amd/display: Add Debug Option To Enable Per-DPM De-rate Usage
In reply to George ZhangFrom: Austin Zheng <[email protected]>
[Why]
DML has been updated to use per-DPM derates when provided but per-DPM de-rates have not been finalized. Need to validate to see what values should be stored in the bounding box.
[How]
Add debug options to set custom derates per DPM (starting at DPM0) and their values
Each entry in the custom derate expects the derates to be stored in the following format:
bits 0-7: dram_derate_percent_pixel
bits 8-15: fclk_derate_percent
bits 16-23: dcfclk_derate_percent
bits 24-31 are unused.
e.g. Using the value 0x414020 will set the following derates for DPM0
DPM0: 0x20, 0x40, 0x41 for dram, fclk, and dcfclk respectively
Note that global derate value will be used if the per-DPM derate is 0.
--- drivers/gpu/drm/amd/display/dc/dc.h | 2 ++ .../dcn401/dcn401_soc_and_ip_translator.c | 16 ++++++++++++++++ 2 files changed, 18 insertions(+)
drivers/gpu/drm/amd/display/dc/dc.h +2 -0
@@ -1289,6 +1289,8 @@ struct dc_debug_options {bool enable_replay_esd_recovery;uint8_t iommu_mismatch_temp_wka;bool disable_dynamic_expansion_for_test_pattern; +uint32_t dml21_custom_derate_num_dpms; +uint32_t dml21_custom_derate_at_dpm[DML2_MAX_NUM_DPM_LVL ]; };
drivers/gpu/drm/amd/display/dc/soc_and_ip_translator/dcn401/dcn401_soc_and_ip_translator.c +16 -0
@@ -269,6 +269,22 @@ void dcn401_update_soc_bb_with_values_from_software_policy(struct dml2_soc_bb *sif (dc->bb_overrides.sr_enter_plus_exit_z8_time_ns) soc_bb->power_management_parameters.z8_stutter_enter_plus_exit_latency_us = dc->bb_overrides.sr_enter_plus_exit_z8_time_ns /1000.0 ; + +/* Override per-dpm derates based on a custom derate table. +* Global derate value will be used for derates that aren't populated +* 3 derates for a single DPM level: +* bits 0-7: dram_derate_percent_pixel +* bits 8-15: fclk_derate_percent +* bits 16-23: dcfclk_derate_percent +*/ +for (unsigned int i =0 ; i < dc->debug.dml21_custom_derate_num_dpms; i++) { + soc_bb->qos_parameters.derate_table_per_dpm.system_active_derates_per_dpm.dram_derate_percent_pixel[i] + = dc->debug.dml21_custom_derate_at_dpm[i] &0xFF ; + soc_bb->qos_parameters.derate_table_per_dpm.system_active_derates_per_dpm.fclk_derate_percent[i] + = (dc->debug.dml21_custom_derate_at_dpm[i] >>8 ) &0xFF ; + soc_bb->qos_parameters.derate_table_per_dpm.system_active_derates_per_dpm.dcfclk_derate_percent[i] + = (dc->debug.dml21_custom_derate_at_dpm[i] >>16 ) &0xFF ; + } }static void apply_soc_bb_updates (struct dml2_soc_bb *soc_bb,const struct dc *dc,const struct dml2_configuration_options *config)
--
2.55.0
PATCH 15/80 drm/amd/display: update memclk clock table read for dcn42
In reply to George ZhangFrom: Dmytro Laktyushkin <[email protected]>
Change memclk table to match dcfclk size to avoid fine grained mapping in dml2.1
--- .../amd/display/dc/clk_mgr/dcn42/dcn42_clk_mgr.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn42/dcn42_clk_mgr.c +11 -5
@@ -999,15 +999,21 @@ void dcn42_get_smu_clocks(struct clk_mgr_internal *clk_mgr_int) clk_mgr_base->bw_params->clk_table.num_entries_per_clk.num_fclk_levels = dpm_clks->NumFclkLevelsEnabled; clk_mgr_base->bw_params->clk_table.num_entries = dpm_clks->NumFclkLevelsEnabled; -/* Memory Pstate table is in reverse order*/ +/* Memory Pstate table is in reverse order for dcn42. Proper way to map this is for pmfw to provide an fclk indexed uclk key since we consume fclk matched pairs.*/ ASSERT (dpm_clks->NumMemPstatesEnabled <=NUM_MEM_PSTATE_LEVELS );if (dpm_clks->NumMemPstatesEnabled >NUM_MEM_PSTATE_LEVELS ) dpm_clks->NumMemPstatesEnabled =NUM_MEM_PSTATE_LEVELS ; -for (i =0 ; i < dpm_clks->NumMemPstatesEnabled; i++) { - clk_mgr_base->bw_params->clk_table.entries[dpm_clks->NumMemPstatesEnabled -1 - i].memclk_mhz = dpm_clks->MemPstateTable[i].MemClk; - clk_mgr_base->bw_params->clk_table.entries[dpm_clks->NumMemPstatesEnabled -1 - i].wck_ratio =dcn42_convert_wck_ratio (dpm_clks->MemPstateTable[i].WckRatio) ; +for (i =0 ; i < dpm_clks->NumDcfClkLevelsEnabled; i++) { +if (i < dpm_clks->NumMemPstatesEnabled) { + clk_mgr_base->bw_params->clk_table.entries[dpm_clks->NumMemPstatesEnabled -1 - i].memclk_mhz = dpm_clks->MemPstateTable[i].MemClk; + clk_mgr_base->bw_params->clk_table.entries[dpm_clks->NumMemPstatesEnabled -1 - i].wck_ratio =dcn42_convert_wck_ratio (dpm_clks->MemPstateTable[i].WckRatio); + }else { + clk_mgr_base->bw_params->clk_table.entries[i].memclk_mhz = dpm_clks->MemPstateTable[0 ].MemClk; + clk_mgr_base->bw_params->clk_table.entries[i].wck_ratio =dcn42_convert_wck_ratio (dpm_clks->MemPstateTable[0 ].WckRatio); + } } - clk_mgr_base->bw_params->clk_table.num_entries_per_clk.num_memclk_levels = dpm_clks->NumMemPstatesEnabled; + + clk_mgr_base->bw_params->clk_table.num_entries_per_clk.num_memclk_levels = dpm_clks->NumDcfClkLevelsEnabled;/* DTBCLK*/ clk_mgr_base->bw_params->clk_table.entries[0 ].dtbclk_mhz =600 ;/* Fixed on platform */
--
2.55.0
PATCH 16/80 drm/amd/display: Fix dc_stream_remove_writeback dropping wrong writeback entries.
In reply to George ZhangFrom: Bhuvanachandra Pinninti <[email protected]>
[why]
The matching entry was disabled but still copied during compaction, so a removed pipe could survive and overwrite a valid entry, leaving num_wb_info wrong.
[how]
Skip every entry matching dwb_pipe_inst and compact only survivors. Covered by test_dc_stream_writeback_drc_and_remove.And added new test cases for coverage.
--- .../gpu/drm/amd/display/dc/core/dc_stream.c | 21 ++++++++----------- 1 file changed, 9 insertions(+), 12 deletions(-)
drivers/gpu/drm/amd/display/dc/core/dc_stream.c +9 -12
@@ -720,20 +720,17 @@ bool dc_stream_remove_writeback(struct dc *dc,return false; } -/* remove writeback info for disabled writeback pipes from stream */ +/* remove writeback info for the requested writeback pipe from stream */ for (i =0 , j =0 ; i < stream->num_wb_info; i++) { -if (stream->writeback_info[i].wb_enabled) { - -if (stream->writeback_info[i].dwb_pipe_inst == dwb_pipe_inst) - stream->writeback_info[i].wb_enabled = false; +/* drop every entry that targets the pipe being removed */ +if (stream->writeback_info[i].dwb_pipe_inst == dwb_pipe_inst) +continue ; -/* trim the array */ -if (j < i) { -memcpy (&stream->writeback_info[j], &stream->writeback_info[i], -sizeof (struct dc_writeback_info )); - j++; - } - } +/* keep this entry, compacting it down when earlier entries were removed */ +if (j != i) +memcpy (&stream->writeback_info[j], &stream->writeback_info[i], +sizeof (struct dc_writeback_info )); + j++; } stream->num_wb_info = j;
--
2.55.0
PATCH 17/80 drm/amd/display: Add KUnit tests for ism
In reply to George ZhangFrom: Alex Hung <[email protected]>
Add KUnit coverage for the following ISM functions:
- dm_ism_next_state(): state transitions for running, busy, hysteresis-wait, optimized-idle, and aborted states
- dm_ism_get_sso_delay(): null stream, zero frames, 1080p60 3-frame, and 4k60 1-frame calculations
- dm_ism_get_idle_allow_delay(): null stream, zero filter/entry/delay frames, short-idle filtering, wrap-around, old history cutoff, mixed durations, and entry count exceeding history size
- amdgpu_dm_ism_init(): initial state setup
- amdgpu_dm_ism_fini(): cleanup after init
- dm_ism_set_last_idle_ts(): timestamp update
- dm_ism_insert_record(): basic insert and wrap-around
- dm_ism_trigger_event(): valid and invalid transitions
--- .../drm/amd/display/amdgpu_dm/amdgpu_dm_ism.c | 4 + .../amdgpu_dm/tests/amdgpu_dm_ism_test.c | 353 ++++++++++++++++++ 2 files changed, 357 insertions(+)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_ism.c +4 -0
@@ -502,6 +502,7 @@ void amdgpu_dm_ism_commit_event(struct amdgpu_dm_ism *ism, }while (next_event <DM_ISM_NUM_EVENTS ); } +EXPORT_IF_KUNIT (amdgpu_dm_ism_commit_event);static void dm_ism_delayed_work_func (struct work_struct *work)
@@ -568,6 +569,7 @@ void amdgpu_dm_ism_disable(struct amdgpu_display_manager *dm)disable_delayed_work_sync (&ism->sso_delayed_work); } } +EXPORT_IF_KUNIT (amdgpu_dm_ism_disable);/** * amdgpu_dm_ism_force_full_power - Force every CRTC's ISM FSM to FULL_POWER
@@ -603,6 +605,7 @@ void amdgpu_dm_ism_force_full_power(struct amdgpu_display_manager *dm) DM_ISM_EVENT_EXIT_IDLE_REQUESTED); } } +EXPORT_IF_KUNIT (amdgpu_dm_ism_force_full_power);/** * amdgpu_dm_ism_enable - enable the ISM
@@ -626,6 +629,7 @@ void amdgpu_dm_ism_enable(struct amdgpu_display_manager *dm)enable_delayed_work (&ism->sso_delayed_work); } } +EXPORT_IF_KUNIT (amdgpu_dm_ism_enable);void amdgpu_dm_ism_init (struct amdgpu_dm_ism *ism,struct amdgpu_dm_ism_config *config)
drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_ism_test.c +353 -0
371 lines not on this page · raw message
--
2.55.0
PATCH 18/80 drm/amd/display: add null pointer access check
In reply to George ZhangFrom: Charlene Liu <[email protected]>
[why]
need to add null pointer access check
--- .../drm/amd/display/dc/dio/dcn10/dcn10_link_encoder.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/display/dc/dio/dcn10/dcn10_link_encoder.c +6 -4
@@ -1189,8 +1189,9 @@ void dcn10_link_encoder_dp_set_phy_pattern(set_dp_phy_pattern_prbs7 (enc10);break ;case DP_TEST_PATTERN_80BIT_CUSTOM : -set_dp_phy_pattern_80bit_custom ( - enc10, param->custom_pattern); +if (param) +set_dp_phy_pattern_80bit_custom ( + enc10, param->custom_pattern);break ;case DP_TEST_PATTERN_CP2520_1 :set_dp_phy_pattern_hbr2_compliance_cp2520_2 (enc10,1 );
@@ -1202,8 +1203,9 @@ void dcn10_link_encoder_dp_set_phy_pattern(set_dp_phy_pattern_hbr2_compliance_cp2520_2 (enc10,3 );break ;case DP_TEST_PATTERN_VIDEO_MODE : { -set_dp_phy_pattern_passthrough_mode ( - enc10, param->dp_panel_mode); +if (param) +set_dp_phy_pattern_passthrough_mode ( + enc10, param->dp_panel_mode);break ; }
--
2.55.0
PATCH 19/80 drm/amd/display: Add DCN42B VID_CRC_CONTROL and HBLANK_CONTROL registers
In reply to George ZhangFrom: Matthew Stewart <[email protected]>
[why]
These registers are needed by our existing code.
[how]
Add the missing register defines to dcn42b_resource.c.
Remove DCN42B variant of HP_DP_STREAM_ENC_REG_LIST_RI as it is now the same as the DCN42B one, when these registers are included.
--- .../dc/resource/dcn42b/dcn42b_resource.c | 15 ++++++- .../dc/resource/dcn42b/dcn42b_resource.h | 40 ------------------- 2 files changed, 14 insertions(+), 41 deletions(-)
drivers/gpu/drm/amd/display/dc/resource/dcn42b/dcn42b_resource.c +14 -1
@@ -134,6 +134,19 @@#define regHUBP3_HUBPREQ_DEBUG 0x088d#define regHUBP3_HUBPREQ_DEBUG_BASE_IDX 2 +#define regDP_SYM32_ENC0_DP_SYM32_ENC_VID_CRC_CONTROL 0x3687 +#define regDP_SYM32_ENC0_DP_SYM32_ENC_VID_CRC_CONTROL_BASE_IDX 2 +#define regDP_SYM32_ENC1_DP_SYM32_ENC_VID_CRC_CONTROL 0x375b +#define regDP_SYM32_ENC1_DP_SYM32_ENC_VID_CRC_CONTROL_BASE_IDX 2 +#define regDP_SYM32_ENC2_DP_SYM32_ENC_VID_CRC_CONTROL 0x382f +#define regDP_SYM32_ENC2_DP_SYM32_ENC_VID_CRC_CONTROL_BASE_IDX 2 +#define regDP_SYM32_ENC0_DP_SYM32_ENC_HBLANK_CONTROL 0x366b +#define regDP_SYM32_ENC0_DP_SYM32_ENC_HBLANK_CONTROL_BASE_IDX 2 +#define regDP_SYM32_ENC1_DP_SYM32_ENC_HBLANK_CONTROL 0x373f +#define regDP_SYM32_ENC1_DP_SYM32_ENC_HBLANK_CONTROL_BASE_IDX 2 +#define regDP_SYM32_ENC2_DP_SYM32_ENC_HBLANK_CONTROL 0x3813 +#define regDP_SYM32_ENC2_DP_SYM32_ENC_HBLANK_CONTROL_BASE_IDX 2 +enum dcn401_clk_src_array_id {DCN401_CLK_SRC_PLL0 ,DCN401_CLK_SRC_PLL1 ,
@@ -351,7 +364,7 @@ static const struct dcn10_link_enc_mask le_mask = { LINK_ENCODER_MASK_SH_LIST_DCN42B(_MASK)};#define hpo_dp_stream_encoder_reg_init (id) \ - DCN42B_HPO_DP_STREAM_ENC_REG_LIST_RI(id) + DCN42_HPO_DP_STREAM_ENC_REG_LIST_RI(id)static struct dcn31_hpo_dp_stream_encoder_registers hpo_dp_stream_enc_regs[4 ];
drivers/gpu/drm/amd/display/dc/resource/dcn42b/dcn42b_resource.h +0 -40
@@ -254,46 +254,6 @@SRI_ARR (STREAM_MAPPER_CONTROL ,DIG , id),\SRI_ARR (DIG_FE_AUDIO_CNTL ,DIG , id) -/* HPO DP stream encoder */ -/* Not in DCN42B: -* SRI_ARR(DP_SYM32_ENC_VID_CRC_CONTROL, DP_SYM32_ENC, id), -* SRI_ARR(DP_SYM32_ENC_HBLANK_CONTROL, DP_SYM32_ENC, id), - */ -#define DCN42B_HPO_DP_STREAM_ENC_REG_LIST_RI (id) \ - SR_ARR(DP_STREAM_MAPPER_CONTROL0, id), \ - SR_ARR(DP_STREAM_MAPPER_CONTROL1, id), \ - SR_ARR(DP_STREAM_MAPPER_CONTROL2, id), \ - SR_ARR(DP_STREAM_MAPPER_CONTROL3, id), \ - SRI_ARR(DP_STREAM_ENC_CLOCK_CONTROL, DP_STREAM_ENC, id), \ - SRI_ARR(DP_STREAM_ENC_INPUT_MUX_CONTROL, DP_STREAM_ENC, id), \ - SRI_ARR(DP_STREAM_ENC_AUDIO_CONTROL, DP_STREAM_ENC, id), \ - SRI_ARR(DP_STREAM_ENC_CLOCK_RAMP_ADJUSTER_FIFO_STATUS_CONTROL0, DP_STREAM_ENC, id), \ - SRI_ARR(DP_SYM32_ENC_CONTROL, DP_SYM32_ENC, id), \ - SRI_ARR(DP_SYM32_ENC_VID_PIXEL_FORMAT, DP_SYM32_ENC, id), \ - SRI_ARR(DP_SYM32_ENC_VID_PIXEL_FORMAT_DOUBLE_BUFFER_CONTROL, DP_SYM32_ENC, id), \ - SRI_ARR(DP_SYM32_ENC_VID_MSA0, DP_SYM32_ENC, id), \ - SRI_ARR(DP_SYM32_ENC_VID_MSA1, DP_SYM32_ENC, id), \ - SRI_ARR(DP_SYM32_ENC_VID_MSA2, DP_SYM32_ENC, id), \ - SRI_ARR(DP_SYM32_ENC_VID_MSA3, DP_SYM32_ENC, id), \ - SRI_ARR(DP_SYM32_ENC_VID_MSA4, DP_SYM32_ENC, id), \ - SRI_ARR(DP_SYM32_ENC_VID_MSA5, DP_SYM32_ENC, id), \ - SRI_ARR(DP_SYM32_ENC_VID_MSA6, DP_SYM32_ENC, id), \ - SRI_ARR(DP_SYM32_ENC_VID_MSA7, DP_SYM32_ENC, id), \ - SRI_ARR(DP_SYM32_ENC_VID_MSA8, DP_SYM32_ENC, id), \ - SRI_ARR(DP_SYM32_ENC_VID_MSA_CONTROL, DP_SYM32_ENC, id), \ - SRI_ARR(DP_SYM32_ENC_VID_MSA_DOUBLE_BUFFER_CONTROL, DP_SYM32_ENC, id), \ - SRI_ARR(DP_SYM32_ENC_VID_FIFO_CONTROL, DP_SYM32_ENC, id), \ - SRI_ARR(DP_SYM32_ENC_VID_STREAM_CONTROL, DP_SYM32_ENC, id), \ - SRI_ARR(DP_SYM32_ENC_VID_VBID_CONTROL, DP_SYM32_ENC, id), \ - SRI_ARR(DP_SYM32_ENC_SDP_CONTROL, DP_SYM32_ENC, id), \ - SRI_ARR(DP_SYM32_ENC_SDP_GSP_CONTROL0, DP_SYM32_ENC, id), \ - SRI_ARR(DP_SYM32_ENC_SDP_GSP_CONTROL2, DP_SYM32_ENC, id), \ - SRI_ARR(DP_SYM32_ENC_SDP_GSP_CONTROL3, DP_SYM32_ENC, id), \ - SRI_ARR(DP_SYM32_ENC_SDP_GSP_CONTROL5, DP_SYM32_ENC, id), \ - SRI_ARR(DP_SYM32_ENC_SDP_GSP_CONTROL11, DP_SYM32_ENC, id), \ - SRI_ARR(DP_SYM32_ENC_SDP_METADATA_PACKET_CONTROL, DP_SYM32_ENC, id), \ - SRI_ARR(DP_SYM32_ENC_SDP_AUDIO_CONTROL0, DP_SYM32_ENC, id) - /*HPO DP link encoder regs */#define DCN42B_HPO_DP_LINK_ENC_REG_LIST_RI (id) \ SRI_ARR(DP_LINK_ENC_CLOCK_CONTROL, DP_LINK_ENC, id), \
--
2.55.0
PATCH 20/80 drm/amd/display: Add MALL status readback support for DCN 4.0.1
In reply to George ZhangFrom: James Lin <[email protected]>
[why]
The IGT test igt@amdgpu/amd_mall@static-screen always fails on DCN 4.0.1
because debugfs reports "mall enabled: no" even when MALL is
actually active. This is because the DCN 4.0.1 hubbub function table is missing the .get_mall_en callback, so capabilities_show() always sees mall_in_use as false.
[how]
Reuse hubbub32_get_mall_en() for DCN 4.0.1 since the DCHUBBUB_ARB_MALL_CNTL register layout is identical to DCN 3.2:
- Register the DCHUBBUB_ARB_MALL_CNTL register offset in dcn401_resource.h
- Add MALL_PREFETCH_COMPLETE and MALL_IN_USE mask/shift definitions in dcn401_hubbub.h
- Wire up .get_mall_en = hubbub32_get_mall_en in hubbub4_01_funcs
--- drivers/gpu/drm/amd/display/dc/hubbub/dcn401/dcn401_hubbub.c | 3 ++- drivers/gpu/drm/amd/display/dc/hubbub/dcn401/dcn401_hubbub.h | 4 +++- .../gpu/drm/amd/display/dc/resource/dcn401/dcn401_resource.h | 3 ++- 3 files changed, 7 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/display/dc/hubbub/dcn401/dcn401_hubbub.c +2 -1
@@ -1250,7 +1250,8 @@ static const struct hubbub_funcs hubbub4_01_funcs = { .program_compbuf_segments = dcn401_program_compbuf_segments, .wait_for_det_update = dcn401_wait_for_det_update, .program_arbiter = dcn401_program_arbiter, - .hubbub_read_reg_state = hubbub3_read_reg_state + .hubbub_read_reg_state = hubbub3_read_reg_state, + .get_mall_en = hubbub32_get_mall_en }; void hubbub401_construct(struct dcn20_hubbub *hubbub2,
drivers/gpu/drm/amd/display/dc/hubbub/dcn401/dcn401_hubbub.h +3 -1
@@ -133,7 +133,9 @@HUBBUB_SF (DCHUBBUB_CTRL_STATUS ,ROB_OVERFLOW_STATUS , mask_sh),\HUBBUB_SF (DCHUBBUB_CTRL_STATUS ,ROB_OVERFLOW_CLEAR , mask_sh),\HUBBUB_SF (DCHUBBUB_CTRL_STATUS ,DCHUBBUB_HW_DEBUG , mask_sh),\ - HUBBUB_SF(DCHUBBUB_CTRL_STATUS, CSTATE_SWATH_CHK_GOOD_MODE, mask_sh) +HUBBUB_SF (DCHUBBUB_CTRL_STATUS ,CSTATE_SWATH_CHK_GOOD_MODE , mask_sh),\ +HUBBUB_SF (DCHUBBUB_ARB_MALL_CNTL ,MALL_PREFETCH_COMPLETE , mask_sh),\ + HUBBUB_SF(DCHUBBUB_ARB_MALL_CNTL, MALL_IN_USE, mask_sh) bool hubbub401_program_urgent_watermarks( struct hubbub *hubbub,
drivers/gpu/drm/amd/display/dc/resource/dcn401/dcn401_resource.h +2 -1
@@ -622,7 +622,8 @@ int dcn401_get_power_profile(const struct dc_state *context);SR (DCHUBBUB_MEM_PWR_MODE_CTRL ), \SR (DCHUBBUB_TIMEOUT_DETECTION_CTRL1 ), \SR (DCHUBBUB_TIMEOUT_DETECTION_CTRL2 ), \ -SR (DCHUBBUB_CTRL_STATUS ) +SR (DCHUBBUB_CTRL_STATUS ), \ +SR (DCHUBBUB_ARB_MALL_CNTL )/* DCCG */
--
2.55.0
PATCH 21/80 drm/amd/display: Fix indenting of dpms on
In reply to George ZhangFrom: Dominik Kaszewski <[email protected]>
[Why & How]
Cleanup for future refactors.
--- .../gpu/drm/amd/display/dc/link/link_dpms.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
drivers/gpu/drm/amd/display/dc/link/link_dpms.c +9 -9
@@ -2610,13 +2610,14 @@ void link_set_dpms_on(*/ if (stream->timing.flags.DSC) {if (dc_is_dp_signal (stream->signal) || -dc_is_virtual_signal (stream->signal)) +dc_is_virtual_signal (stream->signal))link_set_dsc_enable (pipe_ctx, true); }if (link->replay_settings.config.replay_supported && !dc_is_embedded_signal (link->connector_signal))dp_setup_replay (link, stream); +// TODO: Split DPMS-on into 3 functions at this point status =enable_link (state, pipe_ctx);if (status !=DC_OK ) {
@@ -2629,9 +2630,9 @@ void link_set_dpms_on(* show the stream anyway. But MST displays can't proceed * without link training. */ -if ((status !=DC_FAIL_DP_LINK_TRAINING && - status !=DC_FAIL_HDMI_FRL_LINK_TRAINING ) || - stream->signal ==SIGNAL_TYPE_DISPLAY_PORT_MST ) { +if ((status !=DC_FAIL_DP_LINK_TRAINING && + status !=DC_FAIL_HDMI_FRL_LINK_TRAINING ) || + stream->signal ==SIGNAL_TYPE_DISPLAY_PORT_MST ) {if (false == link->link_status.link_active)disable_link (link, &pipe_ctx->link_res, stream->signal);
@@ -2639,6 +2640,7 @@ void link_set_dpms_on(return ; } } +// TODO: Split DPMS-on into 3 functions at this point if (stream->timing.flags.DSC &&dc_is_hdmi_frl_signal (stream->signal))//TODO: bring HDMI FRL in line with DP
@@ -2657,13 +2659,11 @@ void link_set_dpms_on(if (!(dc_is_virtual_signal (stream->signal) ||dc_is_hdmi_frl_signal (stream->signal) ||dp_is_128b_132b_signal (pipe_ctx))) { - -if (link_enc) - link_enc->funcs->setup ( +if (link_enc) + link_enc->funcs->setup ( link_enc, stream->signal); - - } + } dc->hwss.enable_stream (pipe_ctx);
--
2.55.0
PATCH 22/80 drm/amd/display: ensure dtbclk clk_src selected before hdmistream_clk_en
In reply to George ZhangFrom: Charlene Liu <[email protected]>
[why]
correct a sequence issue by switching to dcn35's dccg sequence:
to make sure select dtbclk src first before programming hdmistream_clk_en.
--- drivers/gpu/drm/amd/display/dc/dccg/dcn35/dcn35_dccg.c | 2 +- drivers/gpu/drm/amd/display/dc/dccg/dcn35/dcn35_dccg.h | 5 ++++- drivers/gpu/drm/amd/display/dc/dccg/dcn42/dcn42_dccg.c | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/display/dc/dccg/dcn35/dcn35_dccg.c +1 -1
@@ -1654,7 +1654,7 @@ void dccg35_set_dpstreamclk_root_clock_gating(struct dccg *dccg, int dp_hpo_inst -static void dccg35_set_hdmistreamclk ( +void dccg35_set_hdmistreamclk (struct dccg *dccg,enum streamclk_source src,uint32_t otg_inst)
drivers/gpu/drm/amd/display/dc/dccg/dcn35/dcn35_dccg.h +4 -1
@@ -269,5 +269,8 @@ void dccg35_disable_dscclk(struct dccg *dccg, int inst);void dccg35_enable_symclk_se (struct dccg *dccg,uint32_t stream_enc_inst,uint32_t link_enc_inst);void dccg35_disable_symclk_se (struct dccg *dccg,uint32_t stream_enc_inst,uint32_t link_enc_inst); - +void dccg35_set_hdmistreamclk ( +struct dccg *dccg, +enum streamclk_source src, +uint32_t otg_inst);#endif //__DCN35_DCCG_H__
drivers/gpu/drm/amd/display/dc/dccg/dcn42/dcn42_dccg.c +1 -1
@@ -313,7 +313,7 @@ static void dccg42_init(struct dccg *dccg)static const struct dccg_funcs dccg42_funcs = { .enable_hdmicharclk = dccg401_enable_hdmicharclk, .disable_hdmicharclk = dccg42_disable_hdmicharclk, - .set_hdmistreamclk = dccg401_set_hdmistreamclk, + .set_hdmistreamclk = dccg35_set_hdmistreamclk, .set_hdmistreamclk_root_clock_gating = dccg35_set_hdmistreamclk_root_clock_gating, .update_dpp_dto = dccg35_update_dpp_dto, .dpp_root_clock_control = dccg35_dpp_root_clock_control,
--
2.55.0
PATCH 23/80 drm/amd/display: Re-evaluate cursor mode on plane position/size change
In reply to George ZhangFrom: James Lin <[email protected]>
[Why]dm_crtc_get_cursor_mode() only re-evaluates the required cursor mode (native vs overlay) when a top plane changes its scale, pixel format, enable state, or zpos/color pipeline. It does not re-evaluate when a plane changes only its destination rectangle (crtc_x, crtc_y, crtc_w, crtc_h) at a constant scale. A pure move/resize can create or remove a hole under the cursor, which changes whether the native cursor is valid. When a primary plane shrinks and no longer covers the cursor region, the cursor mode stays NATIVE and the cursor is not rendered over the uncovered area, so it becomes invisible there. This is caught by igt@amdgpu/amd_cursor_overlay@non-full, where the test CRC was a constant black value across all cursor positions instead of tracking the reference.
[How]
In the per-plane loop of dm_crtc_get_cursor_mode(), set consider_mode_change when any of crtc_x, crtc_y, crtc_w or crtc_h differs between the old and new plane state, so a plane move/resize forces re-evaluation of the cursor mode. The driver then correctly promotes the cursor to OVERLAY mode when the primary stops covering the cursor region.
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +14 -0
@@ -6647,6 +6647,20 @@ static int dm_crtc_get_cursor_mode(struct amdgpu_device *adev,break ; } +/* +* A plane moving or resizing (without a scale change) changes how +* much of the CRTC it covers. This can create/remove holes under +* the cursor and thus flip the required cursor mode (native vs +* overlay), so the destination rect must be re-evaluated too. +*/ +if (old_plane_state->crtc_x != plane_state->crtc_x || + old_plane_state->crtc_y != plane_state->crtc_y || + old_plane_state->crtc_w != plane_state->crtc_w || + old_plane_state->crtc_h != plane_state->crtc_h) { + consider_mode_change = true; +break ; + } +if (dm_plane_color_pipeline_active (state, plane, true) !=dm_plane_color_pipeline_active (state, plane, false)) { consider_mode_change = true;
--
2.55.0
PATCH 24/80 drm/amd/display: Test EDID and ACPI/VBIOS readers
In reply to George ZhangFrom: Alex Hung <[email protected]>
[WHAT]
Add KUnit coverage for the EDID parsing helpers edid_extract_panel_id, apply_edid_quirks and dm_helpers_parse_edid_caps, together with the ACPI/VBIOS EDID readers dm_helpers_probe_acpi_edid, dm_helpers_read_acpi_edid and dm_helpers_read_vbios_hardcoded_edid.
--- .../amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 27 +- .../amd/display/amdgpu_dm/amdgpu_dm_helpers.h | 19 + .../amdgpu_dm/tests/amdgpu_dm_helpers_test.c | 727 ++++++++++++++++++ 3 files changed, 769 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +23 -4
@@ -98,7 +98,7 @@ STATIC_IFN_KUNIT u32 edid_extract_panel_id(struct edid *edid) }EXPORT_IF_KUNIT (edid_extract_panel_id); -static void apply_edid_quirks (struct dc_link *link,struct edid *edid, +STATIC_IFN_KUNIT void apply_edid_quirks(struct dc_link *link, struct edid *edid,struct dc_edid_caps *edid_caps) {struct amdgpu_dm_connector *aconnector = link->priv;
@@ -141,6 +141,7 @@ static void apply_edid_quirks(struct dc_link *link, struct edid *edid,return ; } } +EXPORT_IF_KUNIT (apply_edid_quirks);/** * dm_helpers_parse_edid_caps() - Parse edid caps
@@ -237,6 +238,7 @@ enum dc_edid_status dm_helpers_parse_edid_caps(return result; } +EXPORT_IF_KUNIT (dm_helpers_parse_edid_caps); static void fill_dc_mst_payload_table_from_drm(struct dc_link *link,
@@ -979,6 +981,20 @@ bool dm_helpers_dp_write_dsc_enable(return ret; } +#if IS_ENABLED (CONFIG_DRM_AMD_DC_KUNIT_TEST ) +uint dm_helpers_get_dc_debug_mask (void ) +{ +return amdgpu_dc_debug_mask; +} +EXPORT_IF_KUNIT (dm_helpers_get_dc_debug_mask); + +void dm_helpers_set_dc_debug_mask (uint debug_mask) +{ + amdgpu_dc_debug_mask = debug_mask; +} +EXPORT_IF_KUNIT (dm_helpers_set_dc_debug_mask); +#endif +bool dm_helpers_dp_write_hblank_reduction (struct dc_context *ctx,const struct dc_stream_state *stream) {// TODO
@@ -1002,7 +1018,7 @@ bool dm_helpers_is_dp_sink_present(struct dc_link *link)return dp_sink_present; } -static int +STATIC_IFN_KUNIT intdm_helpers_probe_acpi_edid (void *data,u8 *buf,unsigned int block,size_t len) {struct drm_connector *connector = data;
@@ -1040,8 +1056,9 @@ dm_helpers_probe_acpi_edid(void *data, u8 *buf, unsigned int block, size_t len)return r; } +EXPORT_IF_KUNIT (dm_helpers_probe_acpi_edid); -static const struct drm_edid * +STATIC_IFN_KUNIT const struct drm_edid *dm_helpers_read_acpi_edid (struct amdgpu_dm_connector *aconnector) {struct drm_connector *connector = &aconnector->base;
@@ -1062,8 +1079,9 @@ dm_helpers_read_acpi_edid(struct amdgpu_dm_connector *aconnector)return drm_edid_read_custom (connector, dm_helpers_probe_acpi_edid, connector); } +EXPORT_IF_KUNIT (dm_helpers_read_acpi_edid); -static const struct drm_edid * +STATIC_IFN_KUNIT const struct drm_edid *dm_helpers_read_vbios_hardcoded_edid (struct dc_link *link,struct amdgpu_dm_connector *aconnector) {struct dc_bios *bios = link->ctx->dc_bios;
@@ -1101,6 +1119,7 @@ dm_helpers_read_vbios_hardcoded_edid(struct dc_link *link, struct amdgpu_dm_connreturn edid; } +EXPORT_IF_KUNIT (dm_helpers_read_vbios_hardcoded_edid); STATIC_IFN_KUNIT uint8_t get_max_frl_rate(uint8_t max_lanes, uint8_t max_rate_per_lane) {
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.h +19 -0
@@ -9,12 +9,31 @@#if IS_ENABLED (CONFIG_DRM_AMD_DC_KUNIT_TEST )#include <drm/drm_edid.h> +struct amdgpu_dm_connector ; +struct dc_link ; +struct dc_context ; +struct dc_stream_state ; +struct dc_edid_caps ; +struct dc_dp_mst_stream_allocation_table ; +struct drm_dp_aux ; +struct drm_dp_mst_atomic_payload ; +struct drm_dp_mst_topology_mgr ; +struct drm_dp_mst_topology_state ; +/* Exported for KUnit testing */ u32 edid_extract_panel_id (struct edid *edid); +void apply_edid_quirks (struct dc_link *link,struct edid *edid, +struct dc_edid_caps *edid_caps);uint8_t get_max_frl_rate (uint8_t max_lanes,uint8_t max_rate_per_lane);bool dm_is_freesync_pcon_whitelist (const uint32_t branch_dev_id);extern const uint32_t dm_freesync_pcon_whitelist[];uint32_t dm_freesync_pcon_whitelist_count (void ); +uint dm_helpers_get_dc_debug_mask (void ); +void dm_helpers_set_dc_debug_mask (uint debug_mask); +int dm_helpers_probe_acpi_edid (void *data,u8 *buf,unsigned int block,size_t len); +const struct drm_edid *dm_helpers_read_acpi_edid (struct amdgpu_dm_connector *aconnector); +const struct drm_edid *dm_helpers_read_vbios_hardcoded_edid (struct dc_link *link, +struct amdgpu_dm_connector *aconnector);#endif /* CONFIG_DRM_AMD_DC_KUNIT_TEST */ #endif /* __AMDGPU_DM_HELPERS_H__ */
drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_helpers_test.c +727 -0
752 lines not on this page · raw message
--
2.55.0
PATCH 25/80 drm/amd/display: Test DPCD AUX and Synaptics helpers
In reply to George ZhangFrom: Alex Hung <[email protected]>
[WHAT]
Add KUnit coverage for DTN logging, DPCD read/write, fused IO and the Synaptics DSC workaround helpers execute_synaptics_rc_command, apply_synaptics_fifo_reset_wa, write_dsc_enable_synaptics_non_virtual_dpcd_mst and dm_helpers_dp_write_dsc_enable.
--- .../amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 11 +- .../amd/display/amdgpu_dm/amdgpu_dm_helpers.h | 13 + .../amdgpu_dm/tests/amdgpu_dm_helpers_test.c | 485 ++++++++++++++++++ 3 files changed, 506 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +8 -3
@@ -719,8 +719,9 @@ bool dm_helpers_execute_fused_io(return amdgpu_dm_execute_fused_io (dev, link, commands, count, timeout_us); } +EXPORT_IF_KUNIT (dm_helpers_execute_fused_io); -static bool execute_synaptics_rc_command(struct drm_dp_aux *aux, +STATIC_IFN_KUNIT bool execute_synaptics_rc_command(struct drm_dp_aux *aux, bool is_write_cmd, unsigned char cmd, unsigned int length,
@@ -792,8 +793,9 @@ static bool execute_synaptics_rc_command(struct drm_dp_aux *aux,DRM_ERROR ("%s: write cmd ..., err = %d\n" , __func__, ret);return false; } +EXPORT_IF_KUNIT (execute_synaptics_rc_command); -static void apply_synaptics_fifo_reset_wa (struct drm_dp_aux *aux) +STATIC_IFN_KUNIT void apply_synaptics_fifo_reset_wa(struct drm_dp_aux *aux) {unsigned char data[16 ] = {0 };
@@ -857,11 +859,12 @@ static void apply_synaptics_fifo_reset_wa(struct drm_dp_aux *aux)drm_dbg_dp (aux->drm_dev,"Done\n" ); } +EXPORT_IF_KUNIT (apply_synaptics_fifo_reset_wa);/* MST Dock */ static const uint8_t SYNAPTICS_DEVICE_ID [] ="SYNA" ; -static uint8_t write_dsc_enable_synaptics_non_virtual_dpcd_mst ( +STATIC_IFN_KUNIT uint8_t write_dsc_enable_synaptics_non_virtual_dpcd_mst(struct drm_dp_aux *aux,const struct dc_stream_state *stream,bool enable)
@@ -897,6 +900,7 @@ static uint8_t write_dsc_enable_synaptics_non_virtual_dpcd_mst(return ret; } +EXPORT_IF_KUNIT (write_dsc_enable_synaptics_non_virtual_dpcd_mst); bool dm_helpers_dp_write_dsc_enable( struct dc_context *ctx,
@@ -980,6 +984,7 @@ bool dm_helpers_dp_write_dsc_enable(return ret; } +EXPORT_IF_KUNIT (dm_helpers_dp_write_dsc_enable);#if IS_ENABLED (CONFIG_DRM_AMD_DC_KUNIT_TEST )uint dm_helpers_get_dc_debug_mask (void )
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.h +13 -0
@@ -28,12 +28,25 @@ uint8_t get_max_frl_rate(uint8_t max_lanes, uint8_t max_rate_per_lane);bool dm_is_freesync_pcon_whitelist (const uint32_t branch_dev_id);extern const uint32_t dm_freesync_pcon_whitelist[];uint32_t dm_freesync_pcon_whitelist_count (void ); +bool dm_helpers_dp_write_dsc_enable (struct dc_context *ctx, +const struct dc_stream_state *stream, +bool enable);uint dm_helpers_get_dc_debug_mask (void );void dm_helpers_set_dc_debug_mask (uint debug_mask);int dm_helpers_probe_acpi_edid (void *data,u8 *buf,unsigned int block,size_t len);const struct drm_edid *dm_helpers_read_acpi_edid (struct amdgpu_dm_connector *aconnector);const struct drm_edid *dm_helpers_read_vbios_hardcoded_edid (struct dc_link *link,struct amdgpu_dm_connector *aconnector); +bool execute_synaptics_rc_command (struct drm_dp_aux *aux, +bool is_write_cmd, +unsigned char cmd, +unsigned int length, +unsigned int offset, +unsigned char *data); +void apply_synaptics_fifo_reset_wa (struct drm_dp_aux *aux); +uint8_t write_dsc_enable_synaptics_non_virtual_dpcd_mst (struct drm_dp_aux *aux, +const struct dc_stream_state *stream, +bool enable);#endif /* CONFIG_DRM_AMD_DC_KUNIT_TEST */ #endif /* __AMDGPU_DM_HELPERS_H__ */
drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_helpers_test.c +485 -0
497 lines not on this page · raw message
--
2.55.0
PATCH 26/80 drm/amd/display: Test MST start/stop and panel settings
In reply to George ZhangFrom: Alex Hung <[email protected]>
[WHAT]
Add KUnit coverage for dm_helpers_dp_mst_start_top_mgr and dm_helpers_dp_mst_stop_top_mgr, dm_helpers_dp_write_hblank_reduction, get_dsc_max_slices, dm_helpers_init_panel_settings, dm_helpers_override_panel_settings and fill_dc_mst_payload_table_from_drm.
--- .../amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 8 +- .../amd/display/amdgpu_dm/amdgpu_dm_helpers.h | 5 + .../amdgpu_dm/tests/amdgpu_dm_helpers_test.c | 295 ++++++++++++++++++ 3 files changed, 306 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +6 -2
@@ -240,7 +240,7 @@ enum dc_edid_status dm_helpers_parse_edid_caps( }EXPORT_IF_KUNIT (dm_helpers_parse_edid_caps); -static void +STATIC_IFN_KUNIT void fill_dc_mst_payload_table_from_drm(struct dc_link *link, bool enable, struct drm_dp_mst_atomic_payload *target_payload,
@@ -290,6 +290,7 @@ fill_dc_mst_payload_table_from_drm(struct dc_link *link,/* Overwrite the old table */ *table = new_table; } +EXPORT_IF_KUNIT (fill_dc_mst_payload_table_from_drm); void dm_helpers_dp_update_branch_info( struct dc_context *ctx,
@@ -1149,7 +1150,7 @@ STATIC_IFN_KUNIT uint8_t get_max_frl_rate(uint8_t max_lanes, uint8_t max_rate_pe }EXPORT_IF_KUNIT (get_max_frl_rate); -static uint8_t get_dsc_max_slices (uint8_t max_slices,int clk_per_slice) +STATIC_IFN_KUNIT uint8_t get_dsc_max_slices(uint8_t max_slices, int clk_per_slice) {uint8_t dsc_max_slices;
@@ -1172,6 +1173,7 @@ static uint8_t get_dsc_max_slices(uint8_t max_slices, int clk_per_slice)return dsc_max_slices; } +EXPORT_IF_KUNIT (get_dsc_max_slices);void populate_hdmi_info_from_connector (bool enable_frl,struct drm_hdmi_info *hdmi,struct dc_edid_caps *edid_caps) {
@@ -1354,6 +1356,7 @@ void dm_helpers_init_panel_settings( panel_config->dsc.disable_dsc_edp = false; panel_config->dsc.force_dsc_edp_policy =0 ; } +EXPORT_IF_KUNIT (dm_helpers_init_panel_settings); void dm_helpers_override_panel_settings( struct dc_context *ctx,
@@ -1371,6 +1374,7 @@ void dm_helpers_override_panel_settings( link->panel_config.psr.disallow_replay = true; } } +EXPORT_IF_KUNIT (dm_helpers_override_panel_settings); void *dm_helpers_allocate_gpu_mem( struct dc_context *ctx,
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.h +5 -0
@@ -25,9 +25,14 @@ u32 edid_extract_panel_id(struct edid *edid);void apply_edid_quirks (struct dc_link *link,struct edid *edid,struct dc_edid_caps *edid_caps);uint8_t get_max_frl_rate (uint8_t max_lanes,uint8_t max_rate_per_lane); +uint8_t get_dsc_max_slices (uint8_t max_slices,int clk_per_slice);bool dm_is_freesync_pcon_whitelist (const uint32_t branch_dev_id);extern const uint32_t dm_freesync_pcon_whitelist[];uint32_t dm_freesync_pcon_whitelist_count (void ); +void fill_dc_mst_payload_table_from_drm (struct dc_link *link, +bool enable, +struct drm_dp_mst_atomic_payload *target_payload, +struct dc_dp_mst_stream_allocation_table *table);bool dm_helpers_dp_write_dsc_enable (struct dc_context *ctx,const struct dc_stream_state *stream,bool enable);
drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_helpers_test.c +295 -0
307 lines not on this page · raw message
--
2.55.0
PATCH 27/80 drm/amd/display: Test I2C, stubs and MST early returns
In reply to George ZhangFrom: Alex Hung <[email protected]>
[WHAT]
Add KUnit coverage for dm_helpers_submit_i2c, dm_helper_dmub_aux_transfer_sync, the empty stub helpers, the MST null-connector early returns, dm_helpers_dmub_outbox_interrupt_control, dm_helpers_mst_enable_stream_features and dm_helpers_enable_periodic_detection.
--- .../amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 18 + .../amdgpu_dm/tests/amdgpu_dm_helpers_test.c | 541 ++++++++++++++++++ 2 files changed, 559 insertions(+)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +18 -0
@@ -296,6 +296,7 @@ void dm_helpers_dp_update_branch_info(struct dc_context *ctx, const struct dc_link *link) {} +EXPORT_IF_KUNIT (dm_helpers_dp_update_branch_info ); static void dm_helpers_construct_old_payload( struct drm_dp_mst_topology_mgr *mgr,
@@ -380,6 +381,7 @@ bool dm_helpers_dp_mst_write_payload_allocation_table(return true; } +EXPORT_IF_KUNIT (dm_helpers_dp_mst_write_payload_allocation_table);/* * poll pending down reply
@@ -388,6 +390,7 @@ void dm_helpers_dp_mst_poll_pending_down_reply(struct dc_context *ctx, const struct dc_link *link) {} +EXPORT_IF_KUNIT (dm_helpers_dp_mst_poll_pending_down_reply );/* * Clear payload allocation table before enable MST DP link.
@@ -396,6 +399,7 @@ void dm_helpers_dp_mst_clear_payload_allocation_table(struct dc_context *ctx, const struct dc_link *link) {} +EXPORT_IF_KUNIT (dm_helpers_dp_mst_clear_payload_allocation_table );/* * Polls for ACT (allocation change trigger) handled and sends
@@ -426,6 +430,7 @@ enum act_return_status dm_helpers_dp_mst_poll_for_allocation_change_trigger(return ACT_SUCCESS ; } +EXPORT_IF_KUNIT (dm_helpers_dp_mst_poll_for_allocation_change_trigger); void dm_helpers_dp_mst_send_payload_allocation( struct dc_context *ctx,
@@ -460,6 +465,7 @@ void dm_helpers_dp_mst_send_payload_allocation( clr_flag, false); } } +EXPORT_IF_KUNIT (dm_helpers_dp_mst_send_payload_allocation); void dm_helpers_dp_mst_update_mst_mgr_for_deallocation( struct dc_context *ctx,
@@ -488,6 +494,7 @@ void dm_helpers_dp_mst_update_mst_mgr_for_deallocation(amdgpu_dm_set_mst_status (&aconnector->mst_status, set_flag, true);amdgpu_dm_set_mst_status (&aconnector->mst_status, clr_flag, false); } +EXPORT_IF_KUNIT (dm_helpers_dp_mst_update_mst_mgr_for_deallocation);void dm_dtn_log_begin (struct dc_context *ctx,struct dc_log_buffer_ctx *log_ctx)
@@ -707,6 +714,7 @@ bool dm_helpers_submit_i2c(return result; } +EXPORT_IF_KUNIT (dm_helpers_submit_i2c); bool dm_helpers_execute_fused_io( struct dc_context *ctx,
@@ -1023,6 +1031,7 @@ bool dm_helpers_is_dp_sink_present(struct dc_link *link)mutex_unlock (&aconnector->dm_dp_aux.aux.hw_mutex);return dp_sink_present; } +EXPORT_IF_KUNIT (dm_helpers_is_dp_sink_present); STATIC_IFN_KUNIT intdm_helpers_probe_acpi_edid (void *data,u8 *buf,unsigned int block,size_t len)
@@ -1312,6 +1321,7 @@ int dm_helper_dmub_aux_transfer_sync(return amdgpu_dm_process_dmub_aux_transfer_sync (ctx, link->link_index, payload, operation_result); } +EXPORT_IF_KUNIT (dm_helper_dmub_aux_transfer_sync); int dm_helpers_dmub_set_config_sync(struct dc_context *ctx, const struct dc_link *link,
@@ -1326,18 +1336,21 @@ void dm_set_dcn_clocks(struct dc_context *ctx, struct dc_clocks *clks) {/* TODO: something */ } +EXPORT_IF_KUNIT (dm_set_dcn_clocks);void dm_helpers_dmu_timeout (struct dc_context *ctx) {// TODO: //amdgpu_device_gpu_recover(dc_context->driver-context, NULL); } +EXPORT_IF_KUNIT (dm_helpers_dmu_timeout);void dm_helpers_smu_timeout (struct dc_context *ctx,unsigned int msg_id,unsigned int param,unsigned int timeout_us) {// TODO: //amdgpu_device_gpu_recover(dc_context->driver-context, NULL); } +EXPORT_IF_KUNIT (dm_helpers_smu_timeout); void dm_helpers_init_panel_settings( struct dc_context *ctx,
@@ -1410,6 +1423,7 @@ bool dm_helpers_dmub_outbox_interrupt_control(struct dc_context *ctx, bool enabl enable ? "en" : "dis", ret);return ret; } +EXPORT_IF_KUNIT (dm_helpers_dmub_outbox_interrupt_control);void dm_helpers_mst_enable_stream_features (const struct dc_stream_state *stream) {
@@ -1435,6 +1449,7 @@ void dm_helpers_mst_enable_stream_features(const struct dc_stream_state *stream) &new_downspread.raw, sizeof(new_downspread)); } +EXPORT_IF_KUNIT (dm_helpers_mst_enable_stream_features); bool dm_helpers_dp_handle_test_pattern_request( struct dc_context *ctx,
@@ -1578,6 +1593,7 @@ void dm_set_phyd32clk(struct dc_context *ctx, int freq_khz) {// TODO } +EXPORT_IF_KUNIT (dm_set_phyd32clk);void dm_helpers_enable_periodic_detection (struct dc_context *ctx,bool enable) {
@@ -1589,6 +1605,7 @@ void dm_helpers_enable_periodic_detection(struct dc_context *ctx, bool enable)schedule_work (&adev->dm.idle_workqueue->work); } } +EXPORT_IF_KUNIT (dm_helpers_enable_periodic_detection); void dm_helpers_dp_mst_update_branch_bandwidth( struct dc_context *ctx,
@@ -1596,6 +1613,7 @@ void dm_helpers_dp_mst_update_branch_bandwidth( {// TODO } +EXPORT_IF_KUNIT (dm_helpers_dp_mst_update_branch_bandwidth); STATIC_IFN_KUNIT const uint32_t dm_freesync_pcon_whitelist[] = {DP_BRANCH_DEVICE_ID_0060AD ,
drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_helpers_test.c +541 -0
559 lines not on this page · raw message
--
2.55.0
PATCH 28/80 drm/amd/display: Test MCCS FreeSync VCP helpers
In reply to George ZhangFrom: Alex Hung <[email protected]>
[WHAT]
Add KUnit coverage for dm_helpers_read_mccs_caps and dm_helpers_mccs_vcp_set, including the DP/HDMI/legacy-PCON selection, the i2c VCP request and set packets and the retry-failure paths.
--- .../amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 2 + .../amdgpu_dm/tests/amdgpu_dm_helpers_test.c | 419 ++++++++++++++++++ 2 files changed, 421 insertions(+)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +2 -0
@@ -1800,6 +1800,7 @@ void dm_helpers_read_mccs_caps(struct dc_context *ctx, struct dc_link *link, } } } +EXPORT_IF_KUNIT (dm_helpers_read_mccs_caps);static int mccs_operation_vcp_set (unsigned int vcp_code,struct dc_link *link,uint16_t value) {
@@ -1874,4 +1875,5 @@ void dm_helpers_mccs_vcp_set(struct dc_context *ctx, struct dc_link *link,drm_dbg_driver (dev,"%s: Failed to set VCP code %d" , __func__, sink->edid_caps.freesync_vcp_code); } +EXPORT_IF_KUNIT (dm_helpers_mccs_vcp_set);
drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_helpers_test.c +419 -0
437 lines not on this page · raw message
--
2.55.0
PATCH 29/80 drm/amd/display: Test MST payload and DSC enable helpers
In reply to George ZhangFrom: Alex Hung <[email protected]>
[WHAT]
Add KUnit coverage for dm_helpers_construct_old_payload, the DP MST payload allocation, poll-for-ACT and deallocation success paths, the full dm_helpers_dp_write_dsc_enable matrix and dm_helpers_dp_handle_test_pattern_request.
--- .../amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 4 +- .../amd/display/amdgpu_dm/amdgpu_dm_helpers.h | 4 + .../amdgpu_dm/tests/amdgpu_dm_helpers_test.c | 806 ++++++++++++++++++ 3 files changed, 813 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +3 -1
@@ -298,7 +298,7 @@ void dm_helpers_dp_update_branch_info( {}EXPORT_IF_KUNIT (dm_helpers_dp_update_branch_info); -static void dm_helpers_construct_old_payload( +STATIC_IFN_KUNIT void dm_helpers_construct_old_payload( struct drm_dp_mst_topology_mgr *mgr, struct drm_dp_mst_topology_state *mst_state, struct drm_dp_mst_atomic_payload *new_payload,
@@ -329,6 +329,7 @@ static void dm_helpers_construct_old_payload( old_payload->time_slots = allocated_time_slots; old_payload->pbn = allocated_time_slots * pbn_per_slot; } +EXPORT_IF_KUNIT (dm_helpers_construct_old_payload);/* * Writes payload allocation table in immediate downstream device.
@@ -1588,6 +1589,7 @@ bool dm_helpers_dp_handle_test_pattern_request(return false; } +EXPORT_IF_KUNIT (dm_helpers_dp_handle_test_pattern_request);void dm_set_phyd32clk (struct dc_context *ctx,int freq_khz) {
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.h +4 -0
@@ -33,6 +33,10 @@ void fill_dc_mst_payload_table_from_drm(struct dc_link *link,bool enable, struct drm_dp_mst_atomic_payload *target_payload, struct dc_dp_mst_stream_allocation_table *table); +void dm_helpers_construct_old_payload (struct drm_dp_mst_topology_mgr *mgr, +struct drm_dp_mst_topology_state *mst_state, +struct drm_dp_mst_atomic_payload *new_payload, +struct drm_dp_mst_atomic_payload *old_payload);bool dm_helpers_dp_write_dsc_enable (struct dc_context *ctx,const struct dc_stream_state *stream,bool enable);
drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_helpers_test.c +806 -0
836 lines not on this page · raw message
--
2.55.0
PATCH 30/80 drm/amd/display: Test irq funcs/suspend/workqueue
In reply to George ZhangFrom: Alex Hung <[email protected]>
[WHAT]
Expand the amdgpu_dm_irq KUnit suite with the first batch of tests covering IRQ source-function setup, suspend/resume of the IRQ clients, and the HPD RX offload workqueue lifecycle.
--- .../drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c | 7 + .../amdgpu_dm/tests/amdgpu_dm_irq_test.c | 353 ++++++++++++++++++ 2 files changed, 360 insertions(+)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c +7 -0
@@ -537,6 +537,7 @@ void amdgpu_dm_irq_suspend(struct amdgpu_device *adev)if (dev->mode_config.poll_enabled)drm_kms_helper_poll_disable (dev); } +EXPORT_IF_KUNIT (amdgpu_dm_irq_suspend);void amdgpu_dm_irq_resume_early (struct amdgpu_device *adev) {
@@ -558,6 +559,7 @@ void amdgpu_dm_irq_resume_early(struct amdgpu_device *adev)DM_IRQ_TABLE_UNLOCK (adev, irq_table_flags); } +EXPORT_IF_KUNIT (amdgpu_dm_irq_resume_early);void amdgpu_dm_irq_resume_late (struct amdgpu_device *adev) {
@@ -586,6 +588,7 @@ void amdgpu_dm_irq_resume_late(struct amdgpu_device *adev)if (dev->mode_config.poll_enabled)drm_kms_helper_poll_enable (dev); } +EXPORT_IF_KUNIT (amdgpu_dm_irq_resume_late);/* * amdgpu_dm_irq_schedule_work - schedule all work items registered for the
@@ -900,6 +903,8 @@ void amdgpu_dm_set_irq_funcs(struct amdgpu_device *adev) adev->hpd_irq.num_types = adev->mode_info.num_hpd; adev->hpd_irq.funcs = &dm_hpd_irq_funcs; } +EXPORT_IF_KUNIT (amdgpu_dm_set_irq_funcs); +void amdgpu_dm_outbox_init (struct amdgpu_device *adev) { dc_interrupt_set(adev->dm.dc,
@@ -1187,6 +1192,7 @@ struct hpd_rx_irq_offload_work_queue *amdgpu_dm_hpd_rx_irq_create_workqueue(strukfree (hpd_rx_offload_wq);return NULL ; } +EXPORT_IF_KUNIT (amdgpu_dm_hpd_rx_irq_create_workqueue);void amdgpu_dm_hpd_rx_irq_work_suspend (struct amdgpu_display_manager *dm) {
@@ -1197,6 +1203,7 @@ void amdgpu_dm_hpd_rx_irq_work_suspend(struct amdgpu_display_manager *dm)flush_workqueue (dm->hpd_rx_offload_wq[i].wq); } } +EXPORT_IF_KUNIT (amdgpu_dm_hpd_rx_irq_work_suspend); STATIC_IFN_KUNIT bool are_sinks_equal(const struct dc_sink *sink1, const struct dc_sink *sink2) {
drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_irq_test.c +353 -0
385 lines not on this page · raw message
--
2.55.0
PATCH 31/80 drm/amd/display: Test irq state setters and work
In reply to George ZhangFrom: Alex Hung <[email protected]>
[WHAT]
Add KUnit tests for the per-source IRQ state callbacks (HPD, pflip, CRTC, vline0, vupdate, dmub outbox/trace), the immediate and scheduled IRQ work paths, and amdgpu_dm_outbox_init.
--- .../drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c | 28 +- .../drm/amd/display/amdgpu_dm/amdgpu_dm_irq.h | 35 ++ .../amdgpu_dm/tests/amdgpu_dm_irq_test.c | 582 ++++++++++++++++++ 3 files changed, 636 insertions(+), 9 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c +19 -9
@@ -594,7 +594,7 @@ EXPORT_IF_KUNIT(amdgpu_dm_irq_resume_late);* amdgpu_dm_irq_schedule_work - schedule all work items registered for the * "irq_source". */ -static void amdgpu_dm_irq_schedule_work (struct amdgpu_device *adev, +STATIC_IFN_KUNIT void amdgpu_dm_irq_schedule_work(struct amdgpu_device *adev,enum dc_irq_source irq_source) {struct list_head *handler_list = &adev->dm.irq_handler_list_low_tab[irq_source];
@@ -643,12 +643,13 @@ static void amdgpu_dm_irq_schedule_work(struct amdgpu_device *adev, irq_source); } } +EXPORT_IF_KUNIT (amdgpu_dm_irq_schedule_work);/* * amdgpu_dm_irq_immediate_work * Callback high irq work immediately, don't send to work queue */ -static void amdgpu_dm_irq_immediate_work (struct amdgpu_device *adev, +STATIC_IFN_KUNIT void amdgpu_dm_irq_immediate_work(struct amdgpu_device *adev,enum dc_irq_source irq_source) {struct amdgpu_dm_irq_handler_data *handler_data;
@@ -667,6 +668,7 @@ static void amdgpu_dm_irq_immediate_work(struct amdgpu_device *adev,DM_IRQ_TABLE_UNLOCK (adev, irq_table_flags); } +EXPORT_IF_KUNIT (amdgpu_dm_irq_immediate_work);/** * amdgpu_dm_irq_handler - Generic DM IRQ handler
@@ -719,7 +721,7 @@ STATIC_IFN_KUNIT enum dc_irq_source amdgpu_dm_hpd_to_dal_irq_source(unsigned int }EXPORT_IF_KUNIT (amdgpu_dm_hpd_to_dal_irq_source); -static int amdgpu_dm_set_hpd_irq_state (struct amdgpu_device *adev, +STATIC_IFN_KUNIT int amdgpu_dm_set_hpd_irq_state(struct amdgpu_device *adev,struct amdgpu_irq_src *source,unsigned int type,enum amdgpu_interrupt_state state)
@@ -730,6 +732,7 @@ static int amdgpu_dm_set_hpd_irq_state(struct amdgpu_device *adev,dc_interrupt_set (adev->dm.dc, src, st);return 0 ; } +EXPORT_IF_KUNIT (amdgpu_dm_set_hpd_irq_state); static inline int dm_irq_state(struct amdgpu_device *adev, struct amdgpu_irq_src *source,
@@ -765,7 +768,7 @@ static inline int dm_irq_state(struct amdgpu_device *adev,return 0 ; } -static int amdgpu_dm_set_pflip_irq_state (struct amdgpu_device *adev, +STATIC_IFN_KUNIT int amdgpu_dm_set_pflip_irq_state(struct amdgpu_device *adev,struct amdgpu_irq_src *source,unsigned int crtc_id,enum amdgpu_interrupt_state state)
@@ -778,8 +781,9 @@ static int amdgpu_dm_set_pflip_irq_state(struct amdgpu_device *adev,IRQ_TYPE_PFLIP , __func__); } +EXPORT_IF_KUNIT (amdgpu_dm_set_pflip_irq_state); -static int amdgpu_dm_set_crtc_irq_state (struct amdgpu_device *adev, +STATIC_IFN_KUNIT int amdgpu_dm_set_crtc_irq_state(struct amdgpu_device *adev,struct amdgpu_irq_src *source,unsigned int crtc_id,enum amdgpu_interrupt_state state)
@@ -792,8 +796,9 @@ static int amdgpu_dm_set_crtc_irq_state(struct amdgpu_device *adev,IRQ_TYPE_VBLANK , __func__); } +EXPORT_IF_KUNIT (amdgpu_dm_set_crtc_irq_state); -static int amdgpu_dm_set_vline0_irq_state (struct amdgpu_device *adev, +STATIC_IFN_KUNIT int amdgpu_dm_set_vline0_irq_state(struct amdgpu_device *adev,struct amdgpu_irq_src *source,unsigned int crtc_id,enum amdgpu_interrupt_state state)
@@ -806,8 +811,9 @@ static int amdgpu_dm_set_vline0_irq_state(struct amdgpu_device *adev,IRQ_TYPE_VLINE0 , __func__); } +EXPORT_IF_KUNIT (amdgpu_dm_set_vline0_irq_state); -static int amdgpu_dm_set_dmub_outbox_irq_state (struct amdgpu_device *adev, +STATIC_IFN_KUNIT int amdgpu_dm_set_dmub_outbox_irq_state(struct amdgpu_device *adev,struct amdgpu_irq_src *source,unsigned int crtc_id,enum amdgpu_interrupt_state state)
@@ -818,8 +824,9 @@ static int amdgpu_dm_set_dmub_outbox_irq_state(struct amdgpu_device *adev,dc_interrupt_set (adev->dm.dc, irq_source, st);return 0 ; } +EXPORT_IF_KUNIT (amdgpu_dm_set_dmub_outbox_irq_state); -static int amdgpu_dm_set_vupdate_irq_state (struct amdgpu_device *adev, +STATIC_IFN_KUNIT int amdgpu_dm_set_vupdate_irq_state(struct amdgpu_device *adev,struct amdgpu_irq_src *source,unsigned int crtc_id,enum amdgpu_interrupt_state state)
@@ -832,8 +839,9 @@ static int amdgpu_dm_set_vupdate_irq_state(struct amdgpu_device *adev,IRQ_TYPE_VUPDATE , __func__); } +EXPORT_IF_KUNIT (amdgpu_dm_set_vupdate_irq_state); -static int amdgpu_dm_set_dmub_trace_irq_state (struct amdgpu_device *adev, +STATIC_IFN_KUNIT int amdgpu_dm_set_dmub_trace_irq_state(struct amdgpu_device *adev,struct amdgpu_irq_src *source,unsigned int type,enum amdgpu_interrupt_state state)
@@ -844,6 +852,7 @@ static int amdgpu_dm_set_dmub_trace_irq_state(struct amdgpu_device *adev,dc_interrupt_set (adev->dm.dc, irq_source, st);return 0 ; } +EXPORT_IF_KUNIT (amdgpu_dm_set_dmub_trace_irq_state);static const struct amdgpu_irq_src_funcs dm_crtc_irq_funcs = { .set = amdgpu_dm_set_crtc_irq_state,
@@ -911,6 +920,7 @@ void amdgpu_dm_outbox_init(struct amdgpu_device *adev)DC_IRQ_SOURCE_DMCUB_OUTBOX , true); } +EXPORT_IF_KUNIT (amdgpu_dm_outbox_init);/** * amdgpu_dm_hpd_init - hpd setup callback.
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.h +35 -0
@@ -123,9 +123,44 @@ int amdgpu_dm_dcn10_register_irq_handlers(struct amdgpu_device *adev);int amdgpu_dm_register_outbox_irq_handlers (struct amdgpu_device *adev);#if IS_ENABLED (CONFIG_DRM_AMD_DC_KUNIT_TEST ) +struct amdgpu_irq_src ; +enum amdgpu_interrupt_state ; +enum dc_irq_source amdgpu_dm_hpd_to_dal_irq_source (unsigned int type);bool are_sinks_equal (const struct dc_sink *sink1,const struct dc_sink *sink2);const char *dmub_notification_type_str (enum dmub_notification_type e); +int amdgpu_dm_set_hpd_irq_state (struct amdgpu_device *adev, +struct amdgpu_irq_src *source, +unsigned int type, +enum amdgpu_interrupt_state state); +int amdgpu_dm_set_dmub_outbox_irq_state (struct amdgpu_device *adev, +struct amdgpu_irq_src *source, +unsigned int crtc_id, +enum amdgpu_interrupt_state state); +int amdgpu_dm_set_dmub_trace_irq_state (struct amdgpu_device *adev, +struct amdgpu_irq_src *source, +unsigned int type, +enum amdgpu_interrupt_state state); +int amdgpu_dm_set_pflip_irq_state (struct amdgpu_device *adev, +struct amdgpu_irq_src *source, +unsigned int crtc_id, +enum amdgpu_interrupt_state state); +int amdgpu_dm_set_crtc_irq_state (struct amdgpu_device *adev, +struct amdgpu_irq_src *source, +unsigned int crtc_id, +enum amdgpu_interrupt_state state); +int amdgpu_dm_set_vline0_irq_state (struct amdgpu_device *adev, +struct amdgpu_irq_src *source, +unsigned int crtc_id, +enum amdgpu_interrupt_state state); +int amdgpu_dm_set_vupdate_irq_state (struct amdgpu_device *adev, +struct amdgpu_irq_src *source, +unsigned int crtc_id, +enum amdgpu_interrupt_state state); +void amdgpu_dm_irq_schedule_work (struct amdgpu_device *adev, +enum dc_irq_source irq_source); +void amdgpu_dm_irq_immediate_work (struct amdgpu_device *adev, +enum dc_irq_source irq_source);#endif #endif /* __AMDGPU_DM_IRQ_H__ */
drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_irq_test.c +582 -0
600 lines not on this page · raw message
--
2.55.0
PATCH 32/80 drm/amd/display: Test HPD init/fini
In reply to George ZhangFrom: Alex Hung <[email protected]>
Add KUnit coverage for amdgpu_dm_hpd_init() and amdgpu_dm_hpd_fini():
empty connector list, the per-connector HW fallback path, the analog polling enable/disable path, and the base-driver irq-ref path. Export both functions for KUnit and add shared drm_connector test helpers.
--- .../drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c | 2 + .../amdgpu_dm/tests/amdgpu_dm_irq_test.c | 187 +++++++++++++++++- 2 files changed, 183 insertions(+), 6 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c +2 -0
@@ -1003,6 +1003,7 @@ void amdgpu_dm_hpd_init(struct amdgpu_device *adev)if (use_polling)drm_kms_helper_poll_init (dev); } +EXPORT_IF_KUNIT (amdgpu_dm_hpd_init);/** * amdgpu_dm_hpd_fini - hpd tear down callback.
@@ -1056,6 +1057,7 @@ void amdgpu_dm_hpd_fini(struct amdgpu_device *adev)if (dev->mode_config.poll_enabled)drm_kms_helper_poll_fini (dev); } +EXPORT_IF_KUNIT (amdgpu_dm_hpd_fini);/* ========== HPD handling ========== */ static void force_connector_state(
drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_irq_test.c +181 -6
218 lines not on this page · raw message
--
2.55.0
PATCH 33/80 drm/amd/display: Test HPD interrupt handling
In reply to George ZhangFrom: Alex Hung <[email protected]>
Add KUnit coverage for the HPD interrupt-handling helpers: the HPD-RX offload worker, the HDMI HPD debounce worker, handle_hpd_irq_helper(), handle_hpd_irq(), schedule_hpd_rx_offload_work() and handle_hpd_rx_irq(). Expose these statics for KUnit and add the stub link-service callbacks, sink helpers and fixtures the tests rely on.
--- .../drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c | 16 +- .../drm/amd/display/amdgpu_dm/amdgpu_dm_irq.h | 8 + .../amdgpu_dm/tests/amdgpu_dm_irq_test.c | 930 ++++++++++++++++++ 3 files changed, 949 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c +11 -5
@@ -1075,7 +1075,7 @@ static void force_connector_state(mutex_unlock (&aconnector->hpd_lock); } -static void dm_handle_hpd_rx_offload_work (struct work_struct *work) +STATIC_IFN_KUNIT void dm_handle_hpd_rx_offload_work(struct work_struct *work) {struct hpd_rx_irq_offload_work *offload_work;struct amdgpu_dm_connector *aconnector;
@@ -1168,6 +1168,7 @@ static void dm_handle_hpd_rx_offload_work(struct work_struct *work)kfree (offload_work); } +EXPORT_IF_KUNIT (dm_handle_hpd_rx_offload_work);struct hpd_rx_irq_offload_work_queue *amdgpu_dm_hpd_rx_irq_create_workqueue (struct amdgpu_device *adev) {
@@ -1309,8 +1310,9 @@ void amdgpu_dm_hdmi_hpd_debounce_work(struct work_struct *work)dc_allow_idle_optimizations (dc, true); } } +EXPORT_IF_KUNIT (amdgpu_dm_hdmi_hpd_debounce_work); -static void handle_hpd_irq_helper (struct amdgpu_dm_connector *aconnector, +STATIC_IFN_KUNIT void handle_hpd_irq_helper(struct amdgpu_dm_connector *aconnector,enum dc_detect_reason reason) {struct drm_connector *connector = &aconnector->base;
@@ -1408,16 +1410,18 @@ static void handle_hpd_irq_helper(struct amdgpu_dm_connector *aconnector, } } } +EXPORT_IF_KUNIT (handle_hpd_irq_helper); -static void handle_hpd_irq (void *param) +STATIC_IFN_KUNIT void handle_hpd_irq(void *param) {struct amdgpu_dm_connector *aconnector = (struct amdgpu_dm_connector *)param;handle_hpd_irq_helper (aconnector,DETECT_REASON_HPD ); } +EXPORT_IF_KUNIT (handle_hpd_irq); -static void schedule_hpd_rx_offload_work (struct amdgpu_device *adev,struct hpd_rx_irq_offload_work_queue *offload_wq, +STATIC_IFN_KUNIT void schedule_hpd_rx_offload_work(struct amdgpu_device *adev, struct hpd_rx_irq_offload_work_queue *offload_wq,union hpd_irq_data hpd_irq_data) { struct hpd_rx_irq_offload_work *offload_work =
@@ -1436,8 +1440,9 @@ static void schedule_hpd_rx_offload_work(struct amdgpu_device *adev, struct hpd_queue_work (offload_wq->wq, &offload_work->work);drm_dbg_kms (adev_to_drm (adev),"queue work to handle hpd_rx offload work" ); } +EXPORT_IF_KUNIT (schedule_hpd_rx_offload_work); -static void handle_hpd_rx_irq (void *param) +STATIC_IFN_KUNIT void handle_hpd_rx_irq(void *param) {struct amdgpu_dm_connector *aconnector = (struct amdgpu_dm_connector *)param;struct drm_connector *connector = &aconnector->base;
@@ -1570,6 +1575,7 @@ static void handle_hpd_rx_irq(void *param)mutex_unlock (&aconnector->hpd_lock); } +EXPORT_IF_KUNIT (handle_hpd_rx_irq);/** * dmub_hpd_callback - DMUB HPD interrupt processing callback.
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.h +8 -0
@@ -161,6 +161,14 @@ void amdgpu_dm_irq_schedule_work(struct amdgpu_device *adev, enum dc_irq_source irq_source);void amdgpu_dm_irq_immediate_work (struct amdgpu_device *adev,enum dc_irq_source irq_source); +void dm_handle_hpd_rx_offload_work (struct work_struct *work); +void handle_hpd_irq_helper (struct amdgpu_dm_connector *aconnector, +enum dc_detect_reason reason); +void handle_hpd_irq (void *param); +void schedule_hpd_rx_offload_work (struct amdgpu_device *adev, +struct hpd_rx_irq_offload_work_queue *offload_wq, +union hpd_irq_data hpd_irq_data); +void handle_hpd_rx_irq (void *param);#endif #endif /* __AMDGPU_DM_IRQ_H__ */
drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_irq_test.c +930 -0
954 lines not on this page · raw message
--
2.55.0
PATCH 34/80 drm/amd/display: Test dmub HPD callbacks and handlers
In reply to George ZhangFrom: Alex Hung <[email protected]>
[WHAT]
Add KUnit tests for the DMUB HPD notification callbacks (dmub_hpd_callback, dmub_hpd_sense_callback) and for amdgpu_dm_register_hpd_handlers().
--- .../drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c | 7 +- .../drm/amd/display/amdgpu_dm/amdgpu_dm_irq.h | 4 + .../amdgpu_dm/tests/amdgpu_dm_irq_test.c | 418 ++++++++++++++++++ 3 files changed, 427 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c +5 -2
@@ -1585,7 +1585,7 @@ EXPORT_IF_KUNIT(handle_hpd_rx_irq);* Dmub Hpd interrupt processing callback. Gets displayindex through the * ink index and calls helper to do the processing. */ -static void dmub_hpd_callback (struct amdgpu_device *adev, +STATIC_IFN_KUNIT void dmub_hpd_callback(struct amdgpu_device *adev,struct dmub_notification *notify) {struct amdgpu_dm_connector *aconnector;
@@ -1651,6 +1651,7 @@ static void dmub_hpd_callback(struct amdgpu_device *adev, } } } +EXPORT_IF_KUNIT (dmub_hpd_callback);/** * dmub_hpd_sense_callback - DMUB HPD sense processing callback.
@@ -1660,11 +1661,12 @@ static void dmub_hpd_callback(struct amdgpu_device *adev,* HPD sense changes can occur during low power states and need to be * notified from firmware to driver. */ -static void dmub_hpd_sense_callback (struct amdgpu_device *adev, +STATIC_IFN_KUNIT void dmub_hpd_sense_callback(struct amdgpu_device *adev,struct dmub_notification *notify) {drm_dbg_driver (adev_to_drm (adev),"DMUB HPD SENSE callback.\n" ); } +EXPORT_IF_KUNIT (dmub_hpd_sense_callback);int amdgpu_dm_register_hpd_handlers (struct amdgpu_device *adev) {
@@ -1742,6 +1744,7 @@ int amdgpu_dm_register_hpd_handlers(struct amdgpu_device *adev) }return 0 ; } +EXPORT_IF_KUNIT (amdgpu_dm_register_hpd_handlers);/* ========== IRQ handlers ========== */ struct amdgpu_crtc *
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.h +4 -0
@@ -169,6 +169,10 @@ void schedule_hpd_rx_offload_work(struct amdgpu_device *adev,struct hpd_rx_irq_offload_work_queue *offload_wq, union hpd_irq_data hpd_irq_data);void handle_hpd_rx_irq (void *param); +void dmub_hpd_callback (struct amdgpu_device *adev, +struct dmub_notification *notify); +void dmub_hpd_sense_callback (struct amdgpu_device *adev, +struct dmub_notification *notify);#endif #endif /* __AMDGPU_DM_IRQ_H__ */
drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_irq_test.c +418 -0
430 lines not on this page · raw message
--
2.55.0
PATCH 35/80 drm/amd/display: Test high-IRQ and handler registration
In reply to George ZhangFrom: Alex Hung <[email protected]>
[WHAT]
Add the final batch of amdgpu_dm_irq KUnit tests covering the high-IRQ callbacks (dm_pflip_high_irq, dm_vupdate_high_irq, dm_crtc_high_irq), dm_handle_hpd_work, the DMUB outbox1 low IRQ, and the per-ASIC IRQ handler registration helpers (DCE110, DCN10 and outbox).
--- .../drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c | 18 +- .../drm/amd/display/amdgpu_dm/amdgpu_dm_irq.h | 5 + .../amdgpu_dm/tests/amdgpu_dm_irq_test.c | 606 ++++++++++++++++++ 3 files changed, 624 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c +13 -5
@@ -1776,7 +1776,7 @@ EXPORT_IF_KUNIT(amdgpu_dm_get_crtc_by_otg_inst);* Handles the pageflip interrupt by notifying all interested parties * that the pageflip has been completed. */ -static void dm_pflip_high_irq (void *interrupt_params) +STATIC_IFN_KUNIT void dm_pflip_high_irq(void *interrupt_params) {struct amdgpu_crtc *amdgpu_crtc;struct common_irq_params *irq_params = interrupt_params;
@@ -1872,6 +1872,7 @@ static void dm_pflip_high_irq(void *interrupt_params)"crtc:%d[%p], pflip_stat:AMDGPU_FLIP_NONE, vrr[%d]-fp %d\n" , amdgpu_crtc->crtc_id, amdgpu_crtc, vrr_active, (int)!e); } +EXPORT_IF_KUNIT (dm_pflip_high_irq);static void dm_handle_vmin_vmax_update (struct work_struct *offload_work) {
@@ -1918,7 +1919,7 @@ static void schedule_dc_vmin_vmax(struct amdgpu_device *adev,queue_work (system_percpu_wq, &offload_work->work); } -static void dm_vupdate_high_irq (void *interrupt_params) +STATIC_IFN_KUNIT void dm_vupdate_high_irq(void *interrupt_params) {struct common_irq_params *irq_params = interrupt_params;struct amdgpu_device *adev = irq_params->adev;
@@ -1981,6 +1982,7 @@ static void dm_vupdate_high_irq(void *interrupt_params) } } } +EXPORT_IF_KUNIT (dm_vupdate_high_irq);/** * dm_crtc_high_irq() - Handles CRTC interrupt
@@ -1989,7 +1991,7 @@ static void dm_vupdate_high_irq(void *interrupt_params)* Handles the CRTC/VSYNC interrupt by notfying DRM's VBLANK * event handler. */ -static void dm_crtc_high_irq (void *interrupt_params) +STATIC_IFN_KUNIT void dm_crtc_high_irq(void *interrupt_params) {struct common_irq_params *irq_params = interrupt_params;struct amdgpu_device *adev = irq_params->adev;
@@ -2088,6 +2090,7 @@ static void dm_crtc_high_irq(void *interrupt_params)spin_unlock_irqrestore (&adev_to_drm (adev)->event_lock, flags); } +EXPORT_IF_KUNIT (dm_crtc_high_irq);#if defined(CONFIG_DRM_AMD_SECURE_DISPLAY )/**
@@ -2112,7 +2115,7 @@ static void dm_dcn_vertical_interrupt0_high_irq(void *interrupt_params) }#endif /* CONFIG_DRM_AMD_SECURE_DISPLAY */ -static void dm_handle_hpd_work (struct work_struct *work) +STATIC_IFN_KUNIT void dm_handle_hpd_work(struct work_struct *work) {struct dmub_hpd_work *dmub_hpd_wrk;
@@ -2132,6 +2135,7 @@ static void dm_handle_hpd_work(struct work_struct *work)kfree (dmub_hpd_wrk); } +EXPORT_IF_KUNIT (dm_handle_hpd_work); STATIC_IFN_KUNIT const char *dmub_notification_type_str(enum dmub_notification_type e) {
@@ -2166,7 +2170,7 @@ EXPORT_IF_KUNIT(dmub_notification_type_str);* Handles the Outbox Interrupt * event handler. */ -static void dm_dmub_outbox1_low_irq (void *interrupt_params) +STATIC_IFN_KUNIT void dm_dmub_outbox1_low_irq(void *interrupt_params) {struct dmub_notification notify = {0 };struct common_irq_params *irq_params = interrupt_params;
@@ -2229,6 +2233,7 @@ static void dm_dmub_outbox1_low_irq(void *interrupt_params) }while (notify.pending_notification); } } +EXPORT_IF_KUNIT (dm_dmub_outbox1_low_irq);/* Register IRQ sources and initialize IRQ callbacks */ int amdgpu_dm_dce110_register_irq_handlers (struct amdgpu_device *adev)
@@ -2367,6 +2372,7 @@ int amdgpu_dm_dce110_register_irq_handlers(struct amdgpu_device *adev)return r; } +EXPORT_IF_KUNIT (amdgpu_dm_dce110_register_irq_handlers);/* Register IRQ sources and initialize IRQ callbacks */ int amdgpu_dm_dcn10_register_irq_handlers (struct amdgpu_device *adev)
@@ -2548,6 +2554,7 @@ int amdgpu_dm_dcn10_register_irq_handlers(struct amdgpu_device *adev)return r; } +EXPORT_IF_KUNIT (amdgpu_dm_dcn10_register_irq_handlers);/* Register Outbox IRQ sources and initialize IRQ callbacks */ int amdgpu_dm_register_outbox_irq_handlers (struct amdgpu_device *adev)
@@ -2585,3 +2592,4 @@ int amdgpu_dm_register_outbox_irq_handlers(struct amdgpu_device *adev)return 0 ; } +EXPORT_IF_KUNIT (amdgpu_dm_register_outbox_irq_handlers);
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.h +5 -0
@@ -173,6 +173,11 @@ void dmub_hpd_callback(struct amdgpu_device *adev, struct dmub_notification *notify);void dmub_hpd_sense_callback (struct amdgpu_device *adev,struct dmub_notification *notify); +void dm_pflip_high_irq (void *interrupt_params); +void dm_vupdate_high_irq (void *interrupt_params); +void dm_crtc_high_irq (void *interrupt_params); +void dm_handle_hpd_work (struct work_struct *work); +void dm_dmub_outbox1_low_irq (void *interrupt_params);#endif #endif /* __AMDGPU_DM_IRQ_H__ */
drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_irq_test.c +606 -0
636 lines not on this page · raw message
--
2.55.0
PATCH 36/80 drm/amd/display: Test top-level IRQ handler and vmin/vmax worker
In reply to George ZhangFrom: Alex Hung <[email protected]>
[WHAT]
Add KUnit coverage for the two remaining uncovered functions in amdgpu_dm_irq.c: amdgpu_dm_irq_handler() and dm_handle_vmin_vmax_update().
amdgpu_dm_irq_handler() is driven with a fake dc whose irq_service maps the hardware IRQ entry to a DC source and whose per-source info table lets dc_interrupt_ack() succeed; high- and low-context counting handlers verify the immediate and scheduled dispatch paths.
--- .../drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c | 6 +- .../drm/amd/display/amdgpu_dm/amdgpu_dm_irq.h | 5 + .../amdgpu_dm/tests/amdgpu_dm_irq_test.c | 125 ++++++++++++++++++ 3 files changed, 134 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c +4 -2
@@ -679,7 +679,7 @@ EXPORT_IF_KUNIT(amdgpu_dm_irq_immediate_work);* Calls all registered high irq work immediately, and schedules work for low * irq. The DM IRQ table is used to find the corresponding handlers. */ -static int amdgpu_dm_irq_handler (struct amdgpu_device *adev, +STATIC_IFN_KUNIT int amdgpu_dm_irq_handler(struct amdgpu_device *adev,struct amdgpu_irq_src *source,struct amdgpu_iv_entry *entry) {
@@ -699,6 +699,7 @@ static int amdgpu_dm_irq_handler(struct amdgpu_device *adev,return 0 ; } +EXPORT_IF_KUNIT (amdgpu_dm_irq_handler); STATIC_IFN_KUNIT enum dc_irq_source amdgpu_dm_hpd_to_dal_irq_source(unsigned int type) {
@@ -1874,7 +1875,7 @@ STATIC_IFN_KUNIT void dm_pflip_high_irq(void *interrupt_params) }EXPORT_IF_KUNIT (dm_pflip_high_irq); -static void dm_handle_vmin_vmax_update (struct work_struct *offload_work) +STATIC_IFN_KUNIT void dm_handle_vmin_vmax_update(struct work_struct *offload_work) { struct vupdate_offload_work *work = container_of(offload_work, struct vupdate_offload_work, work);struct amdgpu_device *adev = work->adev;
@@ -1889,6 +1890,7 @@ static void dm_handle_vmin_vmax_update(struct work_struct *offload_work)kfree (work->adjust);kfree (work); } +EXPORT_IF_KUNIT (dm_handle_vmin_vmax_update); static void schedule_dc_vmin_vmax(struct amdgpu_device *adev, struct dc_stream_state *stream,
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.h +5 -0
@@ -124,6 +124,7 @@ int amdgpu_dm_register_outbox_irq_handlers(struct amdgpu_device *adev);#if IS_ENABLED (CONFIG_DRM_AMD_DC_KUNIT_TEST )struct amdgpu_irq_src ; +struct amdgpu_iv_entry ;enum amdgpu_interrupt_state ;enum dc_irq_source amdgpu_dm_hpd_to_dal_irq_source (unsigned int type);
@@ -178,6 +179,10 @@ void dm_vupdate_high_irq(void *interrupt_params);void dm_crtc_high_irq (void *interrupt_params);void dm_handle_hpd_work (struct work_struct *work);void dm_dmub_outbox1_low_irq (void *interrupt_params); +int amdgpu_dm_irq_handler (struct amdgpu_device *adev, +struct amdgpu_irq_src *source, +struct amdgpu_iv_entry *entry); +void dm_handle_vmin_vmax_update (struct work_struct *offload_work);#endif #endif /* __AMDGPU_DM_IRQ_H__ */
drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_irq_test.c +125 -0
137 lines not on this page · raw message
--
2.55.0
PATCH 37/80 drm/amd/display: Fix 8K Mode Not Parsed by EDID
In reply to George ZhangFrom: Fangzhi Zuo <[email protected]>
[why]
The 8K120/8K240 timings live in DisplayID extension blocks 2 and 3 of this EDID. The EDID is a 4-block (512-byte) HDMI 2.1 EDID that uses HF-EEODB.
drm core reads and parses this correctly, but amdgpu rebuilds its own copy. Only 2 of 4 blocks were copied into sink->dc_edid, that leads to drm_edid_connector_add_modes() never sees blocks 2 and 3.
[how]
Directly populate edid_blob_ptr with a blob whose length is the full, and HF-EEODB-aware size.
--- .../amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 20 ++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +17 -3
@@ -1256,11 +1256,25 @@ enum dc_edid_status dm_helpers_read_local_edid(continue ; edid =drm_edid_raw (drm_edid);// FIXME: Get rid of drm_edid_raw() -if (!edid || - edid->extensions >=sizeof (sink->dc_edid.raw_edid) /EDID_LENGTH ) +/* +* Use the length of the EDID property blob populated by +* drm_edid_connector_update() above. It reflects the true number +* of EDID blocks, including any HDMI Forum EDID Extension Override +* Data Block (HF-EEODB) count, which the raw byte 0x7e extension +* count can hide (e.g. HDMI 8K sinks). +*/ +if (!edid || !connector->edid_blob_ptr || + connector->edid_blob_ptr->length >sizeof (sink->dc_edid.raw_edid))return EDID_BAD_INPUT ; - sink->dc_edid.length =EDID_LENGTH * (edid->extensions +1 ); +/* +* FIXME: amdgpu_dm today does not consider the HF-EEODB, which +* may contain additional mode info for sinks. This is a +* workaround until dc_edid is refactored out from DC into +* amdgpu_dm's ownership, allowing amdgpu_dm to use drm_edid +* directly +*/ + sink->dc_edid.length = connector->edid_blob_ptr->length;memmove (sink->dc_edid.raw_edid, (uint8_t *)edid, sink->dc_edid.length);/* We don't need the original edid anymore */
--
2.55.0
PATCH 38/80 drm/amd/display: Tear down dangling pipe on boot to fix s0i3
In reply to George ZhangFrom: Tom Chung <[email protected]>
[Why]
If an external monitor is connected at power-on and then unplugged before the driver loads (e.g. at the GRUB menu), the system can no longer enter the s0i3 deepest suspend state, even though all connectors report disconnected.
The pre-OS firmware (GOP/vBIOS) lights up a front-end for the display that is present at power-on. The driver never fully tears this inherited pipe down, and the leftover pipe keeps the DCN block from reaching idle, which blocks s0i3.
[How]
Add dc_disable_dangling_timing_generators() to DC core and call it from amdgpu_dm right after dc_hardware_init(). It scans every enabled timing generator and classifies it as in-use or dangling. If a dangling pipe exists and nothing needs to be preserved, power down the hw blocks so DCN can reach idle.
--- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 8 ++ drivers/gpu/drm/amd/display/dc/core/dc.c | 109 ++++++++++++++++++ drivers/gpu/drm/amd/display/dc/dc.h | 2 + 3 files changed, 119 insertions(+)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +8 -0
@@ -779,6 +779,14 @@ static int amdgpu_dm_init(struct amdgpu_device *adev)dc_hardware_init (adev->dm.dc); +/* GOP/vBIOS may leave an OPTC enabled for a display present at power-on +* but no longer driven (e.g. an external DP unplugged at boot). Such a +* dangling pipe keeps DCN out of idle and blocks s0i3. Power it down +* here when nothing needs to be preserved. +*/ +if (adev->flags &AMD_IS_APU ) +dc_disable_dangling_timing_generators (adev->dm.dc); + adev->dm.hpd_rx_offload_wq =amdgpu_dm_hpd_rx_irq_create_workqueue (adev);if (!adev->dm.hpd_rx_offload_wq) {drm_err (adev_to_drm (adev),"failed to create hpd rx offload workqueue.\n" );
drivers/gpu/drm/amd/display/dc/core/dc.c +109 -0
115 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/dc.h +2 -0
@@ -3010,6 +3010,8 @@ void dc_resume(struct dc *dc);void dc_power_down_on_boot (struct dc *dc); +void dc_disable_dangling_timing_generators (struct dc *dc); +/* * HDCP Interfaces */
--
2.55.0
PATCH 39/80 drm/amd/display: Add more tests for HDCP
In reply to George ZhangFrom: Bhawanpreet Lakha <[email protected]>
Adds a few more test cases to the hdcp code
- process_output(): make sure work gets requeued when callback and watchdog are stopped but also asked to run again
- event_property_update(): bail out when the connector is NULL
- hdcp_handle_cpirq(): schedules the work and picks the right link
- hdcp_update_display(): schedules property validation on enable, resets status and cancels validation on disable
- hdcp_create_workqueue(): returns NULL when max links is zero
--- .../amd/display/amdgpu_dm/amdgpu_dm_hdcp.c | 48 ++-- .../amd/display/amdgpu_dm/amdgpu_dm_hdcp.h | 5 + .../amdgpu_dm/tests/amdgpu_dm_hdcp_test.c | 240 ++++++++++++++++++ 3 files changed, 276 insertions(+), 17 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c +31 -17
@@ -258,6 +258,30 @@ static void link_lock(struct hdcp_workqueue *work, bool lock) } } +STATIC_IFN_KUNIT +void hdcp_update_display_encryption_control(struct hdcp_workqueue *hdcp_work, +struct hdcp_workqueue *hdcp_w, +unsigned int conn_index, +bool enable_encryption) +{ +if (enable_encryption) { +/* Explicitly set the saved SRM as sysfs call will be after we already enabled hdcp +* (s3 resume case) +*/ +if (hdcp_work->srm_size >0 ) +psp_set_srm (hdcp_work->hdcp.config.psp.handle, hdcp_work->srm, + hdcp_work->srm_size, + &hdcp_work->srm_version); + +schedule_delayed_work (&hdcp_w->property_validate_dwork, +msecs_to_jiffies (DRM_HDCP_CHECK_PERIOD_MS )); + }else { + hdcp_w->encryption_status[conn_index] =MOD_HDCP_ENCRYPTION_STATUS_HDCP_OFF ; +cancel_delayed_work (&hdcp_w->property_validate_dwork); + } +} +EXPORT_IF_KUNIT (hdcp_update_display_encryption_control); + void hdcp_update_display(struct hdcp_workqueue *hdcp_work, unsigned int link_index, struct amdgpu_dm_connector *aconnector,
@@ -281,22 +305,8 @@ void hdcp_update_display(struct hdcp_workqueue *hdcp_work, dc->debug.hdcp_lc_force_fw_enable, dc->debug.hdcp_lc_enable_sw_fallback, &link_adjust, &display_adjust); - -if (enable_encryption) { -/* Explicitly set the saved SRM as sysfs call will be after we already enabled hdcp -* (s3 resume case) -*/ -if (hdcp_work->srm_size >0 ) -psp_set_srm (hdcp_work->hdcp.config.psp.handle, hdcp_work->srm, - hdcp_work->srm_size, - &hdcp_work->srm_version); - -schedule_delayed_work (&hdcp_w->property_validate_dwork, -msecs_to_jiffies (DRM_HDCP_CHECK_PERIOD_MS )); - }else { - hdcp_w->encryption_status[conn_index] =MOD_HDCP_ENCRYPTION_STATUS_HDCP_OFF ; -cancel_delayed_work (&hdcp_w->property_validate_dwork); - } +hdcp_update_display_encryption_control (hdcp_work, hdcp_w, conn_index, + enable_encryption);mod_hdcp_update_display (&hdcp_w->hdcp, conn_index, &link_adjust, &display_adjust, &hdcp_w->output);
@@ -363,6 +373,7 @@ void hdcp_handle_cpirq(struct hdcp_workqueue *hdcp_work, unsigned int link_indexschedule_work (&hdcp_w->cpirq_work); } +EXPORT_IF_KUNIT (hdcp_handle_cpirq);static void event_callback (struct work_struct *work) {
@@ -381,7 +392,8 @@ static void event_callback(struct work_struct *work)process_output (hdcp_work); } -static void event_property_update (struct work_struct *work) +STATIC_IFN_KUNIT +void event_property_update(struct work_struct *work) { struct hdcp_workqueue *hdcp_work = container_of(work, struct hdcp_workqueue, property_update_work);
@@ -440,6 +452,7 @@ static void event_property_update(struct work_struct *work)drm_modeset_unlock (&dev->mode_config.connection_mutex); } } +EXPORT_IF_KUNIT (event_property_update);static void event_property_validate (struct work_struct *work) {
@@ -872,4 +885,5 @@ struct hdcp_workqueue *hdcp_create_workqueue(struct amdgpu_device *adev,return NULL ; } +EXPORT_IF_KUNIT (hdcp_create_workqueue);
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.h +5 -0
@@ -108,6 +108,11 @@ void hdcp_get_link_display_adjustments(bool hdcp_lc_enable_sw_fallback, struct mod_hdcp_link_adjustment *link_adjust, struct mod_hdcp_display_adjustment *display_adjust); +void hdcp_update_display_encryption_control (struct hdcp_workqueue *hdcp_work, +struct hdcp_workqueue *hdcp_w, +unsigned int conn_index, +bool enable_encryption); +void event_property_update (struct work_struct *work);#endif #endif /* AMDGPU_DM_AMDGPU_DM_HDCP_H_ */
drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_hdcp_test.c +240 -0
254 lines not on this page · raw message
--
2.55.0
PATCH 40/80 drm/amd/display: More Kunit tests for audio
In reply to George ZhangFrom: Bhawanpreet Lakha <[email protected]>
Split audio init to make the initialization modular
Test the audio pin initialization
--- .../amd/display/amdgpu_dm/amdgpu_dm_audio.c | 36 ++++-- .../amd/display/amdgpu_dm/amdgpu_dm_audio.h | 2 + .../amdgpu_dm/tests/amdgpu_dm_audio_test.c | 118 ++++++++++++++++++ 3 files changed, 145 insertions(+), 11 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_audio.c +25 -11
@@ -116,28 +116,42 @@ static const struct component_ops amdgpu_dm_audio_component_bind_ops = { .unbind = amdgpu_dm_audio_component_unbind, }; -int amdgpu_dm_audio_init (struct amdgpu_device *adev) +STATIC_IFN_KUNIT +void amdgpu_dm_audio_init_pins(struct amdgpu_device *adev, int audio_count, +const unsigned int *inst_array) { -int i, ret; +int i; -if (!amdgpu_audio) -return 0 ; + adev->mode_info.audio.num_pins = audio_count; - adev->mode_info.audio.enabled = true; - - adev->mode_info.audio.num_pins = adev->dm.dc->res_pool->audio_count; - -for (i =0 ; i < adev->mode_info.audio.num_pins; i++) { +for (i =0 ; i < audio_count; i++) { adev->mode_info.audio.pin[i].channels =-1 ; adev->mode_info.audio.pin[i].rate =-1 ; adev->mode_info.audio.pin[i].bits_per_sample =-1 ; adev->mode_info.audio.pin[i].status_bits =0 ; adev->mode_info.audio.pin[i].category_code =0 ; adev->mode_info.audio.pin[i].connected = false; - adev->mode_info.audio.pin[i].id = - adev->dm.dc->res_pool->audios[i]->inst; + adev->mode_info.audio.pin[i].id = inst_array[i]; adev->mode_info.audio.pin[i].offset =0 ; } +} +EXPORT_IF_KUNIT (amdgpu_dm_audio_init_pins); + +int amdgpu_dm_audio_init (struct amdgpu_device *adev) +{ +unsigned int inst_array[MAX_AUDIOS ]; +int audio_count; +int i, ret; + +if (!amdgpu_audio) +return 0 ; + + adev->mode_info.audio.enabled = true; + + audio_count = adev->dm.dc->res_pool->audio_count; +for (i =0 ; i < audio_count; i++) + inst_array[i] = adev->dm.dc->res_pool->audios[i]->inst; +amdgpu_dm_audio_init_pins (adev, audio_count, inst_array); ret =component_add (adev->dev, &amdgpu_dm_audio_component_bind_ops);if (ret <0 )
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_audio.h +2 -0
@@ -51,6 +51,8 @@ void amdgpu_dm_audio_component_unbind(struct device *kdev,void amdgpu_dm_audio_eld_notify (struct amdgpu_device *adev,int pin);int amdgpu_dm_audio_get_param (void );void amdgpu_dm_audio_set_param (int val); +void amdgpu_dm_audio_init_pins (struct amdgpu_device *adev,int audio_count, +const unsigned int *inst_array);#endif #endif /* __AMDGPU_DM_AUDIO_H__ */
drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_audio_test.c +118 -0
143 lines not on this page · raw message
Signature · 1 line
2.55.0
PATCH 41/80 drm/amd/display: Add color space and timing tests for connector
In reply to George ZhangFrom: Bhawanpreet Lakha <[email protected]>
Add KUnit coverage for adjust_colour_depth_from_display_info() 420 reduction, amdgpu_dm_get_output_color_space() Y_ONLY/YCbCr601/BT2020 fallbacks, to_drm_connector_type() dual-link DVI-D, and copy_crtc_timing_for_drm_display_mode().
Export copy_crtc_timing_for_drm_display_mode via EXPORT_IF_KUNIT so the tests can reach it.
--- .../display/amdgpu_dm/amdgpu_dm_connector.c | 3 +- .../display/amdgpu_dm/amdgpu_dm_connector.h | 2 + .../tests/amdgpu_dm_connector_test.c | 186 ++++++++++++++++++ 3 files changed, 190 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_connector.c +2 -1
@@ -948,7 +948,7 @@ static void fill_stream_properties_from_drm_display_mode( stream->content_type =get_output_content_type (connector_state); } -static void +STATIC_IFN_KUNIT voidcopy_crtc_timing_for_drm_display_mode (const struct drm_display_mode *src_mode,struct drm_display_mode *dst_mode) {
@@ -967,6 +967,7 @@ copy_crtc_timing_for_drm_display_mode(const struct drm_display_mode *src_mode, dst_mode->crtc_vsync_end = src_mode->crtc_vsync_end; dst_mode->crtc_vtotal = src_mode->crtc_vtotal; } +EXPORT_IF_KUNIT (copy_crtc_timing_for_drm_display_mode); STATIC_IFN_KUNIT void decide_crtc_timing_for_drm_display_mode(struct drm_display_mode *drm_mode,
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_connector.h +2 -0
@@ -155,6 +155,8 @@ bool adjust_colour_depth_from_display_info(struct dc_crtc_timing *timing_out,int to_drm_connector_type (enum signal_type st,uint32_t connector_id);bool is_duplicate_mode (struct amdgpu_dm_connector *aconnector,struct drm_display_mode *mode);enum dc_aspect_ratio get_aspect_ratio (const struct drm_display_mode *mode_in); +void copy_crtc_timing_for_drm_display_mode (const struct drm_display_mode *src_mode, +struct drm_display_mode *dst_mode);void decide_crtc_timing_for_drm_display_mode (struct drm_display_mode *drm_mode,const struct drm_display_mode *native_mode,bool scale_enabled);
drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_connector_test.c +186 -0
234 lines not on this page · raw message
Signature · 1 line
2.55.0
PATCH 42/80 drm/amd/display: Add subconnector property tests for connector
In reply to George ZhangFrom: Bhawanpreet Lakha <[email protected]>
Add KUnit coverage for update_subconnector_property() on the amdgpu_dm_connector suite:
- DP connector with a sink: subconnector property is resolved from the dongle type (VGA converter -> VGA).
- DP connector without a sink: dongle type is ignored and the property stays Unknown.
- Non-DP connector: function early-returns and leaves a pre-seeded property value untouched.
--- .../display/amdgpu_dm/amdgpu_dm_connector.c | 3 +- .../display/amdgpu_dm/amdgpu_dm_connector.h | 1 + .../tests/amdgpu_dm_connector_test.c | 142 ++++++++++++++++++ 3 files changed, 145 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_connector.c +2 -1
@@ -235,7 +235,7 @@ STATIC_IFN_KUNIT enum drm_mode_subconnector get_subconnector_type(struct dc_link }EXPORT_IF_KUNIT (get_subconnector_type); -static void update_subconnector_property (struct amdgpu_dm_connector *aconnector) +STATIC_IFN_KUNIT void update_subconnector_property(struct amdgpu_dm_connector *aconnector) {struct dc_link *link = aconnector->dc_link;struct drm_connector *connector = &aconnector->base;
@@ -251,6 +251,7 @@ static void update_subconnector_property(struct amdgpu_dm_connector *aconnector) connector->dev->mode_config.dp_subconnector_property, subconnector); } +EXPORT_IF_KUNIT (update_subconnector_property);static int amdgpu_dm_connector_get_modes (struct drm_connector *connector);
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_connector.h +1 -0
@@ -147,6 +147,7 @@ int amdgpu_dm_encoder_init(struct drm_device *dev,#if IS_ENABLED (CONFIG_DRM_AMD_DC_KUNIT_TEST )enum drm_mode_subconnector get_subconnector_type (struct dc_link *link); +void update_subconnector_property (struct amdgpu_dm_connector *aconnector);enum display_content_type get_output_content_type (const struct drm_connector_state *connector_state); bool adjust_colour_depth_from_display_info(struct dc_crtc_timing *timing_out,
drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_connector_test.c +142 -0
154 lines not on this page · raw message
Signature · 1 line
2.55.0
PATCH 43/80 drm/amd/display: Add FBC init tests for connector
In reply to George ZhangFrom: Bhawanpreet Lakha <[email protected]>
Add KUnit coverage for amdgpu_dm_fbc_init() on the amdgpu_dm_connector tests:
- No FBC present
- Non-eDP link
- Buffer already allocated
--- .../display/amdgpu_dm/amdgpu_dm_connector.c | 3 +- .../display/amdgpu_dm/amdgpu_dm_connector.h | 1 + .../tests/amdgpu_dm_connector_test.c | 112 ++++++++++++++++++ 3 files changed, 115 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_connector.c +2 -1
@@ -255,7 +255,7 @@ EXPORT_IF_KUNIT(update_subconnector_property);static int amdgpu_dm_connector_get_modes (struct drm_connector *connector); -static void amdgpu_dm_fbc_init (struct drm_connector *connector) +STATIC_IFN_KUNIT void amdgpu_dm_fbc_init(struct drm_connector *connector) {struct amdgpu_device *adev =drm_to_adev (connector->dev);struct dm_compressor_info *compressor = &adev->dm.compressor;
@@ -293,6 +293,7 @@ static void amdgpu_dm_fbc_init(struct drm_connector *connector) } } +EXPORT_IF_KUNIT (amdgpu_dm_fbc_init);int amdgpu_dm_detect_mst_link_for_all_connectors (struct drm_device *dev)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_connector.h +1 -0
@@ -148,6 +148,7 @@ int amdgpu_dm_encoder_init(struct drm_device *dev,#if IS_ENABLED (CONFIG_DRM_AMD_DC_KUNIT_TEST )enum drm_mode_subconnector get_subconnector_type (struct dc_link *link);void update_subconnector_property (struct amdgpu_dm_connector *aconnector); +void amdgpu_dm_fbc_init (struct drm_connector *connector);enum display_content_type get_output_content_type (const struct drm_connector_state *connector_state); bool adjust_colour_depth_from_display_info(struct dc_crtc_timing *timing_out,
drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_connector_test.c +112 -0
124 lines not on this page · raw message
Signature · 1 line
2.55.0
PATCH 44/80 drm/amd/display: Test format info and blending
In reply to George ZhangFrom: Alex Hung <[email protected]>
[WHAT]
Add KUnit coverage for amdgpu_dm_plane_get_format_info(), the overlay universal-plane path of get_plane_formats(), the D-swizzle rejection path of format_mod_supported(), and the DCN4.2 variant of fill_blending_from_plane_state().
These exercise format-query and blending code paths that the existing suite did not cover.
--- .../amdgpu_dm/tests/amdgpu_dm_plane_test.c | 141 +++++++++++++++++- 1 file changed, 134 insertions(+), 7 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_plane_test.c +134 -7
@@ -5,13 +5,16 @@* Copyright 2026 Advanced Micro Devices, Inc. */ -#include <kunit/test.h> -#include <drm/drm_blend.h> -#include "link_enc_cfg.h" -#include "amdgpu_dm_plane.h" -#include <drm/amdgpu_drm.h> -#include <drm/drm_plane.h> - +#include <kunit/test.h> +#include <drm/drm_atomic.h> +#include <drm/drm_blend.h> +#include "link_enc_cfg.h" +#include "amdgpu_dm_plane.h" +#include "amdgpu_rlc.h" +#include "gc/gc_11_0_0_offset.h" +#include "gc/gc_11_0_0_sh_mask.h" +#include <drm/amdgpu_drm.h> +#include <drm/drm_plane.h> struct dm_test_dcc_cap_ctx {bool callback_ret;
@@ -1162,19 +1165,142 @@ static void dm_test_fill_gfx9_tiling_info_from_modifier_nv(struct kunit *test)KUNIT_EXPECT_EQ (test, tiling_info.gfx9.shaderEnable,1U ); } +/** +* dm_test_get_format_info() - Verify modifier-based format info lookup. +* @test: KUnit test context. +* +* Verify if non-AMD modifiers return NULL and AMD DCC modifiers resolve a +* dedicated format info structure. +*/ +static void dm_test_get_format_info (struct kunit *test) +{ +u64 dcc_mod =AMD_FMT_MOD | +AMD_FMT_MOD_SET (TILE_VERSION ,AMD_FMT_MOD_TILE_VER_GFX9 ) | +AMD_FMT_MOD_SET (DCC ,1 ); +const struct drm_format_info *format_info; + +KUNIT_EXPECT_PTR_EQ (test, + (void *)amdgpu_dm_plane_get_format_info (DRM_FORMAT_XRGB8888 , +DRM_FORMAT_MOD_LINEAR ), +NULL ); + format_info =amdgpu_dm_plane_get_format_info (DRM_FORMAT_XRGB8888 , dcc_mod); +KUNIT_EXPECT_NOT_NULL (test, format_info); +} + +/** +* dm_test_fill_blending_global_alpha_dcn42() - Verify DCN 4.2 alpha scaling. +* @test: KUnit test context. +* +* Verify if DCN 4.2 scales the 16-bit DRM alpha down by 4 bits instead of 8. +*/ +static void dm_test_fill_blending_global_alpha_dcn42 (struct kunit *test) +{ +struct amdgpu_device *adev; +struct drm_plane *plane; +struct drm_plane_state *state; +bool per_pixel_alpha; +bool pre_multiplied_alpha; +bool global_alpha; +int global_alpha_value; + + adev =kunit_kzalloc (test,sizeof (*adev),GFP_KERNEL ); + plane =kunit_kzalloc (test,sizeof (*plane),GFP_KERNEL ); + state =kunit_kzalloc (test,sizeof (*state),GFP_KERNEL ); +KUNIT_ASSERT_NOT_NULL (test, adev); +KUNIT_ASSERT_NOT_NULL (test, plane); +KUNIT_ASSERT_NOT_NULL (test, state); + + adev->ip_versions[DCE_HWIP ][0 ] =IP_VERSION (4 ,2 ,0 ); + plane->dev = &adev->ddev; + state->plane = plane; + state->pixel_blend_mode =DRM_MODE_BLEND_PIXEL_NONE ; + state->alpha =0x8000 ; + +amdgpu_dm_plane_fill_blending_from_plane_state (state, + &per_pixel_alpha, + &pre_multiplied_alpha, + &global_alpha, + &global_alpha_value); + +KUNIT_EXPECT_TRUE (test, global_alpha); +KUNIT_EXPECT_EQ (test, global_alpha_value,0x800 ); +} + +/** +* dm_test_get_plane_formats_overlay_universal_cap() - Verify universal overlay. +* @test: KUnit test context. +* +* Verify if an overlay plane with a DCN universal plane cap reports the RGB +* format list instead of the overlay-only list. +*/ +static void dm_test_get_plane_formats_overlay_universal_cap (struct kunit *test) +{ +struct drm_plane *plane; +struct dc_plane_cap *cap; +u32 formats[32 ] = {0 }; + + plane =kunit_kzalloc (test,sizeof (*plane),GFP_KERNEL ); + cap =kunit_kzalloc (test,sizeof (*cap),GFP_KERNEL ); +KUNIT_ASSERT_NOT_NULL (test, plane); +KUNIT_ASSERT_NOT_NULL (test, cap); + + plane->type =DRM_PLANE_TYPE_OVERLAY ; + cap->type =DC_PLANE_TYPE_DCN_UNIVERSAL ; + +KUNIT_EXPECT_EQ (test, +amdgpu_dm_plane_get_plane_formats (plane, cap, formats,32 ), +14 ); +} + +/** +* dm_test_format_mod_supported_d_swizzle_reject() - Verify D swizzle rejection. +* @test: KUnit test context. +* +* Verify if a D micro-swizzle modifier is rejected for formats narrower than +* 8 bytes per pixel. +*/ +static void dm_test_format_mod_supported_d_swizzle_reject (struct kunit *test) +{ +struct amdgpu_device *adev; +struct drm_plane *plane; +u64 listed_mod; + + adev =kunit_kzalloc (test,sizeof (*adev),GFP_KERNEL ); + plane =kunit_kzalloc (test,sizeof (*plane),GFP_KERNEL ); +KUNIT_ASSERT_NOT_NULL (test, adev); +KUNIT_ASSERT_NOT_NULL (test, plane); + + adev->family =AMDGPU_FAMILY_RV ; + plane->dev = &adev->ddev; + + listed_mod =AMD_FMT_MOD | +AMD_FMT_MOD_SET (TILE ,AMD_FMT_MOD_TILE_GFX9_64K_D ) | +AMD_FMT_MOD_SET (TILE_VERSION ,AMD_FMT_MOD_TILE_VER_GFX9 ); + plane->modifiers = &listed_mod; + plane->modifier_count =1 ; + +KUNIT_EXPECT_FALSE (test, +amdgpu_dm_plane_format_mod_supported (plane,DRM_FORMAT_XRGB8888 , + listed_mod)); +} +static struct kunit_case amdgpu_dm_plane_test_cases[] = {/* amdgpu_dm_plane_is_video_format() */ KUNIT_CASE (dm_test_plane_is_video_format_known_video), +/* amdgpu_dm_plane_get_format_info() */ +KUNIT_CASE (dm_test_get_format_info),/* amdgpu_dm_plane_fill_blending_from_plane_state() */ KUNIT_CASE (dm_test_fill_blending_defaults),KUNIT_CASE (dm_test_fill_blending_premulti_alpha_format),KUNIT_CASE (dm_test_fill_blending_coverage_alpha_format),KUNIT_CASE (dm_test_fill_blending_global_alpha), +KUNIT_CASE (dm_test_fill_blending_global_alpha_dcn42),/* amdgpu_dm_plane_modifier_* helpers() */ KUNIT_CASE (dm_test_modifier_has_dcc),KUNIT_CASE (dm_test_modifier_gfx9_swizzle_mode),/* amdgpu_dm_plane_get_plane_formats() */ KUNIT_CASE (dm_test_get_plane_formats), +KUNIT_CASE (dm_test_get_plane_formats_overlay_universal_cap),/* amdgpu_dm_plane_get_plane_modifiers() */ KUNIT_CASE (dm_test_get_plane_modifiers),/* amdgpu_dm_plane_fill_dc_scaling_info() */
@@ -1187,6 +1313,7 @@ static struct kunit_case amdgpu_dm_plane_test_cases[] = {KUNIT_CASE (dm_test_get_cursor_position),/* amdgpu_dm_plane_format_mod_supported() */ KUNIT_CASE (dm_test_format_mod_supported), +KUNIT_CASE (dm_test_format_mod_supported_d_swizzle_reject),/* amdgpu_dm_plane_fill_gfx12_plane_attributes_from_modifiers() */ KUNIT_CASE(dm_test_fill_gfx12_plane_attributes_from_modifiers),/* amdgpu_dm_plane_fill_gfx9_plane_attributes_from_modifiers() */
Signature · 1 line
2.55.0
PATCH 45/80 drm/amd/display: Test GFX9/GFX10 plane modifiers
In reply to George ZhangFrom: Alex Hung <[email protected]>
[WHAT]
Add KUnit tests for amdgpu_dm_plane_get_plane_modifiers() on GFX9, Raven, Raven constant-encode, GFX10.1 and GFX10.3 devices.
Introduce the dm_test_expect_mods_terminated(), dm_test_mods_contain() and dm_test_get_primary_mods() helpers used to validate the generated modifier lists.
--- .../amdgpu_dm/tests/amdgpu_dm_plane_test.c | 219 ++++++++++++++++++ 1 file changed, 219 insertions(+)
drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_plane_test.c +219 -0
@@ -1226,6 +1226,48 @@ static void dm_test_fill_blending_global_alpha_dcn42(struct kunit *test)KUNIT_EXPECT_EQ (test, global_alpha_value,0x800 ); } +static void dm_test_expect_mods_terminated (struct kunit *test,struct amdgpu_device *adev) +{ +u64 *mods =NULL ; +int ret; +int i; + + ret =amdgpu_dm_plane_get_plane_modifiers (adev,DRM_PLANE_TYPE_PRIMARY , &mods); +KUNIT_ASSERT_EQ (test, ret,0 ); +KUNIT_ASSERT_NOT_NULL (test, mods); + +for (i =0 ; mods[i] !=DRM_FORMAT_MOD_INVALID ; i++) + ; + +KUNIT_EXPECT_GT (test, i,0 ); +KUNIT_EXPECT_EQ (test, mods[i -1 ],DRM_FORMAT_MOD_LINEAR ); +kfree (mods); +} + +static bool dm_test_mods_contain (const u64 *mods,u64 expected) +{ +int i; + +for (i =0 ; mods[i] !=DRM_FORMAT_MOD_INVALID ; i++) { +if (mods[i] == expected) +return true; + } + +return false; +} + +static u64 *dm_test_get_primary_mods (struct kunit *test,struct amdgpu_device *adev) +{ +u64 *mods =NULL ; +int ret; + + ret =amdgpu_dm_plane_get_plane_modifiers (adev,DRM_PLANE_TYPE_PRIMARY , &mods); +KUNIT_ASSERT_EQ (test, ret,0 ); +KUNIT_ASSERT_NOT_NULL (test, mods); + +return mods; +} +/** * dm_test_get_plane_formats_overlay_universal_cap() - Verify universal overlay. * @test: KUnit test context.
@@ -1252,6 +1294,178 @@ static void dm_test_get_plane_formats_overlay_universal_cap(struct kunit *test) 14); } +/** +* dm_test_get_plane_modifiers_gfx9() - Verify GFX9 modifier list generation. +* @test: KUnit test context. +* +* Verify if the GFX9 family produces a non-empty modifier list terminated by +* LINEAR and INVALID entries. +*/ +static void dm_test_get_plane_modifiers_gfx9 (struct kunit *test) +{ +struct amdgpu_device *adev; + + adev =kunit_kzalloc (test,sizeof (*adev),GFP_KERNEL ); +KUNIT_ASSERT_NOT_NULL (test, adev); + + adev->family =AMDGPU_FAMILY_AI ; + adev->gfx.config.gb_addr_config_fields.num_pipes =4 ; + adev->gfx.config.gb_addr_config_fields.num_banks =8 ; + adev->gfx.config.gb_addr_config_fields.num_se =2 ; + adev->gfx.config.gb_addr_config_fields.num_rb_per_se =2 ; + +dm_test_expect_mods_terminated (test, adev); +} + +/** +* dm_test_get_plane_modifiers_rv() - Verify RV modifier list generation. +* @test: KUnit test context. +* +* Verify if pre-Raven2 RV devices add RV-specific S-swizzle modifiers and +* non-constant-encode DCC modifiers. +*/ +static void dm_test_get_plane_modifiers_rv (struct kunit *test) +{ +struct amdgpu_device *adev; +u64 *mods; +u64 dcc_mod; +u64 s_x_mod; +u64 s_mod; +int pipes =2 ; +int pipe_xor_bits =3 ; +int bank_xor_bits =2 ; + + adev =kunit_kzalloc (test,sizeof (*adev),GFP_KERNEL ); +KUNIT_ASSERT_NOT_NULL (test, adev); + + adev->family =AMDGPU_FAMILY_RV ; + adev->asic_type =CHIP_RAVEN ; + adev->external_rev_id =0x80 ; + adev->gfx.config.gb_addr_config_fields.num_pipes =4 ; + adev->gfx.config.gb_addr_config_fields.num_banks =4 ; + adev->gfx.config.gb_addr_config_fields.num_se =2 ; + adev->gfx.config.gb_addr_config_fields.num_rb_per_se =2 ; + + mods =dm_test_get_primary_mods (test, adev); + dcc_mod =AMD_FMT_MOD | +AMD_FMT_MOD_SET (TILE ,AMD_FMT_MOD_TILE_GFX9_64K_S_X ) | +AMD_FMT_MOD_SET (TILE_VERSION ,AMD_FMT_MOD_TILE_VER_GFX9 ) | +AMD_FMT_MOD_SET (PIPE_XOR_BITS , pipe_xor_bits) | +AMD_FMT_MOD_SET (BANK_XOR_BITS , bank_xor_bits) | +AMD_FMT_MOD_SET (DCC ,1 ) | +AMD_FMT_MOD_SET (DCC_INDEPENDENT_64B ,1 ) | +AMD_FMT_MOD_SET (DCC_MAX_COMPRESSED_BLOCK ,AMD_FMT_MOD_DCC_BLOCK_64B ) | +AMD_FMT_MOD_SET (DCC_CONSTANT_ENCODE ,0 ); + s_x_mod =AMD_FMT_MOD | +AMD_FMT_MOD_SET (TILE ,AMD_FMT_MOD_TILE_GFX9_64K_S_X ) | +AMD_FMT_MOD_SET (TILE_VERSION ,AMD_FMT_MOD_TILE_VER_GFX9 ) | +AMD_FMT_MOD_SET (PIPE_XOR_BITS , pipe_xor_bits) | +AMD_FMT_MOD_SET (BANK_XOR_BITS , bank_xor_bits); + s_mod =AMD_FMT_MOD | +AMD_FMT_MOD_SET (TILE ,AMD_FMT_MOD_TILE_GFX9_64K_S ) | +AMD_FMT_MOD_SET (TILE_VERSION ,AMD_FMT_MOD_TILE_VER_GFX9 ); + +KUNIT_EXPECT_TRUE (test,dm_test_mods_contain (mods, dcc_mod)); +KUNIT_EXPECT_TRUE (test,dm_test_mods_contain (mods, dcc_mod | +AMD_FMT_MOD_SET (DCC_RETILE ,1 ) | +AMD_FMT_MOD_SET (RB ,2 ) | +AMD_FMT_MOD_SET (PIPE , pipes))); +KUNIT_EXPECT_TRUE (test,dm_test_mods_contain (mods, s_x_mod)); +KUNIT_EXPECT_TRUE (test,dm_test_mods_contain (mods, s_mod)); + +kfree (mods); +} + +/** +* dm_test_get_plane_modifiers_rv_constant_encode() - Verify Raven2+ modifiers. +* @test: KUnit test context. +* +* Verify if Raven2 and later RV devices add the constant-encode modifier +* variants. +*/ +static void dm_test_get_plane_modifiers_rv_constant_encode (struct kunit *test) +{ +struct amdgpu_device *adev; +u64 *mods; +u64 dcc_mod; +int pipes =2 ; +int pipe_xor_bits =3 ; +int bank_xor_bits =2 ; + + adev =kunit_kzalloc (test,sizeof (*adev),GFP_KERNEL ); +KUNIT_ASSERT_NOT_NULL (test, adev); + + adev->family =AMDGPU_FAMILY_RV ; + adev->asic_type =CHIP_RAVEN ; + adev->external_rev_id =0x81 ; + adev->gfx.config.gb_addr_config_fields.num_pipes =4 ; + adev->gfx.config.gb_addr_config_fields.num_banks =4 ; + adev->gfx.config.gb_addr_config_fields.num_se =2 ; + adev->gfx.config.gb_addr_config_fields.num_rb_per_se =2 ; + + mods =dm_test_get_primary_mods (test, adev); + dcc_mod =AMD_FMT_MOD | +AMD_FMT_MOD_SET (TILE ,AMD_FMT_MOD_TILE_GFX9_64K_S_X ) | +AMD_FMT_MOD_SET (TILE_VERSION ,AMD_FMT_MOD_TILE_VER_GFX9 ) | +AMD_FMT_MOD_SET (PIPE_XOR_BITS , pipe_xor_bits) | +AMD_FMT_MOD_SET (BANK_XOR_BITS , bank_xor_bits) | +AMD_FMT_MOD_SET (DCC ,1 ) | +AMD_FMT_MOD_SET (DCC_INDEPENDENT_64B ,1 ) | +AMD_FMT_MOD_SET (DCC_MAX_COMPRESSED_BLOCK ,AMD_FMT_MOD_DCC_BLOCK_64B ) | +AMD_FMT_MOD_SET (DCC_CONSTANT_ENCODE ,1 ); + +KUNIT_EXPECT_TRUE (test,dm_test_mods_contain (mods, dcc_mod)); +KUNIT_EXPECT_TRUE (test,dm_test_mods_contain (mods, dcc_mod | +AMD_FMT_MOD_SET (DCC_RETILE ,1 ) | +AMD_FMT_MOD_SET (RB ,2 ) | +AMD_FMT_MOD_SET (PIPE , pipes))); + +kfree (mods); +} + +/** +* dm_test_get_plane_modifiers_gfx10_1() - Verify GFX10.1 modifier list generation. +* @test: KUnit test context. +* +* Verify if a pre-10.3 NV family device dispatches to the GFX10.1 modifier +* builder and produces a terminated list. +*/ +static void dm_test_get_plane_modifiers_gfx10_1 (struct kunit *test) +{ +struct amdgpu_device *adev; + + adev =kunit_kzalloc (test,sizeof (*adev),GFP_KERNEL ); +KUNIT_ASSERT_NOT_NULL (test, adev); + + adev->family =AMDGPU_FAMILY_NV ; + adev->gfx.config.gb_addr_config_fields.num_pipes =4 ; + adev->ip_versions[GC_HWIP ][0 ] =IP_VERSION (10 ,1 ,0 ); + +dm_test_expect_mods_terminated (test, adev); +} + +/** +* dm_test_get_plane_modifiers_gfx10_3() - Verify GFX10.3 modifier list generation. +* @test: KUnit test context. +* +* Verify if a 10.3+ NV family device dispatches to the GFX10.3 modifier +* builder and produces a terminated list. +*/ +static void dm_test_get_plane_modifiers_gfx10_3 (struct kunit *test) +{ +struct amdgpu_device *adev; + + adev =kunit_kzalloc (test,sizeof (*adev),GFP_KERNEL ); +KUNIT_ASSERT_NOT_NULL (test, adev); + + adev->family =AMDGPU_FAMILY_NV ; + adev->gfx.config.gb_addr_config_fields.num_pipes =4 ; + adev->gfx.config.gb_addr_config_fields.num_pkrs =2 ; + adev->ip_versions[GC_HWIP ][0 ] =IP_VERSION (10 ,3 ,0 ); + +dm_test_expect_mods_terminated (test, adev); +} +/** * dm_test_format_mod_supported_d_swizzle_reject() - Verify D swizzle rejection. * @test: KUnit test context.
@@ -1303,6 +1517,11 @@ static struct kunit_case amdgpu_dm_plane_test_cases[] = {KUNIT_CASE (dm_test_get_plane_formats_overlay_universal_cap),/* amdgpu_dm_plane_get_plane_modifiers() */ KUNIT_CASE (dm_test_get_plane_modifiers), +KUNIT_CASE (dm_test_get_plane_modifiers_gfx9), +KUNIT_CASE (dm_test_get_plane_modifiers_rv), +KUNIT_CASE (dm_test_get_plane_modifiers_rv_constant_encode), +KUNIT_CASE (dm_test_get_plane_modifiers_gfx10_1), +KUNIT_CASE (dm_test_get_plane_modifiers_gfx10_3),/* amdgpu_dm_plane_fill_dc_scaling_info() */ KUNIT_CASE(dm_test_fill_dc_scaling_info),/* amdgpu_dm_plane_get_min_max_dc_plane_scaling() */
Signature · 1 line
2.55.0
PATCH 46/80 drm/amd/display: Test GFX11/GFX12 plane modifiers
In reply to George ZhangFrom: Alex Hung <[email protected]>
[WHAT]
Add KUnit tests for amdgpu_dm_plane_get_plane_modifiers() on GFX11 (64K-first and 256K-first) and GFX12 devices.
Add a register-read mock (dm_test_gfx11_reg_ctx and friends) and device-setup helpers so the GFX11 DCC modifier ordering can be checked without real hardware.
--- .../amdgpu_dm/tests/amdgpu_dm_plane_test.c | 179 ++++++++++++++++++ 1 file changed, 179 insertions(+)
drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_plane_test.c +179 -0
@@ -26,6 +26,39 @@ struct dm_test_dcc_cap_ctx {static struct dm_test_dcc_cap_ctx *dm_test_dcc_ctx; +struct dm_test_gfx11_reg_ctx { +u32 gb_addr_config; +u32 gc_reg_offsets[1 ]; +u32 expected_reg; +u32 captured_reg; +u32 captured_acc_flags; +u32 captured_hwip; +u32 captured_xcc_id; +bool called; +}; + +static struct dm_test_gfx11_reg_ctx *dm_test_gfx11_reg_ctx; + +static u32 dm_test_gfx11_rreg32 (struct amdgpu_device *adev, +u32 reg,u32 acc_flags,u32 hwip, +u32 xcc_id) +{ +if (!dm_test_gfx11_reg_ctx) +return 0 ; + + dm_test_gfx11_reg_ctx->called = true; + dm_test_gfx11_reg_ctx->captured_reg = reg; + dm_test_gfx11_reg_ctx->captured_acc_flags = acc_flags; + dm_test_gfx11_reg_ctx->captured_hwip = hwip; + dm_test_gfx11_reg_ctx->captured_xcc_id = xcc_id; + +return dm_test_gfx11_reg_ctx->gb_addr_config; +} + +static const struct amdgpu_rlc_reg_funcs dm_test_gfx11_reg_funcs = { + .rreg32 = dm_test_gfx11_rreg32, +}; +static bool dm_test_get_dcc_compression_cap (const struct dc *dc,const struct dc_dcc_surface_param *input,struct dc_surface_dcc_cap *output)
@@ -1268,6 +1301,48 @@ static u64 *dm_test_get_primary_mods(struct kunit *test, struct amdgpu_device *areturn mods; } +static void dm_test_setup_gfx11_device (struct amdgpu_device *adev, +struct dm_test_gfx11_reg_ctx *ctx, +u32 num_pkrs_log2,u32 num_pipes_log2) +{ + ctx->gb_addr_config = +REG_SET_FIELD (0 ,GB_ADDR_CONFIG ,NUM_PKRS , num_pkrs_log2) | +REG_SET_FIELD (0 ,GB_ADDR_CONFIG ,NUM_PIPES , num_pipes_log2); + ctx->gc_reg_offsets[regGB_ADDR_CONFIG_BASE_IDX] =0 ; + ctx->expected_reg = ctx->gc_reg_offsets[regGB_ADDR_CONFIG_BASE_IDX] + + regGB_ADDR_CONFIG; + dm_test_gfx11_reg_ctx = ctx; + + adev->family =AMDGPU_FAMILY_GC_11_0_0 ; + adev->reg_offset[GC_HWIP ][0 ] = ctx->gc_reg_offsets; + adev->gfx.rlc.reg_funcs = &dm_test_gfx11_reg_funcs; +} + +static u64 dm_test_gfx11_dcc_best_modifier (u32 pipe_xor_bits,u32 pkrs,u32 tile) +{ +return AMD_FMT_MOD | +AMD_FMT_MOD_SET (TILE_VERSION ,AMD_FMT_MOD_TILE_VER_GFX11 ) | +AMD_FMT_MOD_SET (PIPE_XOR_BITS , pipe_xor_bits) | +AMD_FMT_MOD_SET (TILE , tile) | +AMD_FMT_MOD_SET (PACKERS , pkrs) | +AMD_FMT_MOD_SET (DCC ,1 ) | +AMD_FMT_MOD_SET (DCC_INDEPENDENT_128B ,1 ) | +AMD_FMT_MOD_SET (DCC_MAX_COMPRESSED_BLOCK ,AMD_FMT_MOD_DCC_BLOCK_128B ); +} + +static u64 dm_test_gfx11_dcc_4k_modifier (u32 pipe_xor_bits,u32 pkrs,u32 tile) +{ +return AMD_FMT_MOD | +AMD_FMT_MOD_SET (TILE_VERSION ,AMD_FMT_MOD_TILE_VER_GFX11 ) | +AMD_FMT_MOD_SET (PIPE_XOR_BITS , pipe_xor_bits) | +AMD_FMT_MOD_SET (TILE , tile) | +AMD_FMT_MOD_SET (PACKERS , pkrs) | +AMD_FMT_MOD_SET (DCC ,1 ) | +AMD_FMT_MOD_SET (DCC_INDEPENDENT_64B ,1 ) | +AMD_FMT_MOD_SET (DCC_INDEPENDENT_128B ,1 ) | +AMD_FMT_MOD_SET (DCC_MAX_COMPRESSED_BLOCK ,AMD_FMT_MOD_DCC_BLOCK_64B ); +} +/** * dm_test_get_plane_formats_overlay_universal_cap() - Verify universal overlay. * @test: KUnit test context.
@@ -1466,6 +1541,107 @@ static void dm_test_get_plane_modifiers_gfx10_3(struct kunit *test)dm_test_expect_mods_terminated (test, adev); } +/** +* dm_test_get_plane_modifiers_gfx11_64k_first() - Verify GFX11 small-pipe order. +* @test: KUnit test context. +* +* Verify if GFX11 modifier generation reads GB_ADDR_CONFIG through the RLC +* register callback and prefers 64K_R_X when the pipe count is 16 or lower. +*/ +static void dm_test_get_plane_modifiers_gfx11_64k_first (struct kunit *test) +{ +struct dm_test_gfx11_reg_ctx ctx = {0 }; +struct amdgpu_device *adev; +u64 *mods; +u32 pipe_xor_bits =4 ; +u32 pkrs =1 ; +u32 tile =AMD_FMT_MOD_TILE_GFX9_64K_R_X ; +u64 dcc_best; +u64 dcc_4k; +u64 d_mod; + + adev =kunit_kzalloc (test,sizeof (*adev),GFP_KERNEL ); +KUNIT_ASSERT_NOT_NULL (test, adev); +dm_test_setup_gfx11_device (adev, &ctx, pkrs, pipe_xor_bits); + + mods =dm_test_get_primary_mods (test, adev); + dcc_best =dm_test_gfx11_dcc_best_modifier (pipe_xor_bits, pkrs, tile); + dcc_4k =dm_test_gfx11_dcc_4k_modifier (pipe_xor_bits, pkrs, tile); + d_mod =AMD_FMT_MOD | +AMD_FMT_MOD_SET (TILE_VERSION ,AMD_FMT_MOD_TILE_VER_GFX11 ) | +AMD_FMT_MOD_SET (TILE ,AMD_FMT_MOD_TILE_GFX9_64K_D ); + +KUNIT_EXPECT_TRUE (test, ctx.called); +KUNIT_EXPECT_EQ (test, ctx.captured_reg, ctx.expected_reg); +KUNIT_EXPECT_EQ (test, ctx.captured_acc_flags,0U ); +KUNIT_EXPECT_EQ (test, ctx.captured_hwip, (u32 )GC_HWIP ); +KUNIT_EXPECT_EQ (test, ctx.captured_xcc_id,0U ); +KUNIT_EXPECT_EQ (test, mods[0 ], dcc_best); +KUNIT_EXPECT_TRUE (test,dm_test_mods_contain (mods, dcc_4k)); +KUNIT_EXPECT_TRUE (test, +dm_test_mods_contain (mods, + dcc_best |AMD_FMT_MOD_SET (DCC_RETILE ,1 ))); +KUNIT_EXPECT_TRUE (test,dm_test_mods_contain (mods, d_mod)); + + dm_test_gfx11_reg_ctx =NULL ; +kfree (mods); +} + +/** +* dm_test_get_plane_modifiers_gfx11_256k_first() - Verify GFX11 large-pipe order. +* @test: KUnit test context. +* +* Verify if GFX11 modifier generation prefers 256K_R_X when more than 16 pipes +* are reported by GB_ADDR_CONFIG. +*/ +static void dm_test_get_plane_modifiers_gfx11_256k_first (struct kunit *test) +{ +struct dm_test_gfx11_reg_ctx ctx = {0 }; +struct amdgpu_device *adev; +u64 *mods; +u32 pipe_xor_bits =5 ; +u32 pkrs =2 ; +u32 tile =AMD_FMT_MOD_TILE_GFX11_256K_R_X ; +u32 fallback_tile =AMD_FMT_MOD_TILE_GFX9_64K_R_X ; +u64 dcc_best; +u64 fallback_dcc_best =dm_test_gfx11_dcc_best_modifier (pipe_xor_bits, pkrs, + fallback_tile); + + adev =kunit_kzalloc (test,sizeof (*adev),GFP_KERNEL ); +KUNIT_ASSERT_NOT_NULL (test, adev); +dm_test_setup_gfx11_device (adev, &ctx, pkrs, pipe_xor_bits); + + mods =dm_test_get_primary_mods (test, adev); + dcc_best =dm_test_gfx11_dcc_best_modifier (pipe_xor_bits, pkrs, tile); + +KUNIT_EXPECT_TRUE (test, ctx.called); +KUNIT_EXPECT_EQ (test, ctx.captured_reg, ctx.expected_reg); +KUNIT_EXPECT_EQ (test, mods[0 ], dcc_best); +KUNIT_EXPECT_TRUE (test,dm_test_mods_contain (mods, fallback_dcc_best)); + + dm_test_gfx11_reg_ctx =NULL ; +kfree (mods); +} + +/** +* dm_test_get_plane_modifiers_gfx12() - Verify GFX12 modifier list generation. +* @test: KUnit test context. +* +* Verify if the GFX12 family dispatches to the GFX12 modifier builder and +* produces a terminated list. +*/ +static void dm_test_get_plane_modifiers_gfx12 (struct kunit *test) +{ +struct amdgpu_device *adev; + + adev =kunit_kzalloc (test,sizeof (*adev),GFP_KERNEL ); +KUNIT_ASSERT_NOT_NULL (test, adev); + + adev->family =AMDGPU_FAMILY_GC_12_0_0 ; + +dm_test_expect_mods_terminated (test, adev); +} +/** * dm_test_format_mod_supported_d_swizzle_reject() - Verify D swizzle rejection. * @test: KUnit test context.
@@ -1522,6 +1698,9 @@ static struct kunit_case amdgpu_dm_plane_test_cases[] = {KUNIT_CASE (dm_test_get_plane_modifiers_rv_constant_encode),KUNIT_CASE (dm_test_get_plane_modifiers_gfx10_1),KUNIT_CASE (dm_test_get_plane_modifiers_gfx10_3), +KUNIT_CASE (dm_test_get_plane_modifiers_gfx11_64k_first), +KUNIT_CASE (dm_test_get_plane_modifiers_gfx11_256k_first), +KUNIT_CASE (dm_test_get_plane_modifiers_gfx12),/* amdgpu_dm_plane_fill_dc_scaling_info() */ KUNIT_CASE(dm_test_fill_dc_scaling_info),/* amdgpu_dm_plane_get_min_max_dc_plane_scaling() */
Signature · 1 line
2.55.0
PATCH 47/80 drm/amd/display: Test plane scaling info paths
In reply to George ZhangFrom: Alex Hung <[email protected]>
[WHAT]
Add KUnit tests covering the NV12 DCN1.x and plane-caps paths of amdgpu_dm_plane_fill_dc_scaling_info() and the FP16 path of amdgpu_dm_plane_get_min_max_dc_plane_scaling().
--- .../amdgpu_dm/tests/amdgpu_dm_plane_test.c | 125 ++++++++++++++++++ 1 file changed, 125 insertions(+)
drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_plane_test.c +125 -0
@@ -1642,6 +1642,128 @@ static void dm_test_get_plane_modifiers_gfx12(struct kunit *test)dm_test_expect_mods_terminated (test, adev); } +/** +* dm_test_get_min_max_dc_plane_scaling_fp16() - Verify fp16 cap selection. +* @test: KUnit test context. +* +* Verify if 64bpp fp16 formats use the fp16 scaling caps. +*/ +static void dm_test_get_min_max_dc_plane_scaling_fp16 (struct kunit *test) +{ +struct amdgpu_device *adev; +struct dc *dc; +struct drm_framebuffer *fb; +int min_downscale =0 ; +int max_upscale =0 ; + + adev =kunit_kzalloc (test,sizeof (*adev),GFP_KERNEL ); + dc =kunit_kzalloc (test,sizeof (*dc),GFP_KERNEL ); + fb =kunit_kzalloc (test,sizeof (*fb),GFP_KERNEL ); +KUNIT_ASSERT_NOT_NULL (test, adev); +KUNIT_ASSERT_NOT_NULL (test, dc); +KUNIT_ASSERT_NOT_NULL (test, fb); + + adev->dm.dc = dc; + dc->caps.planes[0 ].max_upscale_factor.fp16 =2000 ; + dc->caps.planes[0 ].max_downscale_factor.fp16 =500 ; + + fb->format =drm_format_info (DRM_FORMAT_ARGB16161616F ); +KUNIT_ASSERT_NOT_NULL (test, fb->format); +amdgpu_dm_plane_get_min_max_dc_plane_scaling (&adev->ddev, fb, + &min_downscale, &max_upscale); +KUNIT_EXPECT_EQ (test, min_downscale,500 ); +KUNIT_EXPECT_EQ (test, max_upscale,2000 ); +} + +/** +* dm_test_fill_dc_scaling_info_nv12_dcn1x() - Verify NV12 DCN1x rejection. +* @test: KUnit test context. +* +* Verify if a non-zero NV12 source origin is rejected on DCN 1.0 to avoid the +* known DCN1x hang. +*/ +static void dm_test_fill_dc_scaling_info_nv12_dcn1x (struct kunit *test) +{ +struct amdgpu_device *adev; +struct drm_plane_state state = {0 }; +struct drm_framebuffer fb = {0 }; +struct dc_scaling_info info = {0 }; + + adev =kunit_kzalloc (test,sizeof (*adev),GFP_KERNEL ); +KUNIT_ASSERT_NOT_NULL (test, adev); + + adev->ip_versions[DCE_HWIP ][0 ] =IP_VERSION (1 ,0 ,0 ); + fb.format =drm_format_info (DRM_FORMAT_NV12 ); +KUNIT_ASSERT_NOT_NULL (test, fb.format); + + state.fb = &fb; + state.src_x =10 <<16 ; + state.src_y =0 ; + state.src_w =100 <<16 ; + state.src_h =100 <<16 ; + state.crtc_w =100 ; + state.crtc_h =100 ; + +KUNIT_EXPECT_EQ (test, +amdgpu_dm_plane_fill_dc_scaling_info (adev, &state, &info), + -EINVAL ); + + state.src_x =0 ; + state.src_y =10 <<16 ; +memset (&info,0 ,sizeof (info)); + +KUNIT_EXPECT_EQ (test, +amdgpu_dm_plane_fill_dc_scaling_info (adev, &state, &info), + -EINVAL ); +} + +/** +* dm_test_fill_dc_scaling_info_plane_caps() - Verify scaling caps path. +* @test: KUnit test context. +* +* Verify if scaling info uses plane caps when the state references a plane, +* device, and framebuffer. +*/ +static void dm_test_fill_dc_scaling_info_plane_caps (struct kunit *test) +{ +struct amdgpu_device *adev; +struct dc *dc; +struct drm_plane *plane; +struct drm_plane_state *state; +struct drm_framebuffer *fb; +struct dc_scaling_info info = {0 }; + + adev =kunit_kzalloc (test,sizeof (*adev),GFP_KERNEL ); + dc =kunit_kzalloc (test,sizeof (*dc),GFP_KERNEL ); + plane =kunit_kzalloc (test,sizeof (*plane),GFP_KERNEL ); + state =kunit_kzalloc (test,sizeof (*state),GFP_KERNEL ); + fb =kunit_kzalloc (test,sizeof (*fb),GFP_KERNEL ); +KUNIT_ASSERT_NOT_NULL (test, adev); +KUNIT_ASSERT_NOT_NULL (test, dc); +KUNIT_ASSERT_NOT_NULL (test, plane); +KUNIT_ASSERT_NOT_NULL (test, state); +KUNIT_ASSERT_NOT_NULL (test, fb); + + adev->dm.dc = dc; + dc->caps.planes[0 ].max_upscale_factor.argb8888 =16000 ; + dc->caps.planes[0 ].max_downscale_factor.argb8888 =250 ; + + plane->dev = &adev->ddev; + fb->format =drm_format_info (DRM_FORMAT_XRGB8888 ); +KUNIT_ASSERT_NOT_NULL (test, fb->format); + + state->plane = plane; + state->fb = fb; + state->src_w =100 <<16 ; + state->src_h =100 <<16 ; + state->crtc_w =100 ; + state->crtc_h =100 ; + +KUNIT_EXPECT_EQ (test, +amdgpu_dm_plane_fill_dc_scaling_info (adev, state, &info), +0 ); +} +/** * dm_test_format_mod_supported_d_swizzle_reject() - Verify D swizzle rejection. * @test: KUnit test context.
@@ -1703,8 +1825,11 @@ static struct kunit_case amdgpu_dm_plane_test_cases[] = {KUNIT_CASE (dm_test_get_plane_modifiers_gfx12),/* amdgpu_dm_plane_fill_dc_scaling_info() */ KUNIT_CASE (dm_test_fill_dc_scaling_info), +KUNIT_CASE (dm_test_fill_dc_scaling_info_nv12_dcn1x), +KUNIT_CASE (dm_test_fill_dc_scaling_info_plane_caps),/* amdgpu_dm_plane_get_min_max_dc_plane_scaling() */ KUNIT_CASE (dm_test_get_min_max_dc_plane_scaling), +KUNIT_CASE (dm_test_get_min_max_dc_plane_scaling_fp16),/* amdgpu_dm_plane_fill_plane_buffer_attributes() */ KUNIT_CASE(dm_test_fill_plane_buffer_attributes_gfx8),/* amdgpu_dm_plane_get_cursor_position() */
Signature · 1 line
2.55.0
PATCH 48/80 drm/amd/display: Test plane buffer attributes
In reply to George ZhangFrom: Alex Hung <[email protected]>
[WHAT]
Add KUnit tests for the video and GFX12 paths ofamdgpu_dm_plane_fill_plane_buffer_attributes().
Introduce the dm_test_plane_attrs(), dm_test_video_attrs() and dm_test_graphics_attrs() helpers that drive the buffer-attribute fill with representative plane states.
--- .../amdgpu_dm/tests/amdgpu_dm_plane_test.c | 135 ++++++++++++++++++ 1 file changed, 135 insertions(+)
drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_plane_test.c +135 -0
@@ -1301,6 +1301,41 @@ static u64 *dm_test_get_primary_mods(struct kunit *test, struct amdgpu_device *areturn mods; } +static int dm_test_plane_attrs (struct amdgpu_device *adev, +const struct amdgpu_framebuffer *afb, +enum surface_pixel_format format, +struct dc_tiling_info *tiling_info, +struct plane_size *plane_size, +struct dc_plane_dcc_param *dcc, +struct dc_plane_address *address) +{ +return amdgpu_dm_plane_fill_plane_buffer_attributes (adev, afb, format, +ROTATION_ANGLE_0 ,0 , tiling_info, plane_size, dcc, address, + false); +} + +static int dm_test_video_attrs (struct amdgpu_device *adev, +const struct amdgpu_framebuffer *afb, +struct dc_tiling_info *tiling_info, +struct plane_size *plane_size, +struct dc_plane_dcc_param *dcc, +struct dc_plane_address *address) +{ +return dm_test_plane_attrs (adev, afb, SURFACE_PIXEL_FORMAT_VIDEO_420_YCbCr, + tiling_info, plane_size, dcc, address); +} + +static int dm_test_graphics_attrs (struct amdgpu_device *adev, +const struct amdgpu_framebuffer *afb, +struct dc_tiling_info *tiling_info, +struct plane_size *plane_size, +struct dc_plane_dcc_param *dcc, +struct dc_plane_address *address) +{ +return dm_test_plane_attrs (adev, afb,SURFACE_PIXEL_FORMAT_GRPH_ARGB8888 , + tiling_info, plane_size, dcc, address); +} +static void dm_test_setup_gfx11_device (struct amdgpu_device *adev,struct dm_test_gfx11_reg_ctx *ctx,u32 num_pkrs_log2,u32 num_pipes_log2)
@@ -1642,6 +1677,104 @@ static void dm_test_get_plane_modifiers_gfx12(struct kunit *test)dm_test_expect_mods_terminated (test, adev); } +/** +* dm_test_fill_plane_buffer_attributes_video() - Verify NV12 attributes. +* @test: KUnit test context. +* +* Verify if a video pixel format fills chroma plane size and the progressive +* video address type on a GFX9 family device. +*/ +static void dm_test_fill_plane_buffer_attributes_video (struct kunit *test) +{ +struct amdgpu_device *adev; +struct amdgpu_framebuffer *afb; +struct dc_tiling_info tiling_info; +struct plane_size plane_size; +struct dc_plane_dcc_param dcc; +struct dc_plane_address address; +int ret; + + adev =kunit_kzalloc (test,sizeof (*adev),GFP_KERNEL ); + afb =kunit_kzalloc (test,sizeof (*afb),GFP_KERNEL ); + tiling_info = (struct dc_tiling_info ){0 }; + plane_size = (struct plane_size ){0 }; + dcc = (struct dc_plane_dcc_param ){0 }; + address = (struct dc_plane_address ){0 }; +KUNIT_ASSERT_NOT_NULL (test, adev); +KUNIT_ASSERT_NOT_NULL (test, afb); + + adev->family =AMDGPU_FAMILY_NV ; + adev->ip_versions[GC_HWIP ][0 ] =IP_VERSION (10 ,3 ,0 ); + afb->address =0x80000000ULL ; + afb->base.width =1920 ; + afb->base.height =1080 ; + afb->base.offsets[0 ] =0 ; + afb->base.offsets[1 ] =0x200000 ; + afb->base.pitches[0 ] =1920 ; + afb->base.pitches[1 ] =1920 ; + afb->base.format =drm_format_info (DRM_FORMAT_NV12 ); + afb->base.modifier =DRM_FORMAT_MOD_LINEAR ; +KUNIT_ASSERT_NOT_NULL (test, afb->base.format); + + ret =dm_test_video_attrs (adev, afb, &tiling_info, &plane_size, &dcc, + &address); + +KUNIT_EXPECT_EQ (test, ret,0 ); +KUNIT_EXPECT_EQ (test, plane_size.surface_size.width,1920 ); +KUNIT_EXPECT_EQ (test, plane_size.chroma_size.width,960U ); +KUNIT_EXPECT_EQ (test, plane_size.chroma_size.height,540U ); +KUNIT_EXPECT_EQ (test, address.type, + (int )PLN_ADDR_TYPE_VIDEO_PROGRESSIVE ); +KUNIT_EXPECT_EQ (test, (int )tiling_info.gfxversion, (int )DcGfxVersion9); +} + +/** +* dm_test_fill_plane_buffer_attributes_gfx12() - Verify GFX12 dispatch path. +* @test: KUnit test context. +* +* Verify if a GFX12 family device fills graphics attributes via the GFX12 +* modifier path and reports the GFX addr3 version. +*/ +static void dm_test_fill_plane_buffer_attributes_gfx12 (struct kunit *test) +{ +struct amdgpu_device *adev; +struct dc *dc; +struct amdgpu_framebuffer *afb; +struct dc_tiling_info tiling_info; +struct plane_size plane_size; +struct dc_plane_dcc_param dcc; +struct dc_plane_address address; +int ret; + + adev =kunit_kzalloc (test,sizeof (*adev),GFP_KERNEL ); + dc =kunit_kzalloc (test,sizeof (*dc),GFP_KERNEL ); + afb =kunit_kzalloc (test,sizeof (*afb),GFP_KERNEL ); + tiling_info = (struct dc_tiling_info ){0 }; + plane_size = (struct plane_size ){0 }; + dcc = (struct dc_plane_dcc_param ){0 }; + address = (struct dc_plane_address ){0 }; +KUNIT_ASSERT_NOT_NULL (test, adev); +KUNIT_ASSERT_NOT_NULL (test, dc); +KUNIT_ASSERT_NOT_NULL (test, afb); + + adev->family =AMDGPU_FAMILY_GC_12_0_0 ; + adev->dm.dc = dc; + afb->address =0x80000000ULL ; + afb->base.width =1920 ; + afb->base.height =1080 ; + afb->base.pitches[0 ] =7680 ; + afb->base.format =drm_format_info (DRM_FORMAT_XRGB8888 ); + afb->base.modifier =DRM_FORMAT_MOD_LINEAR ; +KUNIT_ASSERT_NOT_NULL (test, afb->base.format); + + ret =dm_test_graphics_attrs (adev, afb, &tiling_info, &plane_size, &dcc, + &address); + +KUNIT_EXPECT_EQ (test, ret,0 ); +KUNIT_EXPECT_EQ (test, address.type, (int )PLN_ADDR_TYPE_GRAPHICS ); +KUNIT_EXPECT_EQ (test, (int )tiling_info.gfxversion, (int )DcGfxAddr3); +} +/** * dm_test_get_min_max_dc_plane_scaling_fp16() - Verify fp16 cap selection. * @test: KUnit test context.
@@ -1832,6 +1965,8 @@ static struct kunit_case amdgpu_dm_plane_test_cases[] = {KUNIT_CASE (dm_test_get_min_max_dc_plane_scaling_fp16),/* amdgpu_dm_plane_fill_plane_buffer_attributes() */ KUNIT_CASE (dm_test_fill_plane_buffer_attributes_gfx8), +KUNIT_CASE (dm_test_fill_plane_buffer_attributes_video), +KUNIT_CASE (dm_test_fill_plane_buffer_attributes_gfx12),/* amdgpu_dm_plane_get_cursor_position() */ KUNIT_CASE(dm_test_get_cursor_position),/* amdgpu_dm_plane_format_mod_supported() */
Signature · 1 line
2.55.0
PATCH 49/80 drm/amd/display: Test GFX9 DCC plane attributes
In reply to George ZhangFrom: Alex Hung <[email protected]>
[WHAT]
Add KUnit tests for amdgpu_dm_plane_fill_gfx9_plane_attributes_from_modifiers() covering DCC enablement, validation failure, and the RB+ 64B/128B and GFX9 64B/unconstrained block modes.
Add the dm_test_gfx9_attrs(), dm_test_setup_gfx9_dcc_device() and dm_test_gfx9_dcc_modifier() helpers used to build the GFX9 DCC inputs.
--- .../amdgpu_dm/tests/amdgpu_dm_plane_test.c | 351 ++++++++++++++++++ 1 file changed, 351 insertions(+)
drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_plane_test.c +351 -0
@@ -1301,6 +1301,18 @@ static u64 *dm_test_get_primary_mods(struct kunit *test, struct amdgpu_device *areturn mods; } +static int dm_test_gfx9_attrs (struct amdgpu_device *adev, +const struct amdgpu_framebuffer *afb, +const struct plane_size *plane_size, +struct dc_tiling_info *tiling_info, +struct dc_plane_dcc_param *dcc, +struct dc_plane_address *address) +{ +return amdgpu_dm_plane_fill_gfx9_plane_attributes_from_modifiers (adev, + afb,SURFACE_PIXEL_FORMAT_GRPH_ARGB8888 ,ROTATION_ANGLE_0 , + plane_size, tiling_info, dcc, address); +} + static int dm_test_plane_attrs(struct amdgpu_device *adev, const struct amdgpu_framebuffer *afb, enum surface_pixel_format format,
@@ -1336,6 +1348,34 @@ static int dm_test_graphics_attrs(struct amdgpu_device *adev, tiling_info, plane_size, dcc, address); } +static void dm_test_setup_gfx9_dcc_device (struct amdgpu_device *adev, +struct dc *dc, +struct dm_test_dcc_cap_ctx *ctx, +bool output_independent_64b_blks) +{ + adev->family =AMDGPU_FAMILY_NV ; + adev->dm.dc = dc; + adev->gfx.config.gb_addr_config_fields.num_pipes =2 ; + adev->gfx.config.gb_addr_config_fields.num_pkrs =2 ; + adev->ip_versions[GC_HWIP ][0 ] =IP_VERSION (10 ,3 ,0 ); + dc->cap_funcs.get_dcc_compression_cap = dm_test_get_dcc_compression_cap; + ctx->callback_ret = true; + ctx->capable = true; + ctx->output_independent_64b_blks = output_independent_64b_blks; + dm_test_dcc_ctx = ctx; +} + +static u64 dm_test_gfx9_dcc_modifier (u64 tile_version,bool independent_64b_blks, +bool independent_128b_blks) +{ +return AMD_FMT_MOD | +AMD_FMT_MOD_SET (TILE ,AMD_FMT_MOD_TILE_GFX9_64K_S_X ) | +AMD_FMT_MOD_SET (TILE_VERSION , tile_version) | +AMD_FMT_MOD_SET (DCC ,1 ) | +AMD_FMT_MOD_SET (DCC_INDEPENDENT_64B , independent_64b_blks) | +AMD_FMT_MOD_SET (DCC_INDEPENDENT_128B , independent_128b_blks); +} +static void dm_test_setup_gfx11_device (struct amdgpu_device *adev,struct dm_test_gfx11_reg_ctx *ctx,u32 num_pkrs_log2,u32 num_pipes_log2)
@@ -1677,6 +1717,310 @@ static void dm_test_get_plane_modifiers_gfx12(struct kunit *test)dm_test_expect_mods_terminated (test, adev); } +/** +* dm_test_fill_gfx9_plane_attributes_dcc() - Verify GFX9 DCC modifier path. +* @test: KUnit test context. +* +* Verify if a GFX10-RBPLUS DCC modifier enables DCC and selects the 64B +* independent block mode. +*/ +static void dm_test_fill_gfx9_plane_attributes_dcc (struct kunit *test) +{ +struct amdgpu_device *adev; +struct dc *dc; +struct amdgpu_framebuffer *afb; +struct plane_size plane_size = {0 }; +struct dc_tiling_info tiling_info = {0 }; +struct dc_plane_dcc_param dcc = {0 }; +struct dc_plane_address address = {0 }; +struct dm_test_dcc_cap_ctx ctx = { + .callback_ret = true, + .capable = true, + .output_independent_64b_blks = true, + }; +int ret; + + adev =kunit_kzalloc (test,sizeof (*adev),GFP_KERNEL ); + dc =kunit_kzalloc (test,sizeof (*dc),GFP_KERNEL ); + afb =kunit_kzalloc (test,sizeof (*afb),GFP_KERNEL ); +KUNIT_ASSERT_NOT_NULL (test, adev); +KUNIT_ASSERT_NOT_NULL (test, dc); +KUNIT_ASSERT_NOT_NULL (test, afb); + + adev->family =AMDGPU_FAMILY_NV ; + adev->dm.dc = dc; + adev->gfx.config.gb_addr_config_fields.num_pipes =2 ; + adev->gfx.config.gb_addr_config_fields.num_pkrs =2 ; + adev->ip_versions[GC_HWIP ][0 ] =IP_VERSION (10 ,3 ,0 ); + dc->cap_funcs.get_dcc_compression_cap = dm_test_get_dcc_compression_cap; + dm_test_dcc_ctx = &ctx; + + afb->base.pitches[1 ] =256 ; + afb->base.modifier =AMD_FMT_MOD | +AMD_FMT_MOD_SET (TILE ,AMD_FMT_MOD_TILE_GFX9_64K_S_X ) | +AMD_FMT_MOD_SET (TILE_VERSION ,AMD_FMT_MOD_TILE_VER_GFX10_RBPLUS ) | +AMD_FMT_MOD_SET (DCC ,1 ) | +AMD_FMT_MOD_SET (DCC_INDEPENDENT_64B ,1 ); + plane_size.surface_size.width =1920 ; + plane_size.surface_size.height =1080 ; + + ret =dm_test_gfx9_attrs (adev, afb, &plane_size, &tiling_info, &dcc, + &address); +KUNIT_EXPECT_EQ (test, ret,0 ); +KUNIT_EXPECT_EQ (test, (int )tiling_info.gfxversion, (int )DcGfxVersion9); +KUNIT_EXPECT_TRUE (test, dcc.enable); +KUNIT_EXPECT_EQ (test, (int )dcc.dcc_ind_blk, (int )hubp_ind_block_64b); +KUNIT_EXPECT_EQ (test, dcc.meta_pitch,256U ); + + dm_test_dcc_ctx =NULL ; +} + +/** +* dm_test_fill_gfx9_plane_attributes_validate_fails() - Verify GFX9 error path. +* @test: KUnit test context. +* +* Verify if GFX9 modifier parsing returns validation errors from the shared DCC +* validation helper. +*/ +static void dm_test_fill_gfx9_plane_attributes_validate_fails (struct kunit *test) +{ +struct amdgpu_device *adev; +struct dc *dc; +struct amdgpu_framebuffer *afb; +struct plane_size plane_size = {0 }; +struct dc_tiling_info tiling_info = {0 }; +struct dc_plane_dcc_param dcc = {0 }; +struct dc_plane_address address = {0 }; +u64 tile_version =AMD_FMT_MOD_TILE_VER_GFX10_RBPLUS ; +int ret; + + adev =kunit_kzalloc (test,sizeof (*adev),GFP_KERNEL ); + dc =kunit_kzalloc (test,sizeof (*dc),GFP_KERNEL ); + afb =kunit_kzalloc (test,sizeof (*afb),GFP_KERNEL ); +KUNIT_ASSERT_NOT_NULL (test, adev); +KUNIT_ASSERT_NOT_NULL (test, dc); +KUNIT_ASSERT_NOT_NULL (test, afb); + + adev->family =AMDGPU_FAMILY_NV ; + adev->dm.dc = dc; + adev->ip_versions[GC_HWIP ][0 ] =IP_VERSION (10 ,3 ,0 ); + afb->base.modifier =dm_test_gfx9_dcc_modifier (tile_version, true, false); + plane_size.surface_size.width =1920 ; + plane_size.surface_size.height =1080 ; + + ret =dm_test_gfx9_attrs (adev, afb, &plane_size, &tiling_info, &dcc, + &address); +KUNIT_EXPECT_EQ (test, ret, -EINVAL ); +} + +/** +* dm_test_fill_gfx9_plane_attributes_dcc_rbplus_64b_no_128bcl() - Verify block mode. +* @test: KUnit test context. +* +* Verify if a GFX10-RBPLUS modifier with both 64B and 128B independent block +* bits selects the 64B-no-128BCL block mode. +*/ +static void dm_test_fill_gfx9_plane_attributes_dcc_rbplus_64b_no_128bcl (struct kunit *test) +{ +struct amdgpu_device *adev; +struct dc *dc; +struct amdgpu_framebuffer *afb; +struct plane_size plane_size = {0 }; +struct dc_tiling_info tiling_info = {0 }; +struct dc_plane_dcc_param dcc = {0 }; +struct dc_plane_address address = {0 }; +struct dm_test_dcc_cap_ctx ctx = {0 }; +u64 tile_version =AMD_FMT_MOD_TILE_VER_GFX10_RBPLUS ; +int ret; + + adev =kunit_kzalloc (test,sizeof (*adev),GFP_KERNEL ); + dc =kunit_kzalloc (test,sizeof (*dc),GFP_KERNEL ); + afb =kunit_kzalloc (test,sizeof (*afb),GFP_KERNEL ); +KUNIT_ASSERT_NOT_NULL (test, adev); +KUNIT_ASSERT_NOT_NULL (test, dc); +KUNIT_ASSERT_NOT_NULL (test, afb); + +dm_test_setup_gfx9_dcc_device (adev, dc, &ctx, true); + afb->base.modifier =dm_test_gfx9_dcc_modifier (tile_version, true, true); + plane_size.surface_size.width =1920 ; + plane_size.surface_size.height =1080 ; + + ret =dm_test_gfx9_attrs (adev, afb, &plane_size, &tiling_info, &dcc, + &address); +KUNIT_EXPECT_EQ (test, ret,0 ); +KUNIT_EXPECT_TRUE (test, dcc.enable); +KUNIT_EXPECT_EQ (test, (int )dcc.dcc_ind_blk, + (int )hubp_ind_block_64b_no_128bcl); + + dm_test_dcc_ctx =NULL ; +} + +/** +* dm_test_fill_gfx9_plane_attributes_dcc_rbplus_128b() - Verify 128B block mode. +* @test: KUnit test context. +* +* Verify if a GFX10-RBPLUS modifier with only the 128B independent block bit +* selects the 128B block mode. +*/ +static void dm_test_fill_gfx9_plane_attributes_dcc_rbplus_128b (struct kunit *test) +{ +struct amdgpu_device *adev; +struct dc *dc; +struct amdgpu_framebuffer *afb; +struct plane_size plane_size = {0 }; +struct dc_tiling_info tiling_info = {0 }; +struct dc_plane_dcc_param dcc = {0 }; +struct dc_plane_address address = {0 }; +struct dm_test_dcc_cap_ctx ctx = {0 }; +u64 tile_version =AMD_FMT_MOD_TILE_VER_GFX10_RBPLUS ; +int ret; + + adev =kunit_kzalloc (test,sizeof (*adev),GFP_KERNEL ); + dc =kunit_kzalloc (test,sizeof (*dc),GFP_KERNEL ); + afb =kunit_kzalloc (test,sizeof (*afb),GFP_KERNEL ); +KUNIT_ASSERT_NOT_NULL (test, adev); +KUNIT_ASSERT_NOT_NULL (test, dc); +KUNIT_ASSERT_NOT_NULL (test, afb); + +dm_test_setup_gfx9_dcc_device (adev, dc, &ctx, false); + afb->base.modifier =dm_test_gfx9_dcc_modifier (tile_version, false, true); + plane_size.surface_size.width =1920 ; + plane_size.surface_size.height =1080 ; + + ret =dm_test_gfx9_attrs (adev, afb, &plane_size, &tiling_info, &dcc, + &address); +KUNIT_EXPECT_EQ (test, ret,0 ); +KUNIT_EXPECT_TRUE (test, dcc.enable); +KUNIT_EXPECT_EQ (test, (int )dcc.dcc_ind_blk, (int )hubp_ind_block_128b); + + dm_test_dcc_ctx =NULL ; +} + +/** +* dm_test_fill_gfx9_plane_attributes_dcc_rbplus_unconstrained() - Verify block mode. +* @test: KUnit test context. +* +* Verify if a GFX10-RBPLUS modifier without independent block bits selects the +* unconstrained block mode. +*/ +static void dm_test_fill_gfx9_plane_attributes_dcc_rbplus_unconstrained (struct kunit *test) +{ +struct amdgpu_device *adev; +struct dc *dc; +struct amdgpu_framebuffer *afb; +struct plane_size plane_size = {0 }; +struct dc_tiling_info tiling_info = {0 }; +struct dc_plane_dcc_param dcc = {0 }; +struct dc_plane_address address = {0 }; +struct dm_test_dcc_cap_ctx ctx = {0 }; +u64 tile_version =AMD_FMT_MOD_TILE_VER_GFX10_RBPLUS ; +int ret; + + adev =kunit_kzalloc (test,sizeof (*adev),GFP_KERNEL ); + dc =kunit_kzalloc (test,sizeof (*dc),GFP_KERNEL ); + afb =kunit_kzalloc (test,sizeof (*afb),GFP_KERNEL ); +KUNIT_ASSERT_NOT_NULL (test, adev); +KUNIT_ASSERT_NOT_NULL (test, dc); +KUNIT_ASSERT_NOT_NULL (test, afb); + +dm_test_setup_gfx9_dcc_device (adev, dc, &ctx, false); + afb->base.modifier =dm_test_gfx9_dcc_modifier (tile_version, false, false); + plane_size.surface_size.width =1920 ; + plane_size.surface_size.height =1080 ; + + ret =dm_test_gfx9_attrs (adev, afb, &plane_size, &tiling_info, &dcc, + &address); +KUNIT_EXPECT_EQ (test, ret,0 ); +KUNIT_EXPECT_TRUE (test, dcc.enable); +KUNIT_EXPECT_EQ (test, (int )dcc.dcc_ind_blk, + (int )hubp_ind_block_unconstrained); + + dm_test_dcc_ctx =NULL ; +} + +/** +* dm_test_fill_gfx9_plane_attributes_dcc_gfx9_64b() - Verify legacy 64B mode. +* @test: KUnit test context. +* +* Verify if a pre-RBPLUS GFX9 modifier with the 64B independent block bit +* selects the 64B block mode. +*/ +static void dm_test_fill_gfx9_plane_attributes_dcc_gfx9_64b (struct kunit *test) +{ +struct amdgpu_device *adev; +struct dc *dc; +struct amdgpu_framebuffer *afb; +struct plane_size plane_size = {0 }; +struct dc_tiling_info tiling_info = {0 }; +struct dc_plane_dcc_param dcc = {0 }; +struct dc_plane_address address = {0 }; +struct dm_test_dcc_cap_ctx ctx = {0 }; +int ret; + + adev =kunit_kzalloc (test,sizeof (*adev),GFP_KERNEL ); + dc =kunit_kzalloc (test,sizeof (*dc),GFP_KERNEL ); + afb =kunit_kzalloc (test,sizeof (*afb),GFP_KERNEL ); +KUNIT_ASSERT_NOT_NULL (test, adev); +KUNIT_ASSERT_NOT_NULL (test, dc); +KUNIT_ASSERT_NOT_NULL (test, afb); + +dm_test_setup_gfx9_dcc_device (adev, dc, &ctx, true); + afb->base.modifier =dm_test_gfx9_dcc_modifier (AMD_FMT_MOD_TILE_VER_GFX9 , + true, false); + plane_size.surface_size.width =1920 ; + plane_size.surface_size.height =1080 ; + + ret =dm_test_gfx9_attrs (adev, afb, &plane_size, &tiling_info, &dcc, + &address); +KUNIT_EXPECT_EQ (test, ret,0 ); +KUNIT_EXPECT_TRUE (test, dcc.enable); +KUNIT_EXPECT_EQ (test, (int )dcc.dcc_ind_blk, (int )hubp_ind_block_64b); + + dm_test_dcc_ctx =NULL ; +} + +/** +* dm_test_fill_gfx9_plane_attributes_dcc_gfx9_unconstrained() - Verify legacy mode. +* @test: KUnit test context. +* +* Verify if a pre-RBPLUS GFX9 modifier without the 64B independent block bit +* selects the unconstrained block mode. +*/ +static void dm_test_fill_gfx9_plane_attributes_dcc_gfx9_unconstrained (struct kunit *test) +{ +struct amdgpu_device *adev; +struct dc *dc; +struct amdgpu_framebuffer *afb; +struct plane_size plane_size = {0 }; +struct dc_tiling_info tiling_info = {0 }; +struct dc_plane_dcc_param dcc = {0 }; +struct dc_plane_address address = {0 }; +struct dm_test_dcc_cap_ctx ctx = {0 }; +int ret; + + adev =kunit_kzalloc (test,sizeof (*adev),GFP_KERNEL ); + dc =kunit_kzalloc (test,sizeof (*dc),GFP_KERNEL ); + afb =kunit_kzalloc (test,sizeof (*afb),GFP_KERNEL ); +KUNIT_ASSERT_NOT_NULL (test, adev); +KUNIT_ASSERT_NOT_NULL (test, dc); +KUNIT_ASSERT_NOT_NULL (test, afb); + +dm_test_setup_gfx9_dcc_device (adev, dc, &ctx, false); + afb->base.modifier =dm_test_gfx9_dcc_modifier (AMD_FMT_MOD_TILE_VER_GFX9 , + false, false); + plane_size.surface_size.width =1920 ; + plane_size.surface_size.height =1080 ; + + ret =dm_test_gfx9_attrs (adev, afb, &plane_size, &tiling_info, &dcc, + &address); +KUNIT_EXPECT_EQ (test, ret,0 ); +KUNIT_EXPECT_TRUE (test, dcc.enable); +KUNIT_EXPECT_EQ (test, (int )dcc.dcc_ind_blk, + (int )hubp_ind_block_unconstrained); + + dm_test_dcc_ctx =NULL ; +} +/** * dm_test_fill_plane_buffer_attributes_video() - Verify NV12 attributes. * @test: KUnit test context.
@@ -1976,6 +2320,13 @@ static struct kunit_case amdgpu_dm_plane_test_cases[] = {KUNIT_CASE (dm_test_fill_gfx12_plane_attributes_from_modifiers),/* amdgpu_dm_plane_fill_gfx9_plane_attributes_from_modifiers() */ KUNIT_CASE (dm_test_fill_gfx9_plane_attributes_from_modifiers), +KUNIT_CASE (dm_test_fill_gfx9_plane_attributes_dcc), +KUNIT_CASE (dm_test_fill_gfx9_plane_attributes_validate_fails), +KUNIT_CASE (dm_test_fill_gfx9_plane_attributes_dcc_rbplus_64b_no_128bcl), +KUNIT_CASE (dm_test_fill_gfx9_plane_attributes_dcc_rbplus_128b), +KUNIT_CASE (dm_test_fill_gfx9_plane_attributes_dcc_rbplus_unconstrained), +KUNIT_CASE (dm_test_fill_gfx9_plane_attributes_dcc_gfx9_64b), +KUNIT_CASE (dm_test_fill_gfx9_plane_attributes_dcc_gfx9_unconstrained),/* amdgpu_dm_plane_helper_check_state() */ KUNIT_CASE (dm_test_helper_check_state_viewport_reject), /* amdgpu_dm_plane_add_modifier() */
Signature · 1 line
2.55.0
PATCH 50/80 drm/amd/display: Test GFX12 DCC plane attributes
In reply to George ZhangFrom: Alex Hung <[email protected]>
[WHAT]
Add KUnit tests for amdgpu_dm_plane_fill_gfx12_plane_attributes_from_modifiers() covering the block0, unconstrained-block and validation-failure cases.
Add the dm_test_gfx12_attrs() helper used to build the GFX12 inputs.
--- .../amdgpu_dm/tests/amdgpu_dm_plane_test.c | 162 ++++++++++++++++++ 1 file changed, 162 insertions(+)
drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_plane_test.c +162 -0
@@ -1313,6 +1313,18 @@ static int dm_test_gfx9_attrs(struct amdgpu_device *adev, plane_size, tiling_info, dcc, address); } +static int dm_test_gfx12_attrs (struct amdgpu_device *adev, +const struct amdgpu_framebuffer *afb, +const struct plane_size *plane_size, +struct dc_tiling_info *tiling_info, +struct dc_plane_dcc_param *dcc, +struct dc_plane_address *address) +{ +return amdgpu_dm_plane_fill_gfx12_plane_attributes_from_modifiers (adev, + afb,SURFACE_PIXEL_FORMAT_GRPH_ARGB8888 ,ROTATION_ANGLE_0 , + plane_size, tiling_info, dcc, address); +} + static int dm_test_plane_attrs(struct amdgpu_device *adev, const struct amdgpu_framebuffer *afb, enum surface_pixel_format format,
@@ -2021,6 +2033,153 @@ static void dm_test_fill_gfx9_plane_attributes_dcc_gfx9_unconstrained(struct kun dm_test_dcc_ctx =NULL ; } +/** +* dm_test_fill_gfx12_plane_attributes_block0() - Verify GFX12 64B max-compressed-block path. +* @test: KUnit test context. +* +* Verify if a zero max-compressed-block modifier selects the 64B independent +* block mode on GFX12. +*/ +static void dm_test_fill_gfx12_plane_attributes_block0 (struct kunit *test) +{ +struct amdgpu_device *adev; +struct dc *dc; +struct amdgpu_framebuffer *afb; +struct plane_size plane_size = {0 }; +struct dc_tiling_info tiling_info = {0 }; +struct dc_plane_dcc_param dcc = {0 }; +struct dc_plane_address address = {0 }; +struct dm_test_dcc_cap_ctx ctx = { + .callback_ret = true, + .capable = true, + .output_independent_64b_blks = false, + }; +int ret; + + adev =kunit_kzalloc (test,sizeof (*adev),GFP_KERNEL ); + dc =kunit_kzalloc (test,sizeof (*dc),GFP_KERNEL ); + afb =kunit_kzalloc (test,sizeof (*afb),GFP_KERNEL ); +KUNIT_ASSERT_NOT_NULL (test, adev); +KUNIT_ASSERT_NOT_NULL (test, dc); +KUNIT_ASSERT_NOT_NULL (test, afb); + + adev->family =AMDGPU_FAMILY_GC_12_0_0 ; + adev->dm.dc = dc; + dc->cap_funcs.get_dcc_compression_cap = dm_test_get_dcc_compression_cap; + dm_test_dcc_ctx = &ctx; + + afb->base.modifier =AMD_FMT_MOD | +AMD_FMT_MOD_SET (TILE ,AMD_FMT_MOD_TILE_GFX12_64K_2D ) | +AMD_FMT_MOD_SET (TILE_VERSION ,AMD_FMT_MOD_TILE_VER_GFX12 ) | +AMD_FMT_MOD_SET (DCC ,1 ) | +AMD_FMT_MOD_SET (DCC_MAX_COMPRESSED_BLOCK ,0 ); + plane_size.surface_size.width =1920 ; + plane_size.surface_size.height =1080 ; + + ret =dm_test_gfx12_attrs (adev, afb, &plane_size, &tiling_info, &dcc, + &address); +KUNIT_EXPECT_EQ (test, ret,0 ); +KUNIT_EXPECT_TRUE (test, dcc.enable); +KUNIT_EXPECT_TRUE (test, dcc.independent_64b_blks); +KUNIT_EXPECT_EQ (test, (int )dcc.dcc_ind_blk, (int )hubp_ind_block_64b); + + dm_test_dcc_ctx =NULL ; +} + +/** +* dm_test_fill_gfx12_plane_attributes_block_unconstrained() - Verify block path. +* @test: KUnit test context. +* +* Verify if a max-compressed-block value above one selects the unconstrained +* independent block mode on GFX12. +*/ +static void dm_test_fill_gfx12_plane_attributes_block_unconstrained (struct kunit *test) +{ +struct amdgpu_device *adev; +struct dc *dc; +struct amdgpu_framebuffer *afb; +struct plane_size plane_size = {0 }; +struct dc_tiling_info tiling_info = {0 }; +struct dc_plane_dcc_param dcc = {0 }; +struct dc_plane_address address = {0 }; +struct dm_test_dcc_cap_ctx ctx = { + .callback_ret = true, + .capable = true, + .output_independent_64b_blks = false, + }; +int ret; + + adev =kunit_kzalloc (test,sizeof (*adev),GFP_KERNEL ); + dc =kunit_kzalloc (test,sizeof (*dc),GFP_KERNEL ); + afb =kunit_kzalloc (test,sizeof (*afb),GFP_KERNEL ); +KUNIT_ASSERT_NOT_NULL (test, adev); +KUNIT_ASSERT_NOT_NULL (test, dc); +KUNIT_ASSERT_NOT_NULL (test, afb); + + adev->family =AMDGPU_FAMILY_GC_12_0_0 ; + adev->dm.dc = dc; + dc->cap_funcs.get_dcc_compression_cap = dm_test_get_dcc_compression_cap; + dm_test_dcc_ctx = &ctx; + + afb->base.modifier =AMD_FMT_MOD | +AMD_FMT_MOD_SET (TILE ,AMD_FMT_MOD_TILE_GFX12_64K_2D ) | +AMD_FMT_MOD_SET (TILE_VERSION ,AMD_FMT_MOD_TILE_VER_GFX12 ) | +AMD_FMT_MOD_SET (DCC ,1 ) | +AMD_FMT_MOD_SET (DCC_MAX_COMPRESSED_BLOCK ,2 ); + plane_size.surface_size.width =1920 ; + plane_size.surface_size.height =1080 ; + + ret =dm_test_gfx12_attrs (adev, afb, &plane_size, &tiling_info, &dcc, + &address); +KUNIT_EXPECT_EQ (test, ret,0 ); +KUNIT_EXPECT_TRUE (test, dcc.enable); +KUNIT_EXPECT_FALSE (test, dcc.independent_64b_blks); +KUNIT_EXPECT_EQ (test, (int )dcc.dcc_ind_blk, + (int )hubp_ind_block_unconstrained); + + dm_test_dcc_ctx =NULL ; +} + +/** +* dm_test_fill_gfx12_plane_attributes_validate_fails() - Verify GFX12 error path. +* @test: KUnit test context. +* +* Verify if GFX12 modifier parsing returns validation errors from the shared +* DCC validation helper. +*/ +static void dm_test_fill_gfx12_plane_attributes_validate_fails (struct kunit *test) +{ +struct amdgpu_device *adev; +struct dc *dc; +struct amdgpu_framebuffer *afb; +struct plane_size plane_size = {0 }; +struct dc_tiling_info tiling_info = {0 }; +struct dc_plane_dcc_param dcc = {0 }; +struct dc_plane_address address = {0 }; +int ret; + + adev =kunit_kzalloc (test,sizeof (*adev),GFP_KERNEL ); + dc =kunit_kzalloc (test,sizeof (*dc),GFP_KERNEL ); + afb =kunit_kzalloc (test,sizeof (*afb),GFP_KERNEL ); +KUNIT_ASSERT_NOT_NULL (test, adev); +KUNIT_ASSERT_NOT_NULL (test, dc); +KUNIT_ASSERT_NOT_NULL (test, afb); + + adev->family =AMDGPU_FAMILY_GC_12_0_0 ; + adev->dm.dc = dc; + afb->base.modifier =AMD_FMT_MOD | +AMD_FMT_MOD_SET (TILE ,AMD_FMT_MOD_TILE_GFX12_64K_2D ) | +AMD_FMT_MOD_SET (TILE_VERSION ,AMD_FMT_MOD_TILE_VER_GFX12 ) | +AMD_FMT_MOD_SET (DCC ,1 ) | +AMD_FMT_MOD_SET (DCC_MAX_COMPRESSED_BLOCK ,1 ); + plane_size.surface_size.width =1920 ; + plane_size.surface_size.height =1080 ; + + ret =dm_test_gfx12_attrs (adev, afb, &plane_size, &tiling_info, &dcc, + &address); +KUNIT_EXPECT_EQ (test, ret, -EINVAL ); +} +/** * dm_test_fill_plane_buffer_attributes_video() - Verify NV12 attributes. * @test: KUnit test context.
@@ -2318,6 +2477,9 @@ static struct kunit_case amdgpu_dm_plane_test_cases[] = {KUNIT_CASE (dm_test_format_mod_supported_d_swizzle_reject),/* amdgpu_dm_plane_fill_gfx12_plane_attributes_from_modifiers() */ KUNIT_CASE (dm_test_fill_gfx12_plane_attributes_from_modifiers), +KUNIT_CASE (dm_test_fill_gfx12_plane_attributes_block0), +KUNIT_CASE (dm_test_fill_gfx12_plane_attributes_block_unconstrained), +KUNIT_CASE (dm_test_fill_gfx12_plane_attributes_validate_fails),/* amdgpu_dm_plane_fill_gfx9_plane_attributes_from_modifiers() */ KUNIT_CASE (dm_test_fill_gfx9_plane_attributes_from_modifiers), KUNIT_CASE(dm_test_fill_gfx9_plane_attributes_dcc),
Signature · 1 line
2.55.0
PATCH 51/80 drm/amd/display: Test DCC and cursor edge cases
In reply to George ZhangFrom: Alex Hung <[email protected]>
[WHAT]
Add KUnit tests for the capability-callback-failure and not-capable paths of amdgpu_dm_plane_validate_dcc(), and for the bad-size path of amdgpu_dm_plane_get_cursor_position().
--- .../amdgpu_dm/tests/amdgpu_dm_plane_test.c | 113 ++++++++++++++++++ 1 file changed, 113 insertions(+)
drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_plane_test.c +113 -0
@@ -785,6 +785,77 @@ static void dm_test_validate_dcc_missing_cap_func_fails(struct kunit *test) -EINVAL); } +/** +* dm_test_validate_dcc_cap_callback_fails() - Verify callback failure path. +* @test: KUnit test context. +* +* Verify if validation fails when the DCC capability callback returns false. +*/ +static void dm_test_validate_dcc_cap_callback_fails (struct kunit *test) +{ +struct amdgpu_device *adev; +struct dc *dc; +struct dc_tiling_info tiling_info = {0 }; +struct dc_plane_dcc_param dcc = {0 }; +struct dc_plane_address address = {0 }; +struct plane_size plane_size = {0 }; +enum surface_pixel_format format =SURFACE_PIXEL_FORMAT_GRPH_ARGB8888 ; +enum dc_rotation_angle rotation =ROTATION_ANGLE_0 ; +struct dm_test_dcc_cap_ctx ctx = { + .callback_ret = false, + .capable = true, + }; +int ret; + +dm_test_init_validate_dcc_inputs (&adev, &dc, &tiling_info, &dcc, &address, + &plane_size, test); + dc->cap_funcs.get_dcc_compression_cap = dm_test_get_dcc_compression_cap; + dm_test_dcc_ctx = &ctx; + + ret =amdgpu_dm_plane_validate_dcc (adev, format, rotation, &tiling_info, + &dcc, &address, &plane_size); +KUNIT_EXPECT_EQ (test, ret, -EINVAL ); +KUNIT_EXPECT_TRUE (test, ctx.called); + + dm_test_dcc_ctx =NULL ; +} + +/** +* dm_test_validate_dcc_not_capable_fails() - Verify not-capable callback output. +* @test: KUnit test context. +* +* Verify if validation fails when the DCC capability callback reports that the +* surface is not DCC capable. +*/ +static void dm_test_validate_dcc_not_capable_fails (struct kunit *test) +{ +struct amdgpu_device *adev; +struct dc *dc; +struct dc_tiling_info tiling_info = {0 }; +struct dc_plane_dcc_param dcc = {0 }; +struct dc_plane_address address = {0 }; +struct plane_size plane_size = {0 }; +enum surface_pixel_format format =SURFACE_PIXEL_FORMAT_GRPH_ARGB8888 ; +enum dc_rotation_angle rotation =ROTATION_ANGLE_0 ; +struct dm_test_dcc_cap_ctx ctx = { + .callback_ret = true, + .capable = false, + }; +int ret; + +dm_test_init_validate_dcc_inputs (&adev, &dc, &tiling_info, &dcc, &address, + &plane_size, test); + dc->cap_funcs.get_dcc_compression_cap = dm_test_get_dcc_compression_cap; + dm_test_dcc_ctx = &ctx; + + ret =amdgpu_dm_plane_validate_dcc (adev, format, rotation, &tiling_info, + &dcc, &address, &plane_size); +KUNIT_EXPECT_EQ (test, ret, -EINVAL ); +KUNIT_EXPECT_TRUE (test, ctx.called); + + dm_test_dcc_ctx =NULL ; +} +/** * dm_test_validate_dcc_success_and_scan_mapping() - Verify success path and rotation-to-scan mapping. * @test: KUnit test context.
@@ -2400,6 +2471,45 @@ static void dm_test_fill_dc_scaling_info_plane_caps(struct kunit *test) 0); } +/** +* dm_test_get_cursor_position_bad_size() - Verify oversized cursor rejection. +* @test: KUnit test context. +* +* Verify if a cursor larger than the CRTC maximum is rejected. +*/ +static void dm_test_get_cursor_position_bad_size (struct kunit *test) +{ +struct amdgpu_device *adev; +struct amdgpu_crtc *amdgpu_crtc; +struct drm_plane *plane; +struct drm_plane_state *state; +struct drm_framebuffer *fb; +struct dc_cursor_position position = {0 }; + + adev =kunit_kzalloc (test,sizeof (*adev),GFP_KERNEL ); + amdgpu_crtc =kunit_kzalloc (test,sizeof (*amdgpu_crtc),GFP_KERNEL ); + plane =kunit_kzalloc (test,sizeof (*plane),GFP_KERNEL ); + state =kunit_kzalloc (test,sizeof (*state),GFP_KERNEL ); + fb =kunit_kzalloc (test,sizeof (*fb),GFP_KERNEL ); +KUNIT_ASSERT_NOT_NULL (test, adev); +KUNIT_ASSERT_NOT_NULL (test, amdgpu_crtc); +KUNIT_ASSERT_NOT_NULL (test, plane); +KUNIT_ASSERT_NOT_NULL (test, state); +KUNIT_ASSERT_NOT_NULL (test, fb); + + amdgpu_crtc->max_cursor_width =64 ; + amdgpu_crtc->max_cursor_height =64 ; + plane->dev = &adev->ddev; + plane->state = state; + state->fb = fb; + state->crtc_w =128 ; + state->crtc_h =32 ; + +KUNIT_EXPECT_EQ (test, +amdgpu_dm_plane_get_cursor_position (plane, &amdgpu_crtc->base, &position), + -EINVAL ); +} +/** * dm_test_format_mod_supported_d_swizzle_reject() - Verify D swizzle rejection. * @test: KUnit test context.
@@ -2472,6 +2582,7 @@ static struct kunit_case amdgpu_dm_plane_test_cases[] = {KUNIT_CASE (dm_test_fill_plane_buffer_attributes_gfx12),/* amdgpu_dm_plane_get_cursor_position() */ KUNIT_CASE (dm_test_get_cursor_position), +KUNIT_CASE (dm_test_get_cursor_position_bad_size),/* amdgpu_dm_plane_format_mod_supported() */ KUNIT_CASE (dm_test_format_mod_supported), KUNIT_CASE(dm_test_format_mod_supported_d_swizzle_reject),
@@ -2510,6 +2621,8 @@ static struct kunit_case amdgpu_dm_plane_test_cases[] = {KUNIT_CASE (dm_test_validate_dcc_disabled_returns_success),KUNIT_CASE (dm_test_validate_dcc_video_non_gfx12_fails),KUNIT_CASE (dm_test_validate_dcc_missing_cap_func_fails), +KUNIT_CASE (dm_test_validate_dcc_cap_callback_fails), +KUNIT_CASE (dm_test_validate_dcc_not_capable_fails),KUNIT_CASE (dm_test_validate_dcc_success_and_scan_mapping), KUNIT_CASE(dm_test_validate_dcc_independent_64b_mismatch_fails), {}
Signature · 1 line
2.55.0
PATCH 52/80 drm/amd/display: Test helper_check_state rejects
In reply to George ZhangFrom: Alex Hung <[email protected]>
[WHAT]
Add KUnit tests for amdgpu_dm_plane_helper_check_state() covering the small viewport width, small viewport height, bottom-edge clipping and scaling-caps rejection paths.
--- .../amdgpu_dm/tests/amdgpu_dm_plane_test.c | 188 ++++++++++++++++++ 1 file changed, 188 insertions(+)
drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_plane_test.c +188 -0
@@ -2382,6 +2382,190 @@ static void dm_test_get_min_max_dc_plane_scaling_fp16(struct kunit *test)KUNIT_EXPECT_EQ (test, max_upscale,2000 ); } +/** +* dm_test_helper_check_state_small_viewport_width() - Verify width rejection. +* @test: KUnit test context. +* +* Verify if a viewport width below the minimum pipe-split width is rejected. +*/ +static void dm_test_helper_check_state_small_viewport_width (struct kunit *test) +{ +struct drm_plane *plane; +struct drm_plane_state *state; +struct drm_crtc *crtc; +struct drm_crtc_state *new_crtc_state; +struct drm_framebuffer *fb; + + plane =kunit_kzalloc (test,sizeof (*plane),GFP_KERNEL ); + state =kunit_kzalloc (test,sizeof (*state),GFP_KERNEL ); + crtc =kunit_kzalloc (test,sizeof (*crtc),GFP_KERNEL ); + new_crtc_state =kunit_kzalloc (test,sizeof (*new_crtc_state),GFP_KERNEL ); + fb =kunit_kzalloc (test,sizeof (*fb),GFP_KERNEL ); +KUNIT_ASSERT_NOT_NULL (test, plane); +KUNIT_ASSERT_NOT_NULL (test, state); +KUNIT_ASSERT_NOT_NULL (test, crtc); +KUNIT_ASSERT_NOT_NULL (test, new_crtc_state); +KUNIT_ASSERT_NOT_NULL (test, fb); + + plane->type =DRM_PLANE_TYPE_OVERLAY ; + state->plane = plane; + state->fb = fb; + state->crtc = crtc; + state->crtc_x =0 ; + state->crtc_y =0 ; + state->crtc_w =10 ; + state->crtc_h =100 ; + new_crtc_state->mode.crtc_hdisplay =1920 ; + new_crtc_state->mode.crtc_vdisplay =1080 ; + +KUNIT_EXPECT_EQ (test, +amdgpu_dm_plane_helper_check_state (state, new_crtc_state), + -EINVAL ); +} + +/** +* dm_test_helper_check_state_small_viewport_height() - Verify height rejection. +* @test: KUnit test context. +* +* Verify if a negative-offset viewport with a too-small height is rejected. +*/ +static void dm_test_helper_check_state_small_viewport_height (struct kunit *test) +{ +struct drm_plane *plane; +struct drm_plane_state *state; +struct drm_crtc *crtc; +struct drm_crtc_state *new_crtc_state; +struct drm_framebuffer *fb; + + plane =kunit_kzalloc (test,sizeof (*plane),GFP_KERNEL ); + state =kunit_kzalloc (test,sizeof (*state),GFP_KERNEL ); + crtc =kunit_kzalloc (test,sizeof (*crtc),GFP_KERNEL ); + new_crtc_state =kunit_kzalloc (test,sizeof (*new_crtc_state),GFP_KERNEL ); + fb =kunit_kzalloc (test,sizeof (*fb),GFP_KERNEL ); +KUNIT_ASSERT_NOT_NULL (test, plane); +KUNIT_ASSERT_NOT_NULL (test, state); +KUNIT_ASSERT_NOT_NULL (test, crtc); +KUNIT_ASSERT_NOT_NULL (test, new_crtc_state); +KUNIT_ASSERT_NOT_NULL (test, fb); + + plane->type =DRM_PLANE_TYPE_OVERLAY ; + state->plane = plane; + state->fb = fb; + state->crtc = crtc; + state->crtc_x =-2 ; + state->crtc_y =-95 ; + state->crtc_w =100 ; + state->crtc_h =100 ; + new_crtc_state->mode.crtc_hdisplay =1920 ; + new_crtc_state->mode.crtc_vdisplay =1080 ; + +KUNIT_EXPECT_EQ (test, +amdgpu_dm_plane_helper_check_state (state, new_crtc_state), + -EINVAL ); +} + +/** +* dm_test_helper_check_state_bottom_clipped_height() - Verify bottom clipping. +* @test: KUnit test context. +* +* Verify if a viewport clipped by the bottom edge to below the minimum height +* is rejected. +*/ +static void dm_test_helper_check_state_bottom_clipped_height (struct kunit *test) +{ +struct drm_plane *plane; +struct drm_plane_state *state; +struct drm_crtc *crtc; +struct drm_crtc_state *new_crtc_state; +struct drm_framebuffer *fb; + + plane =kunit_kzalloc (test,sizeof (*plane),GFP_KERNEL ); + state =kunit_kzalloc (test,sizeof (*state),GFP_KERNEL ); + crtc =kunit_kzalloc (test,sizeof (*crtc),GFP_KERNEL ); + new_crtc_state =kunit_kzalloc (test,sizeof (*new_crtc_state),GFP_KERNEL ); + fb =kunit_kzalloc (test,sizeof (*fb),GFP_KERNEL ); +KUNIT_ASSERT_NOT_NULL (test, plane); +KUNIT_ASSERT_NOT_NULL (test, state); +KUNIT_ASSERT_NOT_NULL (test, crtc); +KUNIT_ASSERT_NOT_NULL (test, new_crtc_state); +KUNIT_ASSERT_NOT_NULL (test, fb); + + plane->type =DRM_PLANE_TYPE_OVERLAY ; + state->plane = plane; + state->fb = fb; + state->crtc = crtc; + state->crtc_x =0 ; + state->crtc_y =95 ; + state->crtc_w =100 ; + state->crtc_h =100 ; + new_crtc_state->mode.crtc_hdisplay =1920 ; + new_crtc_state->mode.crtc_vdisplay =100 ; + +KUNIT_EXPECT_EQ (test, +amdgpu_dm_plane_helper_check_state (state, new_crtc_state), + -EINVAL ); +} + +/** +* dm_test_helper_check_state_scaling_caps() - Verify DC scaling caps are applied. +* @test: KUnit test context. +* +* Verify if helper_check_state converts DC plane scaling caps to DRM scale +* limits and rejects scaling outside those limits. +*/ +static void dm_test_helper_check_state_scaling_caps (struct kunit *test) +{ +struct amdgpu_device *adev; +struct dc *dc; +struct drm_plane *plane; +struct drm_plane_state *state; +struct drm_crtc *crtc; +struct drm_crtc_state *new_crtc_state; +struct drm_framebuffer *fb; + + adev =kunit_kzalloc (test,sizeof (*adev),GFP_KERNEL ); + dc =kunit_kzalloc (test,sizeof (*dc),GFP_KERNEL ); + plane =kunit_kzalloc (test,sizeof (*plane),GFP_KERNEL ); + state =kunit_kzalloc (test,sizeof (*state),GFP_KERNEL ); + crtc =kunit_kzalloc (test,sizeof (*crtc),GFP_KERNEL ); + new_crtc_state =kunit_kzalloc (test,sizeof (*new_crtc_state),GFP_KERNEL ); + fb =kunit_kzalloc (test,sizeof (*fb),GFP_KERNEL ); +KUNIT_ASSERT_NOT_NULL (test, adev); +KUNIT_ASSERT_NOT_NULL (test, dc); +KUNIT_ASSERT_NOT_NULL (test, plane); +KUNIT_ASSERT_NOT_NULL (test, state); +KUNIT_ASSERT_NOT_NULL (test, crtc); +KUNIT_ASSERT_NOT_NULL (test, new_crtc_state); +KUNIT_ASSERT_NOT_NULL (test, fb); + + adev->dm.dc = dc; + dc->caps.planes[0 ].max_upscale_factor.argb8888 =1 ; + dc->caps.planes[0 ].max_downscale_factor.argb8888 =1 ; + + plane->type =DRM_PLANE_TYPE_OVERLAY ; + plane->dev = &adev->ddev; + crtc->dev = &adev->ddev; + fb->width =100 ; + fb->height =100 ; + fb->format =drm_format_info (DRM_FORMAT_XRGB8888 ); +KUNIT_ASSERT_NOT_NULL (test, fb->format); + + state->plane = plane; + state->fb = fb; + state->crtc = crtc; + state->src_w =100 <<16 ; + state->src_h =100 <<16 ; + state->crtc_w =200 ; + state->crtc_h =200 ; + new_crtc_state->crtc = crtc; + new_crtc_state->mode.crtc_hdisplay =1920 ; + new_crtc_state->mode.crtc_vdisplay =1080 ; + +KUNIT_EXPECT_EQ (test, +amdgpu_dm_plane_helper_check_state (state, new_crtc_state), + -ERANGE ); +} +/** * dm_test_fill_dc_scaling_info_nv12_dcn1x() - Verify NV12 DCN1x rejection. * @test: KUnit test context.
@@ -2602,6 +2786,10 @@ static struct kunit_case amdgpu_dm_plane_test_cases[] = {KUNIT_CASE (dm_test_fill_gfx9_plane_attributes_dcc_gfx9_unconstrained),/* amdgpu_dm_plane_helper_check_state() */ KUNIT_CASE (dm_test_helper_check_state_viewport_reject), +KUNIT_CASE (dm_test_helper_check_state_small_viewport_width), +KUNIT_CASE (dm_test_helper_check_state_small_viewport_height), +KUNIT_CASE (dm_test_helper_check_state_bottom_clipped_height), +KUNIT_CASE (dm_test_helper_check_state_scaling_caps),/* amdgpu_dm_plane_add_modifier() */ KUNIT_CASE (dm_test_add_modifier_appends_value), KUNIT_CASE(dm_test_add_modifier_grows_capacity),
Signature · 1 line
2.55.0
PATCH 53/80 drm/amd/display: Test plane atomic check and hooks
In reply to George ZhangFrom: Alex Hung <[email protected]>
[WHAT]
Add KUnit tests for amdgpu_dm_plane_atomic_async_check(), amdgpu_dm_plane_atomic_check(), amdgpu_dm_plane_panic_flush() and the DRM plane reset, duplicate-state and destroy-state hooks.
Add the dm_test_init_atomic_check_state() helper and plane reset vtable used by the new tests.
--- .../amd/display/amdgpu_dm/amdgpu_dm_plane.c | 25 +- .../amd/display/amdgpu_dm/amdgpu_dm_plane.h | 9 + .../amdgpu_dm/tests/amdgpu_dm_plane_test.c | 457 ++++++++++++++++++ 3 files changed, 482 insertions(+), 9 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c +16 -9
@@ -1254,8 +1254,8 @@ int amdgpu_dm_plane_fill_dc_scaling_info(struct amdgpu_device *adev, }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) +STATIC_IFN_KUNIT int amdgpu_dm_plane_atomic_check(struct drm_plane *plane, +struct drm_atomic_state *state) {struct drm_plane_state *new_plane_state =drm_atomic_get_new_plane_state (state, plane);
@@ -1300,9 +1300,10 @@ static int amdgpu_dm_plane_atomic_check(struct drm_plane *plane,return -EINVAL ; } +EXPORT_IF_KUNIT (amdgpu_dm_plane_atomic_check); -static int amdgpu_dm_plane_atomic_async_check (struct drm_plane *plane, -struct drm_atomic_state *state,bool flip) +STATIC_IFN_KUNIT int amdgpu_dm_plane_atomic_async_check(struct drm_plane *plane, +struct drm_atomic_state *state,bool flip) {struct drm_crtc_state *new_crtc_state;struct drm_plane_state *new_plane_state;
@@ -1324,6 +1325,7 @@ static int amdgpu_dm_plane_atomic_async_check(struct drm_plane *plane,return 0 ; } +EXPORT_IF_KUNIT (amdgpu_dm_plane_atomic_async_check);int amdgpu_dm_plane_get_cursor_position (struct drm_plane *plane,struct drm_crtc *crtc,struct dc_cursor_position *position)
@@ -1483,7 +1485,7 @@ static void amdgpu_dm_plane_atomic_async_update(struct drm_plane *plane,amdgpu_dm_plane_handle_cursor_update (plane, old_state); } -static void amdgpu_dm_plane_panic_flush (struct drm_plane *plane) +STATIC_IFN_KUNIT void amdgpu_dm_plane_panic_flush(struct drm_plane *plane) {struct dm_plane_state *dm_plane_state =to_dm_plane_state (plane->state);struct drm_framebuffer *fb = plane->state->fb;
@@ -1496,6 +1498,7 @@ static void amdgpu_dm_plane_panic_flush(struct drm_plane *plane)dc_plane_force_dcc_and_tiling_disable (dc_plane_state, fb->modifier ? true : false); } +EXPORT_IF_KUNIT (amdgpu_dm_plane_panic_flush);static const struct drm_plane_helper_funcs dm_plane_helper_funcs = { .prepare_fb = amdgpu_dm_plane_helper_prepare_fb,
@@ -1515,7 +1518,7 @@ static const struct drm_plane_helper_funcs dm_primary_plane_helper_funcs = { .panic_flush = amdgpu_dm_plane_panic_flush, }; -static void amdgpu_dm_plane_drm_plane_reset (struct drm_plane *plane) +STATIC_IFN_KUNIT void amdgpu_dm_plane_drm_plane_reset(struct drm_plane *plane) {struct dm_plane_state *amdgpu_state;
@@ -1532,8 +1535,10 @@ static void amdgpu_dm_plane_drm_plane_reset(struct drm_plane *plane) amdgpu_state->shaper_tf =AMDGPU_TRANSFER_FUNCTION_DEFAULT ; amdgpu_state->blend_tf =AMDGPU_TRANSFER_FUNCTION_DEFAULT ; } +EXPORT_IF_KUNIT (amdgpu_dm_plane_drm_plane_reset); -static struct drm_plane_state *amdgpu_dm_plane_drm_plane_duplicate_state (struct drm_plane *plane) +STATIC_IFN_KUNIT struct drm_plane_state * +amdgpu_dm_plane_drm_plane_duplicate_state (struct drm_plane *plane) {struct dm_plane_state *dm_plane_state, *old_dm_plane_state;
@@ -1572,6 +1577,7 @@ static struct drm_plane_state *amdgpu_dm_plane_drm_plane_duplicate_state(structreturn &dm_plane_state->base; } +EXPORT_IF_KUNIT (amdgpu_dm_plane_drm_plane_duplicate_state); STATIC_IFN_KUNIT bool amdgpu_dm_plane_format_mod_supported(struct drm_plane *plane, uint32_t format,
@@ -1636,8 +1642,8 @@ STATIC_IFN_KUNIT bool amdgpu_dm_plane_format_mod_supported(struct drm_plane *pla }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) +STATIC_IFN_KUNIT void amdgpu_dm_plane_drm_plane_destroy_state(struct drm_plane *plane, +struct drm_plane_state *state) {struct dm_plane_state *dm_plane_state =to_dm_plane_state (state);
@@ -1657,6 +1663,7 @@ static void amdgpu_dm_plane_drm_plane_destroy_state(struct drm_plane *plane,drm_atomic_helper_plane_destroy_state (plane, state); } +EXPORT_IF_KUNIT (amdgpu_dm_plane_drm_plane_destroy_state);#ifdef AMD_PRIVATE_COLOR static void
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.h +9 -0
@@ -115,5 +115,14 @@ void amdgpu_dm_plane_get_min_max_dc_plane_scaling(struct drm_device *dev,struct drm_framebuffer *fb, int *min_downscale, int *max_upscale); +int amdgpu_dm_plane_atomic_async_check (struct drm_plane *plane, +struct drm_atomic_state *state,bool flip); +int amdgpu_dm_plane_atomic_check (struct drm_plane *plane, +struct drm_atomic_state *state); +void amdgpu_dm_plane_panic_flush (struct drm_plane *plane); +void amdgpu_dm_plane_drm_plane_reset (struct drm_plane *plane); +struct drm_plane_state *amdgpu_dm_plane_drm_plane_duplicate_state (struct drm_plane *plane); +void amdgpu_dm_plane_drm_plane_destroy_state (struct drm_plane *plane, +struct drm_plane_state *state);#endif #endif
drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_plane_test.c +457 -0
469 lines not on this page · raw message
Signature · 1 line
2.55.0
PATCH 54/80 drm/amd/display: Fix VABC Init and OLED Support
In reply to George ZhangFrom: Iswara Nagulendran <[email protected]>
[Why]
TCONs supporting VESA AUX Backlight does not always support VESA Smooth Brightness. Driver software needs to implement smooth brightness by periodically updating the brightness by small steps. Driver implementation is completed and verified on LCD panels but solution is missing for OLED panels.
[How]
Updated driver to include smooth brightness for OLED panels using VESA Aux Backlight. Revert original workaround for VABC on oled issue, as it is no longer needed.
Add VABC backlight Initialization sequence from driver side.
Add fix to remove conflict between FW and driver backlight programming for future ASIC. Enable VABC for all future asic revisions.
--- .../amd/display/dc/hwss/dcn31/dcn31_hwseq.c | 41 ++++++++++++++++++- .../amd/display/dc/hwss/dcn42/dcn42_hwseq.c | 2 + .../link/protocols/link_edp_panel_control.c | 13 +++--- .../drm/amd/display/modules/power/power_abm.c | 10 ++++- 4 files changed, 56 insertions(+), 10 deletions(-)
drivers/gpu/drm/amd/display/dc/hwss/dcn31/dcn31_hwseq.c +40 -1
@@ -719,6 +719,34 @@ static void dmub_abm_set_backlight(struct dc_context *dc,dc_wake_and_execute_dmub_cmd (dc, &cmd,DM_DMUB_WAIT_TYPE_WAIT ); } +static bool dmub_cacp_set_backlight (struct dc_context *dc, +struct set_backlight_level_params *backlight_level_params, +unsigned int panel_inst) +{ +union dmub_rb_cmd cmd; + +memset (&cmd,0 ,sizeof (cmd)); + cmd.cacp_set_backlight.header.type =DMUB_CMD__CACP ; + cmd.cacp_set_backlight.header.sub_type =DMUB_CMD__CACP_SET_BACKLIGHT ; + cmd.cacp_set_backlight.cacp_set_backlight_data.aux_inst = backlight_level_params->aux_inst; + cmd.cacp_set_backlight.cacp_set_backlight_data.frame_ramp = backlight_level_params->frame_ramp; + cmd.cacp_set_backlight.cacp_set_backlight_data.backlight_user_level = + backlight_level_params->backlight_pwm_u16_16; + cmd.cacp_set_backlight.cacp_set_backlight_data.backlight_control_type = + (enum dmub_backlight_control_type )backlight_level_params->control_type; + cmd.cacp_set_backlight.cacp_set_backlight_data.min_luminance = backlight_level_params->min_luminance; + cmd.cacp_set_backlight.cacp_set_backlight_data.max_luminance = backlight_level_params->max_luminance; + cmd.cacp_set_backlight.cacp_set_backlight_data.min_backlight_pwm = backlight_level_params->min_backlight_pwm; + cmd.cacp_set_backlight.cacp_set_backlight_data.max_backlight_pwm = backlight_level_params->max_backlight_pwm; + cmd.cacp_set_backlight.cacp_set_backlight_data.version =DMUB_CMD_CACP_CONTROL_VERSION_1 ; + cmd.cacp_set_backlight.cacp_set_backlight_data.panel_mask = (0x01 << panel_inst); + cmd.cacp_set_backlight.header.payload_bytes =sizeof (struct dmub_cmd_cacp_set_backlight_data ); + +dc_wake_and_execute_dmub_cmd (dc, &cmd,DM_DMUB_WAIT_TYPE_WAIT ); + +return true; +} +bool dcn31_set_backlight_level (struct pipe_ctx *pipe_ctx,struct set_backlight_level_params *backlight_level_params) {
@@ -746,8 +774,19 @@ bool dcn31_set_backlight_level(struct pipe_ctx *pipe_ctx, panel_cntl->inst, panel_cntl->pwrseq_inst); -if (backlight_level_params->control_type !=BACKLIGHT_CONTROL_AMD_AUX ) +if (link && link->panel_type ==PANEL_TYPE_OLED ) { +/* For OLED panel with AMD AUX, skip set backlight call */ +if (backlight_level_params->control_type ==BACKLIGHT_CONTROL_VESA_AUX ) +dmub_cacp_set_backlight (dc, backlight_level_params, panel_cntl->inst); + }else if (link && link->panel_type ==PANEL_TYPE_MINILED ) { +/* For MiniLED panel we need to check if CACP or ABM is being used */ +if (link->panel_config.cacp.cacp_supported) +dmub_cacp_set_backlight (dc, backlight_level_params, panel_cntl->inst); +else +dmub_abm_set_backlight (dc, backlight_level_params, panel_cntl->inst); + }else {dmub_abm_set_backlight (dc, backlight_level_params, panel_cntl->inst); + }return true; }
drivers/gpu/drm/amd/display/dc/hwss/dcn42/dcn42_hwseq.c +2 -0
@@ -281,6 +281,8 @@ void dcn42_init_hw(struct dc *dc) dc->caps.dmub_caps.psr = dc->ctx->dmub_srv->dmub->feature_caps.psr; dc->caps.dmub_caps.mclk_sw = dc->ctx->dmub_srv->dmub->feature_caps.fw_assisted_mclk_switch_ver >0 ; dc->caps.dmub_caps.fams_ver = dc->ctx->dmub_srv->dmub->feature_caps.fw_assisted_mclk_switch_ver; + dc->caps.dmub_caps.aux_backlight_support = + dc->ctx->dmub_srv->dmub->feature_caps.abm_aux_backlight_support;/* sw and fw FAMS versions must match for support */ dc->debug.fams2_config.bits.enable &=
drivers/gpu/drm/amd/display/dc/link/protocols/link_edp_panel_control.c +6 -7
@@ -161,9 +161,7 @@ bool edp_set_backlight_level_nits(struct dc_link *link,if (link->is_dds && !link->dpcd_caps.panel_luminance_control)return true; -// use internal backlight control if dmub capabilities are not present -if (link->backlight_control_type ==BACKLIGHT_CONTROL_VESA_AUX && - !link->dc->caps.dmub_caps.aux_backlight_support) { +if (link->backlight_control_type ==BACKLIGHT_CONTROL_VESA_AUX ) {uint8_t backlight_enable =0 ;struct target_luminance_value *target_luminance =NULL ;
@@ -273,10 +271,11 @@ bool edp_backlight_enable_aux(struct dc_link *link, bool enable)if (link->is_dds)return true; -if (core_link_write_dpcd (link,DP_SOURCE_BACKLIGHT_ENABLE , - &backlight_enable,1 ) !=DC_OK ) -return false; - +if (!link->dpcd_caps.panel_luminance_control) { +if (core_link_write_dpcd (link,DP_SOURCE_BACKLIGHT_ENABLE , + &backlight_enable,1 ) !=DC_OK ) +return false; + }return true; }
drivers/gpu/drm/amd/display/modules/power/power_abm.c +8 -2
@@ -716,8 +716,9 @@ void mod_power_update_backlight_on_mode_change( {struct set_backlight_level_params backlight_level_params = {0 }; -if (link->dpcd_sink_ext_caps.bits.hdr_aux_backlight_control ==1 || - link->dpcd_sink_ext_caps.bits.sdr_aux_backlight_control ==1 ) +if ((link->dpcd_sink_ext_caps.bits.hdr_aux_backlight_control ==1 || + link->dpcd_sink_ext_caps.bits.sdr_aux_backlight_control ==1 ) && + link->backlight_control_type ==BACKLIGHT_CONTROL_AMD_AUX )dc_link_set_backlight_level_nits (link, core_power->bl_state[panel_inst].isHDR, core_power->bl_state[panel_inst].backlight_millinit,0 );
@@ -746,6 +747,11 @@ static bool set_backlight_millinits_aux(struct core_power *core_power, link =dc_stream_get_link (stream); +// only use internal backlight control if dmub capabilities are not present +if (link->backlight_control_type ==BACKLIGHT_CONTROL_VESA_AUX && + link->dc->caps.dmub_caps.aux_backlight_support) +return true; +return dc_link_set_backlight_level_nits (link, core_power->bl_state[inst].isHDR, backlight_millinits, transition_time_millisec); }
Signature · 1 line
2.55.0
PATCH 55/80 drm/amd/display: Allocate DCN32/1 dmub memory to GTT
In reply to George ZhangFrom: Fangzhi Zuo <[email protected]>
[Why]
On DCN32/321 sometimes DMCUB takes a long time to flush. This adds a delay before the data is available on the driver side even after driver receives notification from DMCUB via inbox
[How]
Allocating DMUB memory to GTT gives much better latency. Limit this to DCN32/1 for now; it will be made general to all other dGPUs later.
--- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_dmub.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_dmub.c +9 -2
@@ -506,6 +506,7 @@ int dm_dmub_sw_init(struct amdgpu_device *adev) DMUB_WINDOW_MEMORY_TYPE_FB, /* DMUB_WINDOW_CURSOR_OFFLOAD */ };int r; +int mem_domain =AMDGPU_GEM_DOMAIN_GTT ;switch (amdgpu_ip_version (adev,DCE_HWIP ,0 )) {case IP_VERSION (2 ,1 ,0 ):
@@ -639,13 +640,19 @@ int dm_dmub_sw_init(struct amdgpu_device *adev)return -EINVAL ; } +/* Limit to allocate dmub to GTT on DCN32/1 +* TODO: Other asics with GDDR7 may have worse latency +*/ +if (dmub_asic !=DMUB_ASIC_DCN32 && + dmub_asic !=DMUB_ASIC_DCN321 ) + mem_domain |=AMDGPU_GEM_DOMAIN_VRAM ; +/* * Allocate a framebuffer based on the total size of all the regions. * TODO: Move this into GART. */ r =amdgpu_bo_create_kernel (adev, region_info.fb_size,PAGE_SIZE , -AMDGPU_GEM_DOMAIN_VRAM | -AMDGPU_GEM_DOMAIN_GTT , + mem_domain, &adev->dm.dmub_bo, &adev->dm.dmub_bo_gpu_addr, &adev->dm.dmub_bo_cpu_addr);
Signature · 1 line
2.55.0
PATCH 56/80 drm/amd/display: remove unused dcn42 socbb values
In reply to George ZhangFrom: Dmytro Laktyushkin <[email protected]>
These values should be unset for dcn42
--- .../dc/dml2_0/dml21/inc/bounding_boxes/dcn42_soc_bb.h | 6 ------ 1 file changed, 6 deletions(-)
drivers/gpu/drm/amd/display/dc/dml2_0/dml21/inc/bounding_boxes/dcn42_soc_bb.h +0 -6
@@ -205,7 +205,6 @@ static const struct dml2_soc_bb dml2_socbb_dcn42 = { .xtalclk_mhz = 24, .pcie_refclk_mhz = 100, .dchub_refclk_mhz = 50, - .mall_allocated_for_dcn_mbytes = 0, .max_outstanding_reqs = 256, .fabric_datapath_to_dcn_data_return_bytes = 32, .return_bus_width_bytes = 64,
@@ -216,11 +215,6 @@ static const struct dml2_soc_bb dml2_socbb_dcn42 = { .phy_downspread_percent = 0.38, .dcn_downspread_percent = 0.38, .dispclk_dppclk_vco_speed_mhz = 3000, - .do_urgent_latency_adjustment = 0, - .mem_word_bytes = 32, - .num_dcc_mcaches = 8, - .mcache_size_bytes = 2048, - .mcache_line_size_bytes = 32, .max_fclk_for_uclk_dpm_khz = 2200 * 1000, };
Signature · 1 line
2.55.0
PATCH 57/80 drm/amd/display: Skip Update HDCP Config In Transition State
In reply to George ZhangFrom: Fangzhi Zuo <[email protected]>
Transition state does not have a valid dm_stream_ctx that should skip configuring HDCP routine. The routine is valid to go through only when a valid stream is created.
--- .../amd/display/amdgpu_dm/amdgpu_dm_hdcp.c | 28 +++++++++++++------ 1 file changed, 20 insertions(+), 8 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c +20 -8
@@ -589,15 +589,27 @@ static bool enable_assr(void *handle, struct dc_link *link)static void update_config (void *handle,struct cp_psp_stream_config *config) {struct hdcp_workqueue *hdcp_work = handle; -struct amdgpu_dm_connector *aconnector = config->dm_stream_ctx; -int link_index = aconnector->dc_link->link_index; -unsigned int conn_index = aconnector->base.index; -struct mod_hdcp_display *display = &hdcp_work[link_index].display; -struct mod_hdcp_link *link = &hdcp_work[link_index].link; -struct hdcp_workqueue *hdcp_w = &hdcp_work[link_index]; +struct amdgpu_dm_connector *aconnector; +const struct dc *dc; +int link_index; +unsigned int conn_index; +struct mod_hdcp_display *display; +struct mod_hdcp_link *link; +struct hdcp_workqueue *hdcp_w;struct dc_sink *sink =NULL ;bool link_is_hdcp14 = false; -const struct dc *dc = aconnector->dc_link->dc; + + aconnector = config->dm_stream_ctx; +if (!aconnector || !aconnector->dc_link) +return ; + + link_index = aconnector->dc_link->link_index; + display = &hdcp_work[link_index].display; + link = &hdcp_work[link_index].link; + hdcp_w = &hdcp_work[link_index]; + + conn_index = aconnector->base.index; + dc = aconnector->dc_link->dc;if (config->dpms_off) {hdcp_remove_display (hdcp_work, link_index, aconnector);
@@ -635,7 +647,7 @@ static void update_config(void *handle, struct cp_psp_stream_config *config) link->dp.mst_enabled = config->mst_enabled; link->dp.dp2_enabled = config->dp2_enabled; link->dp.usb4_enabled = config->usb4_enabled; -if (aconnector->dc_sink->sink_signal ==SIGNAL_TYPE_HDMI_FRL ) +if (sink && sink->sink_signal ==SIGNAL_TYPE_HDMI_FRL ) link->hdmi.frl_enabled = config->frl_enabled; display->adjust.disable =MOD_HDCP_DISPLAY_DISABLE_AUTHENTICATION ; link->adjust.auth_delay =2 ;
Signature · 1 line
2.55.0
PATCH 58/80 drm/amd/display: limit reuse dsc capable bootup timing
In reply to George ZhangFrom: Charlene Liu <[email protected]>
[why]
Previous dcn315 BIOS has known dsc issue, not good for reuse their dsc settings. this pre-OS dsc issue is fixed in dcn42 bios.
since there is no production bios update for older asic, limit our new code instead.
--- drivers/gpu/drm/amd/display/dc/core/dc.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/gpu/drm/amd/display/dc/core/dc.c +7 -0
@@ -1945,6 +1945,13 @@ bool dc_validate_boot_timing(const struct dc *dc,struct display_stream_compressor *dsc =NULL ;struct dcn_dsc_state dsc_state = {0 }; +if (dc->ctx->dce_version <DCN_VERSION_4_2 ) { +/*vbios enabled eDP dsc for one of DCN315 only but it has known issue, +since there is no production bios update, block it there*/ +DC_LOG_DEBUG ("boot timing validation failed due to unsupported DSC on this ASIC\n" ); +return false; + } +/* Find DSC associated with this timing generator */ if (tg_inst < (unsigned int )dc->res_pool->res_cap->num_dsc) { dsc = dc->res_pool->dscs[tg_inst];
Signature · 1 line
2.55.0
PATCH 59/80 drm/amd/display: Fix backlight max_brightness to match exported range
In reply to George ZhangFrom: Mario Limonciello <[email protected]>
[Why]
FWTS autobrightness fails on eDP panels because actual_brightness can read higher than the advertised max_brightness (e.g. 63576 vs 62451).
The conversion helpers expose the firmware PWM range to userspace as [0..max]. But max_brightness is advertised as (max - min), which is smaller. So reading the level can return a value above max_brightness.
This regressed in commit 4b61b8a39051 ("drm/amd/display: Add debugging message for brightness caps"), which changed max_brightness to (max - min) and undid commit 8dbd72cb7900 ("drm/amd/display: Export full brightness range to userspace").
[How]
Advertise max_brightness as max, and scale the initial AC/DC brightness against max too. Update the KUnit expectations to match.
--- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_backlight.c | 6 +++--- .../display/amdgpu_dm/tests/amdgpu_dm_backlight_test.c | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_backlight.c +3 -3
@@ -407,12 +407,12 @@ void amdgpu_dm_backlight_fill_props(const struct amdgpu_dm_backlight_caps *caps,if (get_brightness_range (caps, &min, &max)) {if (is_system_supplied) - props->brightness =DIV_ROUND_CLOSEST ((max - min) * caps->ac_level, + props->brightness =DIV_ROUND_CLOSEST (max * caps->ac_level,100 );else - props->brightness =DIV_ROUND_CLOSEST ((max - min) * caps->dc_level, + props->brightness =DIV_ROUND_CLOSEST (max * caps->dc_level,100 ); - props->max_brightness = max - min; + props->max_brightness = max; }else { props->brightness =MAX_BACKLIGHT_LEVEL ; props->max_brightness =MAX_BACKLIGHT_LEVEL ;
drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_backlight_test.c +4 -4
@@ -799,8 +799,8 @@ static void dm_test_backlight_fill_props_ac_linear(struct kunit *test)amdgpu_dm_backlight_fill_props (&caps, true, false, &props);KUNIT_EXPECT_EQ (test, props.brightness, -DIV_ROUND_CLOSEST ((max - min) * caps.ac_level,100 )); -KUNIT_EXPECT_EQ (test, props.max_brightness, max - min); +DIV_ROUND_CLOSEST (max * caps.ac_level,100 )); +KUNIT_EXPECT_EQ (test, props.max_brightness, max);KUNIT_EXPECT_EQ (test, props.scale,BACKLIGHT_SCALE_LINEAR );KUNIT_EXPECT_EQ (test, props.type,BACKLIGHT_RAW ); }
@@ -825,8 +825,8 @@ static void dm_test_backlight_fill_props_dc_nonlinear(struct kunit *test)amdgpu_dm_backlight_fill_props (&caps, false, true, &props);KUNIT_EXPECT_EQ (test, props.brightness, -DIV_ROUND_CLOSEST ((max - min) * caps.dc_level,100 )); -KUNIT_EXPECT_EQ (test, props.max_brightness, max - min); +DIV_ROUND_CLOSEST (max * caps.dc_level,100 )); +KUNIT_EXPECT_EQ (test, props.max_brightness, max);KUNIT_EXPECT_EQ (test, props.scale,BACKLIGHT_SCALE_NON_LINEAR );KUNIT_EXPECT_EQ (test, props.type,BACKLIGHT_RAW ); }
Signature · 1 line
2.55.0
PATCH 60/80 drm/amd/display: Add KUnit test for wb jobs
In reply to George ZhangFrom: Alex Hung <[email protected]>
[WHAT]
Add KUnit tests to verify both functions return early when job->fb is NULL without touching any buffer object.
--- .../drm/amd/display/amdgpu_dm/amdgpu_dm_wb.c | 6 ++- .../drm/amd/display/amdgpu_dm/amdgpu_dm_wb.h | 4 ++ .../amdgpu_dm/tests/amdgpu_dm_wb_test.c | 44 +++++++++++++++++++ 3 files changed, 52 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_wb.c +4 -2
@@ -85,7 +85,7 @@ STATIC_IFN_KUNIT int amdgpu_dm_wb_connector_get_modes(struct drm_connector *conn }EXPORT_IF_KUNIT (amdgpu_dm_wb_connector_get_modes); -static int amdgpu_dm_wb_prepare_job (struct drm_writeback_connector *wb_connector, +STATIC_IFN_KUNIT int amdgpu_dm_wb_prepare_job(struct drm_writeback_connector *wb_connector,struct drm_writeback_job *job) {struct amdgpu_framebuffer *afb;
@@ -146,8 +146,9 @@ static int amdgpu_dm_wb_prepare_job(struct drm_writeback_connector *wb_connectoramdgpu_bo_unreserve (rbo);return r; } +EXPORT_IF_KUNIT (amdgpu_dm_wb_prepare_job); -static void amdgpu_dm_wb_cleanup_job (struct drm_writeback_connector *connector, +STATIC_IFN_KUNIT void amdgpu_dm_wb_cleanup_job(struct drm_writeback_connector *connector,struct drm_writeback_job *job) {struct amdgpu_bo *rbo;
@@ -167,6 +168,7 @@ static void amdgpu_dm_wb_cleanup_job(struct drm_writeback_connector *connector,amdgpu_bo_unreserve (rbo);amdgpu_bo_unref (&rbo); } +EXPORT_IF_KUNIT (amdgpu_dm_wb_cleanup_job);static const struct drm_encoder_helper_funcs amdgpu_dm_wb_encoder_helper_funcs = { .atomic_check = amdgpu_dm_wb_encoder_atomic_check,
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_wb.h +4 -0
@@ -44,6 +44,10 @@ int amdgpu_dm_wb_encoder_atomic_check(struct drm_encoder *encoder,struct drm_crtc_state *crtc_state, struct drm_connector_state *conn_state);int amdgpu_dm_wb_connector_get_modes (struct drm_connector *connector); +int amdgpu_dm_wb_prepare_job (struct drm_writeback_connector *wb_connector, +struct drm_writeback_job *job); +void amdgpu_dm_wb_cleanup_job (struct drm_writeback_connector *connector, +struct drm_writeback_job *job);#endif #endif
drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_wb_test.c +44 -0
56 lines not on this page · raw message
Signature · 1 line
2.55.0
PATCH 61/80 drm/amd/display: Test MST coverage gaps
In reply to George ZhangFrom: Alex Hung <[email protected]>
[WHAT]
Add KUnit tests for uncovered MST paths:
- dm_mst_get_pbn_divider with non-null link
- retrieve_downstream_port_device AUX read failure
- dm_dp_aux_transfer non-ACK reply handling
- dm_handle_mst_sideband_msg_ready_event ESI read failure and ready-bit without MST state
- dm_handle_mst_down_rep_msg_ready wrapper
- amdgpu_dm_initialize_dp_connector eDP early return
- amdgpu_dm_initialize_dp_connector non-eDP MST init path (dc_link_dp_get_max_link_enc_cap, drm_dp_mst_topology_mgr_init and subconnector property attach)
The non-eDP MST test uses standard DRM KUnit helpers to build a full fixture (drmm_mode_config_init plus drm_connector_init), which the topology manager and subconnector property require, and stubs the DC link service get_max_link_enc_cap callback.
--- .../display/amdgpu_dm/amdgpu_dm_mst_types.c | 4 +- .../display/amdgpu_dm/amdgpu_dm_mst_types.h | 1 + .../tests/amdgpu_dm_mst_types_test.c | 371 +++++++++++++++++- 3 files changed, 356 insertions(+), 20 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c +3 -1
@@ -862,10 +862,11 @@ void dm_handle_mst_sideband_msg_ready_event( }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) +STATIC_IFN_KUNIT void dm_handle_mst_down_rep_msg_ready(struct drm_dp_mst_topology_mgr *mgr) {dm_handle_mst_sideband_msg_ready_event (mgr,DOWN_REP_MSG_RDY_EVENT ); } +EXPORT_IF_KUNIT (dm_handle_mst_down_rep_msg_ready);static const struct drm_dp_mst_topology_cbs dm_mst_cbs = { .add_connector = dm_dp_add_mst_connector,
@@ -900,6 +901,7 @@ void amdgpu_dm_initialize_dp_connector(struct amdgpu_display_manager *dm,drm_connector_attach_dp_subconnector_property (&aconnector->base); } +EXPORT_IF_KUNIT (amdgpu_dm_initialize_dp_connector);uint32_t dm_mst_get_pbn_divider (struct dc_link *link) {
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.h +1 -0
@@ -111,6 +111,7 @@ 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); +void dm_handle_mst_down_rep_msg_ready (struct drm_dp_mst_topology_mgr *mgr);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,
drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_mst_types_test.c +352 -19
473 lines not on this page · raw message
Signature · 1 line
2.55.0
PATCH 62/80 drm/amd/display: Test backlight level programming path
In reply to George ZhangFrom: Alex Hung <[email protected]>
[WHAT]
Add KUnit coverage for the backlight level write path in amdgpu_dm_backlight.c.
Tests cover stream lookup hit/miss, the connector-off and no-stream early returns, and the AUX/PWM/idle-reallow programming branches. The DC programming calls stay safe by injecting a NULL power module and keeping idle optimizations a no-op via disable_idle_power_optimizations.
--- .../display/amdgpu_dm/amdgpu_dm_backlight.c | 9 +- .../display/amdgpu_dm/amdgpu_dm_backlight.h | 5 + .../tests/amdgpu_dm_backlight_test.c | 260 ++++++++++++++++++ 3 files changed, 272 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_backlight.c +7 -2
@@ -219,7 +219,8 @@ u32 convert_brightness_to_user(const struct amdgpu_dm_backlight_caps *caps, }EXPORT_IF_KUNIT (convert_brightness_to_user); -static struct dc_stream_state *dm_find_stream_with_link ( +STATIC_IFN_KUNIT +struct dc_stream_state *dm_find_stream_with_link(struct amdgpu_display_manager *dm,struct dc_link *link) {
@@ -235,6 +236,7 @@ static struct dc_stream_state *dm_find_stream_with_link(return NULL ; } +EXPORT_IF_KUNIT (dm_find_stream_with_link); STATIC_IFN_KUNIT int amdgpu_dm_backlight_get_device_index(struct amdgpu_display_manager *dm,
@@ -346,8 +348,10 @@ void amdgpu_dm_backlight_set_level(struct amdgpu_display_manager *dm,if (rc) dm->actual_brightness[bl_idx] = user_brightness; } +EXPORT_IF_KUNIT (amdgpu_dm_backlight_set_level); -static int amdgpu_dm_backlight_update_status (struct backlight_device *bd) +STATIC_IFN_KUNIT +int amdgpu_dm_backlight_update_status(struct backlight_device *bd) {struct amdgpu_display_manager *dm =bl_get_data (bd);int i =amdgpu_dm_backlight_get_device_index (dm, bd);
@@ -356,6 +360,7 @@ static int amdgpu_dm_backlight_update_status(struct backlight_device *bd)return 0 ; } +EXPORT_IF_KUNIT (amdgpu_dm_backlight_update_status);static u32 amdgpu_dm_backlight_get_level (struct amdgpu_display_manager *dm,int bl_idx)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_backlight.h +5 -0
@@ -28,6 +28,8 @@ struct amdgpu_display_manager;struct amdgpu_dm_connector ;struct backlight_device ;struct backlight_properties ; +struct dc_link ; +struct dc_stream_state ;struct drm_connector ;struct attribute_group ;
@@ -49,6 +51,9 @@ bool amdgpu_dm_should_create_sysfs(struct amdgpu_dm_connector *aconnector);extern const struct attribute_group amdgpu_group;#if IS_ENABLED (CONFIG_DRM_AMD_DC_KUNIT_TEST ) +struct dc_stream_state *dm_find_stream_with_link (struct amdgpu_display_manager *dm, +struct dc_link *link); +int amdgpu_dm_backlight_update_status (struct backlight_device *bd);int get_brightness_range (const struct amdgpu_dm_backlight_caps *caps,unsigned int *min,unsigned int *max); void convert_custom_brightness(const struct amdgpu_dm_backlight_caps *caps,
drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_backlight_test.c +260 -0
278 lines not on this page · raw message
Signature · 1 line
2.55.0
PATCH 63/80 drm/amd/display: Test backlight level readback path
In reply to George ZhangFrom: Alex Hung <[email protected]>
[WHAT]
Add KUnit coverage for the backlight level read path.
A faked link_service vtable returns canned PWM and AUX brightness values, letting the tests verify both the successful readback and the DC_ERROR/AUX-failure fallbacks to the cached brightness, plus the get_brightness() device-index wrapper.
--- .../display/amdgpu_dm/amdgpu_dm_backlight.c | 9 +- .../display/amdgpu_dm/amdgpu_dm_backlight.h | 2 + .../tests/amdgpu_dm_backlight_test.c | 156 ++++++++++++++++++ 3 files changed, 164 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_backlight.c +6 -3
@@ -362,8 +362,8 @@ int amdgpu_dm_backlight_update_status(struct backlight_device *bd) }EXPORT_IF_KUNIT (amdgpu_dm_backlight_update_status); -static u32 amdgpu_dm_backlight_get_level (struct amdgpu_display_manager *dm, -int bl_idx) +STATIC_IFN_KUNIT +u32 amdgpu_dm_backlight_get_level(struct amdgpu_display_manager *dm, int bl_idx) {int ret;struct amdgpu_dm_backlight_caps caps;
@@ -387,14 +387,17 @@ static u32 amdgpu_dm_backlight_get_level(struct amdgpu_display_manager *dm,return convert_brightness_to_user (&caps, ret); } +EXPORT_IF_KUNIT (amdgpu_dm_backlight_get_level); -static int amdgpu_dm_backlight_get_brightness (struct backlight_device *bd) +STATIC_IFN_KUNIT +int amdgpu_dm_backlight_get_brightness(struct backlight_device *bd) {struct amdgpu_display_manager *dm =bl_get_data (bd);int i =amdgpu_dm_backlight_get_device_index (dm, bd);return amdgpu_dm_backlight_get_level (dm, i); } +EXPORT_IF_KUNIT (amdgpu_dm_backlight_get_brightness);static const struct backlight_ops amdgpu_dm_backlight_ops = { .options =BL_CORE_SUSPENDRESUME ,
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_backlight.h +2 -0
@@ -54,6 +54,8 @@ extern const struct attribute_group amdgpu_group;struct dc_stream_state *dm_find_stream_with_link (struct amdgpu_display_manager *dm,struct dc_link *link);int amdgpu_dm_backlight_update_status (struct backlight_device *bd); +u32 amdgpu_dm_backlight_get_level (struct amdgpu_display_manager *dm,int bl_idx); +int amdgpu_dm_backlight_get_brightness (struct backlight_device *bd);int get_brightness_range (const struct amdgpu_dm_backlight_caps *caps,unsigned int *min,unsigned int *max); void convert_custom_brightness(const struct amdgpu_dm_backlight_caps *caps,
drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_backlight_test.c +156 -0
174 lines not on this page · raw message
Signature · 1 line
2.55.0
PATCH 64/80 drm/amd/display: Test backlight device registration
In reply to George ZhangFrom: Alex Hung <[email protected]>
[WHAT]
Add KUnit test to amdgpu_dm_register_backlight_device() and cover its bl_idx == -1 early return, which must leave the backlight device slot untouched.
--- .../display/amdgpu_dm/amdgpu_dm_backlight.c | 1 + .../tests/amdgpu_dm_backlight_test.c | 20 +++++++++++++++++++ 2 files changed, 21 insertions(+)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_backlight.c +1 -0
@@ -494,6 +494,7 @@ amdgpu_dm_register_backlight_device(struct amdgpu_dm_connector *aconnector)drm_dbg_driver (drm,"DM: Registered Backlight device: %s\n" , bl_name); } } +EXPORT_IF_KUNIT (amdgpu_dm_register_backlight_device);void amdgpu_dm_update_connector_ext_caps (struct amdgpu_dm_connector *aconnector) {
drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_backlight_test.c +20 -0
@@ -440,6 +440,24 @@ static void dm_test_backlight_get_brightness_uses_device_index(struct kunit *tesKUNIT_EXPECT_EQ (test,amdgpu_dm_backlight_get_brightness (bd),2468 ); } +/* Tests for amdgpu_dm_register_backlight_device() */ + +/** +* dm_test_register_backlight_device_negative_index - Test invalid index no-op +* @test: The KUnit test context +*/ +static void dm_test_register_backlight_device_negative_index (struct kunit *test) +{ +struct amdgpu_device *adev =dm_kunit_alloc_adev (test); +struct amdgpu_dm_connector *aconnector; + + aconnector =dm_kunit_alloc_connector (test, adev,NULL ); + aconnector->bl_idx =-1 ; + +amdgpu_dm_register_backlight_device (aconnector); +KUNIT_EXPECT_NULL (test, adev->dm.backlight_dev[0 ]); +} +/* Tests for amdgpu_dm_backlight_get_device_index() */ /**
@@ -1616,6 +1634,8 @@ static struct kunit_case dm_backlight_test_cases[] = {KUNIT_CASE (dm_test_backlight_get_level_aux_success),KUNIT_CASE (dm_test_backlight_get_level_aux_error),KUNIT_CASE (dm_test_backlight_get_brightness_uses_device_index), +/* amdgpu_dm_register_backlight_device */ +KUNIT_CASE (dm_test_register_backlight_device_negative_index),/* amdgpu_dm_backlight_get_device_index */ KUNIT_CASE (dm_test_backlight_device_index_matches_second), KUNIT_CASE(dm_test_backlight_device_index_missing_fallback),
Signature · 1 line
2.55.0
PATCH 65/80 drm/amd/display: Test panel power savings sysfs
In reply to George ZhangFrom: Alex Hung <[email protected]>
[WHAT]
Add KUnit coverage using a DRM-managed connector fixture.
Tests cover show() mapping immediate-disable to 0 and reporting an active ABM level, and store() handling the disable mapping, the forbidden update, invalid text, and out-of-range input. show() writes through a page-backed buffer because sysfs_emit() requires one.
--- .../display/amdgpu_dm/amdgpu_dm_backlight.c | 16 +- .../display/amdgpu_dm/amdgpu_dm_backlight.h | 8 + .../tests/amdgpu_dm_backlight_test.c | 177 ++++++++++++++++++ 3 files changed, 195 insertions(+), 6 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_backlight.c +10 -6
@@ -611,9 +611,10 @@ EXPORT_IF_KUNIT(amdgpu_dm_setup_backlight_device);* carefully. */ -static ssize_t panel_power_savings_show (struct device *device, -struct device_attribute *attr, -char *buf) +STATIC_IFN_KUNIT +ssize_t panel_power_savings_show(struct device *device, +struct device_attribute *attr, +char *buf) {struct drm_connector *connector =dev_get_drvdata (device);struct drm_device *dev = connector->dev;
@@ -627,10 +628,12 @@ static ssize_t panel_power_savings_show(struct device *device,return sysfs_emit (buf,"%u\n" , val); } +EXPORT_IF_KUNIT (panel_power_savings_show); -static ssize_t panel_power_savings_store (struct device *device, -struct device_attribute *attr, -const char *buf,size_t count) +STATIC_IFN_KUNIT +ssize_t panel_power_savings_store(struct device *device, +struct device_attribute *attr, +const char *buf,size_t count) {struct drm_connector *connector =dev_get_drvdata (device);struct drm_device *dev = connector->dev;
@@ -660,6 +663,7 @@ static ssize_t panel_power_savings_store(struct device *device,return count; } +EXPORT_IF_KUNIT (panel_power_savings_store);static DEVICE_ATTR_RW (panel_power_savings);
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_backlight.h +8 -0
@@ -30,6 +30,8 @@ struct backlight_device;struct backlight_properties ;struct dc_link ;struct dc_stream_state ; +struct device ; +struct device_attribute ;struct drm_connector ;struct attribute_group ;
@@ -56,6 +58,12 @@ struct dc_stream_state *dm_find_stream_with_link(struct amdgpu_display_manager *int amdgpu_dm_backlight_update_status (struct backlight_device *bd);u32 amdgpu_dm_backlight_get_level (struct amdgpu_display_manager *dm,int bl_idx);int amdgpu_dm_backlight_get_brightness (struct backlight_device *bd); +ssize_t panel_power_savings_show (struct device *device, +struct device_attribute *attr, +char *buf); +ssize_t panel_power_savings_store (struct device *device, +struct device_attribute *attr, +const char *buf,size_t count);int get_brightness_range (const struct amdgpu_dm_backlight_caps *caps,unsigned int *min,unsigned int *max); void convert_custom_brightness(const struct amdgpu_dm_backlight_caps *caps,
drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_backlight_test.c +177 -0
195 lines not on this page · raw message
Signature · 1 line
2.55.0
PATCH 66/80 drm/amd/display: Test backlight ABM property attach
In reply to George ZhangFrom: Alex Hung <[email protected]>
[WHAT]
Cover the eDP success path of amdgpu_dm_setup_backlight_device() where the ABM level property is attached to the connector. A DRM-managed connector fixture (drmm_mode_config_init + drmm_connector_init) lets the test verify that one property is added and that its value is ABM_SYSFS_CONTROL.
--- .../tests/amdgpu_dm_backlight_test.c | 63 +++++++++++++++++++ 1 file changed, 63 insertions(+)
drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_backlight_test.c +63 -0
@@ -16,6 +16,7 @@#include "dc.h" #include "dc_dmub_srv.h" #include "amdgpu.h" +#include "amdgpu_display.h" #include "amdgpu_mode.h" #include "amdgpu_dm.h" #include "amdgpu_dm_backlight.h"
@@ -30,6 +31,12 @@ struct dm_backlight_connector_fixture {struct dc_link *link; }; +static const struct drm_connector_funcs dm_backlight_test_connector_funcs = { + .reset = drm_atomic_helper_connector_reset, + .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state, + .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, +}; +static void setup_test_connector (struct kunit *test,struct dm_backlight_connector_fixture *fixture,int bl_idx,enum signal_type signal)
@@ -1787,6 +1794,61 @@ static void dm_test_setup_backlight_device_oled_success(struct kunit *test)amdgpu_dm_set_abm_level_param (saved_abm_level); } +/** +* dm_test_setup_backlight_device_attaches_abm_property - Test ABM property path +* @test: The KUnit test context +*/ +static void dm_test_setup_backlight_device_attaches_abm_property (struct kunit *test) +{ +struct amdgpu_dm_connector *aconnector; +struct amdgpu_display_manager *dm; +struct amdgpu_device *adev; +struct drm_property *prop; +struct dc_link *link; +int saved_abm_level =amdgpu_dm_get_abm_level_param (); +int saved_backlight =amdgpu_dm_get_backlight_param (); +int old_count; +int ret; + +amdgpu_dm_set_abm_level_param (-1 ); +amdgpu_dm_set_backlight_param (-1 ); + adev =dm_kunit_alloc_adev (test); + ret =drmm_mode_config_init (&adev->ddev); +KUNIT_ASSERT_EQ (test, ret,0 ); + + prop =drm_property_create_range (&adev->ddev,0 ,"abm level" ,0 ,4 ); +KUNIT_ASSERT_NOT_ERR_OR_NULL (test, prop); + adev->mode_info.abm_level_property = prop; + + aconnector =dm_kunit_alloc_connector (test, adev,NULL ); + ret =drmm_connector_init (&adev->ddev, &aconnector->base, + &dm_backlight_test_connector_funcs, + DRM_MODE_CONNECTOR_eDP,NULL ); +KUNIT_ASSERT_EQ (test, ret,0 ); + + link =dm_kunit_alloc_link (test); + link->connector_signal =SIGNAL_TYPE_EDP ; + link->type = dc_connection_single; + aconnector->dc_link = link; + aconnector->bl_idx =-1 ; + dm = &adev->dm; + dm->adev = adev; + dm->ddev = &adev->ddev; + old_count = aconnector->base.base.properties->count; + +amdgpu_dm_setup_backlight_device (dm, aconnector); + +KUNIT_EXPECT_EQ (test, dm->num_of_edps,1 ); +KUNIT_EXPECT_EQ (test, aconnector->bl_idx,0 ); +KUNIT_EXPECT_EQ (test, aconnector->base.base.properties->count, old_count +1 ); +KUNIT_EXPECT_PTR_EQ (test, aconnector->base.base.properties->properties[old_count], prop); +KUNIT_EXPECT_EQ (test, aconnector->base.base.properties->values[old_count], + (uint64_t )ABM_SYSFS_CONTROL ); + +amdgpu_dm_set_backlight_param (saved_backlight); +amdgpu_dm_set_abm_level_param (saved_abm_level); +} +static struct kunit_case dm_backlight_test_cases[] = {/* dm_find_stream_with_link */ KUNIT_CASE (dm_test_find_stream_with_link_returns_match),
@@ -1872,6 +1934,7 @@ static struct kunit_case dm_backlight_test_cases[] = {KUNIT_CASE (dm_test_setup_backlight_device_connection_none),KUNIT_CASE (dm_test_setup_backlight_device_max_edps),KUNIT_CASE (dm_test_setup_backlight_device_oled_success), + KUNIT_CASE(dm_test_setup_backlight_device_attaches_abm_property), {} };
Signature · 1 line
2.55.0
PATCH 67/80 drm/amd/display: enable hdmistreamclk_rcg by default for dcn42
In reply to George ZhangFrom: Charlene Liu <[email protected]>
[why]
enable hdmistreamclk_rcg by default
--- drivers/gpu/drm/amd/display/dc/dccg/dcn35/dcn35_dccg.c | 7 +++++-- drivers/gpu/drm/amd/display/dc/hwss/dcn35/dcn35_hwseq.c | 8 ++++---- .../drm/amd/display/dc/resource/dcn42/dcn42_resource.c | 2 +- 3 files changed, 10 insertions(+), 7 deletions(-)
drivers/gpu/drm/amd/display/dc/dccg/dcn35/dcn35_dccg.c +5 -2
@@ -1680,8 +1680,11 @@ void dccg35_set_hdmistreamclk_root_clock_gating(struct dccg *dccg, bool enable) {struct dcn_dccg *dccg_dcn =TO_DCN_DCCG (dccg); -if (dccg->ctx->dc->debug.root_clock_optimization.bits.hdmistream) -REG_UPDATE (DCCG_GATE_DISABLE_CNTL6 ,HDMISTREAMCLK0_ROOT_GATE_DISABLE , enable ?1 :0 ); +if (!dccg->ctx->dc->debug.root_clock_optimization.bits.hdmistream && !enable) { +DC_LOG_DEBUG ("%s: HDMISTREAMCLK0_ROOT_GATE DISABLE = 0 bypassed" , __func__); +return ; + } +REG_UPDATE (DCCG_GATE_DISABLE_CNTL6 ,HDMISTREAMCLK0_ROOT_GATE_DISABLE , enable ?1 :0 );DC_LOG_DEBUG ("%s: HDMISTREAMCLK0_ROOT_GATE_DISABLE = %d\n" , __func__, enable ?1 :0 ); }
drivers/gpu/drm/amd/display/dc/hwss/dcn35/dcn35_hwseq.c +4 -4
@@ -487,7 +487,7 @@ void dcn35_update_odm(struct dc *dc, struct dc_state *context, struct pipe_ctx *void dcn35_dpp_root_clock_control (struct dce_hwseq *hws,unsigned int dpp_inst,bool clock_on) { -if (!hws->ctx->dc->debug.root_clock_optimization.bits.dpp) +if (!hws->ctx->dc->debug.root_clock_optimization.bits.dpp && !clock_on)return ;if (hws->ctx->dc->res_pool->dccg->funcs->dpp_root_clock_control) {
@@ -498,7 +498,7 @@ void dcn35_dpp_root_clock_control(struct dce_hwseq *hws, unsigned int dpp_inst,void dcn35_dpstream_root_clock_control (struct dce_hwseq *hws,unsigned int dp_hpo_inst,bool clock_on) { -if (!hws->ctx->dc->debug.root_clock_optimization.bits.dpstream) +if (!hws->ctx->dc->debug.root_clock_optimization.bits.dpstream && !clock_on)return ;if (hws->ctx->dc->res_pool->dccg->funcs->set_dpstreamclk_root_clock_gating) {
@@ -509,7 +509,7 @@ void dcn35_dpstream_root_clock_control(struct dce_hwseq *hws, unsigned int dp_hpvoid dcn35_hdmistream_root_clock_control (struct dce_hwseq *hws,bool clock_on) { -if (!hws->ctx->dc->debug.root_clock_optimization.bits.hdmistream) +if (!hws->ctx->dc->debug.root_clock_optimization.bits.hdmistream && !clock_on)return ;if (hws->ctx->dc->res_pool->dccg->funcs->set_hdmistreamclk_root_clock_gating) {
@@ -520,7 +520,7 @@ void dcn35_hdmistream_root_clock_control(struct dce_hwseq *hws, bool clock_on)void dcn35_physymclk_root_clock_control (struct dce_hwseq *hws,unsigned int phy_inst,bool clock_on) { -if (!hws->ctx->dc->debug.root_clock_optimization.bits.physymclk) +if (!hws->ctx->dc->debug.root_clock_optimization.bits.physymclk && !clock_on)return ;if (hws->ctx->dc->res_pool->dccg->funcs->set_physymclk_root_clock_gating) {
drivers/gpu/drm/amd/display/dc/resource/dcn42/dcn42_resource.c +1 -1
@@ -762,7 +762,7 @@ static const struct dc_debug_options debug_defaults_drv = { .bits = { .dpp = true, .dsc = true,/*dscclk and dsc pg*/ - .hdmistream = false, + .hdmistream = true, .hdmichar = true, .dpstream = true, .symclk32_se = true,
Signature · 1 line
2.55.0
PATCH 68/80 drm/amd/display: Exit LS for ISHARP before coefficient write
In reply to George ZhangFrom: Nicholas Kazlauskas <[email protected]>
[Why]
The hardware programming guide indicates that we must exit LS before any coefficient writes.
This is true across all ASIC for this block.
[How]
Drop the ips_v2 checks and unconditionall perform the update. It is not based on IPS V2 support, which is set for DCN42, but rather the presence of the block itself.
--- .../display/dc/dpp/dcn401/dcn401_dpp_dscl.c | 25 ++++++++----------- 1 file changed, 11 insertions(+), 14 deletions(-)
drivers/gpu/drm/amd/display/dc/dpp/dcn401/dcn401_dpp_dscl.c +11 -14
@@ -963,14 +963,13 @@ static void dpp401_dscl_program_isharp(struct dpp *dpp_base,PERF_TRACE ();/*power on isharp_delta_mem first*/ -if (dpp_base->ctx->dc->caps.ips_v2_support) { -/*HW default is LS, need to wake up*/ -REG_UPDATE_2 (ISHARP_DELTA_LUT_MEM_PWR_CTRL , -ISHARP_DELTA_LUT_MEM_PWR_FORCE ,0 , -ISHARP_DELTA_LUT_MEM_PWR_DIS ,1 ); -REG_WAIT (ISHARP_DELTA_LUT_MEM_PWR_CTRL , -ISHARP_DELTA_LUT_MEM_PWR_STATE ,0 ,1 ,100 ); - } +REG_UPDATE_2 (ISHARP_DELTA_LUT_MEM_PWR_CTRL , +ISHARP_DELTA_LUT_MEM_PWR_FORCE ,0 , +ISHARP_DELTA_LUT_MEM_PWR_DIS ,1 ); + +REG_WAIT (ISHARP_DELTA_LUT_MEM_PWR_CTRL , +ISHARP_DELTA_LUT_MEM_PWR_STATE ,0 ,1 ,100 ); +/* ISHARP_MODE */ REG_SET_6(ISHARP_MODE, 0, ISHARP_EN, scl_data->dscl_prog_data.isharp_en,
@@ -1049,12 +1048,10 @@ static void dpp401_dscl_program_isharp(struct dpp *dpp_base, }/*power on isharp_delta_mem first*/ -if (dpp_base->ctx->dc->caps.ips_v2_support) { -/*HW default is LS, need to wake up*/ -REG_UPDATE_SEQ_2 (ISHARP_DELTA_LUT_MEM_PWR_CTRL , -ISHARP_DELTA_LUT_MEM_PWR_FORCE ,0 , -ISHARP_DELTA_LUT_MEM_PWR_DIS ,0 ); - } +REG_UPDATE_SEQ_2 (ISHARP_DELTA_LUT_MEM_PWR_CTRL , +ISHARP_DELTA_LUT_MEM_PWR_FORCE ,0 , +ISHARP_DELTA_LUT_MEM_PWR_DIS ,0 ); +PERF_TRACE (); }// dpp401_dscl_program_isharp /**
Signature · 1 line
2.55.0
PATCH 69/80 drm/amd/display: Add MST link detection tests for connector
In reply to George ZhangFrom: Bhawanpreet Lakha <[email protected]>
Add KUnit coverage for amdgpu_dm_detect_mst_link_for_all_connectors() to the amdgpu_dm_connector tests:
- No connectors registered: iteration body never runs and the call succeeds.
- Writeback connector: hit by the early continue
- Non-MST link
- MST branch without aux: NULL mst_mgr.aux
--- .../display/amdgpu_dm/amdgpu_dm_connector.c | 1 + .../tests/amdgpu_dm_connector_test.c | 129 ++++++++++++++++++ 2 files changed, 130 insertions(+)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_connector.c +1 -0
@@ -331,6 +331,7 @@ int amdgpu_dm_detect_mst_link_for_all_connectors(struct drm_device *dev)return ret; } +EXPORT_IF_KUNIT (amdgpu_dm_detect_mst_link_for_all_connectors);static void hdmi_cec_unset_edid (struct amdgpu_dm_connector *aconnector) {
drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_connector_test.c +129 -0
141 lines not on this page · raw message
Signature · 1 line
2.55.0
PATCH 70/80 drm/amd/display: Add crtc matching and panel type tests for connector
In reply to George ZhangFrom: Bhawanpreet Lakha <[email protected]>
Add KUnit coverage for amdgpu_dm_find_first_crtc_matching_connector():
match, no match, empty state, skipping NULL connector slots, and returning the first match when several target the same crtc.
Also add coverage for amdgpu_dm_set_panel_type(): VSDB OLED/miniLED, DPCD OLED/miniLED, Samsung miniLED above and below threshold, and the default LCD fallback.
--- .../display/amdgpu_dm/amdgpu_dm_connector.c | 1 + .../display/amdgpu_dm/amdgpu_dm_connector.h | 1 + .../tests/amdgpu_dm_connector_test.c | 313 ++++++++++++++++++ 3 files changed, 315 insertions(+)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_connector.c +1 -0
@@ -394,6 +394,7 @@ amdgpu_dm_find_first_crtc_matching_connector(struct drm_atomic_state *state,return NULL ; } +EXPORT_IF_KUNIT (amdgpu_dm_find_first_crtc_matching_connector); STATIC_IFN_KUNIT void amdgpu_dm_set_panel_type(struct amdgpu_dm_connector *aconnector) {
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_connector.h +1 -0
@@ -149,6 +149,7 @@ int amdgpu_dm_encoder_init(struct drm_device *dev,enum drm_mode_subconnector get_subconnector_type (struct dc_link *link);void update_subconnector_property (struct amdgpu_dm_connector *aconnector);void amdgpu_dm_fbc_init (struct drm_connector *connector); +void amdgpu_dm_set_panel_type (struct amdgpu_dm_connector *aconnector);enum display_content_type get_output_content_type (const struct drm_connector_state *connector_state); bool adjust_colour_depth_from_display_info(struct dc_crtc_timing *timing_out,
drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_connector_test.c +313 -0
335 lines not on this page · raw message
Signature · 1 line
2.55.0
PATCH 71/80 drm/amd/display: Add CACP caps tests for connector
In reply to George ZhangFrom: Bhawanpreet Lakha <[email protected]>
Add KUnit coverage for amdgpu_dm_update_cacp_caps(): eDP and LVDS supported, old/3.1.6 IP versions unsupported, non-eDP/LVDS and LCD panels unsupported.
--- .../display/amdgpu_dm/amdgpu_dm_connector.h | 1 + .../tests/amdgpu_dm_connector_test.c | 149 ++++++++++++++++++ 2 files changed, 150 insertions(+)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_connector.h +1 -0
@@ -150,6 +150,7 @@ enum drm_mode_subconnector get_subconnector_type(struct dc_link *link);void update_subconnector_property (struct amdgpu_dm_connector *aconnector);void amdgpu_dm_fbc_init (struct drm_connector *connector);void amdgpu_dm_set_panel_type (struct amdgpu_dm_connector *aconnector); +void amdgpu_dm_update_cacp_caps (struct amdgpu_dm_connector *aconnector);enum display_content_type get_output_content_type (const struct drm_connector_state *connector_state); bool adjust_colour_depth_from_display_info(struct dc_crtc_timing *timing_out,
drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_connector_test.c +149 -0
161 lines not on this page · raw message
Signature · 1 line
2.55.0
PATCH 72/80 drm/amd/display: Add stream property tests for connector
In reply to George ZhangFrom: Bhawanpreet Lakha <[email protected]>
Add KUnit coverage for fill_stream_properties_from_drm_display_mode():
zeroed borders, RGB defaults, sync polarity handling, inheriting from an old stream, timing from the crtc, requested bpc colour depth, content type and aspect ratio.
--- .../display/amdgpu_dm/amdgpu_dm_connector.c | 3 +- .../display/amdgpu_dm/amdgpu_dm_connector.h | 7 + .../tests/amdgpu_dm_connector_test.c | 273 ++++++++++++++++++ 3 files changed, 282 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_connector.c +2 -1
@@ -835,7 +835,7 @@ STATIC_IFN_KUNIT bool adjust_colour_depth_from_display_info( }EXPORT_IF_KUNIT (adjust_colour_depth_from_display_info); -static void fill_stream_properties_from_drm_display_mode( +STATIC_IFN_KUNIT void fill_stream_properties_from_drm_display_mode( struct dc_stream_state *stream, const struct drm_display_mode *mode_in, const struct drm_connector *connector,
@@ -951,6 +951,7 @@ static void fill_stream_properties_from_drm_display_mode( stream->output_color_space =amdgpu_dm_get_output_color_space (timing_out, connector_state); stream->content_type =get_output_content_type (connector_state); } +EXPORT_IF_KUNIT (fill_stream_properties_from_drm_display_mode); STATIC_IFN_KUNIT void copy_crtc_timing_for_drm_display_mode(const struct drm_display_mode *src_mode,
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_connector.h +7 -0
@@ -151,6 +151,13 @@ void update_subconnector_property(struct amdgpu_dm_connector *aconnector);void amdgpu_dm_fbc_init (struct drm_connector *connector);void amdgpu_dm_set_panel_type (struct amdgpu_dm_connector *aconnector);void amdgpu_dm_update_cacp_caps (struct amdgpu_dm_connector *aconnector); +void fill_stream_properties_from_drm_display_mode ( +struct dc_stream_state *stream, +const struct drm_display_mode *mode_in, +const struct drm_connector *connector, +const struct drm_connector_state *connector_state, +const struct dc_stream_state *old_stream, +int requested_bpc);enum display_content_type get_output_content_type (const struct drm_connector_state *connector_state); bool adjust_colour_depth_from_display_info(struct dc_crtc_timing *timing_out,
drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_connector_test.c +273 -0
285 lines not on this page · raw message
Signature · 1 line
2.55.0
PATCH 73/80 drm/amd/display: Fix DMSS not triggering for HDR to SDR transition
In reply to George ZhangFrom: Karthi Kandasamy <[email protected]>
Why:
DMSS feature was not getting triggered during HDR to SDR transitions, and no DPCD write was observed. Root cause analysis revealed that incorrect panel capabilities were being reported for PSR SU panels. Due to the wrong capabilities, the OS was not invoking the DMSS API, resulting in no DPCD communication and also gate eDP teardown across DMSS hold
How:
Fixed by setting the correct power panel capabilities for PSR SU panels. This ensures the OS receives accurate panel capability information and triggers the DMSS API as expected, restoring proper DPCD writes during HDR to SDR transitions.
The DC commit sequence,was tearing the eDP down anyway -- backlight off, ABM disable, DPMS off, PSR/Replay feature_enabled cleared, PHY TX off, OTG/OPTC off all these actions are blocked now with the skip_implict_edp_power_control
--- .../amd/display/dc/hwss/dce110/dce110_hwseq.c | 12 +++++++--- .../amd/display/dc/hwss/dcn31/dcn31_hwseq.c | 21 ++++++++++++----- .../amd/display/dc/hwss/dcn35/dcn35_hwseq.c | 7 ++++-- .../amd/display/dc/hwss/dcn401/dcn401_hwseq.c | 23 ++++++++++++++----- .../drm/amd/display/modules/power/power_psr.c | 7 ++++++ .../amd/display/modules/power/power_replay.c | 7 ++++++ 6 files changed, 60 insertions(+), 17 deletions(-)
drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c +9 -3
@@ -1287,7 +1287,9 @@ void dce110_blank_stream(struct pipe_ctx *pipe_ctx)return ;if (link->local_sink && link->local_sink->sink_signal ==SIGNAL_TYPE_EDP ) { -if (!link->skip_implict_edp_power_control && hws) +if (link->skip_implict_edp_power_control) +return ; +if (hws) hws->funcs.edp_backlight_control (link, false); link->dc->hwss.set_abm_immediate_disable (pipe_ctx); }
@@ -1793,7 +1795,9 @@ enum dc_status dce110_apply_single_controller_ctx_to_hw( dc->link_srv->set_dsc_enable (pipe_ctx, true); } -if (!stream->dpms_off) +if (!stream->dpms_off && + !(link->connector_signal ==SIGNAL_TYPE_EDP && + link->skip_implict_edp_power_control)) dc->link_srv->set_dpms_on (context, pipe_ctx);/* DCN3.1 FPGA Workaround
@@ -1812,7 +1816,9 @@ enum dc_status dce110_apply_single_controller_ctx_to_hw(* is constructed with the same sink). Make sure not to override * and link programming on the main. */ -if (dc_state_get_pipe_subvp_type (context, pipe_ctx) !=SUBVP_PHANTOM ) { +if (dc_state_get_pipe_subvp_type (context, pipe_ctx) !=SUBVP_PHANTOM && + !(link->connector_signal ==SIGNAL_TYPE_EDP && + link->skip_implict_edp_power_control)) { pipe_ctx->stream->link->psr_settings.psr_feature_enabled = false; pipe_ctx->stream->link->replay_settings.replay_feature_enabled = false; }
drivers/gpu/drm/amd/display/dc/hwss/dcn31/dcn31_hwseq.c +15 -6
@@ -537,10 +537,12 @@ static void dcn31_reset_back_end_for_pipe( }ASSERT (!pipe_ctx->top_pipe); - dc->hwss.set_abm_immediate_disable (pipe_ctx); - link = pipe_ctx->stream->link; +if (!(link->connector_signal ==SIGNAL_TYPE_EDP && + link->skip_implict_edp_power_control)) + dc->hwss.set_abm_immediate_disable (pipe_ctx); +if (dc->hwseq) dc->hwseq->wa_state.skip_blank_stream = false;
@@ -555,9 +557,11 @@ static void dcn31_reset_back_end_for_pipe( pipe_ctx->stream_res.tg, OPTC_DSC_DISABLED, 0, 0); - pipe_ctx->stream_res.tg->funcs->disable_crtc (pipe_ctx->stream_res.tg); - - pipe_ctx->stream_res.tg->funcs->enable_optc_clock (pipe_ctx->stream_res.tg, false); +if (!(link->connector_signal ==SIGNAL_TYPE_EDP && + link->skip_implict_edp_power_control)) { + pipe_ctx->stream_res.tg->funcs->disable_crtc (pipe_ctx->stream_res.tg); + pipe_ctx->stream_res.tg->funcs->enable_optc_clock (pipe_ctx->stream_res.tg, false); + }if (pipe_ctx->stream_res.tg->funcs->set_odm_bypass) pipe_ctx->stream_res.tg->funcs->set_odm_bypass ( pipe_ctx->stream_res.tg, &pipe_ctx->stream->timing);
@@ -586,7 +590,12 @@ static void dcn31_reset_back_end_for_pipe(* screen only, the dpms_off would be true but * VBIOS lit up eDP, so check link status too. */ -if (!pipe_ctx->stream->dpms_off || link->link_status.link_active) +if (link->connector_signal ==SIGNAL_TYPE_EDP && + link->skip_implict_edp_power_control) { +/* DMSS is holding the panel across the commit; skip dpms-off. */ +if (pipe_ctx->stream_res.audio) + dc->hwss.disable_audio_stream (pipe_ctx); + }else if (!pipe_ctx->stream->dpms_off || link->link_status.link_active) dc->link_srv->set_dpms_off (pipe_ctx);else if (pipe_ctx->stream_res.audio) dc->hwss.disable_audio_stream (pipe_ctx);
drivers/gpu/drm/amd/display/dc/hwss/dcn35/dcn35_hwseq.c +5 -2
@@ -1818,8 +1818,11 @@ void dcn35_disable_link_output(struct dc_link *link,disable_link_output_symclk_on_tx_off (link,DP_UNKNOWN_ENCODING ); link->phy_state.symclk_state =SYMCLK_ON_TX_OFF ; }else { - link_hwss->disable_link_output (link, link_res, signal); - link->phy_state.symclk_state =SYMCLK_OFF_TX_OFF ; +if (!(signal ==SIGNAL_TYPE_EDP && + link->skip_implict_edp_power_control)) { + link_hwss->disable_link_output (link, link_res, signal); + link->phy_state.symclk_state =SYMCLK_OFF_TX_OFF ; + } }/* * Add the logic to extract BOTH power up and power down sequences
drivers/gpu/drm/amd/display/dc/hwss/dcn401/dcn401_hwseq.c +17 -6
@@ -1101,8 +1101,11 @@ void dcn401_disable_link_output(struct dc_link *link,disable_link_output_symclk_on_tx_off (link,DP_UNKNOWN_ENCODING ); link->phy_state.symclk_state =SYMCLK_ON_TX_OFF ; }else { - link_hwss->disable_link_output (link, link_res, signal); - link->phy_state.symclk_state =SYMCLK_OFF_TX_OFF ; +if (!(signal ==SIGNAL_TYPE_EDP && + link->skip_implict_edp_power_control)) { + link_hwss->disable_link_output (link, link_res, signal); + link->phy_state.symclk_state =SYMCLK_OFF_TX_OFF ; + } } if (signal == SIGNAL_TYPE_EDP &&
@@ -2150,7 +2153,12 @@ void dcn401_reset_back_end_for_pipe(* screen only, the dpms_off would be true but * VBIOS lit up eDP, so check link status too. */ -if (!pipe_ctx->stream->dpms_off || link->link_status.link_active) +if (link->connector_signal ==SIGNAL_TYPE_EDP && + link->skip_implict_edp_power_control) { +/* DMSS is holding the panel across the commit; skip dpms-off. */ +if (pipe_ctx->stream_res.audio) + dc->hwss.disable_audio_stream (pipe_ctx); + }else if (!pipe_ctx->stream->dpms_off || link->link_status.link_active) dc->link_srv->set_dpms_off (pipe_ctx);else if (pipe_ctx->stream_res.audio) dc->hwss.disable_audio_stream (pipe_ctx);
@@ -2175,12 +2183,15 @@ void dcn401_reset_back_end_for_pipe(* parent pipe. */ if (pipe_ctx->top_pipe ==NULL ) { +if (!(link->connector_signal ==SIGNAL_TYPE_EDP && + link->skip_implict_edp_power_control)) { - dc->hwss.set_abm_immediate_disable (pipe_ctx); + dc->hwss.set_abm_immediate_disable (pipe_ctx); - pipe_ctx->stream_res.tg->funcs->disable_crtc (pipe_ctx->stream_res.tg); + pipe_ctx->stream_res.tg->funcs->disable_crtc (pipe_ctx->stream_res.tg); - pipe_ctx->stream_res.tg->funcs->enable_optc_clock (pipe_ctx->stream_res.tg, false); + pipe_ctx->stream_res.tg->funcs->enable_optc_clock (pipe_ctx->stream_res.tg, false); + }if (pipe_ctx->stream_res.tg->funcs->set_odm_bypass) pipe_ctx->stream_res.tg->funcs->set_odm_bypass ( pipe_ctx->stream_res.tg, &pipe_ctx->stream->timing);
drivers/gpu/drm/amd/display/modules/power/power_psr.c +7 -0
@@ -58,6 +58,13 @@ bool mod_power_psr_notify_mode_change(struct mod_power *mod_power,// stream_index is passed as validated parameter active_psr_events = core_power->map[stream_index].psr_events; +/* DMSS holds the panel in a forced PSR freeze (e.g. during HDR/SDR toggle). +* Re-running edp_setup_psr would reprogram DPCD 0x170 and disturb the freeze, +* so skip the PSR re-setup until DMSS releases the override. +*/ +if (active_psr_events & psr_event_os_override_hold) +return false; +/* Calculate PSR configurations */ mod_power_calc_psr_configs (&psr_config, link, stream);
drivers/gpu/drm/amd/display/modules/power/power_replay.c +7 -0
@@ -805,6 +805,13 @@ void mod_power_replay_notify_mode_change(struct mod_power *mod_power, core_power =MOD_POWER_TO_CORE (mod_power); active_replay_events = core_power->map[stream_index].replay_events; +/* DMSS holds the panel in a forced freeze (e.g. during HDR/SDR toggle). +* Re-running dp_setup_replay would reprogram DPCD 0x37B and disturb the +* freeze, so skip the replay re-setup until DMSS releases the override. +*/ +if (active_replay_events & replay_event_os_override_hold) +return ; + link->replay_settings.replay_smu_opt_enable = (link->replay_settings.config.replay_smu_opt_supported &&mod_power_only_edp (dc->current_state, stream));
Signature · 1 line
2.55.0
PATCH 74/80 drm/amd/display: fix dcn42 det allocation order
In reply to George ZhangFrom: Dmytro Laktyushkin <[email protected]>
set_pipe_unlock_order needs to be set to true for the pipes to be unlocked in correct order to avoid det overallocation
--- drivers/gpu/drm/amd/display/dc/resource/dcn42/dcn42_resource.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/amd/display/dc/resource/dcn42/dcn42_resource.c +1 -0
@@ -2145,6 +2145,7 @@ static bool dcn42_resource_construct( dc->config.use_pipe_ctx_sync_logic = true; dc->config.dc_mode_clk_limit_support = false; dc->config.enable_windowed_mpo_odm = true; + dc->config.set_pipe_unlock_order = true;/* Need to ensure DET gets freed before allocating */ /* Use psp mailbox to enable assr */ dc->config.use_assr_psp_message = true;/* dcn42 and afterward always support external panel replay */
Signature · 1 line
2.55.0
PATCH 75/80 drm/amd/display: Enable HUBP/DPP Driver PG for DCN42
In reply to George ZhangFrom: Leo Chen <[email protected]>
[Why & How]
The related corruption issue is now resolved, HUBP/DPP driver PG can be enabled for DCN42.
--- .../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 = true, - .disable_hubp_power_gate = true, + .disable_dpp_power_gate = false, + .disable_hubp_power_gate = false, .disable_optc_power_gate = true, .disable_dsc_power_gate = false, .disable_dio_power_gate = true,
Signature · 1 line
2.55.0
PATCH 76/80 drm/amd/display: fix dcn42b det allocation order
In reply to George ZhangFrom: Dmytro Laktyushkin <[email protected]>
set_pipe_unlock_order needs to be set to true for the pipes to be unlocked in correct order to avoid det overallocation
--- drivers/gpu/drm/amd/display/dc/resource/dcn42b/dcn42b_resource.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/amd/display/dc/resource/dcn42b/dcn42b_resource.c +1 -0
@@ -2119,6 +2119,7 @@ static bool dcn42b_resource_construct( dc->config.use_pipe_ctx_sync_logic = true; dc->config.dc_mode_clk_limit_support = false; dc->config.enable_windowed_mpo_odm = true; + dc->config.set_pipe_unlock_order = true;/* Need to ensure DET gets freed before allocating */ /* Use psp mailbox to enable assr */ dc->config.use_assr_psp_message = true;/* dcn42 and afterward always support external panel replay */
Signature · 1 line
2.55.0
PATCH 77/80 drm/amd/display: add DST_Y_DELTA_DRQ_LIMIT reg macro for later use
In reply to George ZhangFrom: Charlene Liu <[email protected]>
[why]DST_Y_DELTA_DRQ_LIMIT from dml2.1
--- drivers/gpu/drm/amd/display/dc/hubp/dcn20/dcn20_hubp.h | 3 ++- drivers/gpu/drm/amd/display/dc/hubp/dcn42/dcn42_hubp.h | 2 ++ drivers/gpu/drm/amd/display/dc/resource/dcn42/dcn42_resource.h | 1 + 3 files changed, 5 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/hubp/dcn20/dcn20_hubp.h +2 -1
@@ -286,7 +286,8 @@type MCACHEID_MALL_PREF_2H_P0 ;\type MCACHEID_MALL_PREF_1H_P1 ;\type MCACHEID_MALL_PREF_2H_P1 ;\ - type HUBP_FGCG_REP_DIS +type HUBP_FGCG_REP_DIS ;\ + type DST_Y_DELTA_DRQ_LIMIT#define DCN42_HUBP_REG_FIELD_VARIABLE_LIST (type) \ type HUBP_3DLUT_CROSSBAR_SEL_G;\
drivers/gpu/drm/amd/display/dc/hubp/dcn42/dcn42_hubp.h +2 -0
@@ -35,6 +35,7 @@HUBP_SF (HUBP0_3DLUT_FL_CONFIG ,HUBP0_3DLUT_FL_FORMAT , mask_sh),\HUBP_SF (HUBP0_3DLUT_FL_BIAS_SCALE ,HUBP0_3DLUT_FL_BIAS , mask_sh),\HUBP_SF (HUBP0_3DLUT_FL_BIAS_SCALE ,HUBP0_3DLUT_FL_SCALE , mask_sh),\ +HUBP_SF (HUBPREQ0_DST_Y_DELTA_DRQ_LIMIT ,DST_Y_DELTA_DRQ_LIMIT , mask_sh),\HUBP_SF (CURSOR0_0_HUBP_3DLUT_CONTROL ,HUBP_3DLUT_ENABLE , mask_sh),\HUBP_SF (CURSOR0_0_HUBP_3DLUT_CONTROL ,HUBP_3DLUT_DONE , mask_sh),\ HUBP_SF(CURSOR0_0_HUBP_3DLUT_CONTROL, HUBP_3DLUT_ADDRESSING_MODE, mask_sh),\
@@ -54,6 +55,7 @@HUBP_SF (HUBP0_3DLUT_FL_CONFIG ,HUBP0_3DLUT_FL_FORMAT , mask_sh),\HUBP_SF (HUBP0_3DLUT_FL_BIAS_SCALE ,HUBP0_3DLUT_FL_BIAS , mask_sh),\HUBP_SF (HUBP0_3DLUT_FL_BIAS_SCALE ,HUBP0_3DLUT_FL_SCALE , mask_sh),\ +HUBP_SF (HUBPREQ0_DST_Y_DELTA_DRQ_LIMIT ,DST_Y_DELTA_DRQ_LIMIT , mask_sh),\HUBP_SF (CURSOR0_0_HUBP_3DLUT_CONTROL ,HUBP_3DLUT_ENABLE , mask_sh),\HUBP_SF (CURSOR0_0_HUBP_3DLUT_CONTROL ,HUBP_3DLUT_DONE , mask_sh),\ HUBP_SF(CURSOR0_0_HUBP_3DLUT_CONTROL, HUBP_3DLUT_ADDRESSING_MODE, mask_sh),\
drivers/gpu/drm/amd/display/dc/resource/dcn42/dcn42_resource.h +1 -0
@@ -581,6 +581,7 @@SRI_ARR (DCHUBP_VMPG_CONFIG ,HUBP , id), \SRI_ARR (UCLK_PSTATE_FORCE ,HUBPREQ , id), \SRI_ARR (HUBP_3DLUT_DLG_PARAM ,CURSOR0_ , id), \ +SRI_ARR (DST_Y_DELTA_DRQ_LIMIT ,HUBPREQ , id), \ HUBP_3DLUT_FL_REG_LIST_DCN401(id)struct dcn42_resource_pool {struct resource_pool base;
Signature · 1 line
2.55.0
PATCH 78/80 drm/amd/display: add DST_Y_DELTA_DRQ_LIMIT hw programming
In reply to George ZhangFrom: Charlene Liu <[email protected]>
[why]
dchubp needs to program DST_Y_DELTA_DRQ_LIMIT based on dml2.x
--- .../amd/display/dc/hubp/dcn42/dcn42_hubp.c | 51 ++++++++++++++++++- .../amd/display/dc/hubp/dcn42/dcn42_hubp.h | 3 ++ 2 files changed, 53 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/hubp/dcn42/dcn42_hubp.c +50 -1
@@ -580,7 +580,56 @@ static bool hubp42_program_surface_flip_and_addr(return true; } +void hubp42_setup_interdependent ( +struct hubp *hubp, +struct dml2_dchub_per_pipe_register_set *pipe_regs) +{ +struct dcn20_hubp *hubp2 =TO_DCN20_HUBP (hubp); + +REG_SET_2 (PREFETCH_SETTINGS ,0 , +DST_Y_PREFETCH , pipe_regs->dlg_regs.dst_y_prefetch, +VRATIO_PREFETCH , pipe_regs->dlg_regs.vratio_prefetch); + +REG_SET (PREFETCH_SETTINGS_C ,0 , +VRATIO_PREFETCH_C , pipe_regs->dlg_regs.vratio_prefetch_c); + +REG_SET_2 (VBLANK_PARAMETERS_0 ,0 , +DST_Y_PER_VM_VBLANK , pipe_regs->dlg_regs.dst_y_per_vm_vblank, +DST_Y_PER_ROW_VBLANK , pipe_regs->dlg_regs.dst_y_per_row_vblank); + +REG_SET_2 (FLIP_PARAMETERS_0 ,0 , +DST_Y_PER_VM_FLIP , pipe_regs->dlg_regs.dst_y_per_vm_flip, +DST_Y_PER_ROW_FLIP , pipe_regs->dlg_regs.dst_y_per_row_flip); +REG_SET (VBLANK_PARAMETERS_3 ,0 , +REFCYC_PER_META_CHUNK_VBLANK_L , pipe_regs->dlg_regs.refcyc_per_meta_chunk_vblank_l); + +REG_SET (VBLANK_PARAMETERS_4 ,0 , +REFCYC_PER_META_CHUNK_VBLANK_C , pipe_regs->dlg_regs.refcyc_per_meta_chunk_vblank_c); + +REG_SET (FLIP_PARAMETERS_2 ,0 , +REFCYC_PER_META_CHUNK_FLIP_L , pipe_regs->dlg_regs.refcyc_per_meta_chunk_flip_l); + +REG_SET_2 (PER_LINE_DELIVERY_PRE ,0 , +REFCYC_PER_LINE_DELIVERY_PRE_L , pipe_regs->dlg_regs.refcyc_per_line_delivery_pre_l, +REFCYC_PER_LINE_DELIVERY_PRE_C , pipe_regs->dlg_regs.refcyc_per_line_delivery_pre_c); + +REG_SET (DCN_SURF0_TTU_CNTL1 ,0 , +REFCYC_PER_REQ_DELIVERY_PRE , + pipe_regs->ttu_regs.refcyc_per_req_delivery_pre_l); +REG_SET (DCN_SURF1_TTU_CNTL1 ,0 , +REFCYC_PER_REQ_DELIVERY_PRE , + pipe_regs->ttu_regs.refcyc_per_req_delivery_pre_c); +REG_SET (DCN_CUR0_TTU_CNTL1 ,0 , +REFCYC_PER_REQ_DELIVERY_PRE , pipe_regs->ttu_regs.refcyc_per_req_delivery_pre_cur0); + +REG_SET_2 (DCN_GLOBAL_TTU_CNTL ,0 , +MIN_TTU_VBLANK , pipe_regs->ttu_regs.min_ttu_vblank, + QoS_LEVEL_FLIP, pipe_regs->ttu_regs.qos_level_flip); + +REG_SET (DST_Y_DELTA_DRQ_LIMIT ,0 , +DST_Y_DELTA_DRQ_LIMIT , pipe_regs->dlg_regs.dst_y_delta_drq_limit); +}struct hubp_funcs dcn42_hubp_funcs = { .hubp_enable_tripleBuffer = hubp2_enable_triplebuffer, .hubp_is_triplebuffer_enabled = hubp2_is_triplebuffer_enabled,
@@ -588,7 +637,7 @@ struct hubp_funcs dcn42_hubp_funcs = { .hubp_program_surface_config = hubp42_program_surface_config, .hubp_is_flip_pending = hubp2_is_flip_pending, .hubp_setup2 = hubp42_setup, - .hubp_setup_interdependent2 = hubp401_setup_interdependent, + .hubp_setup_interdependent2 = hubp42_setup_interdependent, .hubp_set_vm_system_aperture_settings = hubp3_set_vm_system_aperture_settings, .set_blank = hubp2_set_blank, .set_blank_regs = hubp2_set_blank_regs,
drivers/gpu/drm/amd/display/dc/hubp/dcn42/dcn42_hubp.h +3 -0
@@ -97,4 +97,7 @@ void hubp42_setup(union dml2_global_sync_programming *pipe_global_sync, struct dc_crtc_timing *timing); +void hubp42_setup_interdependent ( +struct hubp *hubp, +struct dml2_dchub_per_pipe_register_set *pipe_regs);#endif /* __DC_HUBP_DCN42_H__ */
Signature · 1 line
2.55.0
PATCH 79/80 drm/amd/display: don't re-evaluate cursor mode on cursor plane movement
In reply to George ZhangFrom: James Lin <[email protected]>
[Why]
The cursor-mode re-evaluation added to dm_crtc_get_cursor_mode() also checks the cursor plane's own destination rectangle. The crtc_x/y/w/h check lives in the per-plane loop, which only flags the cursor plane via cursor_changed and does not skip it, so the check fires whenever the cursor itself moves.
flip-vs-cursor-legacy (kms_cursor_legacy) issues a stream of legacy cursor moves and requires each to land on the fast path within a single vblank. With the position check, every cursor move now sets consider_mode_change and defeats the early return, forcing the full cursor-mode evaluation. A legacy cursor move is a cursor-only commit:
the underlying planes are not in the atomic state, so the coverage loop (for_each_oldnew_plane_in_descending_zpos walks only planes in the state) sees nothing covering the CRTC, evaluates entire_crtc_covered as false, and misclassifies the cursor mode as OVERLAY on a fully-covered screen.
That spurious NATIVE->OVERLAY transition makes should_reset_plane() return true (lock_and_validation_needed), pulls all CRTC planes into the commit, and - because amdgpu_dm_plane_atomic_async_check() rejects async updates in overlay mode - permanently knocks later cursor updates off the async fast path. Each cursor move becomes a full atomic commit with DC global validation, serialized against the page flip, so cursor updates no longer fit in one vblank and flip-vs-cursor-legacy fails / times out
[How]
The cursor mode is a function of the underlying planes' coverage and properties, not of the cursor's position, so cursor movement can never change the correct mode. Restrict the destination-rectangle check to non-cursor planes. A move/resize of an underlying plane (the case the original change targets, e.g. amd_cursor_overlay@non-full) still re-evaluates the mode correctly, while pure cursor movement returns to the fast path.
--- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 27 +++++++++++++------ 1 file changed, 19 insertions(+), 8 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +19 -8
@@ -6656,15 +6656,26 @@ static int dm_crtc_get_cursor_mode(struct amdgpu_device *adev, }/* -* A plane moving or resizing (without a scale change) changes how -* much of the CRTC it covers. This can create/remove holes under -* the cursor and thus flip the required cursor mode (native vs -* overlay), so the destination rect must be re-evaluated too. +* A non-cursor plane moving or resizing (without a scale change) +* changes how much of the CRTC it covers. This can create or +* remove a hole under the cursor and thus flip the required +* cursor mode (native vs overlay), so its destination rect must +* be re-evaluated too. +* +* The cursor plane itself is deliberately excluded: the cursor +* mode depends on the underlying planes' coverage, not on the +* cursor's position (see the entire_crtc_covered logic below). +* Triggering on cursor movement would force every legacy cursor +* update off its fast path, and in a cursor-only commit - where +* the underlying planes are not part of the state - the coverage +* loop would see no covering plane and misevaluate the mode as +* overlay, regressing flip-vs-cursor-legacy. */ -if (old_plane_state->crtc_x != plane_state->crtc_x || - old_plane_state->crtc_y != plane_state->crtc_y || - old_plane_state->crtc_w != plane_state->crtc_w || - old_plane_state->crtc_h != plane_state->crtc_h) { +if (plane->type !=DRM_PLANE_TYPE_CURSOR && + (old_plane_state->crtc_x != plane_state->crtc_x || + old_plane_state->crtc_y != plane_state->crtc_y || + old_plane_state->crtc_w != plane_state->crtc_w || + old_plane_state->crtc_h != plane_state->crtc_h)) { consider_mode_change = true;break ; }
Signature · 1 line
2.55.0
PATCH 80/80 drm/amd/display: Promote DC to 3.2.389
In reply to George ZhangFrom: Taimur Hassan <[email protected]>
This DC patchset brings improvements in multiple areas. In summary, we have:
* Fixes on EDID 8K parsing, cursor mode, backlight, OLED/VABC, and HDR to SDR
* Improvements on DCN42 clocking, det allocation, and power gating
* Greatly enhanced KUnit coverage across amdgpu_dm
* Code cleanup
--- drivers/gpu/drm/amd/display/dc/dc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/dc.h +1 -1
@@ -65,7 +65,7 @@ struct dcn_dsc_reg_state;struct dcn_optc_reg_state ;struct dcn_dccg_reg_state ; -#define DC_VER "3.2.388" +#define DC_VER "3.2.389"/** * MAX_SURFACES - representative of the upper bound of surfaces that can be piped to a single CRTC
Signature · 1 line
2.55.0