From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 671991B271 for ; Sat, 27 Jan 2024 22:38:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706395094; cv=none; b=IdLgh8BToUMWvEQL/nXBV3PXlsjiaHdifYuN4zmRdQyhA7+XKKPVvsO7KXPyaE7PhzUB3xQeiMlQlnwrZrN8pqBwa8ZX8yAFdrvpMNYA3rTIHWn4+5bpSIeKP5IuC2DniSx70ue4iGpsI2MAEkitTh1Y+ZSCjkxSaHfs3iAILdQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706395094; c=relaxed/simple; bh=j0hg2AWaqzvYtdhY0AMr/bvdzLPvQeNC5v8C+8dla0k=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=nAnYtNsOHTZ0VxT/Glt9c7FdgGME1PKsU69GzWl4Jvl2iLGA9e1+NzEjcPu3iHcBaiBPg9GvQNH2BnC3t+nTZ0FaKa1eQqZfOl0CEbsycvAP4rjJpLjbGsgOR1ArxbdfUDLMdIBr/zIXU4O4nsNXKyBYNrm5r3uPmy5+Xx+gyLg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=f6lorMj5; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="f6lorMj5" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 28191C433C7; Sat, 27 Jan 2024 22:38:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1706395094; bh=j0hg2AWaqzvYtdhY0AMr/bvdzLPvQeNC5v8C+8dla0k=; h=Subject:To:Cc:From:Date:From; b=f6lorMj5cCYv+Ka/68c39uSV1aZDeOALdulo2RJyukOaS1PJ+4HmXzBn6s5T0RUMt vRYf8spIU/ZgsI3cR6s5mGTgaj6TdjqtaBcKU4cWfWXYx4kt3HAtSYOEZzwXlx7quc B38F6XXGnYr1vtS8p9P4nw2HYRaU4UB/ykC+glX4= Subject: FAILED: patch "[PATCH] drm/amd/display: Restore guard against default backlight" failed to apply to 6.6-stable tree To: mario.limonciello@amd.com,alexander.deucher@amd.com,camille.cho@amd.com,hamza.mahfooz@amd.com,krunoslav.kovac@amd.com,mark.herbert42@gmail.com Cc: From: Date: Sat, 27 Jan 2024 14:38:13 -0800 Message-ID: <2024012713-dismount-frail-dc0d@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit The patch below does not apply to the 6.6-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.6.y git checkout FETCH_HEAD git cherry-pick -x a2020be69490ee8778c59a02e7b270dfeecffbd4 # git commit -s git send-email --to '' --in-reply-to '2024012713-dismount-frail-dc0d@gregkh' --subject-prefix 'PATCH 6.6.y' HEAD^.. Possible dependencies: a2020be69490 ("drm/amd/display: Restore guard against default backlight value < 1 nit") 43b8ac4b34ec ("drm/amd/display: Simplify brightness initialization") 5edb7cdff85a ("drm/amd/display: Reduce default backlight min from 5 nits to 1 nits") 6ec876472ff7 ("drm/amd/display: refactor ILR to make it work") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From a2020be69490ee8778c59a02e7b270dfeecffbd4 Mon Sep 17 00:00:00 2001 From: Mario Limonciello Date: Wed, 6 Dec 2023 12:08:26 -0600 Subject: [PATCH] drm/amd/display: Restore guard against default backlight value < 1 nit Mark reports that brightness is not restored after Xorg dpms screen blank. This behavior was introduced by commit d9e865826c20 ("drm/amd/display: Simplify brightness initialization") which dropped the cached backlight value in display code, but also removed code for when the default value read back was less than 1 nit. Restore this code so that the backlight brightness is restored to the correct default value in this circumstance. Reported-by: Mark Herbert Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/3031 Cc: stable@vger.kernel.org Cc: Camille Cho Cc: Krunoslav Kovac Cc: Hamza Mahfooz Fixes: d9e865826c20 ("drm/amd/display: Simplify brightness initialization") Acked-by: Alex Deucher Signed-off-by: Mario Limonciello Signed-off-by: Alex Deucher diff --git a/drivers/gpu/drm/amd/display/dc/link/protocols/link_edp_panel_control.c b/drivers/gpu/drm/amd/display/dc/link/protocols/link_edp_panel_control.c index ac0fa88b52a0..bf53a86ea817 100644 --- a/drivers/gpu/drm/amd/display/dc/link/protocols/link_edp_panel_control.c +++ b/drivers/gpu/drm/amd/display/dc/link/protocols/link_edp_panel_control.c @@ -287,8 +287,8 @@ bool set_default_brightness_aux(struct dc_link *link) if (link && link->dpcd_sink_ext_caps.bits.oled == 1) { if (!read_default_bl_aux(link, &default_backlight)) default_backlight = 150000; - // if > 5000, it might be wrong readback - if (default_backlight > 5000000) + // if < 1 nits or > 5000, it might be wrong readback + if (default_backlight < 1000 || default_backlight > 5000000) default_backlight = 150000; return edp_set_backlight_level_nits(link, true,