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 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id BBD70C433EF for ; Tue, 12 Apr 2022 00:44:49 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id AD14810FA9E; Tue, 12 Apr 2022 00:44:48 +0000 (UTC) Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1014610FAA3; Tue, 12 Apr 2022 00:44:47 +0000 (UTC) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 54354617B6; Tue, 12 Apr 2022 00:44:46 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id EB02CC385A3; Tue, 12 Apr 2022 00:44:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1649724286; bh=wfI68vr0BsEZOQT/Wk/kW6mnjWwaLMXODSB07j1NzVE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kvQ8QRZWzZxnl9IL4cwLUgQdahHiVRowXIed5uBfFnQjo1MsntnMfWDC38mmQVzGU 7o9Uci+pDsnnHFFXc4f2Ig1LcQ3l/vOfo5o7Y7GfwhjCZXgagTYKmnEaCWd5l+er5y abyc1Br+tIWUBoaa83sEKACd2faisfB9mbyJgt+k7my0dJKF7pCQwzZMw4zPaoLU80 8qs3/kapooTXlJggEwI7XBAZageDV7DsILOaQywY94lVxUgQXLzJ1XtD4aSmEXFO81 rM6xkuK6EbzIm1tH3fMi4Zn4ES7371vpc1Mimzqs8RZjN/CfUV0sFMKDEBr7Fd26/C svz/sjKSu0oNQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH AUTOSEL 5.17 07/49] drm/amd/display: fix audio format not updated after edid updated Date: Mon, 11 Apr 2022 20:43:25 -0400 Message-Id: <20220412004411.349427-7-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220412004411.349427-1-sashal@kernel.org> References: <20220412004411.349427-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: airlied@linux.ie, Rodrigo.Siqueira@amd.com, dri-devel@lists.freedesktop.org, meenakshikumar.somasundaram@amd.com, Jun.Lei@amd.com, Jimmy.Kizito@amd.com, Sasha Levin , Charlene Liu , wenjing.liu@amd.com, amd-gfx@lists.freedesktop.org, sunpeng.li@amd.com, Jerry.Zuo@amd.com, eric.bernstein@amd.com, Alvin Lee , Alex Hung , Daniel Wheeler , Martin.Leung@amd.com, Xinhui.Pan@amd.com, christian.koenig@amd.com, Dmytro.Laktyushkin@amd.com, Alex Deucher , nicholas.kazlauskas@amd.com Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" From: Charlene Liu [ Upstream commit 5e8a71cf13bc9184fee915b2220be71b4c6cac74 ] [why] for the case edid change only changed audio format. driver still need to update stream. Reviewed-by: Alvin Lee Reviewed-by: Aric Cyr Acked-by: Alex Hung Signed-off-by: Charlene Liu Tested-by: Daniel Wheeler Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c index 18757c158523..bb8a762cf8da 100644 --- a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c +++ b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c @@ -1664,8 +1664,8 @@ bool dc_is_stream_unchanged( if (old_stream->ignore_msa_timing_param != stream->ignore_msa_timing_param) return false; - // Only Have Audio left to check whether it is same or not. This is a corner case for Tiled sinks - if (old_stream->audio_info.mode_count != stream->audio_info.mode_count) + /*compare audio info*/ + if (memcmp(&old_stream->audio_info, &stream->audio_info, sizeof(stream->audio_info)) != 0) return false; return true; -- 2.35.1 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 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E6995C433EF for ; Tue, 12 Apr 2022 00:44:47 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 88C6410FAA3; Tue, 12 Apr 2022 00:44:47 +0000 (UTC) Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1014610FAA3; Tue, 12 Apr 2022 00:44:47 +0000 (UTC) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 54354617B6; Tue, 12 Apr 2022 00:44:46 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id EB02CC385A3; Tue, 12 Apr 2022 00:44:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1649724286; bh=wfI68vr0BsEZOQT/Wk/kW6mnjWwaLMXODSB07j1NzVE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kvQ8QRZWzZxnl9IL4cwLUgQdahHiVRowXIed5uBfFnQjo1MsntnMfWDC38mmQVzGU 7o9Uci+pDsnnHFFXc4f2Ig1LcQ3l/vOfo5o7Y7GfwhjCZXgagTYKmnEaCWd5l+er5y abyc1Br+tIWUBoaa83sEKACd2faisfB9mbyJgt+k7my0dJKF7pCQwzZMw4zPaoLU80 8qs3/kapooTXlJggEwI7XBAZageDV7DsILOaQywY94lVxUgQXLzJ1XtD4aSmEXFO81 rM6xkuK6EbzIm1tH3fMi4Zn4ES7371vpc1Mimzqs8RZjN/CfUV0sFMKDEBr7Fd26/C svz/sjKSu0oNQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH AUTOSEL 5.17 07/49] drm/amd/display: fix audio format not updated after edid updated Date: Mon, 11 Apr 2022 20:43:25 -0400 Message-Id: <20220412004411.349427-7-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220412004411.349427-1-sashal@kernel.org> References: <20220412004411.349427-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit X-BeenThere: amd-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion list for AMD gfx List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: aric.cyr@amd.com, airlied@linux.ie, Rodrigo.Siqueira@amd.com, dri-devel@lists.freedesktop.org, meenakshikumar.somasundaram@amd.com, Jun.Lei@amd.com, Jimmy.Kizito@amd.com, Sasha Levin , Charlene Liu , mario.kleiner.de@gmail.com, wenjing.liu@amd.com, amd-gfx@lists.freedesktop.org, sunpeng.li@amd.com, Jerry.Zuo@amd.com, eric.bernstein@amd.com, Alvin Lee , harry.wentland@amd.com, Alex Hung , Daniel Wheeler , Martin.Leung@amd.com, Xinhui.Pan@amd.com, christian.koenig@amd.com, Dmytro.Laktyushkin@amd.com, daniel@ffwll.ch, Alex Deucher , nicholas.kazlauskas@amd.com Errors-To: amd-gfx-bounces@lists.freedesktop.org Sender: "amd-gfx" From: Charlene Liu [ Upstream commit 5e8a71cf13bc9184fee915b2220be71b4c6cac74 ] [why] for the case edid change only changed audio format. driver still need to update stream. Reviewed-by: Alvin Lee Reviewed-by: Aric Cyr Acked-by: Alex Hung Signed-off-by: Charlene Liu Tested-by: Daniel Wheeler Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c index 18757c158523..bb8a762cf8da 100644 --- a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c +++ b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c @@ -1664,8 +1664,8 @@ bool dc_is_stream_unchanged( if (old_stream->ignore_msa_timing_param != stream->ignore_msa_timing_param) return false; - // Only Have Audio left to check whether it is same or not. This is a corner case for Tiled sinks - if (old_stream->audio_info.mode_count != stream->audio_info.mode_count) + /*compare audio info*/ + if (memcmp(&old_stream->audio_info, &stream->audio_info, sizeof(stream->audio_info)) != 0) return false; return true; -- 2.35.1 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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C49F6C433FE for ; Tue, 12 Apr 2022 00:45:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242548AbiDLArQ (ORCPT ); Mon, 11 Apr 2022 20:47:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37736 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242436AbiDLArH (ORCPT ); Mon, 11 Apr 2022 20:47:07 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B91D111C13; Mon, 11 Apr 2022 17:44:48 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 62FCDB8186F; Tue, 12 Apr 2022 00:44:47 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id EB02CC385A3; Tue, 12 Apr 2022 00:44:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1649724286; bh=wfI68vr0BsEZOQT/Wk/kW6mnjWwaLMXODSB07j1NzVE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kvQ8QRZWzZxnl9IL4cwLUgQdahHiVRowXIed5uBfFnQjo1MsntnMfWDC38mmQVzGU 7o9Uci+pDsnnHFFXc4f2Ig1LcQ3l/vOfo5o7Y7GfwhjCZXgagTYKmnEaCWd5l+er5y abyc1Br+tIWUBoaa83sEKACd2faisfB9mbyJgt+k7my0dJKF7pCQwzZMw4zPaoLU80 8qs3/kapooTXlJggEwI7XBAZageDV7DsILOaQywY94lVxUgQXLzJ1XtD4aSmEXFO81 rM6xkuK6EbzIm1tH3fMi4Zn4ES7371vpc1Mimzqs8RZjN/CfUV0sFMKDEBr7Fd26/C svz/sjKSu0oNQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Charlene Liu , Alvin Lee , Aric Cyr , Alex Hung , Daniel Wheeler , Alex Deucher , Sasha Levin , harry.wentland@amd.com, sunpeng.li@amd.com, Rodrigo.Siqueira@amd.com, christian.koenig@amd.com, Xinhui.Pan@amd.com, airlied@linux.ie, daniel@ffwll.ch, Jun.Lei@amd.com, aric.cyr@amd.com, Jimmy.Kizito@amd.com, wenjing.liu@amd.com, nicholas.kazlauskas@amd.com, mario.kleiner.de@gmail.com, Dmytro.Laktyushkin@amd.com, Jerry.Zuo@amd.com, meenakshikumar.somasundaram@amd.com, eric.bernstein@amd.com, Martin.Leung@amd.com, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 5.17 07/49] drm/amd/display: fix audio format not updated after edid updated Date: Mon, 11 Apr 2022 20:43:25 -0400 Message-Id: <20220412004411.349427-7-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220412004411.349427-1-sashal@kernel.org> References: <20220412004411.349427-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Charlene Liu [ Upstream commit 5e8a71cf13bc9184fee915b2220be71b4c6cac74 ] [why] for the case edid change only changed audio format. driver still need to update stream. Reviewed-by: Alvin Lee Reviewed-by: Aric Cyr Acked-by: Alex Hung Signed-off-by: Charlene Liu Tested-by: Daniel Wheeler Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c index 18757c158523..bb8a762cf8da 100644 --- a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c +++ b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c @@ -1664,8 +1664,8 @@ bool dc_is_stream_unchanged( if (old_stream->ignore_msa_timing_param != stream->ignore_msa_timing_param) return false; - // Only Have Audio left to check whether it is same or not. This is a corner case for Tiled sinks - if (old_stream->audio_info.mode_count != stream->audio_info.mode_count) + /*compare audio info*/ + if (memcmp(&old_stream->audio_info, &stream->audio_info, sizeof(stream->audio_info)) != 0) return false; return true; -- 2.35.1