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 83BC4C10F1A for ; Tue, 7 May 2024 23:01:58 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B0E7C112FC2; Tue, 7 May 2024 23:01:57 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.b="YGHSAOdZ"; dkim-atps=neutral Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by gabe.freedesktop.org (Postfix) with ESMTPS id E104B112FC2; Tue, 7 May 2024 23:01:56 +0000 (UTC) Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 44CD8619FA; Tue, 7 May 2024 23:01:56 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id F2012C3277B; Tue, 7 May 2024 23:01:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1715122916; bh=Ojbrq8calDDK6zre4KUhu3qnC0Lb+IpNjLh39EtbaRY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YGHSAOdZ/X7nnaak5mDMKu67mOv7JJU0cVhp9iqEnhji1sy6pe62EFiBaTAr34JB3 p1G4kODBoBubCAy1DWNNaoKpRULctkwiqDPmQBU0b2yBZIB4WN7fIEuE42bcB/pcmx ytSBusVpeUe0lFK+Lg5EhGqi0wUPghZxJapWFMMoAiWvU1freD7uKaDBBGDDVRAqnM jlYUcWUBM3uUFQfSErioLtVjyW6TQ2Kdf2kJgLJV1adzzaxyh4Cz1zWzLR9nDR12nZ +FG2HUZI8F7ETCkzlnemsGEHTtoZVMDfCDwC/Q2gmY+l1HTlc5fcDquwWQ7K//N2D5 8mG/6QCS3DN4A== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Joshua Ashton , Harry Wentland , Alex Deucher , Sasha Levin , sunpeng.li@amd.com, Rodrigo.Siqueira@amd.com, christian.koenig@amd.com, Xinhui.Pan@amd.com, airlied@gmail.com, daniel@ffwll.ch, alex.hung@amd.com, hamza.mahfooz@amd.com, wayne.lin@amd.com, srinivasan.shanmugam@amd.com, mario.limonciello@amd.com, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 5.4 3/3] drm/amd/display: Set color_mgmt_changed to true on unsuspend Date: Tue, 7 May 2024 19:01:43 -0400 Message-ID: <20240507230146.391926-3-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240507230146.391926-1-sashal@kernel.org> References: <20240507230146.391926-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 5.4.275 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: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" From: Joshua Ashton [ Upstream commit 2eb9dd497a698dc384c0dd3e0311d541eb2e13dd ] Otherwise we can end up with a frame on unsuspend where color management is not applied when userspace has not committed themselves. Fixes re-applying color management on Steam Deck/Gamescope on S3 resume. Signed-off-by: Joshua Ashton Reviewed-by: Harry Wentland Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c index 3f3242783e1c3..3bfc4aa328c6f 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -1251,6 +1251,7 @@ static int dm_resume(void *handle) dc_stream_release(dm_new_crtc_state->stream); dm_new_crtc_state->stream = NULL; } + dm_new_crtc_state->base.color_mgmt_changed = true; } for_each_new_plane_in_state(dm->cached_state, plane, new_plane_state, i) { -- 2.43.0