[PATCH] drm/amd/amdgpu: Update update_config() logic

[Ma, Hanghong]

[AMD Official Use Only - Internal Distribution Only]


[AMD Official Use Only - Internal Distribution Only]

Merged.
Thanks for review.

-Leo
From: Lakha, Bhawanpreet <Bhawanpreet.Lakha at amd.com>
Sent: Monday, May 11, 2020 3:51 PM
To: Ma, Hanghong <Hanghong.Ma at amd.com>; Wentland, Harry <Harry.Wentland at amd.com>
Cc: amd-gfx at lists.freedesktop.org
Subject: Re: [PATCH] drm/amd/amdgpu: Update update_config() logic


[AMD Official Use Only - Internal Distribution Only]

Reviewed-by: Bhawanpreet Lakha <Bhawanpreet.Lakha at amd.com<mailto:Bhawanpreet.Lakha at amd.com>>
________________________________
From: Ma, Hanghong <Hanghong.Ma at amd.com<mailto:Hanghong.Ma at amd.com>>
Sent: May 11, 2020 3:48 PM
To: Wentland, Harry <Harry.Wentland at amd.com<mailto:Harry.Wentland at amd.com>>
Cc: Lakha, Bhawanpreet <Bhawanpreet.Lakha at amd.com<mailto:Bhawanpreet.Lakha at amd.com>>; amd-gfx at lists.freedesktop.org<mailto:amd-gfx at lists.freedesktop.org> <amd-gfx at lists.freedesktop.org<mailto:amd-gfx at lists.freedesktop.org>>
Subject: RE: [PATCH] drm/amd/amdgpu: Update update_config() logic

[AMD Official Use Only - Internal Distribution Only]

Thanks Harry.
I will drop the Change-Id before merging.

-Leo

-----Original Message-----
From: Wentland, Harry <Harry.Wentland at amd.com<mailto:Harry.Wentland at amd.com>>
Sent: Monday, May 11, 2020 3:46 PM
To: Ma, Hanghong <Hanghong.Ma at amd.com<mailto:Hanghong.Ma at amd.com>>; Lakha, Bhawanpreet <Bhawanpreet.Lakha at amd.com<mailto:Bhawanpreet.Lakha at amd.com>>; amd-gfx at lists.freedesktop.org<mailto:amd-gfx at lists.freedesktop.org>
Cc: Wentland, Harry <Harry.Wentland at amd.com<mailto:Harry.Wentland at amd.com>>
Subject: Re: [PATCH] drm/amd/amdgpu: Update update_config() logic

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<mailto:hanghong.ma at amd.com>>

Reviewed-by: Harry Wentland <harry.wentland at amd.com<mailto: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)
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/amd-gfx/attachments/20200511/94d9dc63/attachment.htm>