From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 91A5DC433E0 for ; Mon, 1 Jun 2020 18:13:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 701AA2068D for ; Mon, 1 Jun 2020 18:13:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591035239; bh=NdnPmtsS3tWnrdzORWnRxa8zNY3r7zHEa+3nzOiybw8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=iJzWQGyP65VeKqj+726XrJPvooMXGcYK/t9+3q8nb7zuGska28YYTLoF3JAmcJ33p 6kyInF/9lolaUsowDNCRc24PsDkVrFz8n5D9rnWNSeDhIczDzJZ/yUn1f0y/kq+ZAF jKQvGdLokVEGMr3ywQksHhjdVRNmsPFutIE1/Rf8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731423AbgFASN6 (ORCPT ); Mon, 1 Jun 2020 14:13:58 -0400 Received: from mail.kernel.org ([198.145.29.99]:33526 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730992AbgFASNy (ORCPT ); Mon, 1 Jun 2020 14:13:54 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id F1A72206E2; Mon, 1 Jun 2020 18:13:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591035233; bh=NdnPmtsS3tWnrdzORWnRxa8zNY3r7zHEa+3nzOiybw8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kGI8uW/UTMz+oRhYxdDZ79gg6RqVBMxh2hkEPQ0/TSedAqM52NMmPYfDX5KlbWBoS jpe+Sp9aK3Q34IS+9b1Is36+CNvOaQLLKOgoSYg7eHAoj81soqHoN/sJvas6lPvZkI wG6RRANFC1JWS+NS8MDaCRbNsbnwxXQEryswxjhM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Harry Wentland , Bhawanpreet Lakha , "Leo (Hanghong) Ma" , Alex Deucher , Sasha Levin Subject: [PATCH 5.6 068/177] drm/amd/amdgpu: Update update_config() logic Date: Mon, 1 Jun 2020 19:53:26 +0200 Message-Id: <20200601174054.581376739@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200601174048.468952319@linuxfoundation.org> References: <20200601174048.468952319@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Leo (Hanghong) Ma [ Upstream commit 650e723cecf2738dee828564396f3239829aba83 ] [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. Reviewed-by: Harry Wentland Reviewed-by: Bhawanpreet Lakha Signed-off-by: Leo (Hanghong) Ma Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- 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 3abeff7722e3..e80371542622 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 @@ -316,15 +316,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) -- 2.25.1