[PATCH] drm/amd/amdgpu: Update update_config() logic
Harry Wentland
hwentlan at amd.com
Mon May 11 19:46:16 UTC 2020
On 2020-05-11 3:28 p.m., Leo (Hanghong) Ma wrote:
> [Why]
> For MST case: when update_config is called to disable a stream,
> this clears the settings for all the streams on that link.
> We should only clear the settings for the stream that was disabled.
>
> [How]
> Clear the settings after the call to remove display is called.
>
> Change-Id: I8235998b8fac3d58d24edf86bb5d7cc030f1e375
Please drop the Change-Id before merging.
> Signed-off-by: Leo (Hanghong) Ma <hanghong.ma at amd.com>
Reviewed-by: Harry Wentland <harry.wentland at amd.com>
Harry
> ---
> drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c
> index 78e1c11d4ae5..dcf84a61de37 100644
> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c
> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c
> @@ -398,15 +398,15 @@ static void update_config(void *handle, struct cp_psp_stream_config *config)
> struct mod_hdcp_display *display = &hdcp_work[link_index].display;
> struct mod_hdcp_link *link = &hdcp_work[link_index].link;
>
> - memset(display, 0, sizeof(*display));
> - memset(link, 0, sizeof(*link));
> -
> - display->index = aconnector->base.index;
> -
> if (config->dpms_off) {
> hdcp_remove_display(hdcp_work, link_index, aconnector);
> return;
> }
> +
> + memset(display, 0, sizeof(*display));
> + memset(link, 0, sizeof(*link));
> +
> + display->index = aconnector->base.index;
> display->state = MOD_HDCP_DISPLAY_ACTIVE;
>
> if (aconnector->dc_sink != NULL)
>
More information about the amd-gfx
mailing list