DC Patches Jan 29, 2021
Subsystems (3)
cover DC Patches Jan 29, 2021
This DC patchset brings improvements in multiple areas. In summary, we have:
- Better handling of dummy p-state table
- Workaround for some legacy DP-VGA dongles
- Add Freesync HDMI support to DMCU
- Enable "trigger_hotplug" debugfs on all outputs
- fix initial bounding box values for dcn3.02
- implement support for DID2.0 dsc passthrough
- fix calculation for the pwl backlight curve
- Fix display detection on HDMI ComboPHY
- Drop SOC bounding box hookup
- Fix DPCD values
- Fix multiple memory leaks
Anthony Koo (3):
drm/amd/display: [FW Promotion] Release 0.0.49 drm/amd/display: fix calculation for the pwl backlight curve drm/amd/display: [FW Promotion] Release 0.0.50
Aric Cyr (2):
drm/amd/display: 3.2.120
drm/amd/display: 3.2.121
Bhawanpreet Lakha (1):
drm/amd/display: reuse current context instead of recreating one
Brendan Steve Leder (1):
drm/amd/display: initialize i2c speed if not initialized in
dcnxxx__resource.c
George Shen (1):
drm/amd/display: Fix DPCD translation for LTTPR AUX_RD_INTERVAL
Joshua Aberback (1):
drm/amd/display: Better handling of dummy p-state table
Jun Lei (1):
drm/amd/display: implement support for DID2.0 dsc passthrough
Lewis Huang (1):
drm/amd/display: Set power_gated to true for seamless boot pipe init
Michael Strauss (1):
drm/amd/display: Add null pointer check to is_dig_enabled func
Mikita Lipski (1):
drm/amd/display: Release DSC before acquiring
Nicholas Kazlauskas (2):
drm/amd/display: Drop SOC bounding box hookup in DM/DC drm/amd/display: Fix CW4 programming for dmub30 cached inbox
Nikola Cornij (1):
drm/amd/display: Reject too small viewport size when validating plane
Samson Tam (1):
drm/amd/display: fix initial bounding box values for dcn3.02
Stylon Wang (3):
drm/amd/display: Revert "Fix EDID parsing after resume from suspend" drm/amd/display: Enable "trigger_hotplug" debugfs on all outputs drm/amd/display: Add Freesync HDMI support to DMCU
Sung Lee (1):
drm/amd/display: Add more Clock Sources to DCN2.1
Taimur Hassan (1):
drm/amd/display: Workaround for some legacy DP-VGA dongles
Victor Lu (3):
drm/amd/display: Fix dc_sink kref count in emulated_link_detect drm/amd/display: Free atomic state after drm_atomic_commit drm/amd/display: Decrement refcount of dc_sink before reassignment
Wenjing Liu (2):
drm/amd/display: correct some hdcp variable naming drm/amd/display: remove unused force_ignore_link_settings debug option
.../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 76 +++++--- .../amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 10 +- .../amd/display/amdgpu_dm/amdgpu_dm_hdcp.c | 7 +- .../display/amdgpu_dm/amdgpu_dm_mst_types.c | 6 +- drivers/gpu/drm/amd/display/dc/Makefile | 4 +- .../display/dc/clk_mgr/dcn301/vg_clk_mgr.c | 3 +- drivers/gpu/drm/amd/display/dc/core/dc.c | 34 ++-- drivers/gpu/drm/amd/display/dc/core/dc_link.c | 14 +- .../gpu/drm/amd/display/dc/core/dc_link_ddc.c | 13 +- .../gpu/drm/amd/display/dc/core/dc_link_dp.c | 6 +- .../gpu/drm/amd/display/dc/core/dc_resource.c | 4 +- drivers/gpu/drm/amd/display/dc/dc.h | 11 +- drivers/gpu/drm/amd/display/dc/dc_dsc.h | 7 +- .../gpu/drm/amd/display/dc/dc_edid_parser.c | 80 +++++++++ .../gpu/drm/amd/display/dc/dc_edid_parser.h | 44 +++++ drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 1 + drivers/gpu/drm/amd/display/dc/dc_stream.h | 3 +- drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c | 120 +++++++++++++ drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.h | 11 ++ .../amd/display/dc/dcn10/dcn10_hw_sequencer.c | 1 + .../drm/amd/display/dc/dcn20/dcn20_resource.c | 111 ------------ .../drm/amd/display/dc/dcn21/dcn21_resource.c | 10 ++ .../drm/amd/display/dc/dcn30/dcn30_resource.c | 143 +++------------ .../amd/display/dc/dcn301/dcn301_resource.c | 107 +---------- .../amd/display/dc/dcn302/dcn302_resource.c | 168 +++++++++++++++++- .../amd/display/dc/dcn302/dcn302_resource.h | 2 + drivers/gpu/drm/amd/display/dc/dm_cp_psp.h | 7 +- drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c | 29 +-- drivers/gpu/drm/amd/display/dc/inc/hw/dmcu.h | 10 ++ .../gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 5 +- .../gpu/drm/amd/display/dmub/src/dmub_dcn20.c | 2 +- .../gpu/drm/amd/display/dmub/src/dmub_dcn20.h | 2 + .../gpu/drm/amd/display/dmub/src/dmub_dcn30.c | 2 +- .../gpu/drm/amd/display/modules/hdcp/hdcp.h | 2 +- .../drm/amd/display/modules/hdcp/hdcp_psp.c | 2 +- .../drm/amd/display/modules/inc/mod_hdcp.h | 4 +- .../amd/display/modules/power/power_helpers.c | 2 +- 37 files changed, 625 insertions(+), 438 deletions(-) create mode 100644 drivers/gpu/drm/amd/display/dc/dc_edid_parser.c create mode 100644 drivers/gpu/drm/amd/display/dc/dc_edid_parser.h
Signature · 6 lines
2.25.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 1/27 drm/amd/display: Drop SOC bounding box hookup in DM/DC
From: Nicholas Kazlauskas <[email protected]>
[Why]
There aren't any ASIC where we use these binaries and they aren't useful for future use since it's inconvenient to extend and maintain these structures.
[How]
Drop the support from DM and DC for now.
--- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 - drivers/gpu/drm/amd/display/dc/core/dc.c | 1 - drivers/gpu/drm/amd/display/dc/dc.h | 6 - .../drm/amd/display/dc/dcn20/dcn20_resource.c | 111 ------------------ .../drm/amd/display/dc/dcn30/dcn30_resource.c | 107 +---------------- .../amd/display/dc/dcn301/dcn301_resource.c | 107 +---------------- 6 files changed, 4 insertions(+), 330 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +0 -2
@@ -1015,8 +1015,6 @@ static int amdgpu_dm_init(struct amdgpu_device *adev) init_data.flags.power_down_display_on_boot = true; - init_data.soc_bounding_box = adev->dm.soc_bounding_box; -/* Display Core create. */ adev->dm.dc =dc_create (&init_data);
drivers/gpu/drm/amd/display/dc/core/dc.c +0 -1
@@ -712,7 +712,6 @@ static bool dc_construct(struct dc *dc, } dc->dcn_ip = dcn_ip; - dc->soc_bounding_box = init_params->soc_bounding_box;#endif if (!dc_construct_ctx (dc, init_params)) {
drivers/gpu/drm/amd/display/dc/dc.h +0 -6
@@ -638,7 +638,6 @@ struct dc {const char *build_id;struct vm_helper *vm_helper; -const struct gpu_info_soc_bounding_box_v1_0 *soc_bounding_box; };enum frame_buffer_mode {
@@ -676,11 +675,6 @@ struct dc_init_data {struct dc_config flags;uint64_t log_mask; -/** -* gpu_info FW provided soc bounding box struct or 0 if not -* available in FW -*/ -const struct gpu_info_soc_bounding_box_v1_0 *soc_bounding_box;struct dpcd_vendor_signature vendor_signature;#if defined(CONFIG_DRM_AMD_DC_DCN )bool force_smu_not_present;
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c +0 -111
123 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/dcn30/dcn30_resource.c +2 -105
127 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/dcn301/dcn301_resource.c +2 -105
126 lines not on this page · raw message
Signature · 6 lines
2.25.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 2/27 drm/amd/display: Fix DPCD translation for LTTPR AUX_RD_INTERVAL
In reply to Anson JacobFrom: George Shen <[email protected]>
[Why]
The translation between the DPCD value and the specified AUX_RD_INTERVAL in the DP spec do not match.
[How]
Update values to match the spec.
--- drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c +3 -3
@@ -892,13 +892,13 @@ static uint32_t translate_training_aux_read_interval(uint32_t dpcd_aux_read_inteswitch (dpcd_aux_read_interval) {case 0x01 : - aux_rd_interval_us =400 ; + aux_rd_interval_us =4000 ;break ;case 0x02 : - aux_rd_interval_us =4000 ; + aux_rd_interval_us =8000 ;break ;case 0x03 : - aux_rd_interval_us =8000 ; + aux_rd_interval_us =12000 ;break ;case 0x04 : aux_rd_interval_us =16000 ;
Signature · 6 lines
2.25.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 3/27 drm/amd/display: initialize i2c speed if not initialized in dcnxxx__resource.c
In reply to Anson JacobFrom: Brendan Steve Leder <[email protected]>
Some dcnxxx__resource.c do not initialize the i2c speed; this patch adds the required initialization at dc_construct().
--- drivers/gpu/drm/amd/display/dc/core/dc.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/gpu/drm/amd/display/dc/core/dc.c +4 -0
@@ -761,6 +761,10 @@ static bool dc_construct(struct dc *dc,if (!dc->res_pool) goto fail; +/* set i2c speed if not done by the respective dcnxxx__resource.c */ +if (dc->caps.i2c_speed_in_khz_hdcp ==0 ) + dc->caps.i2c_speed_in_khz_hdcp = dc->caps.i2c_speed_in_khz; + dc->clk_mgr =dc_clk_mgr_create (dc->ctx, dc->res_pool->pp_smu, dc->res_pool->dccg);if (!dc->clk_mgr) goto fail;
Signature · 6 lines
2.25.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 4/27 drm/amd/display: Add null pointer check to is_dig_enabled func
In reply to Anson JacobFrom: Michael Strauss <[email protected]>
[WHY]
Safeguarding as pointer may be null in diagnostic environment
--- drivers/gpu/drm/amd/display/dc/clk_mgr/dcn301/vg_clk_mgr.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn301/vg_clk_mgr.c +2 -1
@@ -75,7 +75,8 @@ int vg_get_active_display_cnt_wa(const struct dc_link *link = dc->links[i];/* abusing the fact that the dig and phy are coupled to see if the phy is enabled */ -if (link->link_enc->funcs->is_dig_enabled (link->link_enc)) +if (link->link_enc->funcs->is_dig_enabled && + link->link_enc->funcs->is_dig_enabled (link->link_enc)) display_count++; }
Signature · 6 lines
2.25.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 5/27 drm/amd/display: reuse current context instead of recreating one
In reply to Anson JacobFrom: Bhawanpreet Lakha <[email protected]>
[Why]
Currently we discard the current context and recreate it. The current context is what is applied to the HW so we should be re-using this rather than creating a new context.
Recreating the context can lead to mismatch between new context and the current context
For example: gsl groups get changed when we create a new context this can cause issues in a multi display config (with flip immediate) because we don't align the existing gsl groups in the new and current context. If we reuse the current context the gsl group assignment stays the same.
[How]
Instead of discarding the current context, we instead just copy the current state and add/remove planes and streams.
--- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 23 +++++++--------- drivers/gpu/drm/amd/display/dc/core/dc.c | 27 +++++++++++++------ drivers/gpu/drm/amd/display/dc/dc_stream.h | 3 +-- 3 files changed, 30 insertions(+), 23 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +10 -13
@@ -1936,7 +1936,7 @@ static void dm_gpureset_commit_state(struct dc_state *dc_state,dc_commit_updates_for_stream ( dm->dc, bundle->surface_updates, dc_state->stream_status->plane_count, - dc_state->streams[k], &bundle->stream_update, dc_state); + dc_state->streams[k], &bundle->stream_update); } cleanup:
@@ -1967,8 +1967,7 @@ static void dm_set_dpms_off(struct dc_link *link) stream_update.stream = stream_state;dc_commit_updates_for_stream (stream_state->ctx->dc,NULL ,0 , - stream_state, &stream_update, - stream_state->ctx->dc->current_state); + stream_state, &stream_update);mutex_unlock (&adev->dm.dc_lock); }
@@ -7730,7 +7729,7 @@ static void amdgpu_dm_commit_planes(struct drm_atomic_state *state,struct drm_crtc *pcrtc, bool wait_for_vblank) { - uint32_t i; + int i;uint64_t timestamp_ns;struct drm_plane *plane;struct drm_plane_state *old_plane_state, *new_plane_state;
@@ -7771,7 +7770,7 @@ static void amdgpu_dm_commit_planes(struct drm_atomic_state *state,amdgpu_dm_commit_cursors (state);/* update planes when needed */ -for_each_oldnew_plane_in_state (state, plane, old_plane_state, new_plane_state, i) { +for_each_oldnew_plane_in_state_reverse (state, plane, old_plane_state, new_plane_state, i) {struct drm_crtc *crtc = new_plane_state->crtc;struct drm_crtc_state *new_crtc_state;struct drm_framebuffer *fb = new_plane_state->fb;
@@ -7994,8 +7993,7 @@ static void amdgpu_dm_commit_planes(struct drm_atomic_state *state, bundle->surface_updates, planes_count, acrtc_state->stream, - &bundle->stream_update, - dc_state); + &bundle->stream_update);/** * Enable or disable the interrupts on the backend.
@@ -8331,13 +8329,13 @@ static void amdgpu_dm_atomic_commit_tail(struct drm_atomic_state *state)struct dm_connector_state *dm_new_con_state =to_dm_connector_state (new_con_state);struct dm_connector_state *dm_old_con_state =to_dm_connector_state (old_con_state);struct amdgpu_crtc *acrtc =to_amdgpu_crtc (dm_new_con_state->base.crtc); -struct dc_surface_update dummy_updates[MAX_SURFACES ]; +struct dc_surface_update surface_updates[MAX_SURFACES ];struct dc_stream_update stream_update;struct dc_info_packet hdr_packet;struct dc_stream_status *status =NULL ;bool abm_changed, hdr_changed, scaling_changed; -memset (&dummy_updates,0 ,sizeof (dummy_updates)); +memset (&surface_updates,0 ,sizeof (surface_updates));memset (&stream_update,0 ,sizeof (stream_update));if (acrtc) {
@@ -8394,16 +8392,15 @@ static void amdgpu_dm_atomic_commit_tail(struct drm_atomic_state *state)* To fix this, DC should permit updating only stream properties. */ for (j =0 ; j < status->plane_count; j++) - dummy_updates[j].surface = status->plane_states[0 ]; + surface_updates[j].surface = status->plane_states[j];mutex_lock (&dm->dc_lock);dc_commit_updates_for_stream (dm->dc, - dummy_updates, + surface_updates, status->plane_count, dm_new_crtc_state->stream, - &stream_update, - dc_state); + &stream_update);mutex_unlock (&dm->dc_lock); }
drivers/gpu/drm/amd/display/dc/core/dc.c +19 -8
@@ -2695,8 +2695,7 @@ void dc_commit_updates_for_stream(struct dc *dc,struct dc_surface_update *srf_updates, int surface_count, struct dc_stream_state *stream, - struct dc_stream_update *stream_update, - struct dc_state *state) + struct dc_stream_update *stream_update) { const struct dc_stream_status *stream_status;enum surface_update_type update_type;
@@ -2715,6 +2714,12 @@ void dc_commit_updates_for_stream(struct dc *dc,if (update_type >=UPDATE_TYPE_FULL ) { +struct dc_plane_state *new_planes[MAX_SURFACES ]; + +memset (new_planes,0 ,sizeof (new_planes)); + +for (i =0 ; i < surface_count; i++) + new_planes[i] = srf_updates[i].surface;/* initialize scratch memory for building context */ context =dc_create_state (dc);
@@ -2723,15 +2728,21 @@ void dc_commit_updates_for_stream(struct dc *dc,return ; } -dc_resource_state_copy_construct (state, context); +dc_resource_state_copy_construct ( + dc->current_state, context); -for (i =0 ; i < dc->res_pool->pipe_count; i++) { -struct pipe_ctx *new_pipe = &context->res_ctx.pipe_ctx[i]; -struct pipe_ctx *old_pipe = &dc->current_state->res_ctx.pipe_ctx[i]; +/*remove old surfaces from context */ +if (!dc_rem_all_planes_for_stream (dc, stream, context)) { +DC_ERROR ("Failed to remove streams for new validate context!\n" ); +return ; + } -if (new_pipe->plane_state && new_pipe->plane_state != old_pipe->plane_state) - new_pipe->plane_state->force_full_update = true; +/* add surface to context */ +if (!dc_add_all_planes_for_stream (dc, stream, new_planes, surface_count, context)) { +DC_ERROR ("Failed to add streams for new validate context!\n" ); +return ; } + }
drivers/gpu/drm/amd/display/dc/dc_stream.h +1 -2
@@ -294,8 +294,7 @@ void dc_commit_updates_for_stream(struct dc *dc,struct dc_surface_update *srf_updates, int surface_count, struct dc_stream_state *stream, - struct dc_stream_update *stream_update, - struct dc_state *state); + struct dc_stream_update *stream_update);/* * Log the current stream state. */
Signature · 6 lines
2.25.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Re: [PATCH 05/27] drm/amd/display: reuse current context instead of recreating one
From: youling 257 <[email protected]>
This patch cause replug hdmi blackscreen, https://bugzilla.kernel.org/show_bug.cgi?id=211649
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Re: [PATCH 05/27] drm/amd/display: reuse current context instead of recreating one
Quoted 4 lines · On Tue, Feb 9, 2021 at 11:02 PM youling257 <[email protected]> wrote:
From: youling 257 <[email protected]>
This patch cause replug hdmi blackscreen, https://bugzilla.kernel.org/show_bug.cgi?id=211649
Can you test with my drm-next branch:
https://gitlab.freedesktop.org/agd5f/linux/-/commits/drm-next
Are you able to repro the issue there? I wonder if there is some additional commit missing from 5.11 that causes the issue compared to -next.
Thanks,
Alex
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Re: [PATCH 05/27] drm/amd/display: reuse current context instead of recreating one
test drm-next branch, can reproduce this problem.
2021-02-10 12:43 GMT+08:00, Alex Deucher <[email protected]>:
Quoted 13 lines · On Tue, Feb 9, 2021 at 11:02 PM youling257 <[email protected]> wrote:
Quoted 5 lines
From: youling 257 <[email protected]>
This patch cause replug hdmi blackscreen,
https://bugzilla.kernel.org/show_bug.cgi?id=211649Can you test with my drm-next branch:
https://gitlab.freedesktop.org/agd5f/linux/-/commits/drm-next
Are you able to repro the issue there? I wonder if there is some additional commit missing from 5.11 that causes the issue compared to -next.
Quoted 4 lines
Thanks,
Alex
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 6/27 drm/amd/display: Set power_gated to true for seamless boot pipe init
In reply to Anson JacobFrom: Lewis Huang <[email protected]>
[Why]
In seamless boot without a flip case, the flag power_gated didn't get cleared when resetting path mode because the plane_state is null. The following sequence will cause this issue:
1. OS call set mode to clone/extended
2. Reset path mode to remove edp
[How]
Set power gated default to true in seamless boot pipe
--- drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c +1 -0
@@ -1224,6 +1224,7 @@ void dcn10_init_pipes(struct dc *dc, struct dc_state *context)// signals when OTG blanked. This is to prevent pipe from // requesting data while in PSR. tg->funcs->tg_init (tg); + hubp->power_gated = true;continue ; }
Signature · 6 lines
2.25.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 7/27 drm/amd/display: correct some hdcp variable naming
In reply to Anson JacobFrom: Wenjing Liu <[email protected]>
[why]
In HDCP update stream config interface, some variables are named as xxx_supported, but in fact the variable indicates whether or not xxx_enabled. Correct the naming so it is less confusing to read the code.
--- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c | 7 ++++--- drivers/gpu/drm/amd/display/dc/core/dc_link.c | 14 +++++++------- drivers/gpu/drm/amd/display/dc/dm_cp_psp.h | 7 ++++--- drivers/gpu/drm/amd/display/modules/hdcp/hdcp.h | 2 +- .../gpu/drm/amd/display/modules/hdcp/hdcp_psp.c | 2 +- drivers/gpu/drm/amd/display/modules/inc/mod_hdcp.h | 4 ++-- 6 files changed, 19 insertions(+), 17 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c +4 -3
@@ -449,11 +449,12 @@ static void update_config(void *handle, struct cp_psp_stream_config *config) link->mode =mod_hdcp_signal_type_to_operation_mode (aconnector->dc_sink->sink_signal); display->controller =CONTROLLER_ID_D0 + config->otg_inst; - display->dig_fe = config->stream_enc_inst; - link->dig_be = config->link_enc_inst; + display->dig_fe = config->dig_fe; + link->dig_be = config->dig_be; link->ddc_line = aconnector->dc_link->ddc_hw_inst +1 ; link->dp.rev = aconnector->dc_link->dpcd_caps.dpcd_rev.raw; - link->dp.mst_supported = config->mst_supported; + link->dp.assr_enabled = config->assr_enabled; + link->dp.mst_enabled = config->mst_enabled; display->adjust.disable =1 ; link->adjust.auth_delay =3 ; link->adjust.hdcp1.disable =0 ;
drivers/gpu/drm/amd/display/dc/core/dc_link.c +7 -7
@@ -3169,17 +3169,17 @@ static void update_psp_stream_config(struct pipe_ctx *pipe_ctx, bool dpms_off) {struct cp_psp *cp_psp = &pipe_ctx->stream->ctx->cp_psp;if (cp_psp && cp_psp->funcs.update_stream_config) { -struct cp_psp_stream_config config; - -memset (&config,0 ,sizeof (config)); +struct cp_psp_stream_config config = {0 }; +enum dp_panel_mode panel_mode = +dp_get_panel_mode (pipe_ctx->stream->link); config.otg_inst = (uint8_t ) pipe_ctx->stream_res.tg->inst; -/*stream_enc_inst*/ - config.stream_enc_inst = (uint8_t ) pipe_ctx->stream_res.stream_enc->stream_enc_inst; - config.link_enc_inst = pipe_ctx->stream->link->link_enc_hw_inst; + config.dig_fe = (uint8_t ) pipe_ctx->stream_res.stream_enc->stream_enc_inst; + config.dig_be = pipe_ctx->stream->link->link_enc_hw_inst; config.dpms_off = dpms_off; config.dm_stream_ctx = pipe_ctx->stream->dm_stream_context; - config.mst_supported = (pipe_ctx->stream->signal == + config.assr_enabled = (panel_mode ==DP_PANEL_MODE_EDP ); + config.mst_enabled = (pipe_ctx->stream->signal ==SIGNAL_TYPE_DISPLAY_PORT_MST ); cp_psp->funcs.update_stream_config (cp_psp->handle, &config); }
drivers/gpu/drm/amd/display/dc/dm_cp_psp.h +4 -3
@@ -30,9 +30,10 @@ struct dc_link;struct cp_psp_stream_config {uint8_t otg_inst; -uint8_t link_enc_inst; -uint8_t stream_enc_inst; -uint8_t mst_supported; +uint8_t dig_be; +uint8_t dig_fe; +uint8_t assr_enabled; +uint8_t mst_enabled;void *dm_stream_ctx;bool dpms_off; };
drivers/gpu/drm/amd/display/modules/hdcp/hdcp.h +1 -1
@@ -397,7 +397,7 @@ static inline uint8_t is_dp_hdcp(struct mod_hdcp *hdcp)static inline uint8_t is_dp_mst_hdcp (struct mod_hdcp *hdcp) {return (hdcp->connection.link.mode ==MOD_HDCP_MODE_DP && - hdcp->connection.link.dp.mst_supported); + hdcp->connection.link.dp.mst_enabled); }static inline uint8_t is_hdmi_dvi_sl_hdcp (struct mod_hdcp *hdcp)
drivers/gpu/drm/amd/display/modules/hdcp/hdcp_psp.c +1 -1
@@ -106,7 +106,7 @@ enum mod_hdcp_status mod_hdcp_add_display_to_topology(struct mod_hdcp *hdcp, dtm_cmd->dtm_in_message.topology_update_v2.dig_be = link->dig_be; dtm_cmd->dtm_in_message.topology_update_v2.dig_fe = display->dig_fe;if (is_dp_hdcp (hdcp)) - dtm_cmd->dtm_in_message.topology_update_v2.is_assr = link->dp.assr_supported; + dtm_cmd->dtm_in_message.topology_update_v2.is_assr = link->dp.assr_enabled; dtm_cmd->dtm_in_message.topology_update_v2.dp_mst_vcid = display->vc_id; dtm_cmd->dtm_in_message.topology_update_v2.max_hdcp_supported_version =
drivers/gpu/drm/amd/display/modules/inc/mod_hdcp.h +2 -2
@@ -101,8 +101,8 @@ enum mod_hdcp_status {struct mod_hdcp_displayport {uint8_t rev; -uint8_t assr_supported; -uint8_t mst_supported; +uint8_t assr_enabled; +uint8_t mst_enabled; };struct mod_hdcp_hdmi {
Signature · 6 lines
2.25.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 8/27 drm/amd/display: Add more Clock Sources to DCN2.1
In reply to Anson JacobFrom: Sung Lee <[email protected]>
[WHY]
When enabling HDMI on ComboPHY, there are not enough clock sources to complete display detection.
[HOW]
Initialize more clock sources.
--- drivers/gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/gpu/drm/amd/display/dc/dcn21/dcn21_resource.c +10 -0
@@ -906,6 +906,8 @@ enum dcn20_clk_src_array_id {DCN20_CLK_SRC_PLL0 ,DCN20_CLK_SRC_PLL1 ,DCN20_CLK_SRC_PLL2 , +DCN20_CLK_SRC_PLL3 , +DCN20_CLK_SRC_PLL4 , DCN20_CLK_SRC_TOTAL_DCN21 };
@@ -2030,6 +2032,14 @@ static bool dcn21_resource_construct(dcn21_clock_source_create (ctx, ctx->dc_bios,CLOCK_SOURCE_COMBO_PHY_PLL2 , &clk_src_regs[2 ], false); + pool->base.clock_sources[DCN20_CLK_SRC_PLL3 ] = +dcn21_clock_source_create (ctx, ctx->dc_bios, +CLOCK_SOURCE_COMBO_PHY_PLL3 , + &clk_src_regs[3 ], false); + pool->base.clock_sources[DCN20_CLK_SRC_PLL4 ] = +dcn21_clock_source_create (ctx, ctx->dc_bios, +CLOCK_SOURCE_COMBO_PHY_PLL4 , + &clk_src_regs[4 ], false); pool->base.clk_src_count =DCN20_CLK_SRC_TOTAL_DCN21 ;
Signature · 6 lines
2.25.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 9/27 drm/amd/display: [FW Promotion] Release 0.0.49
In reply to Anson JacobFrom: Anthony Koo <[email protected]>
- Add field for passing line time for a frame
--- drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h +3 -2
@@ -47,10 +47,10 @@/* Firmware versioning. */ #ifdef DMUB_EXPOSE_VERSION -#define DMUB_FW_VERSION_GIT_HASH 0xf09c02ae3 +#define DMUB_FW_VERSION_GIT_HASH 0xf2f2f3a96#define DMUB_FW_VERSION_MAJOR 0#define DMUB_FW_VERSION_MINOR 0 -#define DMUB_FW_VERSION_REVISION 48 +#define DMUB_FW_VERSION_REVISION 49#define DMUB_FW_VERSION_TEST 0#define DMUB_FW_VERSION_VBIOS 0#define DMUB_FW_VERSION_HOTFIX 0
@@ -653,6 +653,7 @@ struct dmub_cmd_psr_copy_settings_data {uint8_t multi_disp_optimizations_en;uint16_t init_sdp_deadline;uint16_t pad2; +uint32_t line_time_in_us; };struct dmub_rb_cmd_psr_copy_settings {
Signature · 6 lines
2.25.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 10/27 drm/amd/display: 3.2.120
In reply to Anson JacobFrom: Aric Cyr <[email protected]>
This DC update brings improvements in multiple areas. In summary, we highlight:
- Fix display detection on HDMI ComboPHY
- Drop SOC bounding box hookup
- Fix DPCD values
--- 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
@@ -42,7 +42,7 @@#include "inc/hw/dmcu.h" #include "dml/display_mode_lib.h" -#define DC_VER "3.2.119" +#define DC_VER "3.2.120"#define MAX_SURFACES 3#define MAX_PLANES 6
Signature · 6 lines
2.25.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 11/27 drm/amd/display: fix calculation for the pwl backlight curve
In reply to Anson JacobFrom: Anthony Koo <[email protected]>
[Why]
The PWL backlight curve is used by the firmware to convert between brightness and linear PWM value.
Driver has a backlight LUT, but the firmware holds a PWL curve and interpolates between points.
The calculations are incorrect leading to slightly off backlight values being programmed.
[How]
Fix the PWL backlight curve threshold/offset calculations
--- drivers/gpu/drm/amd/display/modules/power/power_helpers.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/display/modules/power/power_helpers.c +1 -1
@@ -266,7 +266,7 @@ static void fill_backlight_transform_table_v_2_2(struct dmcu_iram_parameters par* format U4.10. */ for (i =1 ; i+1 < num_entries; i++) { - lut_index = (params.backlight_lut_array_size -1 ) * i / (num_entries -1 ); + lut_index =DIV_ROUNDUP ((i * params.backlight_lut_array_size), num_entries);ASSERT (lut_index < params.backlight_lut_array_size); table->backlight_thresholds[i] = (big_endian) ?
Signature · 6 lines
2.25.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 12/27 drm/amd/display: Revert "Fix EDID parsing after resume from suspend"
In reply to Anson JacobFrom: Stylon Wang <[email protected]>
This reverts commit b24bdc37d03a0478189e20a50286092840f414fa. It caused memory leak after S3 on 4K HDMI displays.
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 -- 1 file changed, 2 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +0 -2
@@ -2348,8 +2348,6 @@ void amdgpu_dm_update_connector_after_detect(drm_connector_update_edid_property (connector, aconnector->edid); -drm_add_edid_modes (connector, aconnector->edid); -if (aconnector->dc_link->aux_mode)drm_dp_cec_set_edid (&aconnector->dm_dp_aux.aux, aconnector->edid);
Signature · 6 lines
2.25.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 13/27 drm/amd/display: Release DSC before acquiring
In reply to Anson JacobFrom: Mikita Lipski <[email protected]>
[why]
Need to unassign DSC from pipes that are not using it so other pipes can acquire it. That is needed for asic's that have unmatching number of DSC engines from the number of pipes.
[how]
Before acquiring dsc to stream resources, first remove it.
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c +5 -1
@@ -829,6 +829,9 @@ bool compute_mst_dsc_configs_for_state(struct drm_atomic_state *state,if (computed_streams[i])continue ; +if (dcn20_remove_stream_from_ctx (stream->ctx->dc, dc_state, stream) !=DC_OK ) +return false; +mutex_lock (&aconnector->mst_mgr.lock);if (!compute_mst_dsc_configs_for_link (state, dc_state, stream->link)) {mutex_unlock (&aconnector->mst_mgr.lock);
@@ -846,7 +849,8 @@ bool compute_mst_dsc_configs_for_state(struct drm_atomic_state *state, stream = dc_state->streams[i];if (stream->timing.flags.DSC ==1 ) -dc_stream_add_dsc_to_resource (stream->ctx->dc, dc_state, stream); +if (dc_stream_add_dsc_to_resource (stream->ctx->dc, dc_state, stream) !=DC_OK ) +return false; }return true;
Signature · 6 lines
2.25.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 14/27 drm/amd/display: Fix dc_sink kref count in emulated_link_detect
In reply to Anson JacobFrom: Victor Lu <[email protected]>
[why]prev_sink is not used anywhere else in the function and the reference to it from dc_link is replaced with a new dc_sink.
[how]
Change dc_sink_retain(prev_sink) to dc_sink_release(prev_sink).
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +2 -2
@@ -1835,8 +1835,8 @@ static void emulated_link_detect(struct dc_link *link) link->type = dc_connection_none; prev_sink = link->local_sink; -if (prev_sink !=NULL ) -dc_sink_retain (prev_sink); +if (prev_sink) +dc_sink_release (prev_sink);switch (link->connector_signal) {case SIGNAL_TYPE_HDMI_TYPE_A : {
Signature · 6 lines
2.25.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 15/27 drm/amd/display: implement support for DID2.0 dsc passthrough
In reply to Anson JacobFrom: Jun Lei <[email protected]>
[Why]
Some panels contain active converters (e.g. DP to MIPI) which only support restricted DSC configurations. DID2.0 adds support for such displays to explicitly define per timing BPP restrictions on DSC. Ignoring these restrictions leads to blackscreen.
[How]
Add parsing in DID2.0 parser to get this bpp info. Add support in DSC module to constraint target bpp based on this info.
--- drivers/gpu/drm/amd/display/dc/dc_dsc.h | 7 +++-- drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 1 + drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c | 29 ++++++++++++-------- 3 files changed, 23 insertions(+), 14 deletions(-)
drivers/gpu/drm/amd/display/dc/dc_dsc.h +4 -3
@@ -51,6 +51,7 @@ struct dc_dsc_policy {int min_slice_height;// Must not be less than 8 uint32_t max_target_bpp;uint32_t min_target_bpp; +uint32_t preferred_bpp_x16;bool enable_dsc_when_not_needed; };
@@ -62,8 +63,8 @@ bool dc_dsc_parse_dsc_dpcd(const struct dc *dc,bool dc_dsc_compute_bandwidth_range (const struct display_stream_compressor *dsc,uint32_t dsc_min_slice_height_override, -uint32_t min_bpp, -uint32_t max_bpp, +uint32_t min_bpp_x16, +uint32_t max_bpp_x16,const struct dsc_dec_dpcd_caps *dsc_sink_caps,const struct dc_crtc_timing *timing,struct dc_dsc_bw_range *range);
@@ -78,7 +79,7 @@ bool dc_dsc_compute_config( struct dc_dsc_config *dsc_cfg);void dc_dsc_get_policy_for_timing (const struct dc_crtc_timing *timing, -uint32_t max_target_bpp_limit_override, +uint32_t max_target_bpp_limit_override_x16,struct dc_dsc_policy *policy);void dc_dsc_policy_set_max_target_bpp_limit (uint32_t limit);
drivers/gpu/drm/amd/display/dc/dc_hw_types.h +1 -0
@@ -769,6 +769,7 @@ struct dc_crtc_timing {#endif struct dc_crtc_timing_flags flags; +uint32_t dsc_fixed_bits_per_pixel_x16;/* DSC target bitrate in 1/16 of bpp (e.g. 128 -> 8bpp) */ struct dc_dsc_config dsc_cfg; };
drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c +18 -11
@@ -369,6 +369,11 @@ static bool decide_dsc_target_bpp_x16(/* enough bandwidth without dsc */ *target_bpp_x16 =0 ; should_use_dsc = false; + }else if (policy->preferred_bpp_x16 >0 && + policy->preferred_bpp_x16 <= range.max_target_bpp_x16 && + policy->preferred_bpp_x16 >= range.min_target_bpp_x16) { + *target_bpp_x16 = policy->preferred_bpp_x16; + should_use_dsc = true; }else if (target_bandwidth_kbps >= range.max_kbps) {/* use max target bpp allowed */ *target_bpp_x16 = range.max_target_bpp_x16;
@@ -545,7 +550,7 @@ static bool setup_dsc_config(int target_bandwidth_kbps, const struct dc_crtc_timing *timing, int min_slice_height_override, - int max_dsc_target_bpp_limit_override, + int max_dsc_target_bpp_limit_override_x16, struct dc_dsc_config *dsc_cfg) { struct dsc_enc_caps dsc_common_caps;
@@ -564,7 +569,7 @@ static bool setup_dsc_config(memset (dsc_cfg,0 ,sizeof (struct dc_dsc_config )); -dc_dsc_get_policy_for_timing (timing, max_dsc_target_bpp_limit_override, &policy); +dc_dsc_get_policy_for_timing (timing, max_dsc_target_bpp_limit_override_x16, &policy); pic_width = timing->h_addressable + timing->h_border_left + timing->h_border_right; pic_height = timing->v_addressable + timing->v_border_top + timing->v_border_bottom;
@@ -865,8 +870,8 @@ bool dc_dsc_parse_dsc_dpcd(const struct dc *dc, const uint8_t *dpcd_dsc_basic_dabool dc_dsc_compute_bandwidth_range (const struct display_stream_compressor *dsc,uint32_t dsc_min_slice_height_override, -uint32_t min_bpp, -uint32_t max_bpp, +uint32_t min_bpp_x16, +uint32_t max_bpp_x16,const struct dsc_dec_dpcd_caps *dsc_sink_caps,const struct dc_crtc_timing *timing,struct dc_dsc_bw_range *range)
@@ -883,10 +888,10 @@ bool dc_dsc_compute_bandwidth_range(if (is_dsc_possible) is_dsc_possible =setup_dsc_config (dsc_sink_caps, &dsc_enc_caps,0 , timing, - dsc_min_slice_height_override, max_bpp, &config); + dsc_min_slice_height_override, max_bpp_x16, &config);if (is_dsc_possible) -get_dsc_bandwidth_range (min_bpp, max_bpp, &dsc_common_caps, timing, range); +get_dsc_bandwidth_range (min_bpp_x16, max_bpp_x16, &dsc_common_caps, timing, range);return is_dsc_possible; }
@@ -895,7 +900,7 @@ bool dc_dsc_compute_config(const struct display_stream_compressor *dsc, const struct dsc_dec_dpcd_caps *dsc_sink_caps, uint32_t dsc_min_slice_height_override, - uint32_t max_target_bpp_limit_override, + uint32_t max_target_bpp_limit_override_x16, uint32_t target_bandwidth_kbps, const struct dc_crtc_timing *timing, struct dc_dsc_config *dsc_cfg)
@@ -908,11 +913,11 @@ bool dc_dsc_compute_config( &dsc_enc_caps, target_bandwidth_kbps, timing, dsc_min_slice_height_override, - max_target_bpp_limit_override, dsc_cfg); + max_target_bpp_limit_override_x16, dsc_cfg);return is_dsc_possible; } -void dc_dsc_get_policy_for_timing (const struct dc_crtc_timing *timing,uint32_t max_target_bpp_limit_override,struct dc_dsc_policy *policy) +void dc_dsc_get_policy_for_timing (const struct dc_crtc_timing *timing,uint32_t max_target_bpp_limit_override_x16,struct dc_dsc_policy *policy) {uint32_t bpc =0 ;
@@ -967,13 +972,15 @@ void dc_dsc_get_policy_for_timing(const struct dc_crtc_timing *timing, uint32_treturn ; } + policy->preferred_bpp_x16 = timing->dsc_fixed_bits_per_pixel_x16; +/* internal upper limit, default 16 bpp */ if (policy->max_target_bpp > dsc_policy_max_target_bpp_limit) policy->max_target_bpp = dsc_policy_max_target_bpp_limit;/* apply override */ -if (max_target_bpp_limit_override && policy->max_target_bpp > max_target_bpp_limit_override) - policy->max_target_bpp = max_target_bpp_limit_override; +if (max_target_bpp_limit_override_x16 && policy->max_target_bpp > max_target_bpp_limit_override_x16 /16 ) + policy->max_target_bpp = max_target_bpp_limit_override_x16 /16 ;/* enable DSC when not needed, default false */ if (dsc_policy_enable_dsc_when_not_needed)
Signature · 6 lines
2.25.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 16/27 drm/amd/display: fix initial bounding box values for dcn3.02
In reply to Anson JacobFrom: Samson Tam <[email protected]>
[Why]
Initial bounding box values are updated in dcn30_update_bw_bounding_box
but they use dcn3_0_soc and dcn3_0_ip instead of dcn3_02_soc and dcn3_02_ip
[How]
Add dcn302_update_bw_bounding_box and
dcn302_get_optimal_dcfclk_fclk_for_uclk so it uses dcn3_02_soc and dcn3_02_ip.
Use sr_exit_time_us, sr_enter_plus_exit_time_us,
from dcn30 on dcn302 to fix flicker on eDP. Also use dram_clock_change_latency_us from dcn30.
--- .../drm/amd/display/dc/dcn30/dcn30_resource.c | 24 ++- .../amd/display/dc/dcn302/dcn302_resource.c | 168 +++++++++++++++++- .../amd/display/dc/dcn302/dcn302_resource.h | 2 + 3 files changed, 184 insertions(+), 10 deletions(-)
drivers/gpu/drm/amd/display/dc/dcn30/dcn30_resource.c +18 -6
@@ -2334,16 +2334,28 @@ bool dcn30_validate_bandwidth(struct dc *dc,return out; } -static noinline void get_optimal_dcfclk_fclk_for_uclk(unsigned int uclk_mts, -unsigned int *optimal_dcfclk, -unsigned int *optimal_fclk) +/* +* This must be noinline to ensure anything that deals with FP registers +* is contained within this call; previously our compiling with hard-float +* would result in fp instructions being emitted outside of the boundaries +* of the DC_FP_START/END macros, which makes sense as the compiler has no +* idea about what is wrapped and what is not +* +* This is largely just a workaround to avoid breakage introduced with 5.6, +* ideally all fp-using code should be moved into its own file, only that +* should be compiled with hard-float, and all code exported from there +* should be strictly wrapped with DC_FP_START/END +*/ +static noinline void dcn30_get_optimal_dcfclk_fclk_for_uclk(unsigned int uclk_mts, +unsigned int *optimal_dcfclk, +unsigned int *optimal_fclk) {double bw_from_dram, bw_from_dram1, bw_from_dram2; bw_from_dram1 = uclk_mts * dcn3_0_soc.num_chans * - dcn3_0_soc.dram_channel_width_bytes * (dcn3_0_soc.max_avg_dram_bw_use_normal_percent /100 ); + dcn3_0_soc.dram_channel_width_bytes * (dcn3_0_soc.max_avg_dram_bw_use_normal_percent /100 ); bw_from_dram2 = uclk_mts * dcn3_0_soc.num_chans * - dcn3_0_soc.dram_channel_width_bytes * (dcn3_0_soc.max_avg_sdp_bw_use_normal_percent /100 ); + dcn3_0_soc.dram_channel_width_bytes * (dcn3_0_soc.max_avg_sdp_bw_use_normal_percent /100 ); bw_from_dram = (bw_from_dram1 < bw_from_dram2) ? bw_from_dram1 : bw_from_dram2;
@@ -2402,7 +2414,7 @@ void dcn30_update_bw_bounding_box(struct dc *dc, struct clk_bw_params *bw_params// Calculate optimal dcfclk for each uclk for (i =0 ; i < num_uclk_states; i++) {DC_FP_START (); -get_optimal_dcfclk_fclk_for_uclk (bw_params->clk_table.entries[i].memclk_mhz *16 , +dcn30_get_optimal_dcfclk_fclk_for_uclk (bw_params->clk_table.entries[i].memclk_mhz *16 , &optimal_dcfclk_for_uclk[i],NULL );DC_FP_END ();if (optimal_dcfclk_for_uclk[i] < bw_params->clk_table.entries[0 ].dcfclk_mhz) {
drivers/gpu/drm/amd/display/dc/dcn302/dcn302_resource.c +164 -4
198 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/dcn302/dcn302_resource.h +2 -0
@@ -30,4 +30,6 @@struct resource_pool *dcn302_create_resource_pool (const struct dc_init_data *init_data,struct dc *dc); +void dcn302_update_bw_bounding_box (struct dc *dc,struct clk_bw_params *bw_params); +#endif /* _DCN302_RESOURCE_H_ */
Signature · 6 lines
2.25.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 17/27 drm/amd/display: Fix CW4 programming for dmub30 cached inbox
In reply to Anson JacobFrom: Nicholas Kazlauskas <[email protected]>
[Why]
The conditions for whether we used cached vs non-cached inbox1 depend on a version check that mismatches what the shared helpers in dmub20 implement.
[How]
Use the dmub_dcn20_use_cached_inbox check for dmub_dcn30 as well.
--- drivers/gpu/drm/amd/display/dmub/src/dmub_dcn20.c | 2 +- drivers/gpu/drm/amd/display/dmub/src/dmub_dcn20.h | 2 ++ drivers/gpu/drm/amd/display/dmub/src/dmub_dcn30.c | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/display/dmub/src/dmub_dcn20.c +1 -1
@@ -81,7 +81,7 @@ static inline void dmub_dcn20_translate_addr(const union dmub_addr *addr_in, addr_out->quad_part = addr_in->quad_part - fb_base + fb_offset; } -static inline bool dmub_dcn20_use_cached_inbox (struct dmub_srv *dmub) +bool dmub_dcn20_use_cached_inbox (struct dmub_srv *dmub) {/* Cached inbox is not supported in this fw version range */ return !(dmub->fw_version >= DMUB_FW_VERSION(1, 0, 0) &&
drivers/gpu/drm/amd/display/dmub/src/dmub_dcn20.h +2 -0
@@ -198,4 +198,6 @@ void dmub_dcn20_skip_dmub_panel_power_sequence(struct dmub_srv *dmub, bool skip)union dmub_fw_boot_status dmub_dcn20_get_fw_boot_status (struct dmub_srv *dmub); +bool dmub_dcn20_use_cached_inbox (struct dmub_srv *dmub); +#endif /* _DMUB_DCN20_H_ */
drivers/gpu/drm/amd/display/dmub/src/dmub_dcn30.c +1 -1
@@ -155,7 +155,7 @@ void dmub_dcn30_setup_windows(struct dmub_srv *dmub, offset = cw4->offset;/* New firmware can support CW4. */ -if (dmub->fw_version >DMUB_FW_VERSION (1 ,0 ,10 )) { +if (dmub_dcn20_use_cached_inbox (dmub)) {REG_WRITE (DMCUB_REGION3_CW4_OFFSET , offset.u.low_part);REG_WRITE (DMCUB_REGION3_CW4_OFFSET_HIGH , offset.u.high_part);REG_WRITE (DMCUB_REGION3_CW4_BASE_ADDRESS , cw4->region.base);
Signature · 6 lines
2.25.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 18/27 drm/amd/display: Enable "trigger_hotplug" debugfs on all outputs
In reply to Anson JacobFrom: Stylon Wang <[email protected]>
[Why]
Per-connector debugfs entry "trigger_hotplug" is available on DP/eDP only. New IGT tests need this entry to test other outputs.
[How]
Enable this debugfs entry on all types of connectors
--- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c +6 -4
@@ -1063,7 +1063,7 @@ static int dp_dsc_fec_support_show(struct seq_file *m, void *data)* echo 0 > /sys/kernel/debug/dri/0/DP-X/trigger_hotplug * */ -static ssize_t dp_trigger_hotplug (struct file *f,const char __user *buf, +static ssize_t trigger_hotplug (struct file *f,const char __user *buf,size_t size,loff_t *pos) {struct amdgpu_dm_connector *aconnector =file_inode (f)->i_private;
@@ -2214,9 +2214,9 @@ static const struct file_operations dp_dsc_slice_bpg_offset_debugfs_fops = { .llseek = default_llseek }; -static const struct file_operations dp_trigger_hotplug_debugfs_fops = { +static const struct file_operations trigger_hotplug_debugfs_fops = { .owner =THIS_MODULE , - .write = dp_trigger_hotplug, + .write = trigger_hotplug, .llseek = default_llseek };
@@ -2270,7 +2270,6 @@ static const struct {const struct file_operations *fops; } dp_debugfs_entries[] = { {"link_settings", &dp_link_settings_debugfs_fops}, - {"trigger_hotplug", &dp_trigger_hotplug_debugfs_fops}, {"phy_settings", &dp_phy_settings_debugfs_fop}, {"test_pattern", &dp_phy_test_pattern_fops}, #ifdef CONFIG_DRM_AMD_DC_HDCP
@@ -2367,6 +2366,9 @@ void connector_debugfs_init(struct amdgpu_dm_connector *connector)debugfs_create_file ("output_bpc" ,0644 , dir, connector, &output_bpc_fops); +debugfs_create_file ("trigger_hotplug" ,0644 , dir, connector, + &trigger_hotplug_debugfs_fops); + connector->debugfs_dpcd_address =0 ; connector->debugfs_dpcd_size =0 ;
Signature · 6 lines
2.25.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 19/27 drm/amd/display: Add Freesync HDMI support to DMCU
In reply to Anson JacobFrom: Stylon Wang <[email protected]>
[Why]
Adding support for Freesync HDMI to DC and DMCU
[How]
Create DC interface and implementation on top of DMCU to support parsing CEA blocks in DMCU.
--- drivers/gpu/drm/amd/display/dc/Makefile | 4 +- .../gpu/drm/amd/display/dc/dc_edid_parser.c | 80 ++++++++++++ .../gpu/drm/amd/display/dc/dc_edid_parser.h | 44 +++++++ drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c | 120 ++++++++++++++++++ drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.h | 11 ++ drivers/gpu/drm/amd/display/dc/inc/hw/dmcu.h | 10 ++ 6 files changed, 268 insertions(+), 1 deletion(-) create mode 100644 drivers/gpu/drm/amd/display/dc/dc_edid_parser.c create mode 100644 drivers/gpu/drm/amd/display/dc/dc_edid_parser.h
drivers/gpu/drm/amd/display/dc/Makefile +3 -1
@@ -69,5 +69,7 @@ AMD_DISPLAY_FILES += $(AMD_DISPLAY_CORE) AMD_DISPLAY_FILES += $(AMD_DM_REG_UPDATE) DC_DMUB += dc_dmub_srv.o +DC_EDID += dc_edid_parser.o AMD_DISPLAY_DMUB = $(addprefix $(AMDDALPATH)/dc/,$(DC_DMUB)) -AMD_DISPLAY_FILES += $(AMD_DISPLAY_DMUB) +AMD_DISPLAY_EDID = $(addprefix $(AMDDALPATH)/dc/,$(DC_EDID)) +AMD_DISPLAY_FILES += $(AMD_DISPLAY_DMUB) $(AMD_DISPLAY_EDID)
drivers/gpu/drm/amd/display/dc/dc_edid_parser.c new file +80 -0
80 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/dc_edid_parser.h new file +44 -0
44 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c +120 -0
138 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.h +11 -0
@@ -40,6 +40,10 @@SR (MASTER_COMM_DATA_REG3 ), \SR (MASTER_COMM_CMD_REG ), \SR (MASTER_COMM_CNTL_REG ), \ +SR (SLAVE_COMM_DATA_REG1 ), \ +SR (SLAVE_COMM_DATA_REG2 ), \ +SR (SLAVE_COMM_DATA_REG3 ), \ +SR (SLAVE_COMM_CMD_REG ), \SR (DMCU_IRAM_RD_CTRL ), \SR (DMCU_IRAM_RD_DATA ), \ SR(DMCU_INTERRUPT_TO_UC_EN_MASK), \
@@ -112,6 +116,7 @@DMCU_SF (MASTER_COMM_CMD_REG , \MASTER_COMM_CMD_REG_BYTE0 , mask_sh), \DMCU_SF (MASTER_COMM_CNTL_REG ,MASTER_COMM_INTERRUPT , mask_sh), \ +DMCU_SF (SLAVE_COMM_CNTL_REG ,SLAVE_COMM_INTERRUPT , mask_sh), \DMCU_SF (DMCU_INTERRUPT_TO_UC_EN_MASK , \STATIC_SCREEN1_INT_TO_UC_EN , mask_sh), \ DMCU_SF(DMCU_INTERRUPT_TO_UC_EN_MASK, \
@@ -179,6 +184,7 @@type UC_IN_RESET ; \type MASTER_COMM_CMD_REG_BYTE0 ; \type MASTER_COMM_INTERRUPT ; \ +type SLAVE_COMM_INTERRUPT ; \type DPHY_RX_FAST_TRAINING_CAPABLE ; \type DPHY_LOAD_BS_COUNT ; \type STATIC_SCREEN1_INT_TO_UC_EN ; \
@@ -211,6 +217,11 @@ struct dce_dmcu_registers {uint32_t MASTER_COMM_DATA_REG3 ;uint32_t MASTER_COMM_CMD_REG ;uint32_t MASTER_COMM_CNTL_REG ; +uint32_t SLAVE_COMM_DATA_REG1 ; +uint32_t SLAVE_COMM_DATA_REG2 ; +uint32_t SLAVE_COMM_DATA_REG3 ; +uint32_t SLAVE_COMM_CMD_REG ; +uint32_t SLAVE_COMM_CNTL_REG ;uint32_t DMCU_IRAM_RD_CTRL ;uint32_t DMCU_IRAM_RD_DATA ;uint32_t DMCU_INTERRUPT_TO_UC_EN_MASK ;
drivers/gpu/drm/amd/display/dc/inc/hw/dmcu.h +10 -0
@@ -74,6 +74,16 @@ struct dmcu_funcs {bool (*is_dmcu_initialized)(struct dmcu *dmcu);bool (*lock_phy)(struct dmcu *dmcu);bool (*unlock_phy)(struct dmcu *dmcu); +bool (*send_edid_cea)(struct dmcu *dmcu, +int offset, +int total_length, +uint8_t *data, +int length); +bool (*recv_amd_vsdb)(struct dmcu *dmcu, +int *version, +int *min_frame_rate, +int *max_frame_rate); + bool (*recv_edid_cea_ack)(struct dmcu *dmcu, int *offset); };#endif
Signature · 6 lines
2.25.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 20/27 drm/amd/display: remove unused force_ignore_link_settings debug option
In reply to Anson JacobFrom: Wenjing Liu <[email protected]>
[why]
Remove force_ignore_link_settings debug option as it is no longer used.
--- drivers/gpu/drm/amd/display/dc/core/dc.c | 2 -- drivers/gpu/drm/amd/display/dc/dc.h | 2 -- 2 files changed, 4 deletions(-)
drivers/gpu/drm/amd/display/dc/core/dc.c +0 -2
@@ -772,8 +772,6 @@ static bool dc_construct(struct dc *dc, dc->clk_mgr->force_smu_not_present = init_params->force_smu_not_present;#endif - dc->debug.force_ignore_link_settings = init_params->force_ignore_link_settings; -if (dc->res_pool->funcs->update_bw_bounding_box) dc->res_pool->funcs->update_bw_bounding_box (dc, dc->clk_mgr->bw_params);
drivers/gpu/drm/amd/display/dc/dc.h +0 -2
@@ -526,7 +526,6 @@ struct dc_debug_options {bool usbc_combo_phy_reset_wa;bool disable_dsc;bool enable_dram_clock_change_one_display_vactive; -bool force_ignore_link_settings;union mem_low_power_enable_options enable_mem_low_power; };
@@ -679,7 +678,6 @@ struct dc_init_data {#if defined(CONFIG_DRM_AMD_DC_DCN )bool force_smu_not_present;#endif -bool force_ignore_link_settings; };struct dc_callback_init {
Signature · 6 lines
2.25.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 21/27 drm/amd/display: Free atomic state after drm_atomic_commit
In reply to Anson JacobFrom: Victor Lu <[email protected]>
[why]drm_atomic_commit was changed so that the caller must free their drm_atomic_state reference on successes.
[how]
Add drm_atomic_commit_put after drm_atomic_commit call in dm_force_atomic_commit.
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +6 -8
@@ -8535,14 +8535,14 @@ static int dm_force_atomic_commit(struct drm_connector *connector) ret =PTR_ERR_OR_ZERO (conn_state);if (ret) - goto err; + goto out;/* Attach crtc to drm_atomic_state*/ crtc_state =drm_atomic_get_crtc_state (state, &disconnected_acrtc->base); ret =PTR_ERR_OR_ZERO (crtc_state);if (ret) - goto err; + goto out;/* force a restore */ crtc_state->mode_changed = true;
@@ -8552,17 +8552,15 @@ static int dm_force_atomic_commit(struct drm_connector *connector) ret =PTR_ERR_OR_ZERO (plane_state);if (ret) - goto err; - + goto out;/* Call commit internally with the state we just constructed */ ret =drm_atomic_commit (state); -if (!ret) -return 0 ; -err: -DRM_ERROR ("Restoring old state failed with %i\n" , ret); +out:drm_atomic_state_put (state); +if (ret) +DRM_ERROR ("Restoring old state failed with %i\n" , ret);return ret; }
Signature · 6 lines
2.25.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 22/27 drm/amd/display: Decrement refcount of dc_sink before reassignment
In reply to Anson JacobFrom: Victor Lu <[email protected]>
[why]
An old dc_sink state is causing a memory leak because it is missing a dc_sink_release before a new dc_sink is assigned back to aconnector->dc_sink.
[how]
Decrement the dc_sink refcount before reassigning it to a new dc_sink.
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +3 -1
@@ -2331,8 +2331,10 @@ void amdgpu_dm_update_connector_after_detect(* TODO: check if we still need the S3 mode update workaround. * If yes, put it here. */ -if (aconnector->dc_sink) +if (aconnector->dc_sink) {amdgpu_dm_update_freesync_caps (connector,NULL ); +dc_sink_release (aconnector->dc_sink); + } aconnector->dc_sink = sink;dc_sink_retain (aconnector->dc_sink);
Signature · 6 lines
2.25.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 23/27 drm/amd/display: Workaround for some legacy DP-VGA dongles
In reply to Anson JacobFrom: Taimur Hassan <[email protected]>
[Why]
Maximum resolution is 1440*900 when connecting to FHD monitor via some DP-VGA dongles. The display EDID reading fails over AUX/I2C via DP->VGA dongle, and this leads to the maximum resolution 1920*1080 cannot be obtained from EDID.
[How]
Provide a workaround for some legacy DP-VGA dongles with a longer aux delay.
--- drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c +12 -1
@@ -39,12 +39,14 @@#define DC_LOGGER_INIT (logger) -/*DP to Dual link DVI converter*/ +static const uint8_t DP_VGA_DONGLE_BRANCH_DEV_NAME [] ="DpVga" ; +/* DP to Dual link DVI converter */ static const uint8_t DP_DVI_CONVERTER_ID_4 [] ="m2DVIa" ;static const uint8_t DP_DVI_CONVERTER_ID_5 [] ="3393N2" ;#define AUX_POWER_UP_WA_DELAY 500#define I2C_OVER_AUX_DEFER_WA_DELAY 70 +#define DPVGA_DONGLE_AUX_DEFER_WA_DELAY 40#define I2C_OVER_AUX_DEFER_WA_DELAY_1MS 1/* CV smart dongle slave address for retrieving supported HDTV modes*/
@@ -292,6 +294,15 @@ static uint32_t defer_delay_converter_wa( { struct dc_link *link = ddc->link; + if (link->dpcd_caps.dongle_type == DISPLAY_DONGLE_DP_VGA_CONVERTER && + link->dpcd_caps.branch_dev_id == DP_BRANCH_DEVICE_ID_0080E1 && + !memcmp(link->dpcd_caps.branch_dev_name, + DP_VGA_DONGLE_BRANCH_DEV_NAME, + sizeof(link->dpcd_caps.branch_dev_name))) + + return defer_delay > DPVGA_DONGLE_AUX_DEFER_WA_DELAY ? + defer_delay : DPVGA_DONGLE_AUX_DEFER_WA_DELAY; + if (link->dpcd_caps.branch_dev_id == DP_BRANCH_DEVICE_ID_0080E1 && !memcmp(link->dpcd_caps.branch_dev_name, DP_DVI_CONVERTER_ID_4,
Signature · 6 lines
2.25.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 24/27 drm/amd/display: Better handling of dummy p-state table
In reply to Anson JacobFrom: Joshua Aberback <[email protected]>
[Why]
Some scenarios where we use a UCLK frequency in between dummy p-state table entries result in a p-state hang, due to the table not having a close enough match, so the default DPM0 latency is used, which can be too long to support dummy p-state switching in these scenarios.
[How]
- old: match if current freq is within +- margin of table entry
- new: find largest table entry that is lower than current freq + margin
- lower than DPM0 will still use DPM0
--- .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)
drivers/gpu/drm/amd/display/dc/dcn30/dcn30_resource.c +5 -7
@@ -2189,17 +2189,15 @@ static noinline void dcn30_calculate_wm_and_dlg_fp(unsigned int min_dram_speed_mts = context->bw_ctx.dml.vba.DRAMSpeed;unsigned int min_dram_speed_mts_margin =160 ; - context->bw_ctx.dml.soc.dram_clock_change_latency_us = dc->clk_mgr->bw_params->dummy_pstate_table[0 ].dummy_pstate_latency_us; -if (context->bw_ctx.dml.vba.DRAMClockChangeSupport[vlevel][context->bw_ctx.dml.vba.maxMpcComb] == dm_dram_clock_change_unsupported) min_dram_speed_mts = dc->clk_mgr->bw_params->clk_table.entries[dc->clk_mgr->bw_params->clk_table.num_entries -1 ].memclk_mhz *16 ; -for (i =3 ; i >0 ; i--) { -if ((min_dram_speed_mts + min_dram_speed_mts_margin > dc->clk_mgr->bw_params->dummy_pstate_table[i].dram_speed_mts) && - (min_dram_speed_mts - min_dram_speed_mts_margin < dc->clk_mgr->bw_params->dummy_pstate_table[i].dram_speed_mts)) - context->bw_ctx.dml.soc.dram_clock_change_latency_us = dc->clk_mgr->bw_params->dummy_pstate_table[i].dummy_pstate_latency_us; - } +/* find largest table entry that is lower than dram speed, but lower than DPM0 still uses DPM0 */ +for (i =3 ; i >0 ; i--) +if (min_dram_speed_mts + min_dram_speed_mts_margin > dc->clk_mgr->bw_params->dummy_pstate_table[i].dram_speed_mts) +break ; + context->bw_ctx.dml.soc.dram_clock_change_latency_us = dc->clk_mgr->bw_params->dummy_pstate_table[i].dummy_pstate_latency_us; context->bw_ctx.dml.soc.sr_enter_plus_exit_time_us = dc->clk_mgr->bw_params->wm_table.nv_entries[WM_C ].dml_input.sr_enter_plus_exit_time_us; context->bw_ctx.dml.soc.sr_exit_time_us = dc->clk_mgr->bw_params->wm_table.nv_entries[WM_C ].dml_input.sr_exit_time_us; }
Signature · 6 lines
2.25.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 25/27 drm/amd/display: Reject too small viewport size when validating plane
In reply to Anson JacobFrom: Nikola Cornij <[email protected]>
[why]
Overlay won't move to a new positon if viewport size is smaller than what can be handled. It'd either disappear or stay at the old position. This condition is for example hit if overlay is moved too much outside of left or top edge of the screen, but it applies to any non-cursor plane type.
[how]
Reject this contidion at validation time. This gives the calling level a chance to handle this gracefully and avoid inconsistent behaivor.
--- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 27 ++++++++++++++++++- .../gpu/drm/amd/display/dc/core/dc_resource.c | 4 +-- drivers/gpu/drm/amd/display/dc/dc.h | 1 + 3 files changed, 29 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +26 -1
@@ -6496,8 +6496,33 @@ static int dm_plane_helper_check_state(struct drm_plane_state *state,int min_scale =0 ;int max_scale =INT_MAX ; -/* Plane enabled? Get min/max allowed scaling factors from plane caps. */ +/* Plane enabled? Validate viewport and get scaling factors from plane caps. */ if (fb && state->crtc) { +/* Validate viewport to cover the case when only the position changes */ +if (state->plane->type !=DRM_PLANE_TYPE_CURSOR ) { +int viewport_width = state->crtc_w; +int viewport_height = state->crtc_h; + +if (state->crtc_x <0 ) + viewport_width += state->crtc_x; +else if (state->crtc_x + state->crtc_w > new_crtc_state->mode.crtc_hdisplay) + viewport_width = new_crtc_state->mode.crtc_hdisplay - state->crtc_x; + +if (state->crtc_y <0 ) + viewport_height += state->crtc_y; +else if (state->crtc_y + state->crtc_h > new_crtc_state->mode.crtc_vdisplay) + viewport_height = new_crtc_state->mode.crtc_vdisplay - state->crtc_y; + +/* If completely outside of screen, viewport_width and/or viewport_height will be negative, +* which is still OK to satisfy the condition below, thereby also covering these cases +* (when plane is completely outside of screen). +* x2 for width is because of pipe-split. +*/ +if (viewport_width <MIN_VIEWPORT_SIZE *2 || viewport_height <MIN_VIEWPORT_SIZE ) +return -EINVAL ; + } + +/* Get min/max allowed scaling factors from plane caps. */ get_min_max_dc_plane_scaling (state->crtc->dev, fb, &min_downscale, &max_upscale);/*
drivers/gpu/drm/amd/display/dc/core/dc_resource.c +2 -2
@@ -1153,8 +1153,8 @@ bool resource_build_scaling_params(struct pipe_ctx *pipe_ctx)calculate_viewport (pipe_ctx); -if (pipe_ctx->plane_res.scl_data.viewport.height <12 || - pipe_ctx->plane_res.scl_data.viewport.width <12 ) { +if (pipe_ctx->plane_res.scl_data.viewport.height <MIN_VIEWPORT_SIZE || + pipe_ctx->plane_res.scl_data.viewport.width <MIN_VIEWPORT_SIZE ) {if (store_h_border_left) {restore_border_left_from_dst (pipe_ctx, store_h_border_left);
drivers/gpu/drm/amd/display/dc/dc.h +1 -0
@@ -48,6 +48,7 @@#define MAX_PLANES 6#define MAX_STREAMS 6#define MAX_SINKS_PER_LINK 4 +#define MIN_VIEWPORT_SIZE 12/******************************************************************************* * Display Core Interfaces
Signature · 6 lines
2.25.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 26/27 drm/amd/display: [FW Promotion] Release 0.0.50
In reply to Anson JacobFrom: Anthony Koo <[email protected]>
--- drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h +2 -2
@@ -47,10 +47,10 @@/* Firmware versioning. */ #ifdef DMUB_EXPOSE_VERSION -#define DMUB_FW_VERSION_GIT_HASH 0xf2f2f3a96 +#define DMUB_FW_VERSION_GIT_HASH 0xca1cd48c9#define DMUB_FW_VERSION_MAJOR 0#define DMUB_FW_VERSION_MINOR 0 -#define DMUB_FW_VERSION_REVISION 49 +#define DMUB_FW_VERSION_REVISION 50#define DMUB_FW_VERSION_TEST 0#define DMUB_FW_VERSION_VBIOS 0#define DMUB_FW_VERSION_HOTFIX 0
Signature · 6 lines
2.25.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 27/27 drm/amd/display: 3.2.121
In reply to Anson JacobFrom: Aric Cyr <[email protected]>
This version brings along following fixes:
- Better handling of dummy p-state table
- Workaround for some legacy DP-VGA dongles
- Add Freesync HDMI support to DMCU
- Enable "trigger_hotplug" debugfs on all outputs
- fix initial bounding box values for dcn3.02
- implement support for DID2.0 dsc passthrough
- fix calculation for the pwl backlight curve
- Fix multiple memory leaks
--- 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
@@ -42,7 +42,7 @@#include "inc/hw/dmcu.h" #include "dml/display_mode_lib.h" -#define DC_VER "3.2.120" +#define DC_VER "3.2.121"#define MAX_SURFACES 3#define MAX_PLANES 6
Signature · 6 lines
2.25.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
[AMD Public Use]
Hi all,
Ran the test this week on a Sapphire Pulse RX5700XT and a HP Envy 360 with Ryzen 5 4500U. Tested with 2x 4k60 (DP) displays, 1x 1440p 144hz (DP) display, and 1x 1680x1050 display. Tested the laptop with these displays (via usb-c to dp/dvi/hdmi/vga) alongside it's 1080p eDP display. Also tested using an MST hub with 2x 4k30.
Thank you,
Dan Wheeler
Technologist | AMD
SW Display
O +(1) 905-882-2600 ext. 74665
------------------------------------------------------------------------------------------------------------------
1 Commerce Valley Dr E, Thornhill, ON L3T 7X6
Facebook | Twitter | amd.com
-----Original Message-----
From: amd-gfx <[email protected]> On Behalf Of Anson Jacob
Sent: January 29, 2021 4:27 PM
To: [email protected]
Cc: Brol, Eryk <[email protected]>; Li, Sun peng (Leo) <[email protected]>; Wentland, Harry <[email protected]>; Zhuo, Qingqing <[email protected]>; Siqueira, Rodrigo <[email protected]>; Jacob, Anson <[email protected]>; Pillai, Aurabindo <[email protected]>; Lakha, Bhawanpreet <[email protected]>; R, Bindu <[email protected]>
Subject: [PATCH 00/27] DC Patches Jan 29, 2021
This DC patchset brings improvements in multiple areas. In summary, we have:
- Better handling of dummy p-state table
- Workaround for some legacy DP-VGA dongles
- Add Freesync HDMI support to DMCU
- Enable "trigger_hotplug" debugfs on all outputs
- fix initial bounding box values for dcn3.02
- implement support for DID2.0 dsc passthrough
- fix calculation for the pwl backlight curve
- Fix display detection on HDMI ComboPHY
- Drop SOC bounding box hookup
- Fix DPCD values
- Fix multiple memory leaks
Anthony Koo (3):
drm/amd/display: [FW Promotion] Release 0.0.49 drm/amd/display: fix calculation for the pwl backlight curve drm/amd/display: [FW Promotion] Release 0.0.50
Aric Cyr (2):
drm/amd/display: 3.2.120
drm/amd/display: 3.2.121
Bhawanpreet Lakha (1):
drm/amd/display: reuse current context instead of recreating one
Brendan Steve Leder (1):
drm/amd/display: initialize i2c speed if not initialized in
dcnxxx__resource.c
George Shen (1):
drm/amd/display: Fix DPCD translation for LTTPR AUX_RD_INTERVAL
Joshua Aberback (1):
drm/amd/display: Better handling of dummy p-state table
Jun Lei (1):
drm/amd/display: implement support for DID2.0 dsc passthrough
Lewis Huang (1):
drm/amd/display: Set power_gated to true for seamless boot pipe init
Michael Strauss (1):
drm/amd/display: Add null pointer check to is_dig_enabled func
Mikita Lipski (1):
drm/amd/display: Release DSC before acquiring
Nicholas Kazlauskas (2):
drm/amd/display: Drop SOC bounding box hookup in DM/DC drm/amd/display: Fix CW4 programming for dmub30 cached inbox
Nikola Cornij (1):
drm/amd/display: Reject too small viewport size when validating plane
Samson Tam (1):
drm/amd/display: fix initial bounding box values for dcn3.02
Stylon Wang (3):
drm/amd/display: Revert "Fix EDID parsing after resume from suspend" drm/amd/display: Enable "trigger_hotplug" debugfs on all outputs drm/amd/display: Add Freesync HDMI support to DMCU
Sung Lee (1):
drm/amd/display: Add more Clock Sources to DCN2.1
Taimur Hassan (1):
drm/amd/display: Workaround for some legacy DP-VGA dongles
Victor Lu (3):
drm/amd/display: Fix dc_sink kref count in emulated_link_detect drm/amd/display: Free atomic state after drm_atomic_commit drm/amd/display: Decrement refcount of dc_sink before reassignment
Wenjing Liu (2):
drm/amd/display: correct some hdcp variable naming drm/amd/display: remove unused force_ignore_link_settings debug option
.../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 76 +++++--- .../amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 10 +- .../amd/display/amdgpu_dm/amdgpu_dm_hdcp.c | 7 +- .../display/amdgpu_dm/amdgpu_dm_mst_types.c | 6 +- drivers/gpu/drm/amd/display/dc/Makefile | 4 +- .../display/dc/clk_mgr/dcn301/vg_clk_mgr.c | 3 +- drivers/gpu/drm/amd/display/dc/core/dc.c | 34 ++-- drivers/gpu/drm/amd/display/dc/core/dc_link.c | 14 +- .../gpu/drm/amd/display/dc/core/dc_link_ddc.c | 13 +- .../gpu/drm/amd/display/dc/core/dc_link_dp.c | 6 +- .../gpu/drm/amd/display/dc/core/dc_resource.c | 4 +- drivers/gpu/drm/amd/display/dc/dc.h | 11 +- drivers/gpu/drm/amd/display/dc/dc_dsc.h | 7 +- .../gpu/drm/amd/display/dc/dc_edid_parser.c | 80 +++++++++ .../gpu/drm/amd/display/dc/dc_edid_parser.h | 44 +++++ drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 1 + drivers/gpu/drm/amd/display/dc/dc_stream.h | 3 +- drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c | 120 +++++++++++++ drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.h | 11 ++ .../amd/display/dc/dcn10/dcn10_hw_sequencer.c | 1 + .../drm/amd/display/dc/dcn20/dcn20_resource.c | 111 ------------ .../drm/amd/display/dc/dcn21/dcn21_resource.c | 10 ++ .../drm/amd/display/dc/dcn30/dcn30_resource.c | 143 +++------------ .../amd/display/dc/dcn301/dcn301_resource.c | 107 +---------- .../amd/display/dc/dcn302/dcn302_resource.c | 168 +++++++++++++++++- .../amd/display/dc/dcn302/dcn302_resource.h | 2 + drivers/gpu/drm/amd/display/dc/dm_cp_psp.h | 7 +- drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c | 29 +-- drivers/gpu/drm/amd/display/dc/inc/hw/dmcu.h | 10 ++ .../gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 5 +- .../gpu/drm/amd/display/dmub/src/dmub_dcn20.c | 2 +- .../gpu/drm/amd/display/dmub/src/dmub_dcn20.h | 2 + .../gpu/drm/amd/display/dmub/src/dmub_dcn30.c | 2 +- .../gpu/drm/amd/display/modules/hdcp/hdcp.h | 2 +- .../drm/amd/display/modules/hdcp/hdcp_psp.c | 2 +- .../drm/amd/display/modules/inc/mod_hdcp.h | 4 +- .../amd/display/modules/power/power_helpers.c | 2 +- 37 files changed, 625 insertions(+), 438 deletions(-) create mode 100644 drivers/gpu/drm/amd/display/dc/dc_edid_parser.c create mode 100644 drivers/gpu/drm/amd/display/dc/dc_edid_parser.h
--
2.25.1
_______________________________________________
amd-gfx mailing list
[email protected]
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=04%7C01%7Cdaniel.wheeler%40amd.com%7C23635029eab44087addf08d8c49cc452%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637475524912193583%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=qOO7HpFb%2B7ppkLj74PEX8QPMShPT77M7ymr15ZFCc%2Fs%3D&reserved=0
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx